diff --git a/flake.lock b/flake.lock index 787232c..e6d484b 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1696501026, - "narHash": "sha256-hC+GuCi3HfuOoubS7gMPr2xHCBN33N07QfkFFEbhr8M=", + "lastModified": 1696529826, + "narHash": "sha256-H8qj+C6vbn629zxLkj5sOCDhTbqsyrcrDd78tjvgqMY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5eba7d96a70b1aad7918b07a4f6563362a8255b7", + "rev": "804c3f5ecc955fd7fa2e70be2f2937b5a2c05f26", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nur": { "locked": { - "lastModified": 1696499135, - "narHash": "sha256-/TcM0bZ+/FYJD5EEgdDC7JIYsf8TUp7GWryTcgBitrw=", + "lastModified": 1696542377, + "narHash": "sha256-swb06Kj12+F9Rr/fXbT2ZGfEoVHcKZCIW+GVjQSI3Xc=", "owner": "nix-community", "repo": "NUR", - "rev": "ef0505cd640f2db6565ad8231ab087cd17da7baa", + "rev": "bd7b9e4113d3a4c726309b32f01c62bc192eb311", "type": "github" }, "original": { diff --git a/home-mods/dev/default.nix b/home-mods/dev/default.nix index 6fa0291..b9dd992 100644 --- a/home-mods/dev/default.nix +++ b/home-mods/dev/default.nix @@ -4,7 +4,21 @@ config, inputs, ... -}: { +}: let + doomemacsSrc = builtins.fetchGit { + url = "https://github.com/doomemacs/doomemacs"; + ref = "master"; + rev = "844a82c4a0cacbb5a1aa558c88675ba1a9ee80a3"; + }; + + personalDoomConfSrc = builtins.fetchGit { + url = "https://git.vlt81.de/tristan/doom"; + ref = "main"; + rev = "84a03424ad594ea286d39eebf0f70116787e8bf1"; + }; +in { + xdg.enable = true; + programs.alacritty = { enable = true; settings = { @@ -16,10 +30,6 @@ }; }; - home.sessionVariables = { - TERMINAL = "alacritty"; - }; - programs.fish = { enable = true; @@ -104,29 +114,48 @@ package = pkgs.emacs-unstable-pgtk; }; - home.packages = with pkgs; [ - any-nix-shell - atool - aspell - aspellDicts.en - aspellDicts.en-computers - aspellDicts.en-science - aspellDicts.de - binutils - cmake - direnv - fd - gnutls - gnumake - gcc - imagemagick - pandoc - libtool - (lib.mkIf (config.services.gpg-agent.enable) - pinentry_emacs) - (ripgrep.override {withPCRE2 = true;}) - rnix-lsp - texlive.combined.scheme-full - zstd - ]; + home = { + activation.installDoomEmacs = lib.hm.dag.entryAfter ["writeBoundary"] '' + mkdir ~/.config/emacs -p + chmod u+rw -R ~/.config/emacs + cp -r ${doomemacsSrc}/. "$HOME/.config/emacs" + mkdir ~/.config/doom -p + chmod u+rw -R ~/.config/doom + cp -r ${personalDoomConfSrc}/. "$HOME/.config/doom" + ''; + + sessionVariables = { + TERMINAL = "alacritty"; + }; + + packages = with pkgs; [ + any-nix-shell + atool + aspell + aspellDicts.en + aspellDicts.en-computers + aspellDicts.en-science + aspellDicts.de + binutils + cmake + direnv + emacs-unstable-pgtk + fd + gnutls + gnumake + gcc + git + imagemagick + libtool + pandoc + (lib.mkIf (config.services.gpg-agent.enable) + pinentry_emacs) + (ripgrep.override {withPCRE2 = true;}) + rnix-lsp + shellcheck + shfmt + texlive.combined.scheme-full + zstd + ]; + }; }