25 files changed, 26 insertions, 55 deletions
diff --git a/home/apps/astal.nix b/home/apps/astal.nix
index f9bf7b4..1dd8527 100644
--- a/home/apps/astal.nix
+++ b/home/apps/astal.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   inputs,
   system,
   ...
diff --git a/home/apps/default.nix b/home/apps/default.nix
index d755a12..074e588 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -1,6 +1,4 @@
-{lib, ...}: let
-  inherit (lib) mkEnableOption;
-in {
+{...}: {
   imports = [
     ./waybar
     ./wofi
diff --git a/home/apps/hyprlock.nix b/home/apps/hyprlock.nix
index 6a0119f..a0e5d84 100644
--- a/home/apps/hyprlock.nix
+++ b/home/apps/hyprlock.nix
@@ -8,7 +8,7 @@
   error = "rgb(${config.theme.colors.error})";
   trans = "rgba(0,0,0,0)";
 
-  inherit (lib) mkIf optionals;
+  inherit (lib) mkIf;
   cfg = config.apps.hyprlock;
 in {
   config = mkIf cfg.enable {
diff --git a/home/desktops/default.nix b/home/desktops/default.nix
index 0831bc0..0c2ce1c 100644
--- a/home/desktops/default.nix
+++ b/home/desktops/default.nix
@@ -6,7 +6,7 @@
   system,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf optionals;
+  inherit (lib) mkIf optionals;
   cfg = config.desktops;
 in {
   imports = [
diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix
index c584913..5fd0d75 100644
--- a/home/desktops/hyprland/default.nix
+++ b/home/desktops/hyprland/default.nix
@@ -1,12 +1,11 @@
 {
   inputs,
   config,
-  pkgs,
   lib,
   system,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.hyprland;
 in {
   imports = [
diff --git a/home/desktops/hyprland/env.nix b/home/desktops/hyprland/env.nix
index 620efd9..6773c55 100644
--- a/home/desktops/hyprland/env.nix
+++ b/home/desktops/hyprland/env.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{...}: {
   wayland.windowManager.hyprland.settings = {
     env = [
       "XDG_CURRENT_DESKTOP,Hyprland"
diff --git a/home/desktops/hyprland/plugins.nix b/home/desktops/hyprland/plugins.nix
index f4b76f2..e8ec00d 100644
--- a/home/desktops/hyprland/plugins.nix
+++ b/home/desktops/hyprland/plugins.nix
@@ -1,7 +1,6 @@
 {
   inputs,
   config,
-  pkgs,
   system,
   ...
 }: {
diff --git a/home/desktops/hyprland/settings.nix b/home/desktops/hyprland/settings.nix
index 2f7d4fb..219467e 100644
--- a/home/desktops/hyprland/settings.nix
+++ b/home/desktops/hyprland/settings.nix
@@ -1,10 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: {
+{config, ...}: {
   wayland.windowManager.hyprland = {
     importantPrefixes = [
       "bezier"
diff --git a/home/desktops/sway/config.nix b/home/desktops/sway/config.nix
index db8c1a4..11a12af 100644
--- a/home/desktops/sway/config.nix
+++ b/home/desktops/sway/config.nix
@@ -50,7 +50,7 @@
 
       startup =
         # autostart apps
-        builtins.map (command: {
+        map (command: {
           inherit command;
           always = false;
         })
diff --git a/home/desktops/sway/default.nix b/home/desktops/sway/default.nix
index 3553c4a..4fed88d 100644
--- a/home/desktops/sway/default.nix
+++ b/home/desktops/sway/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.sway;
 in {
   imports = [
diff --git a/home/development.nix b/home/development.nix
index bf59e8e..773ee07 100644
--- a/home/development.nix
+++ b/home/development.nix
@@ -4,12 +4,15 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption optionals;
+  inherit (lib) optionals;
   cfg = config.development;
 in {
   config = {
     home.packages = with pkgs;
-      (optionals cfg.c.enable [
+      [
+        nixd
+      ]
+      ++ (optionals cfg.c.enable [
         clang-tools
         gcc
         gdb
diff --git a/home/gpg.nix b/home/gpg.nix
index 5c77c78..ae2614c 100644
--- a/home/gpg.nix
+++ b/home/gpg.nix
@@ -1,8 +1,6 @@
 {
   config,
-  lib,
   pkgs,
-  inputs,
   ...
 }: {
   # install keys into gpg keyring
diff --git a/home/neovim/config.nix b/home/neovim/config.nix
index aa5816e..52bae04 100644
--- a/home/neovim/config.nix
+++ b/home/neovim/config.nix
@@ -53,7 +53,10 @@ in
     };
     # list of lsp servers to load
     lsps =
-      optionalAttrs config.development.c.enable {
+      {
+        nixd = {};
+      }
+      // optionalAttrs config.development.c.enable {
         clangd = {};
       }
       // optionalAttrs config.development.java.enable {
diff --git a/home/ssh/default.nix b/home/ssh/default.nix
index efee063..19909c9 100644
--- a/home/ssh/default.nix
+++ b/home/ssh/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   # ssh config
   programs.ssh = {
     enable = true;
diff --git a/home/starship.nix b/home/starship.nix
index 5791141..31b791d 100644
--- a/home/starship.nix
+++ b/home/starship.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   programs.starship = {
     enable = true;
     enableZshIntegration = false;
diff --git a/home/tmux/default.nix b/home/tmux/default.nix
index 69abbf7..22cc8a9 100644
--- a/home/tmux/default.nix
+++ b/home/tmux/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = [
     pkgs.tmux
   ];
diff --git a/hosts/work/default.nix b/hosts/work/default.nix
index 7427945..083c2ec 100644
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -2,7 +2,6 @@
 # System configuration for work vm
 {
   lib,
-  config,
   pkgs,
   inputs,
   ...
diff --git a/lib/files.nix b/lib/files.nix
index 156ec7c..f4e6e50 100644
--- a/lib/files.nix
+++ b/lib/files.nix
@@ -9,12 +9,12 @@
   # set of ssh keys
   sshKeys =
     builtins.filter
-    (path: lib.strings.hasSuffix "pub" path) (getFiles ../files/keys);
+    (filePath: lib.strings.hasSuffix "pub" filePath) (getFiles ../files/keys);
 
   # set of gpg keys
   gpgKeys =
     builtins.filter
-    (path: lib.strings.hasSuffix "asc" path) (getFiles ../files/keys);
+    (filePath: lib.strings.hasSuffix "asc" filePath) (getFiles ../files/keys);
 in {
   inherit getFiles;
   inherit certs;
diff --git a/pkgs/arcanist/default.nix b/pkgs/arcanist/default.nix
index 2660589..1ed7b50 100644
--- a/pkgs/arcanist/default.nix
+++ b/pkgs/arcanist/default.nix
@@ -1,7 +1,4 @@
-{
-  lib,
-  pkgs,
-}:
+{pkgs}:
 pkgs.stdenvNoCC.mkDerivation rec {
   pname = "arcanist";
   version = "2025.18";
diff --git a/system/desktop.nix b/system/desktop.nix
index 8b1f40a..410f144 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -6,7 +6,7 @@
   system,
   ...
 }: let
-  inherit (lib) mkIf optionals;
+  inherit (lib) mkIf;
 in {
   imports = [
     inputs.preload-ng.nixosModules.default
diff --git a/system/desktops/hyprland.nix b/system/desktops/hyprland.nix
index 42a45be..26fa283 100644
--- a/system/desktops/hyprland.nix
+++ b/system/desktops/hyprland.nix
@@ -1,12 +1,11 @@
 {
   inputs,
   config,
-  pkgs,
   lib,
   system,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.hyprland;
 in {
   config = mkIf cfg.enable {
diff --git a/system/desktops/ly.nix b/system/desktops/ly.nix
index 49469b2..298fc4c 100644
--- a/system/desktops/ly.nix
+++ b/system/desktops/ly.nix
@@ -1,9 +1,6 @@
 {
   lib,
   config,
-  pkgs,
-  inputs,
-  system,
   ...
 }: let
   inherit (lib) mkIf;
diff --git a/system/desktops/sway.nix b/system/desktops/sway.nix
index d0838a4..501ee41 100644
--- a/system/desktops/sway.nix
+++ b/system/desktops/sway.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;
   cfg = config.desktops.sway;
 in {
   config = mkIf cfg.enable {
diff --git a/system/fingerprint.nix b/system/fingerprint.nix
index 1fe0560..02b0e75 100644
--- a/system/fingerprint.nix
+++ b/system/fingerprint.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   config,
   inputs,
   system,
diff --git a/system/virt/docker.nix b/system/virt/docker.nix
index 97c57ad..9dcb7e2 100644
--- a/system/virt/docker.nix
+++ b/system/virt/docker.nix
@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }: let
   inherit (lib) mkIf;