From 6ca9516500390a36eab4d8b9168e41846933cacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 29 Jun 2025 22:26:25 +0200 Subject: [PATCH] {vanadium,tungsten}: remove duplicated packages --- nix/configurations/tungsten.nix | 1 - nix/configurations/tungsten/home/programs.nix | 1 - nix/configurations/vanadium.nix | 1 - nix/configurations/vanadium/home/dev.nix | 4 ++++ nix/configurations/vanadium/home/programs.nix | 1 - nix/homeModules/common/neovim.nix | 17 ----------------- 6 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 nix/homeModules/common/neovim.nix diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index a8e54d66..90f25d93 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -144,7 +144,6 @@ in ../homeModules/common/kitty.nix ../homeModules/common/leana.nix ../homeModules/common/locale.nix - ../homeModules/common/neovim.nix ../homeModules/common/packages.nix ../homeModules/common/password-store.nix ../homeModules/common/sioyek.nix diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix index 5ddb946f..f662d598 100644 --- a/nix/configurations/tungsten/home/programs.nix +++ b/nix/configurations/tungsten/home/programs.nix @@ -76,7 +76,6 @@ pkgs.xbrightness pkgs.dmenu pkgs.xclip - pkgs.playerctl # talk to playerctld pkgs.xscreensaver # talk to xscreensaver pkgs.xcolor diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 45c3b166..1614f330 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -164,7 +164,6 @@ in ../homeModules/common/leana.nix ../homeModules/common/locale.nix ../homeModules/common/lazygit.nix - ../homeModules/common/neovim.nix ../homeModules/common/packages.nix ../homeModules/common/password-store.nix ../homeModules/common/sioyek.nix diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 71f9d9d1..c96ed512 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -23,6 +23,10 @@ pkgs.taplo # toml pkgs.vscode-langservers-extracted # JSON etc pkgs.yaml-language-server # yaml + + # bash + pkgs.shfmt + pkgs.nodePackages.bash-language-server ]; programs.git = { diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 6ab1542f..2361abed 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -106,7 +106,6 @@ # productivity / media pkgs.evolution pkgs.libreoffice - pkgs.iamb pkgs.calibre # pkgs.rawtherapee pkgs.digikam diff --git a/nix/homeModules/common/neovim.nix b/nix/homeModules/common/neovim.nix deleted file mode 100644 index 6df8c118..00000000 --- a/nix/homeModules/common/neovim.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - cfg = config.programs.neovim; -in { - config = lib.mkIf cfg.enable { - home.packages = [ - # might be useful for servers, serves as minimal configuration - pkgs.nodePackages.bash-language-server - pkgs.shellcheck - pkgs.shfmt - ]; - }; -}