diff options
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | mut/emacs/init.el | 8 | ||||
| -rw-r--r-- | profiles/core/home.nix | 5 |
3 files changed, 8 insertions, 10 deletions
@@ -49,7 +49,10 @@ (hostname: cfg: mkSystem ivi.machines.${hostname} [cfg]) (modulesIn ./machines) - // { iso = (mkSystem { modules = [./iso.nix]; } []); }; + // { + windows = windowsModules: (mkSystem { modules = (attrValues (modulesIn ./profiles/core)) ++ windowsModules; } []); + iso = (mkSystem { modules = [./iso.nix]; } []); + }; deploy.nodes = mapAttrs diff --git a/mut/emacs/init.el b/mut/emacs/init.el index b31b0f0..52de580 100644 --- a/mut/emacs/init.el +++ b/mut/emacs/init.el @@ -143,8 +143,8 @@ 'go-mode 'auctex 'yaml-pro - 'rust-mode - ) + 'rust-mode) + (require 'lsp-mode) (add-hook 'rust-mode-hook #'lsp-deferred) @@ -173,9 +173,9 @@ '("ba4ab079778624e2eadbdc5d9345e6ada531dc3febeb24d257e6d31d5ed02577" "a9dc7790550dcdb88a23d9f81cc0333490529a20e160a8599a6ceaf1104192b5" "5f128efd37c6a87cd4ad8e8b7f2afaba425425524a68133ac0efd87291d05874" "5b9a45080feaedc7820894ebbfe4f8251e13b66654ac4394cb416fef9fdca789" "9013233028d9798f901e5e8efb31841c24c12444d3b6e92580080505d56fd392" "6adeb971e4d5fe32bee0d5b1302bc0dfd70d4b42bad61e1c346599a6dc9569b5" "8d3ef5ff6273f2a552152c7febc40eabca26bae05bd12bc85062e2dc224cde9a" "75b2a02e1e0313742f548d43003fcdc45106553af7283fb5fad74359e07fe0e2" "b9761a2e568bee658e0ff723dd620d844172943eb5ec4053e2b199c59e0bcc22" "9d29a302302cce971d988eb51bd17c1d2be6cd68305710446f658958c0640f68" "f053f92735d6d238461da8512b9c071a5ce3b9d972501f7a5e6682a90bf29725" "dc8285f7f4d86c0aebf1ea4b448842a6868553eded6f71d1de52f3dcbc960039" "38c0c668d8ac3841cb9608522ca116067177c92feeabc6f002a27249976d7434" "162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213" "ff24d14f5f7d355f47d53fd016565ed128bf3af30eb7ce8cae307ee4fe7f3fd0" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" "88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "dfb1c8b5bfa040b042b4ef660d0aab48ef2e89ee719a1f24a4629a0c5ed769e8" "e13beeb34b932f309fb2c360a04a460821ca99fe58f69e65557d6c1b10ba18c7" default)) '(package-selected-packages '(doom-themes corfu yaml-pro smex rust-mode nix-mode multiple-cursors magit lsp-ui ido-completing-read+ gruber-darker-theme go-mode editorconfig direnv dash-functional auctex))) -(custom-set-faces +(custom-set-faces) ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - ) + diff --git a/profiles/core/home.nix b/profiles/core/home.nix index fe95ec9..eed5d57 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -90,11 +90,6 @@ ''; }; - programs.emacs = { - enable = true; - package = pkgs.emacs29; - }; - programs.tmux = { enable = true; extraConfig = '' |