cleanup, deadnix, format

5 files changed, 29 insertions, 37 deletions

diff --git a/flake.nix b/flake.nix
index 4acd3b9..1174373 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,6 @@
 
   outputs =
     inputs@{
-      authentik-nix,
       lanzaboote,
       lix-module,
       microvm,
@@ -79,25 +78,29 @@
             "immich"
           ];
 
-          microvm-builder = (nixpkgs-ver: vm-list: builtins.listToAttrs (
-            map (vm: {
-              name = vm;
-              value = nixpkgs-ver.lib.nixosSystem {
-                system = "x86_64-linux";
-                specialArgs = { inherit inputs; };
-                modules = [
-                  sops-nix.nixosModules.sops
-                  microvm.nixosModules.microvm
+          microvm-builder = (
+            nixpkgs-ver: vm-list:
+            builtins.listToAttrs (
+              map (vm: {
+                name = vm;
+                value = nixpkgs-ver.lib.nixosSystem {
+                  system = "x86_64-linux";
+                  specialArgs = { inherit inputs; };
+                  modules = [
+                    sops-nix.nixosModules.sops
+                    microvm.nixosModules.microvm
 
-                  ./hosts/${vm}
-                  ./modules/server
-                  ./modules/wg
-                ];
-              };
-            }) vm-list
-          ));
-          microvms = (microvm-builder nixpkgs microvm-stable-list)
-                     // (microvm-builder nixpkgs-unstable microvm-unstable-list);
+                    ./hosts/${vm}
+                    ./modules/server
+                    ./modules/wg
+                  ];
+                };
+              }) vm-list
+            )
+          );
+          microvms =
+            (microvm-builder nixpkgs microvm-stable-list)
+            // (microvm-builder nixpkgs-unstable microvm-unstable-list);
         in
         microvms
         // {
diff --git a/hosts/cloud/proxy/conduwuit.nix b/hosts/cloud/proxy/conduwuit.nix
index 323590d..c731066 100644
--- a/hosts/cloud/proxy/conduwuit.nix
+++ b/hosts/cloud/proxy/conduwuit.nix
@@ -1,4 +1,4 @@
-{ self, ... }:
+{ ... }:
 let
   proxy-conf = ''
     client_max_body_size 50M;
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 {