From b23c1c1098c2b881eb782c0866aabf00baf063ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Balay=C3=A9?= Date: Thu, 21 May 2020 00:39:01 +0200 Subject: [PATCH] Simplify everything: rely on private layers now! --- configs/spacemacs-default/dot-init.el | 2 - configs/spacemacs-default/dot-layers.el | 53 ------- configs/spacemacs-default/dot-user-config.el | 1 - configs/spacemacs-default/dot-user-env.el | 1 - configs/spacemacs-default/dot-user-init.el | 1 - configs/spacemacs-default/dot-user-load.el | 3 - configs/spacemacs-minimal/dot-init.el | 2 - configs/spacemacs-minimal/dot-layers.el | 53 ------- configs/spacemacs-minimal/dot-user-config.el | 2 - configs/spacemacs-minimal/dot-user-env.el | 1 - configs/spacemacs-minimal/dot-user-init.el | 1 - configs/spacemacs-minimal/dot-user-load.el | 3 - configs/spacemacs-minimal/init.el | 123 +--------------- configs/spacemacs-test/dot-init.el | 2 - configs/spacemacs-test/dot-layers.el | 60 -------- configs/spacemacs-test/dot-user-config.el | 24 ---- configs/spacemacs-test/dot-user-env.el | 1 - configs/spacemacs-test/dot-user-init.el | 1 - configs/spacemacs-test/dot-user-load.el | 3 - configs/spacemacs-test/init.el | 142 +------------------ 20 files changed, 13 insertions(+), 466 deletions(-) delete mode 100644 configs/spacemacs-default/dot-init.el delete mode 100644 configs/spacemacs-default/dot-layers.el delete mode 100644 configs/spacemacs-default/dot-user-config.el delete mode 100644 configs/spacemacs-default/dot-user-env.el delete mode 100644 configs/spacemacs-default/dot-user-init.el delete mode 100644 configs/spacemacs-default/dot-user-load.el delete mode 100644 configs/spacemacs-minimal/dot-init.el delete mode 100644 configs/spacemacs-minimal/dot-layers.el delete mode 100644 configs/spacemacs-minimal/dot-user-config.el delete mode 100644 configs/spacemacs-minimal/dot-user-env.el delete mode 100644 configs/spacemacs-minimal/dot-user-init.el delete mode 100644 configs/spacemacs-minimal/dot-user-load.el delete mode 100644 configs/spacemacs-test/dot-init.el delete mode 100644 configs/spacemacs-test/dot-layers.el delete mode 100644 configs/spacemacs-test/dot-user-config.el delete mode 100644 configs/spacemacs-test/dot-user-env.el delete mode 100644 configs/spacemacs-test/dot-user-init.el delete mode 100644 configs/spacemacs-test/dot-user-load.el diff --git a/configs/spacemacs-default/dot-init.el b/configs/spacemacs-default/dot-init.el deleted file mode 100644 index d45cfa9..0000000 --- a/configs/spacemacs-default/dot-init.el +++ /dev/null @@ -1,2 +0,0 @@ -(defun dotspacemacs/init-specific () - ) diff --git a/configs/spacemacs-default/dot-layers.el b/configs/spacemacs-default/dot-layers.el deleted file mode 100644 index 9e7d531..0000000 --- a/configs/spacemacs-default/dot-layers.el +++ /dev/null @@ -1,53 +0,0 @@ -(defun dotspacemacs/layers-specific () - - (setq-default - dotspacemacs-configuration-layers - (append dotspacemacs-configuration-layers - '( - ;; -------- Languages - ;; ess - ;; html - ;; latex - ;; markdown - ;; python - ;; julia - ;; javascript - ;; sql - ;; go - - - ;; -------- Others - ;; systemd - ;; csv - - ;; -------- Applications - ;; org - ;; gnus - ;; fasd - ;; lsp - - ;; -------- Project management - ;; (treemacs :variables - ;; treemacs-use-follow-mode t - ;; treemacs-use-filewatch-mode t) - - ;; -------- Tools - ;; pdf - ;; (shell :variables - ;; shell-default-term-shell "/bin/zsh" - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;; (spell-checking :variables spell-checking-enable-by-default nil) - ;; (auto-completion :variables - ;; auto-completion-enable-snippets-in-popup t - ;; auto-completion-enable-help-tooltip t - ;; auto-completion-enable-sort-by-usage t - ;; ) - ;; syntax-checking - ;; spacemacs-purpose - - ;; ------- - ;; theming - )) - ) - ) diff --git a/configs/spacemacs-default/dot-user-config.el b/configs/spacemacs-default/dot-user-config.el deleted file mode 100644 index 9f5614e..0000000 --- a/configs/spacemacs-default/dot-user-config.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-config-specific ()) diff --git a/configs/spacemacs-default/dot-user-env.el b/configs/spacemacs-default/dot-user-env.el deleted file mode 100644 index 32a5fe2..0000000 --- a/configs/spacemacs-default/dot-user-env.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-env-specific ()) diff --git a/configs/spacemacs-default/dot-user-init.el b/configs/spacemacs-default/dot-user-init.el deleted file mode 100644 index 64a0308..0000000 --- a/configs/spacemacs-default/dot-user-init.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-init-specific ()) diff --git a/configs/spacemacs-default/dot-user-load.el b/configs/spacemacs-default/dot-user-load.el deleted file mode 100644 index 827ace5..0000000 --- a/configs/spacemacs-default/dot-user-load.el +++ /dev/null @@ -1,3 +0,0 @@ - -(defun dotspacemacs/user-load-specific () - ) diff --git a/configs/spacemacs-minimal/dot-init.el b/configs/spacemacs-minimal/dot-init.el deleted file mode 100644 index d45cfa9..0000000 --- a/configs/spacemacs-minimal/dot-init.el +++ /dev/null @@ -1,2 +0,0 @@ -(defun dotspacemacs/init-specific () - ) diff --git a/configs/spacemacs-minimal/dot-layers.el b/configs/spacemacs-minimal/dot-layers.el deleted file mode 100644 index 050ee67..0000000 --- a/configs/spacemacs-minimal/dot-layers.el +++ /dev/null @@ -1,53 +0,0 @@ -(defun dotspacemacs/layers-specific () - - (setq-default - dotspacemacs-configuration-layers - (append dotspacemacs-configuration-layers - '( - ;; -------- Languages - ;; ess - ;; html - ;; latex - ;; markdown - ;; python - ;; julia - ;; javascript - ;; sql - ;; go - - - ;; -------- Others - ;; systemd - ;; csv - - ;; -------- Applications - ;; org - ;; gnus - ;; fasd - - ;; -------- Project management - ;; git - ;; (treemacs :variables - ;; treemacs-use-follow-mode t - ;; treemacs-use-filewatch-mode t) - - ;; -------- Tools - ;; pdf - ;; (shell :variables - ;; shell-default-term-shell "/bin/zsh" - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;; (spell-checking :variables spell-checking-enable-by-default nil) - ;; (auto-completion :variables - ;; auto-completion-enable-snippets-in-popup t - ;; auto-completion-enable-help-tooltip t - ;; auto-completion-enable-sort-by-usage t - ;; ) - ;; syntax-checking - ;; spacemacs-purpose - - ;; ------- - ;; theming - )) - ) - ) diff --git a/configs/spacemacs-minimal/dot-user-config.el b/configs/spacemacs-minimal/dot-user-config.el deleted file mode 100644 index 55e5b5b..0000000 --- a/configs/spacemacs-minimal/dot-user-config.el +++ /dev/null @@ -1,2 +0,0 @@ -(defun dotspacemacs/user-config-specific () - ) diff --git a/configs/spacemacs-minimal/dot-user-env.el b/configs/spacemacs-minimal/dot-user-env.el deleted file mode 100644 index 32a5fe2..0000000 --- a/configs/spacemacs-minimal/dot-user-env.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-env-specific ()) diff --git a/configs/spacemacs-minimal/dot-user-init.el b/configs/spacemacs-minimal/dot-user-init.el deleted file mode 100644 index 64a0308..0000000 --- a/configs/spacemacs-minimal/dot-user-init.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-init-specific ()) diff --git a/configs/spacemacs-minimal/dot-user-load.el b/configs/spacemacs-minimal/dot-user-load.el deleted file mode 100644 index 827ace5..0000000 --- a/configs/spacemacs-minimal/dot-user-load.el +++ /dev/null @@ -1,3 +0,0 @@ - -(defun dotspacemacs/user-load-specific () - ) diff --git a/configs/spacemacs-minimal/init.el b/configs/spacemacs-minimal/init.el index 0e1857f..1a87ba3 100644 --- a/configs/spacemacs-minimal/init.el +++ b/configs/spacemacs-minimal/init.el @@ -1,35 +1,13 @@ ;; -*- mode: emacs-lisp; lexical-binding: t -*- -;; This file is loaded by Spacemacs at startup. -;; It must be stored in your home directory. - -;; Determine specific config directory -(setq config-emacs-directory (replace-regexp-in-string "flavors" "configs" user-emacs-directory)) - -(defun load-config-file (filename) - (load (concat config-emacs-directory filename))) (defun dotspacemacs/layers () - "Layer configuration: -This function should only modify configuration layer settings." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - ;; Settings (setq-default dotspacemacs-distribution 'spacemacs dotspacemacs-enable-lazy-installation nil dotspacemacs-ask-for-lazy-installation t dotspacemacs-configuration-layer-path (list (concat user-emacs-directory - "../../layers/")) - dotspacemacs-additional-packages '() - dotspacemacs-frozen-packages '() - dotspacemacs-excluded-packages '() - dotspacemacs-install-packages 'used-but-keep-unused) - - ;; Layers + "../../layers/"))) (setq-default ;; List of configuration layers to load. dotspacemacs-configuration-layers @@ -41,25 +19,14 @@ This function should only modify configuration layer settings." (stats :location local) ) ) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - - (load-config-file "dot-layers.el") - (dotspacemacs/layers-specific) + (setq-default + dotspacemacs-additional-packages '() + dotspacemacs-frozen-packages '() + dotspacemacs-excluded-packages '() + dotspacemacs-install-packages 'used-but-keep-unused) ) (defun dotspacemacs/init () - "Instantiate Spacemacs core settings. -All `dotspacemacs-' variables with values set different than their defaults. -They are all defined in `~/.emacs.d/core/core-dotspacemacs.el'. -Check `dotspacemacs/get-variable-string-list' for all vars you can configure." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - (setq-default dotspacemacs-editing-style 'hybrid dotspacemacs-startup-banner 100 @@ -92,89 +59,11 @@ Check `dotspacemacs/get-variable-string-list' for all vars you can configure." dotspacemacs-search-tools '("ag" "rg" "pt" "ack" "grep") dotspacemacs-whitespace-cleanup 'all dotspacemacs-pretty-docs t) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - - (load-config-file "dot-init.el") - (dotspacemacs/init-specific) - ) - -(defun dotspacemacs/user-env () - "Environment variables setup. -This function defines the environment variables for your Emacs session. By -default it calls `spacemacs/load-spacemacs-env' which loads the environment -variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'. -See the header of this file for more information." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-env.el") - (dotspacemacs/user-env-specific) - ) - -(defun dotspacemacs/user-init () - "Initialization for user code: -This function is called immediately after `dotspacemacs/init', before layer -configuration. -It is mostly for variables that should be set before packages are loaded. -If you are unsure, try setting them in `dotspacemacs/user-config' first." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-init.el") - (dotspacemacs/user-init-specific) - ) - -(defun dotspacemacs/user-load () - "Library to load while dumping. -This function is called only while dumping Spacemacs configuration. You can -`require' or `load' the libraries of your choice that will be included in the -dump." - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-load.el") - (dotspacemacs/user-load-specific) ) (defun dotspacemacs/user-config () - "Configuration for user code: -This function is called at the very end of Spacemacs startup, after layer -configuration. -Put your configuration code here, except for variables that should be set -before packages are loaded." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- (spacemacs/toggle-centered-point-globally-on) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-config.el") - (dotspacemacs/user-config-specific) ) - - ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. diff --git a/configs/spacemacs-test/dot-init.el b/configs/spacemacs-test/dot-init.el deleted file mode 100644 index d45cfa9..0000000 --- a/configs/spacemacs-test/dot-init.el +++ /dev/null @@ -1,2 +0,0 @@ -(defun dotspacemacs/init-specific () - ) diff --git a/configs/spacemacs-test/dot-layers.el b/configs/spacemacs-test/dot-layers.el deleted file mode 100644 index 3b663ef..0000000 --- a/configs/spacemacs-test/dot-layers.el +++ /dev/null @@ -1,60 +0,0 @@ -(defun dotspacemacs/layers-specific () - - (setq-default - dotspacemacs-configuration-layers - (append dotspacemacs-configuration-layers - '( - ;; -------- Languages - ;; ess - ;; html - ;; latex - ;; markdown - ;; python - ;; julia - ;; javascript - ;; sql - ;; go - - - ;; -------- Others - ;; systemd - ;; csv - - ;; -------- Applications - ;; org - ;; gnus - ;; fasd - ;; lsp - - ;; -------- Project management - ;; git - ;; (treemacs :variables - ;; treemacs-use-follow-mode t - ;; treemacs-use-filewatch-mode t) - - ;; -------- Tools - ;; pdf - ;; (shell :variables - ;; shell-default-term-shell "/bin/zsh" - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;; (spell-checking :variables spell-checking-enable-by-default nil) - ;; (auto-completion :variables - ;; auto-completion-enable-snippets-in-popup t - ;; auto-completion-enable-help-tooltip t - ;; auto-completion-enable-sort-by-usage t - ;; ) - ;; syntax-checking - ;; spacemacs-purpose - - ;; ------- - ;; theming - )) - -dotspacemacs-additional-packages -(append dotspacemacs-additional-packages - '( - ) - ) - ) - ) diff --git a/configs/spacemacs-test/dot-user-config.el b/configs/spacemacs-test/dot-user-config.el deleted file mode 100644 index 18b85ed..0000000 --- a/configs/spacemacs-test/dot-user-config.el +++ /dev/null @@ -1,24 +0,0 @@ -(defun dotspacemacs/user-config-specific () - (defun ulys/config/org/babel () - - - ;; FIXME julia bug - hack I have opened issue #13597 - (setq inferior-julia-program-name "julia") - - (custom-set-variables - '(org-babel-load-languages (quote ((emacs-lisp . t) - (R . t) - (latex . t) - (shell . t) - (ditaa . t) - (julia . t) - (python . t) - (sql . t) - ))) - '(org-confirm-babel-evaluate nil))) - - - (ulys/config/org/babel) - - (require 'org-tempo) - ) diff --git a/configs/spacemacs-test/dot-user-env.el b/configs/spacemacs-test/dot-user-env.el deleted file mode 100644 index 32a5fe2..0000000 --- a/configs/spacemacs-test/dot-user-env.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-env-specific ()) diff --git a/configs/spacemacs-test/dot-user-init.el b/configs/spacemacs-test/dot-user-init.el deleted file mode 100644 index 64a0308..0000000 --- a/configs/spacemacs-test/dot-user-init.el +++ /dev/null @@ -1 +0,0 @@ -(defun dotspacemacs/user-init-specific ()) diff --git a/configs/spacemacs-test/dot-user-load.el b/configs/spacemacs-test/dot-user-load.el deleted file mode 100644 index 827ace5..0000000 --- a/configs/spacemacs-test/dot-user-load.el +++ /dev/null @@ -1,3 +0,0 @@ - -(defun dotspacemacs/user-load-specific () - ) diff --git a/configs/spacemacs-test/init.el b/configs/spacemacs-test/init.el index c4c0741..1a87ba3 100644 --- a/configs/spacemacs-test/init.el +++ b/configs/spacemacs-test/init.el @@ -1,35 +1,13 @@ ;; -*- mode: emacs-lisp; lexical-binding: t -*- -;; This file is loaded by Spacemacs at startup. -;; It must be stored in your home directory. - -;; Determine specific config directory -(setq config-emacs-directory (replace-regexp-in-string "flavors" "configs" user-emacs-directory)) - -(defun load-config-file (filename) - (load (concat config-emacs-directory filename))) (defun dotspacemacs/layers () - "Layer configuration: -This function should only modify configuration layer settings." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - ;; Settings (setq-default dotspacemacs-distribution 'spacemacs dotspacemacs-enable-lazy-installation nil dotspacemacs-ask-for-lazy-installation t dotspacemacs-configuration-layer-path (list (concat user-emacs-directory - "../../layers/")) - dotspacemacs-additional-packages '() - dotspacemacs-frozen-packages '() - dotspacemacs-excluded-packages '() - dotspacemacs-install-packages 'used-but-keep-unused) - - ;; Layers + "../../layers/"))) (setq-default ;; List of configuration layers to load. dotspacemacs-configuration-layers @@ -38,27 +16,17 @@ This function should only modify configuration layer settings." (smartparens :location local) (dired :location local) (pdfs :location local) + (stats :location local) ) ) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - - (load-config-file "dot-layers.el") - (dotspacemacs/layers-specific) + (setq-default + dotspacemacs-additional-packages '() + dotspacemacs-frozen-packages '() + dotspacemacs-excluded-packages '() + dotspacemacs-install-packages 'used-but-keep-unused) ) (defun dotspacemacs/init () - "Instantiate Spacemacs core settings. -All `dotspacemacs-' variables with values set different than their defaults. -They are all defined in `~/.emacs.d/core/core-dotspacemacs.el'. -Check `dotspacemacs/get-variable-string-list' for all vars you can configure." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - (setq-default dotspacemacs-editing-style 'hybrid dotspacemacs-startup-banner 100 @@ -91,107 +59,11 @@ Check `dotspacemacs/get-variable-string-list' for all vars you can configure." dotspacemacs-search-tools '("ag" "rg" "pt" "ack" "grep") dotspacemacs-whitespace-cleanup 'all dotspacemacs-pretty-docs t) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - - (load-config-file "dot-init.el") - (dotspacemacs/init-specific) - ) - -(defun dotspacemacs/user-env () - "Environment variables setup. -This function defines the environment variables for your Emacs session. By -default it calls `spacemacs/load-spacemacs-env' which loads the environment -variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'. -See the header of this file for more information." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-env.el") - (dotspacemacs/user-env-specific) - ) - -(defun dotspacemacs/user-init () - "Initialization for user code: -This function is called immediately after `dotspacemacs/init', before layer -configuration. -It is mostly for variables that should be set before packages are loaded. -If you are unsure, try setting them in `dotspacemacs/user-config' first." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-init.el") - (dotspacemacs/user-init-specific) - ) - -(defun dotspacemacs/user-load () - "Library to load while dumping. -This function is called only while dumping Spacemacs configuration. You can -`require' or `load' the libraries of your choice that will be included in the -dump." - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- - - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-load.el") - (dotspacemacs/user-load-specific) ) (defun dotspacemacs/user-config () - "Configuration for user code: -This function is called at the very end of Spacemacs startup, after layer -configuration. -Put your configuration code here, except for variables that should be set -before packages are loaded." - - ;; -------------------------------------------------- - ;; ------ Configuration common to all versions ------ - ;; -------------------------------------------------- (spacemacs/toggle-centered-point-globally-on) - - (ulys/conf/dired) - (ulys/conf/kbd) - - ;; -------------------------------------------------- - ;; ----- Configuration specific to this version ----- - ;; -------------------------------------------------- - (load-config-file "dot-user-config.el") - (dotspacemacs/user-config-specific) - ) - - ; dired config -(defun ulys/conf/dired () -) - ; kbd config -(defun ulys/conf/kbd () - - ;; --- others - ;; C-h to delete buffer and C-S-h for help - (global-set-key (kbd "C-h") 'spacemacs/kill-this-buffer) - - ;; Simulates vim increment and decrement number - (define-key evil-normal-state-map (kbd "C-a C-a") 'evil-numbers/inc-at-pt) - (define-key evil-normal-state-map (kbd "C-x C-x") 'evil-numbers/dec-at-pt) - ) - ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. -- GitLab