diff options
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | hosts/toaster/default.nix | 8 | ||||
| -rw-r--r-- | modules/basic-tools/default.nix (renamed from modules/basic-tools.nix) | 4 | ||||
| -rw-r--r-- | modules/basic-tools/fzf.nix | 10 |
4 files changed, 18 insertions, 12 deletions
@@ -57,7 +57,7 @@ ./hosts/toaster - ./modules/basic-tools.nix + ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix ./modules/gnupg.nix @@ -77,7 +77,7 @@ ./hosts/microwave - ./modules/basic-tools.nix + ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix ./modules/gnupg.nix @@ -93,7 +93,7 @@ modules = [ sops-nix.nixosModules.sops ./hosts/cirrus - ./modules/basic-tools.nix + ./modules/basic-tools ]; }; @@ -104,7 +104,7 @@ sops-nix.nixosModules.sops microvm.nixosModules.host ./hosts/dishwasher - ./modules/basic-tools.nix + ./modules/basic-tools ./modules/binary-caches.nix { diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix index 458672a..f67d3ff 100644 --- a/hosts/toaster/default.nix +++ b/hosts/toaster/default.nix @@ -13,14 +13,6 @@ audacity yt-dlp ]; - # integrate fzf into shell, >23.05 only - # to be moved to basic tools at some point - programs = { - fzf = { - keybindings = true; - fuzzyCompletion = true; - }; - }; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; diff --git a/modules/basic-tools.nix b/modules/basic-tools/default.nix index b865d74..94cdcec 100644 --- a/modules/basic-tools.nix +++ b/modules/basic-tools/default.nix @@ -1,6 +1,10 @@ { lib, config, pkgs, inputs, ... }: { + imports = [ + ./fzf.nix + ]; + environment.systemPackages = with pkgs; [ bat fd diff --git a/modules/basic-tools/fzf.nix b/modules/basic-tools/fzf.nix new file mode 100644 index 0000000..5e0ce0e --- /dev/null +++ b/modules/basic-tools/fzf.nix @@ -0,0 +1,10 @@ +{ lib, config, ... }: { + # integrate fzf into shell, >23.05 only + programs = + if (lib.toInt (lib.elemAt (lib.splitVersion config.system.nixos.release) 0) >= 23) then { + fzf = { + keybindings = true; + fuzzyCompletion = true; + }; + } else { }; +} |