11 files changed, 69 insertions, 41 deletions
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 692369e4..2dc51936 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -16,16 +16,11 @@
     withNodeJs = true;
     plugins = with pkgs.vimPlugins; [
       commentary
-      coc-css
       coc-git
-      coc-html
       coc-json
       coc-tabnine
       coc-yaml
-      conjure
       vim-surround
-      vim-nix
-      zig-vim
     ];
     extraLuaConfig = builtins.readFile ../nvim/init.lua;
     coc = {
diff --git a/user/settings/development/clojure.nix b/user/settings/development/clojure.nix
index 7b06691a..a5d6ceae 100644
--- a/user/settings/development/clojure.nix
+++ b/user/settings/development/clojure.nix
@@ -8,4 +8,11 @@
     node2nixPackages.node-cljfmt
     node2nixPackages.shadow-cljs
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    cider
+    clojure-mode
+  ]);
+  programs.neovim.plugins = with pkgs.vimPlugins; [
+    conjure
+  ];
 }
diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix
index 9b8bdabf..692995e7 100644
--- a/user/settings/development/javascript.nix
+++ b/user/settings/development/javascript.nix
@@ -51,6 +51,14 @@ in {
     NO_UPDATE_NOTIFIER = "1"; # stop npm update-notifier
   };
 
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    add-node-modules-path
+    js2-mode
+    rjsx-mode
+    tide
+    typescript-mode
+  ]);
+
   programs.zsh.shellAliases = {
     ava = "pnpx ava";
     avt = "pnpx ava --tap";
diff --git a/user/settings/development/rust.nix b/user/settings/development/rust.nix
index 63d0db35..16a50b41 100644
--- a/user/settings/development/rust.nix
+++ b/user/settings/development/rust.nix
@@ -11,4 +11,7 @@
     rust-analyzer
     clippy
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    rustic
+  ]);
 }
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index f1f45878..64502198 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -12,4 +12,17 @@
     ++ [
       pkgs.nodePackages.stylelint
     ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    caddyfile-mode
+    company-web
+    emmet-mode
+    nginx-mode
+    restclient
+    scss-mode
+    web-mode
+  ]);
+  programs.neovim.plugins = with pkgs.vimPlugins; [
+    coc-css
+    coc-html
+  ];
 }
diff --git a/user/settings/development/zig.nix b/user/settings/development/zig.nix
new file mode 100644
index 00000000..69c2ea80
--- /dev/null
+++ b/user/settings/development/zig.nix
@@ -0,0 +1,12 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    zig-mode
+  ]);
+  programs.neovim.plugins = with pkgs.vimPlugins; [
+    zig-vim
+  ];
+}
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index dee95202..fd3909fe 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -73,7 +73,6 @@ in {
         ace-link
         all-the-icons
         almost-mono-themes
-        add-node-modules-path
         ag
         all-the-icons
         amx
@@ -81,24 +80,17 @@ in {
         auto-async-byte-compile
         avy
         bash-completion
-        caddyfile-mode
-        cider
-        clojure-mode
         company
-        company-web
         company-tabnine
         consult
         consult-eglot
         counsel
         counsel-projectile
         crux
-        docker-compose-mode
-        dockerfile-mode
         dired-git-info
         editorconfig
         eglot
         eldoc-box
-        emmet-mode
         esh-autosuggest
         esh-buf-stack
         esh-help
@@ -110,7 +102,6 @@ in {
         evil-collection
         evil-commentary
         evil-embrace
-        evil-ledger
         evil-matchit
         evil-mu4e
         evil-numbers
@@ -119,7 +110,6 @@ in {
         evil-space
         evil-surround
         eyebrowse
-        feature-mode
         format-all
         flycheck
         flyspell-correct
@@ -129,64 +119,38 @@ in {
         git-messenger
         git-modes
         git-timemachine
-        gitlab-ci-mode
-        gitlab-ci-mode-flycheck
-        go-mode
         goto-chg
-        haskell-mode
         helpful
         ivy-hydra
-        janet-mode
-        jinja2-mode
-        js2-mode
         json-mode
-        k8s-mode
-        kubel
-        kubel-evil
         lua-mode
-        ledger-mode
         magit
         markdown-mode
         modus-themes
         doom-modeline
-        nginx-mode
-        nix-mode
-        nix-update
         org-journal
         paredit
         posframe
         projectile
         projectile-ripgrep
         quickrun
-        racket-mode
         rainbow-mode
         rainbow-delimiters
-        restclient
         ripgrep
-        rjsx-mode
-        rustic
-        scss-mode
         spacemacs-theme
         swiper
-        tide
         toml-mode
         tree-sitter
         tree-sitter-langs
         tree-sitter-indent
-        typescript-mode
         undo-tree
         use-package
         wucuo
-        web-mode
         wgrep-ag
         ws-butler
         which-key
         yaml-mode
         yasnippet
-        zig-mode
-      ]
-      ++ lib.optionals (!stdenv.isDarwin) [
-        pkgs.mu
       ]);
   };
   home.packages = [
diff --git a/user/settings/golang.nix b/user/settings/golang.nix
index 92abbf4d..5e84488c 100644
--- a/user/settings/golang.nix
+++ b/user/settings/golang.nix
@@ -9,4 +9,7 @@
     goimports
     gotools
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    go-mode
+  ]);
 }
diff --git a/user/settings/ledger.nix b/user/settings/ledger.nix
index 6c674ff9..b0fe9ef9 100644
--- a/user/settings/ledger.nix
+++ b/user/settings/ledger.nix
@@ -7,4 +7,8 @@
     --date-format %F
     --start-of-week 1
   '';
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    evil-ledger
+    ledger-mode
+  ]);
 }
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 0d1f0e1c..39f34623 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -12,4 +12,11 @@
   nixpkgs.overlays = [
     (import ../overlays/extra-packages.nix)
   ];
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    nix-mode
+    nix-update
+  ]);
+  programs.neovim.plugins = with pkgs.vimPlugins; [
+    vim-nix
+  ];
 }
diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix
index 2ecb4761..b93d7eee 100644
--- a/user/settings/satoshipay.nix
+++ b/user/settings/satoshipay.nix
@@ -45,6 +45,18 @@ in {
         ripcord
         robo3t
       ]));
+  programs.emacs.extraPackages = epkgs: (with epkgs; [
+    docker-compose-mode
+    dockerfile-mode
+    feature-mode
+    gitlab-ci-mode
+    gitlab-ci-mode-flycheck
+    k8s-mode
+    kubel
+    kubel-evil
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    pkgs.mu
+  ]);
 
   programs.git.includes = [
     {