From 7223ca43a7f68dc8b044b37596685f5431de26e7 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov
Date: Tue, 27 May 2025 10:17:27 +0200
Subject: cleanup, deadnix, format

---
 modules/basic-tools/default.nix |  4 +---
 modules/basic-tools/fzf.nix     | 17 ++++-------------
 modules/niri.nix                |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'modules')

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;
+  };
 }
diff --git a/modules/niri.nix b/modules/niri.nix
index c3438fc..e769189 100644
--- a/modules/niri.nix
+++ b/modules/niri.nix
@@ -12,7 +12,7 @@
   environment.systemPackages =
     let
       xwayland-satellite-git = pkgs.xwayland-satellite.overrideAttrs (
-        final: prev: {
+        final: _prev: {
           version = "git";
           cargoHash = "sha256-MaF2FyR3HvQAKkZKa8OO/5jbO64/Ncv7+JqHda4jN50=";
           src = pkgs.fetchFromGitHub {
-- 
cgit v1.3.1