remove unused variables and nesting issues

baseModules/default.nix

@@ -1,5 +1,4 @@
 self: {
-  config,
   lib,
   pkgs,
   ...

homeManagerModules/apps/alacritty/default.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.alacritty.enable {

homeManagerModules/apps/backblaze/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: let
   cfg = config.ar.home.apps.backblaze;

homeManagerModules/apps/bash/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.bash.enable {

homeManagerModules/apps/chromium/default.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.chromium.enable {

homeManagerModules/apps/default.nix

@@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./alacritty
     ./backblaze

homeManagerModules/apps/emacs/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.emacs.enable {

homeManagerModules/apps/fastfetch/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.fastfetch.enable {

homeManagerModules/apps/firefox/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.firefox.enable {

homeManagerModules/apps/fuzzel/default.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.fuzzel.enable {

homeManagerModules/apps/keepassxc/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.keepassxc.enable {

homeManagerModules/apps/librewolf/default.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.librewolf.enable {

homeManagerModules/apps/mako/default.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.mako.enable {

homeManagerModules/apps/nemo/default.nix

@@ -1,16 +1,15 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.nemo.enable {
-    home.packages = with pkgs; [
+    home.packages = [pkgs.cinnamon.nemo];
-      cinnamon.nemo
-    ];
 
     dconf = {
       enable = true;
+      
       settings = {
         "org/nemo/preferences" = {
           show-image-thumbnails = "always";

homeManagerModules/apps/swaylock/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.swaylock.enable {

homeManagerModules/apps/thunar/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.thunar.enable {

homeManagerModules/apps/tmux/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.tmux.enable {

homeManagerModules/apps/vsCodium/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.vsCodium.enable {

homeManagerModules/apps/waybar/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.waybar.enable {

homeManagerModules/apps/wlogout/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.apps.wlogout.enable {

homeManagerModules/apps/zed/default.nix

@@ -95,6 +95,7 @@
           ui_font_size = 16;
           vim_mode = false;
         };
+
         settings = defaults // config.ar.home.apps.zed.settings;
       in
         lib.generators.toJSON {} settings;

homeManagerModules/default.nix

@@ -1,9 +1,4 @@
 self: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./apps
     ./defaultApps.nix

homeManagerModules/defaultApps.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.ar.home.defaultApps;

homeManagerModules/desktop/cinnamon/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

homeManagerModules/desktop/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   osConfig,
-  pkgs,
   ...
 }: {
   imports = [

homeManagerModules/desktop/gnome/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

homeManagerModules/desktop/hyprland/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  self,
   ...
 }: let
   cfg = config.ar.home;

homeManagerModules/desktop/sway/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   imports = [./randomWallpaper.nix ./redShift.nix];

homeManagerModules/desktop/sway/randomWallpaper.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  self,
   ...
 }: let
   sway-randomWallpaper = pkgs.writeShellScriptBin "sway-randomWallpaper" ''
@@ -38,7 +37,10 @@
   '';
 in {
   config = lib.mkIf config.ar.home.desktop.sway.randomWallpaper {
-    home.packages = with pkgs; [swaybg sway-randomWallpaper];
+    home.packages = [
+      pkgs.swaybg
+      sway-randomWallpaper
+    ];
 
     wayland.windowManager.sway.config.startup = [
       {command = "${lib.getExe sway-randomWallpaper}";}

homeManagerModules/desktop/sway/redShift.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.home.desktop.sway.redShift {

homeManagerModules/desktop/waylandComp.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf (config.ar.home.desktop.hyprland.enable || config.ar.home.desktop.sway.enable) {

homeManagerModules/services/default.nix

@@ -1,8 +1,6 @@
 {
-  config,
+  imports = [
-  lib,
+    ./easyeffects
-  pkgs,
+    ./mpd
-  ...
+  ];
-}: {
-  imports = [./easyeffects ./mpd];
 }

homeManagerModules/services/easyeffects/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

homeManagerModules/services/mpd/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

homes/aly/firefox/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: {

homes/dustin/default.nix

@@ -1,6 +1,5 @@
 self: {
   config,
-  lib,
   pkgs,
   ...
 }: {

hosts/fallarbor/default.nix

@@ -1,8 +1,6 @@
 # Framework 13 with 11th gen Intel Core i5, 16GB RAM, 512GB SSD.
 {
   config,
-  lib,
-  pkgs,
   self,
   ...
 }: {

hosts/fallarbor/home.nix

@@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   home-manager.sharedModules = [
     {
       ar.home.desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];

hosts/lavaridge/default.nix

@@ -1,8 +1,6 @@
 # Framework Laptop 13 with AMD Ryzen 7640U, 32GB RAM, 1TB SSD.
 {
   config,
-  lib,
-  pkgs,
   self,
   ...
 }: {

hosts/lavaridge/home.nix

@@ -1,9 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   home-manager.sharedModules = [
     {
       ar.home = {

hosts/mauville/home.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   self,

hosts/petalburg/default.nix

@@ -1,8 +1,6 @@
 # Lenovo Yoga 9i Convertible with Intel Core i7-1360P, 16GB RAM, 512GB SSD.
 {
   config,
-  lib,
-  pkgs,
   self,
   ...
 }: {

hosts/petalburg/home.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   self,

hosts/rustboro/default.nix

@@ -1,8 +1,6 @@
 # Lenovo Thinkpad T440p with a Core i5 4210M, 16GB RAM, 512GB SSD.
 {
   config,
-  lib,
-  pkgs,
   self,
   ...
 }: {

hosts/rustboro/home.nix

@@ -1,9 +1,4 @@
-{
+{lib, ...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   home-manager.sharedModules = [
     {
       gtk.font.size = lib.mkForce 14;

nixosModules/apps/default.nix

@@ -1,9 +1,9 @@
 {
-  pkgs,
+  imports = [
-  inputs,
+    ./firefox
-  lib,
+    ./nicotine-plus
-  config,
+    ./steam
-  ...
+    ./podman
-}: {
+    ./virt-manager
-  imports = [./firefox ./nicotine-plus ./steam ./podman ./virt-manager];
+  ];
 }

nixosModules/apps/firefox/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.apps.firefox.enable {

nixosModules/apps/nicotine-plus/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.apps.nicotine-plus.enable {

nixosModules/apps/podman/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

nixosModules/apps/virt-manager/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.apps.virt-manager.enable {

nixosModules/default.nix

@@ -1,9 +1,4 @@
-self: {
+{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./apps
     ./desktop

nixosModules/desktop/cinnamon/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.desktop.cinnamon.enable {

nixosModules/desktop/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   pkgs,
   ...

nixosModules/desktop/gnome/default.nix

@@ -20,16 +20,16 @@
   '';
 in {
   config = lib.mkIf config.ar.desktop.gnome.enable {
-    environment.systemPackages = with pkgs;
+    environment.systemPackages =
       [
-        gnomeExtensions.appindicator
+        pkgs.gnomeExtensions.appindicator
-        gnomeExtensions.blur-my-shell
+        pkgs.gnomeExtensions.blur-my-shell
-        gnomeExtensions.gsconnect
+        pkgs.gnomeExtensions.gsconnect
-        gnomeExtensions.light-shell
+        pkgs.gnomeExtensions.light-shell
-        gnomeExtensions.night-theme-switcher
+        pkgs.gnomeExtensions.night-theme-switcher
-        gnomeExtensions.noannoyance-fork
+        pkgs.gnomeExtensions.noannoyance-fork
-        gnomeExtensions.tailscale-status
+        pkgs.gnomeExtensions.tailscale-status
-        gnomeExtensions.tiling-assistant
+        pkgs.gnomeExtensions.tiling-assistant
       ]
       ++ [gnomeCsAdjuster];
 

nixosModules/desktop/greetd/default.nix

@@ -11,26 +11,25 @@
       kwallet.enable = true;
     };
 
-    services = {
+    services.greetd = {
-      greetd = {
+      enable = true;
-        enable = true;
+
-        settings =
+      settings =
-          if config.ar.desktop.greetd.autologin != null
+        if config.ar.desktop.greetd.autologin != null
-          then {
+        then {
-            default_session = {
+          default_session = {
-              command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
+            command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
-            };
-            initial_session = {
-              command = config.ar.desktop.greetd.session;
-              user = config.ar.desktop.greetd.autologin;
-            };
-          }
-          else {
-            default_session = {
-              command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
-            };
           };
-      };
+          initial_session = {
+            command = config.ar.desktop.greetd.session;
+            user = config.ar.desktop.greetd.autologin;
+          };
+        }
+        else {
+          default_session = {
+            command = lib.mkDefault "${lib.getExe pkgs.greetd.tuigreet} --asterisks --user-menu -g 'Welcome to NixOS ${config.system.nixos.release}' --time --remember --cmd ${config.ar.desktop.greetd.session}";
+          };
+        };
     };
   };
 }

nixosModules/desktop/hyprland/default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   pkgs,
   ...

nixosModules/desktop/sway/default.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   pkgs,
   lib,
   config,

nixosModules/desktop/waylandComp.nix

@@ -1,5 +1,4 @@
 {
-  inputs,
   pkgs,
   lib,
   config,

nixosModules/options.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: {
   options.ar = {

nixosModules/services/default.nix

@@ -1,9 +1,4 @@
 {
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
   imports = [
     ./flatpak
   ];

nixosModules/services/flatpak/default.nix

@@ -1,7 +1,7 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.ar.services.flatpak.enable {

userModules/aly/default.nix

@@ -1,8 +1,6 @@
 {
   config,
-  inputs,
   lib,
-  pkgs,
   self,
   ...
 }: {

userModules/aly/syncthing.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.ar.users.aly.syncthing;

userModules/default.nix

@@ -1,9 +1,4 @@
 self: {
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./aly
     ./dustin

userModules/dustin/default.nix

@@ -1,8 +1,6 @@
 {
   config,
-  inputs,
   lib,
-  pkgs,
   self,
   ...
 }: {

userModules/options.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: {
   options.ar.users = let