From ed25cd6d31d3ce0da0ab1532e12c06d726d701fc Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 8 Sep 2023 11:26:46 -0400 Subject: [PATCH] Move elisp into a folder and switch to emacs-wayland on linux. --- ansible/roles/emacs/files/early-init.el | 0 .../files/{ => elisp}/base-extensions.el | 0 .../emacs/files/{ => elisp}/base-functions.el | 0 .../files/{ => elisp}/base-global-keys.el | 0 .../emacs/files/{ => elisp}/base-theme.el | 0 ansible/roles/emacs/files/{ => elisp}/base.el | 0 .../emacs/files/{ => elisp}/common-lsp.el | 0 .../emacs/files/{ => elisp}/lang-bash.el | 0 .../files/{ => elisp}/lang-dockerfile.el | 0 .../roles/emacs/files/{ => elisp}/lang-go.el | 0 .../files/{ => elisp}/lang-javascript.el | 0 .../roles/emacs/files/{ => elisp}/lang-lua.el | 0 .../emacs/files/{ => elisp}/lang-markdown.el | 0 .../roles/emacs/files/{ => elisp}/lang-org.el | 0 .../emacs/files/{ => elisp}/lang-python.el | 0 .../emacs/files/{ => elisp}/lang-rust.el | 0 .../emacs/files/{ => elisp}/lang-terraform.el | 0 .../emacs/files/{ => elisp}/lang-yaml.el | 0 .../files/{ => elisp}/util-tree-sitter.el | 0 .../emacs/files/{ => elisp}/util-vertico.el | 0 ansible/roles/emacs/tasks/linux.yaml | 2 +- ansible/roles/emacs/tasks/peruser.yaml | 28 ++++--------------- 22 files changed, 7 insertions(+), 23 deletions(-) create mode 100644 ansible/roles/emacs/files/early-init.el rename ansible/roles/emacs/files/{ => elisp}/base-extensions.el (100%) rename ansible/roles/emacs/files/{ => elisp}/base-functions.el (100%) rename ansible/roles/emacs/files/{ => elisp}/base-global-keys.el (100%) rename ansible/roles/emacs/files/{ => elisp}/base-theme.el (100%) rename ansible/roles/emacs/files/{ => elisp}/base.el (100%) rename ansible/roles/emacs/files/{ => elisp}/common-lsp.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-bash.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-dockerfile.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-go.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-javascript.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-lua.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-markdown.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-org.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-python.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-rust.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-terraform.el (100%) rename ansible/roles/emacs/files/{ => elisp}/lang-yaml.el (100%) rename ansible/roles/emacs/files/{ => elisp}/util-tree-sitter.el (100%) rename ansible/roles/emacs/files/{ => elisp}/util-vertico.el (100%) diff --git a/ansible/roles/emacs/files/early-init.el b/ansible/roles/emacs/files/early-init.el new file mode 100644 index 0000000..e69de29 diff --git a/ansible/roles/emacs/files/base-extensions.el b/ansible/roles/emacs/files/elisp/base-extensions.el similarity index 100% rename from ansible/roles/emacs/files/base-extensions.el rename to ansible/roles/emacs/files/elisp/base-extensions.el diff --git a/ansible/roles/emacs/files/base-functions.el b/ansible/roles/emacs/files/elisp/base-functions.el similarity index 100% rename from ansible/roles/emacs/files/base-functions.el rename to ansible/roles/emacs/files/elisp/base-functions.el diff --git a/ansible/roles/emacs/files/base-global-keys.el b/ansible/roles/emacs/files/elisp/base-global-keys.el similarity index 100% rename from ansible/roles/emacs/files/base-global-keys.el rename to ansible/roles/emacs/files/elisp/base-global-keys.el diff --git a/ansible/roles/emacs/files/base-theme.el b/ansible/roles/emacs/files/elisp/base-theme.el similarity index 100% rename from ansible/roles/emacs/files/base-theme.el rename to ansible/roles/emacs/files/elisp/base-theme.el diff --git a/ansible/roles/emacs/files/base.el b/ansible/roles/emacs/files/elisp/base.el similarity index 100% rename from ansible/roles/emacs/files/base.el rename to ansible/roles/emacs/files/elisp/base.el diff --git a/ansible/roles/emacs/files/common-lsp.el b/ansible/roles/emacs/files/elisp/common-lsp.el similarity index 100% rename from ansible/roles/emacs/files/common-lsp.el rename to ansible/roles/emacs/files/elisp/common-lsp.el diff --git a/ansible/roles/emacs/files/lang-bash.el b/ansible/roles/emacs/files/elisp/lang-bash.el similarity index 100% rename from ansible/roles/emacs/files/lang-bash.el rename to ansible/roles/emacs/files/elisp/lang-bash.el diff --git a/ansible/roles/emacs/files/lang-dockerfile.el b/ansible/roles/emacs/files/elisp/lang-dockerfile.el similarity index 100% rename from ansible/roles/emacs/files/lang-dockerfile.el rename to ansible/roles/emacs/files/elisp/lang-dockerfile.el diff --git a/ansible/roles/emacs/files/lang-go.el b/ansible/roles/emacs/files/elisp/lang-go.el similarity index 100% rename from ansible/roles/emacs/files/lang-go.el rename to ansible/roles/emacs/files/elisp/lang-go.el diff --git a/ansible/roles/emacs/files/lang-javascript.el b/ansible/roles/emacs/files/elisp/lang-javascript.el similarity index 100% rename from ansible/roles/emacs/files/lang-javascript.el rename to ansible/roles/emacs/files/elisp/lang-javascript.el diff --git a/ansible/roles/emacs/files/lang-lua.el b/ansible/roles/emacs/files/elisp/lang-lua.el similarity index 100% rename from ansible/roles/emacs/files/lang-lua.el rename to ansible/roles/emacs/files/elisp/lang-lua.el diff --git a/ansible/roles/emacs/files/lang-markdown.el b/ansible/roles/emacs/files/elisp/lang-markdown.el similarity index 100% rename from ansible/roles/emacs/files/lang-markdown.el rename to ansible/roles/emacs/files/elisp/lang-markdown.el diff --git a/ansible/roles/emacs/files/lang-org.el b/ansible/roles/emacs/files/elisp/lang-org.el similarity index 100% rename from ansible/roles/emacs/files/lang-org.el rename to ansible/roles/emacs/files/elisp/lang-org.el diff --git a/ansible/roles/emacs/files/lang-python.el b/ansible/roles/emacs/files/elisp/lang-python.el similarity index 100% rename from ansible/roles/emacs/files/lang-python.el rename to ansible/roles/emacs/files/elisp/lang-python.el diff --git a/ansible/roles/emacs/files/lang-rust.el b/ansible/roles/emacs/files/elisp/lang-rust.el similarity index 100% rename from ansible/roles/emacs/files/lang-rust.el rename to ansible/roles/emacs/files/elisp/lang-rust.el diff --git a/ansible/roles/emacs/files/lang-terraform.el b/ansible/roles/emacs/files/elisp/lang-terraform.el similarity index 100% rename from ansible/roles/emacs/files/lang-terraform.el rename to ansible/roles/emacs/files/elisp/lang-terraform.el diff --git a/ansible/roles/emacs/files/lang-yaml.el b/ansible/roles/emacs/files/elisp/lang-yaml.el similarity index 100% rename from ansible/roles/emacs/files/lang-yaml.el rename to ansible/roles/emacs/files/elisp/lang-yaml.el diff --git a/ansible/roles/emacs/files/util-tree-sitter.el b/ansible/roles/emacs/files/elisp/util-tree-sitter.el similarity index 100% rename from ansible/roles/emacs/files/util-tree-sitter.el rename to ansible/roles/emacs/files/elisp/util-tree-sitter.el diff --git a/ansible/roles/emacs/files/util-vertico.el b/ansible/roles/emacs/files/elisp/util-vertico.el similarity index 100% rename from ansible/roles/emacs/files/util-vertico.el rename to ansible/roles/emacs/files/elisp/util-vertico.el diff --git a/ansible/roles/emacs/tasks/linux.yaml b/ansible/roles/emacs/tasks/linux.yaml index 2042292..1b964f1 100644 --- a/ansible/roles/emacs/tasks/linux.yaml +++ b/ansible/roles/emacs/tasks/linux.yaml @@ -2,7 +2,7 @@ package: name: - aspell-en - - emacs + - emacs-wayland state: present - name: Install packages diff --git a/ansible/roles/emacs/tasks/peruser.yaml b/ansible/roles/emacs/tasks/peruser.yaml index a30e2a6..2d6b9c1 100644 --- a/ansible/roles/emacs/tasks/peruser.yaml +++ b/ansible/roles/emacs/tasks/peruser.yaml @@ -22,6 +22,8 @@ loop: - src: init.el dest: .emacs.d/init.el + - src: early-init.el + dest: .emacs.d/early-init.el - name: Configure dotfiles when: 'emacs_flavor == "plain"' @@ -38,31 +40,13 @@ - name: Configure elisp files when: 'emacs_flavor == "full"' copy: - src: "files/{{ item }}" - dest: "{{ account_homedir.stdout }}/.emacs.d/elisp/{{ item }}" - mode: 0600 + src: "files/{{ item.src }}" + dest: "{{ account_homedir.stdout }}/{{ item.dest }}" owner: "{{ account_name.stdout }}" group: "{{ group_name.stdout }}" loop: - - base-extensions.el - - base-functions.el - - base-global-keys.el - - base-theme.el - - base.el - - common-lsp.el - - lang-bash.el - - lang-dockerfile.el - - lang-go.el - - lang-javascript.el - - lang-lua.el - - lang-markdown.el - - lang-org.el - - lang-python.el - - lang-rust.el - - lang-terraform.el - - lang-yaml.el - - util-vertico.el - - util-tree-sitter.el + - src: elisp + dest: .emacs.d/ - name: Configure zshrc additional imports copy: