diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix index ec54c9a..2d43ec2 100644 --- a/hosts/common/desktop/default.nix +++ b/hosts/common/desktop/default.nix @@ -7,5 +7,6 @@ _: { ./malloc-perturb.nix ./noisetorch.nix ./starship.nix + ./zoxide.nix ]; } diff --git a/hosts/common/desktop/zoxide.nix b/hosts/common/desktop/zoxide.nix new file mode 100644 index 0000000..4f0109a --- /dev/null +++ b/hosts/common/desktop/zoxide.nix @@ -0,0 +1,13 @@ +{ + config, + ... +}: let + inherit (config.poz.other.system) username; +in { + home-manager.users.${username} = { + programs.zoxide = { + enable = true; + enableZshIntegration = config.poz.programs.zsh.enable; + }; + }; +} diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 1da8b45..1252d85 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -119,7 +119,6 @@ in { }; profiling = false; }; - zoxide.enable = true; anyrun.enable = true; vesktop.enable = true; btop.enable = true; diff --git a/hosts/hape/configuration.nix b/hosts/hape/configuration.nix index 7d27765..55a02a2 100644 --- a/hosts/hape/configuration.nix +++ b/hosts/hape/configuration.nix @@ -34,7 +34,6 @@ }; profiling = false; }; - zoxide.enable = true; anyrun.enable = true; btop.enable = true; foot.enable = true; diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index a605025..8a175f1 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -75,7 +75,6 @@ in { }; profiling = false; }; - zoxide.enable = true; anyrun.enable = true; vesktop.enable = true; btop.enable = true; diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix index 64525d6..34d5eb7 100644 --- a/hosts/work/configuration.nix +++ b/hosts/work/configuration.nix @@ -73,7 +73,6 @@ in { }; profiling = false; }; - zoxide.enable = true; anyrun.enable = true; btop.enable = true; foot.enable = true; diff --git a/modules/cli/default.nix b/modules/cli/default.nix index 886b392..bea6974 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -2,7 +2,6 @@ _: { imports = [ ./git.nix ./nh.nix - ./zoxide.nix ./zsh.nix ]; } diff --git a/modules/cli/zoxide.nix b/modules/cli/zoxide.nix deleted file mode 100644 index ce0460f..0000000 --- a/modules/cli/zoxide.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.poz.programs.zoxide; - inherit (config.poz.other.system) username; - - inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; -in { - options.poz.programs.zoxide.enable = mkEnableOption "zoxide"; - - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.zoxide = { - enable = true; - enableZshIntegration = config.poz.programs.zsh.enable; - }; - }; - }; -}