diff --git a/hosts/common/common.nix b/hosts/common/common.nix index 0d4ac40..2904951 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -34,7 +34,6 @@ btop thunderbird lf - fzf file qalculate-qt baobab diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index 728cac8..58fd482 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -10,6 +10,8 @@ smayzy = { nvidia.enable = true; steam.enable = true; + prism.enable = true; + fzf.enable = true; }; home-manager = { @@ -71,7 +73,6 @@ obsidian samrewritten libsForQt5.kdenlive - prismlauncher floorp komikku librewolf @@ -83,8 +84,6 @@ stylix.enable = true; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; - programs.fzf.keybindings = true; - services.flatpak = { enable = true; update.onActivation = true; diff --git a/modules/nix/base-cli/default.nix b/modules/nix/base-cli/default.nix index c502b64..3137654 100644 --- a/modules/nix/base-cli/default.nix +++ b/modules/nix/base-cli/default.nix @@ -3,5 +3,6 @@ imports = [ ./nh.nix ./nvf.nix + ./fzf.nix ]; } diff --git a/modules/nix/base-cli/fzf.nix b/modules/nix/base-cli/fzf.nix new file mode 100644 index 0000000..ee71083 --- /dev/null +++ b/modules/nix/base-cli/fzf.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ...}: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.fzf.enable = mkOption { + type = types.bool; + default = false; + description = "use fzf"; + }; + + config = mkIf config.smayzy.fzf.enable { + environment.systemPackages = with pkgs; [ + fzf + ]; + programs.fzf.keybindings = true; + }; +} diff --git a/modules/nix/games/default.nix b/modules/nix/games/default.nix index c37d9e4..0f11a09 100644 --- a/modules/nix/games/default.nix +++ b/modules/nix/games/default.nix @@ -2,5 +2,6 @@ { imports = [ ./steam.nix + ./prism.nix ]; } diff --git a/modules/nix/games/prism.nix b/modules/nix/games/prism.nix new file mode 100644 index 0000000..492c061 --- /dev/null +++ b/modules/nix/games/prism.nix @@ -0,0 +1,17 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.prism.enable = mkOption { + type = types.bool; + default = false; + description = "prismlauncher"; + }; + + config = mkIf config.smayzy.prism.enable { + environment.systemPackages = with pkgs; [ + prismlauncher + ]; + }; +}