diff --git a/system/machines/desktop/system.nix b/system/machines/desktop/system.nix index e981ab8..7b6a061 100644 --- a/system/machines/desktop/system.nix +++ b/system/machines/desktop/system.nix @@ -66,6 +66,8 @@ in }; }; + programs.nix-ld.enable = true; + boot.loader = { systemd-boot = { enable = true; diff --git a/user/modules/neovim/default.nix b/user/modules/neovim/default.nix index 9a90d08..361bf65 100644 --- a/user/modules/neovim/default.nix +++ b/user/modules/neovim/default.nix @@ -12,7 +12,12 @@ in defaultEditor = true; vimAlias = true; vimdiffAlias = true; - extraPackages = import ./pkgs.nix { inherit pkgs; }; + extraPackages = with pkgs; [ + lazygit + gcc + fzf + rg + ]; }; home.file.".config/nvim" = { diff --git a/user/modules/neovim/pkgs.nix b/user/modules/neovim/pkgs.nix deleted file mode 100644 index 04dcd86..0000000 --- a/user/modules/neovim/pkgs.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: - -let - # Essential LSPs for config files (project-specific LSPs go in devShells) - lsp = with pkgs; [ - nixd - lua-language-server - marksman - taplo - ]; - - lsp' = with pkgs.nodePackages; [ - vscode-langservers-extracted # jsonls, html, cssls - bash-language-server - yaml-language-server - ]; - - extraPackages = with pkgs; [ - lazygit - gcc - ]; - -in - extraPackages ++ lsp ++ lsp'