summaryrefslogtreecommitdiff
path: root/modules/basic-tools
diff options
context:
space:
mode:
Diffstat (limited to 'modules/basic-tools')
-rw-r--r--modules/basic-tools/default.nix4
-rw-r--r--modules/basic-tools/fzf.nix17
2 files changed, 5 insertions, 16 deletions
diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index b7b193b..a917168 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -65,9 +65,7 @@
let
editorconf =
if config.services.emacs.defaultEditor then
- {
- EDITOR = "emacsclient";
- }
+ { }
else
{
EDITOR = "nvim";
diff --git a/modules/basic-tools/fzf.nix b/modules/basic-tools/fzf.nix
index 8ad1b92..96ab39c 100644
--- a/modules/basic-tools/fzf.nix
+++ b/modules/basic-tools/fzf.nix
@@ -1,6 +1,4 @@
{
- lib,
- config,
pkgs,
...
}:
@@ -14,15 +12,8 @@
};
};
# integrate fzf into shell, >23.05 only
- programs =
- with lib;
- if (toInt (elemAt (splitVersion config.system.nixos.release) 0) >= 23) then
- {
- fzf = {
- keybindings = true;
- fuzzyCompletion = true;
- };
- }
- else
- { };
+ programs.fzf = {
+ keybindings = true;
+ fuzzyCompletion = true;
+ };
}