diff --git a/home/default.nix b/home/default.nix index 1d7fda8..f6d3731 100644 --- a/home/default.nix +++ b/home/default.nix @@ -14,6 +14,11 @@ in { ./emacs.nix ]; + programs.nh = { + enable = true; + # flake = "/etc/nixos/config#laptop" + }; + fonts.fontconfig.enable = true; home = { stateVersion = "25.05"; diff --git a/home/emacs.nix b/home/emacs.nix index a521d3a..c83db55 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -1,32 +1,10 @@ # home-manager configuration for Emacs {lib, pkgs, ...}: let - # emacs-config = lib.mkDerivation { - # pname = "emacs-config"; - # version = "1.0"; - - # src = builtins.fetchGit { - # url = "git@git.nirgendwo.xyz:janis/dot-emacs.git"; - # ref = "main"; - # rev = "ac3c35f358"; - # }; - - # buildInputs = [ pkgs.emacs ]; - - # installPhase = '' - # runHook preInstall - # mkdir -p $out/share/emacs.d/ - # cp -r * $out/share/emacs.d - # runHook postInstall - # ''; - # }; - - # emacs-config-pkg = pkgs.callPackage emacs-config { }; - emacs-config = builtins.fetchGit { url = "git@git.nirgendwo.xyz:janis/dot-emacs.git"; ref = "main"; - rev = "ac3c35f358"; + rev = "39d889549f2b0b5c5392852daa862437e080a710"; }; in { home.packages = with pkgs; [ @@ -34,10 +12,26 @@ in { enchant # spell checking ripgrep # for Emacs' ripgrep integration libvterm-neovim # vterm support for Emacs + nodejs_24 + copilot-language-server-fhs + cmake + gcc + tree-sitter + texlive.combined.scheme-full + # tree-sitter-grammars.tree-sitter-c + # tree-sitter-grammars.tree-sitter-cpp + # tree-sitter-grammars.tree-sitter-zig + # tree-sitter-grammars.tree-sitter-nix + # tree-sitter-grammars.tree-sitter-toml + # tree-sitter-grammars.tree-sitter-wgsl + # tree-sitter-grammars.tree-sitter-rust + # tree-sitter-grammars.tree-sitter-bash + # tree-sitter-grammars.tree-sitter-elisp + # tree-sitter-grammars.tree-sitter-markdown ]; - xdg.configFile = { - "emacs" = { - source = emacs-config; - }; - }; + # xdg.configFile = { + # "emacs" = { + # source = emacs-config; + # }; + # }; }