Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Pierre Balaye
Multiple Emacs Flavor Setup
Commits
b23c1c10
Commit
b23c1c10
authored
May 21, 2020
by
Pierre Balaye
Browse files
Simplify everything: rely on private layers now!
parent
6f6ccb19
Changes
20
Hide whitespace changes
Inline
Side-by-side
configs/spacemacs-default/dot-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/init-specific
()
)
configs/spacemacs-default/dot-layers.el
deleted
100644 → 0
View file @
6f6ccb19
(
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
))
)
)
configs/spacemacs-default/dot-user-config.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-config-specific
())
configs/spacemacs-default/dot-user-env.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-env-specific
())
configs/spacemacs-default/dot-user-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-init-specific
())
configs/spacemacs-default/dot-user-load.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-load-specific
()
)
configs/spacemacs-minimal/dot-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/init-specific
()
)
configs/spacemacs-minimal/dot-layers.el
deleted
100644 → 0
View file @
6f6ccb19
(
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
))
)
)
configs/spacemacs-minimal/dot-user-config.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-config-specific
()
)
configs/spacemacs-minimal/dot-user-env.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-env-specific
())
configs/spacemacs-minimal/dot-user-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-init-specific
())
configs/spacemacs-minimal/dot-user-load.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-load-specific
()
)
configs/spacemacs-minimal/init.el
View file @
b23c1c10
;; -*- 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.
configs/spacemacs-test/dot-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/init-specific
()
)
configs/spacemacs-test/dot-layers.el
deleted
100644 → 0
View file @
6f6ccb19
(
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
'
(
)
)
)
)
configs/spacemacs-test/dot-user-config.el
deleted
100644 → 0
View file @
6f6ccb19
(
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
)
)
configs/spacemacs-test/dot-user-env.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-env-specific
())
configs/spacemacs-test/dot-user-init.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-init-specific
())
configs/spacemacs-test/dot-user-load.el
deleted
100644 → 0
View file @
6f6ccb19
(
defun
dotspacemacs/user-load-specific
()
)
configs/spacemacs-test/init.el
View file @
b23c1c10
;; -*- 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.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment