diff --git a/modules/programs/base_packages.nix b/modules/programs/base_packages.nix index 74f2bd0..d13dec6 100644 --- a/modules/programs/base_packages.nix +++ b/modules/programs/base_packages.nix @@ -84,7 +84,7 @@ programs = { nix-ld = { enable = true; - nix-ld.libraries = with pkgs; [ jdk zlib ]; + libraries = with pkgs; [ jdk zlib ]; }; direnv = { package = pkgs.direnv; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index df2e130..44e60ab 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -29,5 +29,6 @@ ./virtualbox.nix ./xone.nix ./yazi + ./kitty.nix ]; } diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 07f3397..5bdf66a 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -8,7 +8,7 @@ }; }; config = lib.mkIf config.mods.fish.enable - (lib.optionalAttrs (options ? programs.fish) { fish = { enable = true; }; } + (lib.optionalAttrs (options ? programs.fish) { programs.fish = { enable = true; }; } // lib.optionalAttrs (options ? xdg.configFile) { xdg.configFile."fish/config.fish" = { text = '' diff --git a/programs/default.nix b/programs/default.nix index 48643cf..3276246 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -35,7 +35,6 @@ in { ./xdg.nix ./oxi/default.nix ./themes/default.nix - ./individual_configs/default.nix ./sync.nix ] ++ base_imports ++ lib.optional (builtins.pathExists mod) mod; };