diff --git a/flake.lock b/flake.lock
index 66eba43..b2a5720 100644
--- a/flake.lock
+++ b/flake.lock
@@ -114,6 +114,27 @@
         "type": "github"
       }
     },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -121,11 +142,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723685519,
-        "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
+        "lastModified": 1726730453,
+        "narHash": "sha256-Kdi7liMdbr1/uyMhMDl19O5b9LESxcnYgBRZblrJi9E=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "rev": "a31fe5ef162f2f963308289e6e27d37e3948a983",
         "type": "github"
       },
       "original": {
@@ -135,6 +156,20 @@
       }
     },
     "flake-compat": {
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "revCount": 57,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -150,7 +185,46 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": [
           "stylix",
@@ -187,6 +261,58 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725513492,
+        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -211,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1726592409,
+        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
         "type": "github"
       },
       "original": {
@@ -226,6 +352,27 @@
       }
     },
     "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726825546,
+        "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "stylix",
@@ -246,13 +393,34 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726188813,
+        "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1726724509,
+        "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
         "type": "github"
       },
       "original": {
@@ -263,11 +431,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1726447378,
+        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
         "type": "github"
       },
       "original": {
@@ -279,11 +447,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "lastModified": 1726463316,
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
@@ -309,6 +477,56 @@
         "type": "github"
       }
     },
+    "nixvim": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
+        "home-manager": "home-manager_2",
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1726846628,
+        "narHash": "sha256-0CH44sEwiljiN2q7eIFCvabyUm1WeEiF8ofP/z5ca0Q=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "3211ce356be612ae89a38c60799992bde8a47127",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726816132,
+        "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "7733a39a1321057172d87e6251ded7cdeb67171e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
@@ -316,6 +534,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixvim": "nixvim",
         "stylix": "stylix"
       }
     },
@@ -328,19 +547,19 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_2",
         "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager_3",
         "nixpkgs": "nixpkgs_2",
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1725290973,
-        "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
+        "lastModified": 1726497442,
+        "narHash": "sha256-fieyqmLEJQqqnuJcg2CAnQ8kHapXHhg9rL48NNWjnPw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
+        "rev": "149b313ddf91c3cc94309170498b162cec666675",
         "type": "github"
       },
       "original": {
@@ -363,6 +582,42 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725271838,
+        "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index b1da2a5..7352795 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
 
     stylix.url = "github:danth/stylix";
 
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
 #    # Secrets management. See ./docs/secretsmgmt.md
 #    sops-nix = {
 #      url = "github:mic92/sops-nix";
@@ -30,9 +35,8 @@
 
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, stylix, ... }@attrs: 
+  outputs = { nixpkgs, nixpkgs-unstable, stylix, nixvim, ... }@attrs: 
   let
-      system = "x86_64-linux";
       lib = nixpkgs.lib;
       pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
       pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
@@ -61,6 +65,8 @@
             }
           attrs.disko.nixosModules.disko
           stylix.nixosModules.stylix
+#          nixvim.homeManagerModules.nixvim
+          nixvim.nixosModules.nixvim
           attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
           ./hosts
           ./users/willifan
@@ -88,6 +94,7 @@
               home-manager.useUserPackages = true;
             }
           attrs.disko.nixosModules.disko
+          stylix.nixosModules.stylix
           attrs.nixos-hardware.nixosModules.common-cpu-amd
           attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
diff --git a/hosts/Anton/data.nix b/hosts/Anton/data.nix
index 224b321..710027e 100644
--- a/hosts/Anton/data.nix
+++ b/hosts/Anton/data.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
 #  environment.systemPackages = with pkgs; [
diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix
index 8a1c65f..a4db889 100644
--- a/hosts/Anton/default.nix
+++ b/hosts/Anton/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [
diff --git a/hosts/Anton/docker.nix.save b/hosts/Anton/docker.nix.save
deleted file mode 100644
index 1798fdf..0000000
--- a/hosts/Anton/docker.nix.save
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "btrfs";
-  };
-
-}
diff --git a/hosts/Anton/firewall.nix b/hosts/Anton/firewall.nix
index 8067bfc..ed09e4d 100644
--- a/hosts/Anton/firewall.nix
+++ b/hosts/Anton/firewall.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   networking.firewall = {
     enable = true;
diff --git a/hosts/Anton/gitea.nix b/hosts/Anton/gitea.nix
index 65c4388..c3d5467 100644
--- a/hosts/Anton/gitea.nix
+++ b/hosts/Anton/gitea.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ... }:
+{ pkgs-unstable, ... }:
 {
   
   services.gitea = {
diff --git a/hosts/Anton/hardware-configuration.nix b/hosts/Anton/hardware-configuration.nix
index b1da3d4..052515c 100644
--- a/hosts/Anton/hardware-configuration.nix
+++ b/hosts/Anton/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/hosts/Anton/invidious.nix b/hosts/Anton/invidious.nix
index b09d59c..84617bf 100644
--- a/hosts/Anton/invidious.nix
+++ b/hosts/Anton/invidious.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 {
   services.invidious = {
     enable = true;
diff --git a/hosts/Anton/minecraft.nix b/hosts/Anton/minecraft.nix
index 3213cc8..3e1707d 100644
--- a/hosts/Anton/minecraft.nix
+++ b/hosts/Anton/minecraft.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ...}:
+{ pkgs-unstable, ...}:
 {
   services.minecraft-server = {
     eula = true;
diff --git a/hosts/Anton/radicale.nix b/hosts/Anton/radicale.nix
index d982e57..fc6547d 100644
--- a/hosts/Anton/radicale.nix
+++ b/hosts/Anton/radicale.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   services.radicale = {
diff --git a/hosts/Anton/syncthing.nix b/hosts/Anton/syncthing.nix
index 375b315..d3f4d06 100644
--- a/hosts/Anton/syncthing.nix
+++ b/hosts/Anton/syncthing.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.syncthing = {
     enable =  true;
diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix
index 78c455a..d08b671 100644
--- a/hosts/Lenni/default.nix
+++ b/hosts/Lenni/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./hardware-configuration.nix
     #./disko.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/hosts/Lenni/hardware-configuration.nix b/hosts/Lenni/hardware-configuration.nix
index 0524a51..0aae747 100644
--- a/hosts/Lenni/hardware-configuration.nix
+++ b/hosts/Lenni/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/hosts/Puenktchen/default.nix b/hosts/Puenktchen/default.nix
index 36963cd..81f90fb 100644
--- a/hosts/Puenktchen/default.nix
+++ b/hosts/Puenktchen/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./hardware-configuration.nix
     ./disko.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/hosts/Puenktchen/hardware-configuration.nix b/hosts/Puenktchen/hardware-configuration.nix
index 490c770..30cec6c 100644
--- a/hosts/Puenktchen/hardware-configuration.nix
+++ b/hosts/Puenktchen/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =
diff --git a/hosts/common/autoupdate.nix b/hosts/common/autoupdate.nix
index c5591ef..4ca0820 100644
--- a/hosts/common/autoupdate.nix
+++ b/hosts/common/autoupdate.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   system.autoUpgrade = {
     enable = true;
@@ -8,4 +8,4 @@
     randomizedDelaySec = "5min";
     fixedRandomDelay = true;
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index ff43091..0101b57 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, hostname, ... }:
+{ hostname, ... }:
 {
   imports = [
     ./autoupdate.nix
diff --git a/hosts/common/garbage-collect.nix b/hosts/common/garbage-collect.nix
index 8a029f8..18d0fd3 100644
--- a/hosts/common/garbage-collect.nix
+++ b/hosts/common/garbage-collect.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   nix.gc = {
     automatic = true;
@@ -6,4 +6,4 @@
     persistent = true;
     options = "--delete-older-than 10d";
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/common/optimise.nix b/hosts/common/optimise.nix
index b4d7458..f92842d 100644
--- a/hosts/common/optimise.nix
+++ b/hosts/common/optimise.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   nix.optimise = {
     automatic = true;
     dates = [ "05:00" ];
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/default.nix b/hosts/default.nix
index fbe7d2c..908c51b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, hostname, type, ... }:
+{ hostname, type, ... }:
 {
   imports = [
     ./common
     ./${type}
     ./${hostname}
   ];
-}
\ No newline at end of file
+}
diff --git a/hosts/desktop/boot.nix b/hosts/desktop/boot.nix
index f9fa4df..bf45717 100644
--- a/hosts/desktop/boot.nix
+++ b/hosts/desktop/boot.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   boot = {
     loader.systemd-boot.enable = true;
diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index cbc992d..be5c60a 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, hostname, ... }:
+{ hostname, ... }:
 {
   networking.hostName = hostname;
   imports = [
diff --git a/hosts/desktop/nix-ld.nix b/hosts/desktop/nix-ld.nix
index 6c4c888..5b71ccf 100644
--- a/hosts/desktop/nix-ld.nix
+++ b/hosts/desktop/nix-ld.nix
@@ -3,10 +3,5 @@
   programs.nix-ld.enable = true;
 
   programs.nix-ld.libraries = with pkgs; [
-
-    # Add any missing dynamic libraries for unpackaged programs
-
-    # here, NOT in environment.systemPackages
-
   ];
-}
\ No newline at end of file
+}
diff --git a/hosts/desktop/syncthing.nix b/hosts/desktop/syncthing.nix
index 21d6cc9..c975529 100644
--- a/hosts/desktop/syncthing.nix
+++ b/hosts/desktop/syncthing.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.syncthing = {
     enable =  true;
diff --git a/hosts/server/boot.nix b/hosts/server/boot.nix
index 019a354..e49fa2b 100644
--- a/hosts/server/boot.nix
+++ b/hosts/server/boot.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   boot = {
     loader.systemd-boot.enable = true;
diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index ac62c2e..4f7dedc 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [
diff --git a/hosts/server/ssh-server.nix b/hosts/server/ssh-server.nix
index 4853e41..0ced326 100644
--- a/hosts/server/ssh-server.nix
+++ b/hosts/server/ssh-server.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   services.openssh = {
@@ -17,4 +17,4 @@
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMRriQfw3pusl04fGhCNVoRRpye71ZwkDXAtKB/FP1DLXA4cYrwjLzv/fG1hXi7lAMp2vLiABAg/UaTE8roGzlt62XsFNwc1TI5M8m67J0kLkCtz3MkIixe/3GOFXr03g80DPncLyoIYPvvNd/TftTBK4yrrZPvMJaRrZhW/QdLPQpdHalcNRZ4bnBOCtCoqQ6RGrRi2EeKaJDYIFNl13b9FxrXEJcXnbSDdr1KI3q7a+vkefI2knUf2Uk7ufOWTQ1aqc0heGtCNlHzwZUzW/dfrpPmoVPq3Fqxqd9uXqxMk1Z3VnOwWcK3VXfzzBXKTsX0MaUgF1EqxibkYs9bDZqLEXoRucBqk3wwMPy8RJXqQOupoqa2xEOoduBf1qDHEEm69coHCpPm2mQVUrwsPrmTHmOjh9ir0mkVBDRgHvhq/ctQTVO5/SE2NCgPdlvUV5s44LLsUyxBp5JWwXZWlVys+7Dhil6mtRDcH4CXceJn0VZ61Zv2jrCTxQjKsroitSkNbpAkKajQ9moLMAblsSwJzl3uvJJ3ydlxjZefwTO/GjyuJMY2sIU2Tu0YbIVgMyq5L782LduVlyWj+RLWoEu19OfMqQvTWhJnQPAbR82qGzlfTGRLUxoY+G5MYipJwgrBQ2TnpWvfpTrZxFrglSfekz0v54lWzNZpW+irImh4w== willifan@proton.me"
   ];
 
-}
\ No newline at end of file
+}
diff --git a/users/willifan/Anton/default.nix b/users/willifan/Anton/default.nix
index c7f8b4f..1c4f482 100644
--- a/users/willifan/Anton/default.nix
+++ b/users/willifan/Anton/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
\ No newline at end of file
+}
diff --git a/users/willifan/Lenni/auto-cpufreq.nix b/users/willifan/Lenni/auto-cpufreq.nix
index 04bc3c0..80297ff 100644
--- a/users/willifan/Lenni/auto-cpufreq.nix
+++ b/users/willifan/Lenni/auto-cpufreq.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.auto-cpufreq = {
     enable = true;
@@ -13,4 +13,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/Lenni/default.nix b/users/willifan/Lenni/default.nix
index 489b782..0a54c75 100644
--- a/users/willifan/Lenni/default.nix
+++ b/users/willifan/Lenni/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./auto-cpufreq.nix
     ./backlight.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/users/willifan/Puenktchen/default.nix b/users/willifan/Puenktchen/default.nix
index c7f8b4f..1c4f482 100644
--- a/users/willifan/Puenktchen/default.nix
+++ b/users/willifan/Puenktchen/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
\ No newline at end of file
+}
diff --git a/users/willifan/common/default.nix b/users/willifan/common/default.nix
index 2de4ace..e3b882f 100644
--- a/users/willifan/common/default.nix
+++ b/users/willifan/common/default.nix
@@ -1,10 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   imports = [
     ./envvar.nix
     ./git.nix
     ./hyfetch.nix
     ./locales.nix
+    ./nixvim
     #./ssh.nix
     ./user.nix
     ./zsh.nix
diff --git a/users/willifan/common/envvar.nix b/users/willifan/common/envvar.nix
index 5e17e60..ca94b5c 100644
--- a/users/willifan/common/envvar.nix
+++ b/users/willifan/common/envvar.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  environment.sessionVariables = rec {
+  environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     XDG_CACHE_HOME  = "$HOME/.cache";
     XDG_CONFIG_HOME = "$HOME/.config";
@@ -13,4 +13,4 @@
     #  "${XDG_BIN_HOME}"
     #];
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/common/git.nix b/users/willifan/common/git.nix
index 7c2c58e..450056c 100644
--- a/users/willifan/common/git.nix
+++ b/users/willifan/common/git.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   home-manager.users.willifan = {
     programs.git = {
@@ -11,4 +11,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/common/hyfetch.nix b/users/willifan/common/hyfetch.nix
index 7e463ee..837dd7d 100644
--- a/users/willifan/common/hyfetch.nix
+++ b/users/willifan/common/hyfetch.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 
 {
   home-manager.users.willifan = {
diff --git a/users/willifan/common/locales.nix b/users/willifan/common/locales.nix
index c55b643..8690f12 100644
--- a/users/willifan/common/locales.nix
+++ b/users/willifan/common/locales.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
@@ -13,4 +13,4 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/common/nixvim/default.nix b/users/willifan/common/nixvim/default.nix
new file mode 100644
index 0000000..91ab42a
--- /dev/null
+++ b/users/willifan/common/nixvim/default.nix
@@ -0,0 +1,17 @@
+{ ... }:
+{
+
+  programs.nixvim = {
+    enable = true;
+  };
+
+  imports = [
+    ./gitsigns.nix
+    ./illuminate.nix
+    ./lsp.nix
+    ./navic.nix
+    ./neotree.nix
+    ./toggleterm.nix
+  ];
+
+}
diff --git a/users/willifan/common/nixvim/gitsigns.nix b/users/willifan/common/nixvim/gitsigns.nix
new file mode 100644
index 0000000..1cc9c44
--- /dev/null
+++ b/users/willifan/common/nixvim/gitsigns.nix
@@ -0,0 +1,28 @@
+{ ... }:
+{
+  programs.nixvim.plugins.gitsigns = {
+    enable = true;
+    settings = {
+      signs = {
+        add = {
+          text = " ";
+        };
+        change = {
+          text = " ";
+        };
+        delete = {
+          text = " ";
+        };
+        untracked = {
+          text = "";
+        };
+        topdelete = {
+          text = "󱂥 ";
+        };
+        changedelete = {
+          text = "󱂧 ";
+        };
+      };
+    };
+  };
+}
diff --git a/users/willifan/common/nixvim/illuminate.nix b/users/willifan/common/nixvim/illuminate.nix
new file mode 100644
index 0000000..278d244
--- /dev/null
+++ b/users/willifan/common/nixvim/illuminate.nix
@@ -0,0 +1,18 @@
+{ ... }:
+{
+
+  programs.nixvim.plugins = {
+    illuminate = {
+      enable = true;
+      underCursor = false;
+      filetypesDenylist = [
+        "Outline"
+        "TelescopePrompt"
+        "alpha"
+        "harpoon"
+        "reason"
+      ];
+    };
+  };
+
+}
diff --git a/users/willifan/common/nixvim/lsp.nix b/users/willifan/common/nixvim/lsp.nix
new file mode 100644
index 0000000..fdbeced
--- /dev/null
+++ b/users/willifan/common/nixvim/lsp.nix
@@ -0,0 +1,99 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      lsp-lines = {enable = true;};
+      lsp-format = {enable = true;};
+      helm = {enable = true;};
+      lsp = {
+        enable = true;
+        inlayHints = true;
+        servers = {
+          html = {enable = true;};
+          lua-ls = {enable = true;};
+          nil-ls = {enable = true;};
+          marksman = {enable = true;};
+	  nixd = {enable = true;};
+          pyright = {enable = true;};
+          gopls = {enable = true;};
+          terraformls = {enable = true;};
+          ansiblels = {enable = true;};
+          jsonls = {enable = true;};
+          yamlls = {
+            enable = true;
+            extraOptions = {
+              settings = {
+                yaml = {
+                  schemas = {
+                    kubernetes = "'*.yaml";
+                    "http://json.schemastore.org/github-workflow" = ".github/workflows/*";
+                    "http://json.schemastore.org/github-action" = ".github/action.{yml,yaml}";
+                    "http://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}";
+                    "http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}";
+                    "http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}";
+                    "http://json.schemastore.org/chart" = "Chart.{yml,yaml}";
+                    "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}";
+                    "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}";
+                    "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}";
+                  };
+                };
+              };
+            };
+          };
+        };
+
+        keymaps = {
+          silent = true;
+          lspBuf = {
+            gd = {
+              action = "definition";
+              desc = "Goto Definition";
+            };
+            gr = {
+              action = "references";
+              desc = "Goto References";
+            };
+            gD = {
+              action = "declaration";
+              desc = "Goto Declaration";
+            };
+            gI = {
+              action = "implementation";
+              desc = "Goto Implementation";
+            };
+            gT = {
+              action = "type_definition";
+              desc = "Type Definition";
+            };
+            K = {
+              action = "hover";
+              desc = "Hover";
+            };
+            "<leader>cw" = {
+              action = "workspace_symbol";
+              desc = "Workspace Symbol";
+            };
+            "<leader>cr" = {
+              action = "rename";
+              desc = "Rename";
+            };
+          };
+          diagnostic = {
+            "<leader>cd" = {
+              action = "open_float";
+              desc = "Line Diagnostics";
+            };
+            "[d" = {
+              action = "goto_next";
+              desc = "Next Diagnostic";
+            };
+            "]d" = {
+              action = "goto_prev";
+              desc = "Previous Diagnostic";
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/users/willifan/common/nixvim/navic.nix b/users/willifan/common/nixvim/navic.nix
new file mode 100644
index 0000000..a4e9e63
--- /dev/null
+++ b/users/willifan/common/nixvim/navic.nix
@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    navic = {
+      enable = true;
+      settings = {
+        separator = "  ";
+        highlight = true;
+        lsp = {
+          autoAttach = true;
+        };
+        icons = {
+          Array = "󱃵  ";
+          Boolean = "  ";
+          Class = "  ";
+          Constant = "  ";
+          Constructor = "  ";
+          Enum = " ";
+          EnumMember = " ";
+          Event = " ";
+          Field = "󰽏 ";
+          File = " ";
+          Function = "󰡱 ";
+          Interface = " ";
+          Key = "  ";
+          Method = " ";
+          Module = "󰕳 ";
+          Namespace = " ";
+          Null = "󰟢 ";
+          Number = " ";
+          Object = "  ";
+          Operator = " ";
+          Package = "󰏖 ";
+          String = " ";
+          Struct = " ";
+          TypeParameter = " ";
+          Variable = " ";
+        };
+      };
+    };
+  };
+}
diff --git a/users/willifan/common/nixvim/neotree.nix b/users/willifan/common/nixvim/neotree.nix
new file mode 100644
index 0000000..9af6173
--- /dev/null
+++ b/users/willifan/common/nixvim/neotree.nix
@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree = {
+        enable = true;
+        sources = ["filesystem" "buffers" "git_status" "document_symbols"];
+        addBlankLineAtTop = false;
+
+        filesystem = {
+          bindToCwd = false;
+          followCurrentFile = {
+            enabled = true;
+          };
+        };
+
+        defaultComponentConfigs = {
+          indent = {
+            withExpanders = true;
+            expanderCollapsed = "󰅂";
+            expanderExpanded = "󰅀";
+            expanderHighlight = "NeoTreeExpander";
+          };
+
+          gitStatus = {
+            symbols = {
+              added = " ";
+              conflict = "󰩌 ";
+              deleted = "󱂥";
+              ignored = " ";
+              modified = " ";
+              renamed = "󰑕";
+              staged = "󰩍";
+              unstaged = "";
+              untracked = " ";
+            };
+          };
+	};
+      };
+    };
+  };
+}
diff --git a/users/willifan/common/nixvim/toggleterm.nix b/users/willifan/common/nixvim/toggleterm.nix
new file mode 100644
index 0000000..47ba41f
--- /dev/null
+++ b/users/willifan/common/nixvim/toggleterm.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    toggleterm = {
+      enable = true;
+      settings = {
+        size = 10;
+      };
+    };
+  };
+}
diff --git a/users/willifan/common/ssh.nix b/users/willifan/common/ssh.nix
index 4b2d4e9..df0bb7d 100644
--- a/users/willifan/common/ssh.nix
+++ b/users/willifan/common/ssh.nix
@@ -1,6 +1,6 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/common/user.nix b/users/willifan/common/user.nix
index c6e4f9b..f8f1b98 100644
--- a/users/willifan/common/user.nix
+++ b/users/willifan/common/user.nix
@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{ ... }:
 {
   users.users.willifan = {
     isNormalUser = true;
     description = "willifan";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
   };
 
-}
\ No newline at end of file
+}
diff --git a/users/willifan/default.nix b/users/willifan/default.nix
index cbb0a6c..908c51b 100644
--- a/users/willifan/default.nix
+++ b/users/willifan/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, hostname, type, ... }:
+{ hostname, type, ... }:
 {
   imports = [
     ./common
diff --git a/users/willifan/desktop/autologin.nix b/users/willifan/desktop/autologin.nix
index 4c67239..2866ad1 100644
--- a/users/willifan/desktop/autologin.nix
+++ b/users/willifan/desktop/autologin.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.greetd = {
     enable = true;
@@ -10,4 +10,4 @@
       default_session = initial_session;
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/default.nix b/users/willifan/desktop/default.nix
index 5e00e4b..6363490 100644
--- a/users/willifan/desktop/default.nix
+++ b/users/willifan/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
 
diff --git a/users/willifan/desktop/dev/default.nix b/users/willifan/desktop/dev/default.nix
index e4a4c47..8c12b5a 100644
--- a/users/willifan/desktop/dev/default.nix
+++ b/users/willifan/desktop/dev/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/users/willifan/desktop/dev/embedded.nix b/users/willifan/desktop/dev/embedded.nix
index c1203ba..ec7f77e 100644
--- a/users/willifan/desktop/dev/embedded.nix
+++ b/users/willifan/desktop/dev/embedded.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.udev.extraRules = ''
 
diff --git a/users/willifan/desktop/dev/vscodium.nix b/users/willifan/desktop/dev/vscodium.nix
index 75af3bb..7401c0f 100644
--- a/users/willifan/desktop/dev/vscodium.nix
+++ b/users/willifan/desktop/dev/vscodium.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 
 {
   home-manager.users.willifan = {
diff --git a/users/willifan/desktop/games/ROG_Pugio_II_fixes.nix b/users/willifan/desktop/games/ROG_Pugio_II_fixes.nix
index 8a8c3f0..860a651 100644
--- a/users/willifan/desktop/games/ROG_Pugio_II_fixes.nix
+++ b/users/willifan/desktop/games/ROG_Pugio_II_fixes.nix
@@ -11,7 +11,7 @@
 
   services.ratbagd = {
     enable = true;
-    package = pkgs.libratbag.overrideAttrs (previousAttrs: rec {
+    package = pkgs.libratbag.overrideAttrs (previousAttrs: {
       postInstall = ''
         # Ensure the target directory exists
         mkdir -p $out/share/libratbag/
@@ -34,4 +34,4 @@ EOF
       '';
     });
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/games/default.nix b/users/willifan/desktop/games/default.nix
index 53a6b11..bc711b5 100644
--- a/users/willifan/desktop/games/default.nix
+++ b/users/willifan/desktop/games/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [
diff --git a/users/willifan/desktop/games/mangohud.nix b/users/willifan/desktop/games/mangohud.nix
index 5277176..e1acfba 100644
--- a/users/willifan/desktop/games/mangohud.nix
+++ b/users/willifan/desktop/games/mangohud.nix
@@ -1,6 +1,6 @@
-{ pkgs, homa-manager, ... }:
+{ pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
     mangohud
   ];
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/games/steam.nix b/users/willifan/desktop/games/steam.nix
index 85e8abb..a7fd388 100644
--- a/users/willifan/desktop/games/steam.nix
+++ b/users/willifan/desktop/games/steam.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   programs.steam = {
     enable = true;
@@ -13,4 +13,4 @@
     SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
   '';
   
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/Lenni/default.nix b/users/willifan/desktop/hyprland/Lenni/default.nix
index 274fc73..ae71f3b 100644
--- a/users/willifan/desktop/hyprland/Lenni/default.nix
+++ b/users/willifan/desktop/hyprland/Lenni/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/users/willifan/desktop/hyprland/common/default.nix b/users/willifan/desktop/hyprland/common/default.nix
index acc305b..eaf6aa8 100644
--- a/users/willifan/desktop/hyprland/common/default.nix
+++ b/users/willifan/desktop/hyprland/common/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.hyprland.enable = true;
diff --git a/users/willifan/desktop/hyprland/common/hyprland.nix b/users/willifan/desktop/hyprland/common/hyprland.nix
index 867f9fa..52c2ee5 100644
--- a/users/willifan/desktop/hyprland/common/hyprland.nix
+++ b/users/willifan/desktop/hyprland/common/hyprland.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ...}:
+{ pkgs, ...}:
 {
   home-manager.users.willifan = {
     wayland.windowManager.hyprland = {
diff --git a/users/willifan/desktop/hyprland/common/hyprpaper.nix b/users/willifan/desktop/hyprland/common/hyprpaper.nix
index f58c9d2..f3525fc 100644
--- a/users/willifan/desktop/hyprland/common/hyprpaper.nix
+++ b/users/willifan/desktop/hyprland/common/hyprpaper.nix
@@ -1,14 +1,10 @@
-{ pkgs, home-manager, ...}:
+{ ...}:
 {
   home-manager.users.willifan = {
     services.hyprpaper = {
       enable = true;
       settings = {
 
-#        preload = "/home/willifan/.config/desktop-utils/images/Bob Ross.png";
-
-#        wallpaper = ",/home/willifan/.config/desktop-utils/images/Bob Ross.png";
-
         splash = true;
 
         ipc = "off";
@@ -16,4 +12,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/common/mako.nix b/users/willifan/desktop/hyprland/common/mako.nix
index 370dda7..5cb529c 100644
--- a/users/willifan/desktop/hyprland/common/mako.nix
+++ b/users/willifan/desktop/hyprland/common/mako.nix
@@ -1,13 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     services.mako = {
       enable = true;
-#      backgroundColor = "#191724bb";
-#      borderColor = "#ffa44bee";
       borderRadius = 10;
       borderSize = 2;
 
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/common/pipewire.nix b/users/willifan/desktop/hyprland/common/pipewire.nix
index 5995cd8..86b339b 100644
--- a/users/willifan/desktop/hyprland/common/pipewire.nix
+++ b/users/willifan/desktop/hyprland/common/pipewire.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   security.rtkit.enable = true;
   services.pipewire = {
@@ -10,4 +10,4 @@
     # If you want to use JACK applications, uncomment this
     #jack.enable = true;
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/common/utils.nix b/users/willifan/desktop/hyprland/common/utils.nix
index 3200d5d..500f9d3 100644
--- a/users/willifan/desktop/hyprland/common/utils.nix
+++ b/users/willifan/desktop/hyprland/common/utils.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
     
@@ -19,4 +19,4 @@
     papirus-icon-theme
     eww
   ];
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/common/wlogout.nix b/users/willifan/desktop/hyprland/common/wlogout.nix
index ea89ef4..1753bbd 100644
--- a/users/willifan/desktop/hyprland/common/wlogout.nix
+++ b/users/willifan/desktop/hyprland/common/wlogout.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ...}:
+{ ...}:
 {
   home-manager.users.willifan = {
     programs.wlogout = {
@@ -80,4 +80,4 @@
       '';
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/hyprland/common/wofi.nix b/users/willifan/desktop/hyprland/common/wofi.nix
index d250d24..e9c2ef8 100644
--- a/users/willifan/desktop/hyprland/common/wofi.nix
+++ b/users/willifan/desktop/hyprland/common/wofi.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.wofi = {
@@ -9,11 +9,6 @@
         halign = "fill";
 
       };
-#      style = ''
-#        window {
-#	        border-radius: 10px;
-#        }
-#      '';
     };
   };
 }
diff --git a/users/willifan/desktop/hyprland/default.nix b/users/willifan/desktop/hyprland/default.nix
index 10ae784..7706f6b 100644
--- a/users/willifan/desktop/hyprland/default.nix
+++ b/users/willifan/desktop/hyprland/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, hostname, ... }:
+{ hostname, ... }:
 {
   imports = [
     ./common
     ./${hostname}
   ];
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/kitty.nix b/users/willifan/desktop/kitty.nix
index d691201..0786af4 100644
--- a/users/willifan/desktop/kitty.nix
+++ b/users/willifan/desktop/kitty.nix
@@ -1,16 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.kitty = {
       enable = true;
-#      font = {
-#        name = "HackNerdFontMono-Regular";
-#        package =pkgs.nerdfonts;
-#      };
       settings = {
-#        background_opacity = "0.85";
         enable_audio_bell = false;
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/theme/.stylix.nix.swp b/users/willifan/desktop/theme/.stylix.nix.swp
deleted file mode 100644
index c52fc85..0000000
Binary files a/users/willifan/desktop/theme/.stylix.nix.swp and /dev/null differ
diff --git a/users/willifan/desktop/theme/cursor.nix b/users/willifan/desktop/theme/cursor.nix
deleted file mode 100644
index 0da61b1..0000000
--- a/users/willifan/desktop/theme/cursor.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, home-manager, ... }:
-{
-
-  environment.sessionVariables = {
-    XCURSOR_SIZE = "18";
-    HYPRCURSOR_SIZE = "18";
-  };
-
-  home-manager.users.willifan = {
-    home.pointerCursor = {
-      gtk.enable = true;
-      name = "Bibata-Modern-Classic";
-      package = pkgs.bibata-cursors;
-      size = 18;
-    };
-  };
-}
\ No newline at end of file
diff --git a/users/willifan/desktop/theme/default.nix b/users/willifan/desktop/theme/default.nix
index fac1e82..94ccd44 100644
--- a/users/willifan/desktop/theme/default.nix
+++ b/users/willifan/desktop/theme/default.nix
@@ -1,11 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
-    #./cursor.nix
-    #./font.nix
-    #./gtk.nix
-    #./qt.nix
     ./stylix.nix
   ];
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/theme/font.nix b/users/willifan/desktop/theme/font.nix
deleted file mode 100644
index 6c7a2a7..0000000
--- a/users/willifan/desktop/theme/font.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, home-manager, ...}:
-{
-  home-manager.users.willifan = {
-    fonts.fontconfig = {
-      enable = true;
-      defaultFonts = {
-        monospace = [ "JetBrains Mono" ];
-        serif = [ "" ];
-        sansSerif = [ "" ];
-        emoji = [ "" ];
-      };
-    };
-  };
-}
diff --git a/users/willifan/desktop/theme/gtk.nix b/users/willifan/desktop/theme/gtk.nix
deleted file mode 100644
index 057bd4d..0000000
--- a/users/willifan/desktop/theme/gtk.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, home-manager, ... }:
-
-{
-  home-manager.users.willifan = {
-    gtk = {
-      enable = true;
-      font = {
-        name = "JetBrains Mono";
-        package = pkgs.jetbrains-mono;
-      };
-
-      theme = {
-        name = "rose-pine";
-        package = pkgs.rose-pine-gtk-theme;
-      };
-
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-
-      #TODO add ascendancy cursor pack
-      #cursortTheme.name = "";
-      #cursortTheme.package = ;
-
-      gtk3.extraConfig = {
-        Settings = ''
-          gtk-application-prefer-dark-theme=1
-        '';
-      };
-      gtk4 = {
-        extraConfig = {
-          Settings = ''
-            gtk-application-prefer-dark-theme=1
-          '';
-        };
-        extraCss = ''
-          .sidebar-pane {
-            background-color: rgb(25, 23, 36);
-          }
-        '';
-
-      };
-    };
-  };
-}
diff --git a/users/willifan/desktop/theme/qt.nix b/users/willifan/desktop/theme/qt.nix
deleted file mode 100644
index fcd5b54..0000000
--- a/users/willifan/desktop/theme/qt.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, home-manager, ... }:
-{
-
-  environment.systemPackages = with pkgs; [
-    qalculate-qt
-  ];
-
-  home-manager.users.willifan = {
-    qt = {
-      enable = true;
-      style = {
-        name = "gtk2";
-        package = pkgs.libsForQt5.qtstyleplugins;
-      };
-      platformTheme.name = "gtk";
-    };
-  };
-  #qt = {
-  #    enable = true;
-  #    platformTheme = "gtk2";
-  #    style = "gtk2";
-  #  };
-}
\ No newline at end of file
diff --git a/users/willifan/desktop/theme/stylix.nix b/users/willifan/desktop/theme/stylix.nix
index d7d948d..34ca9ac 100644
--- a/users/willifan/desktop/theme/stylix.nix
+++ b/users/willifan/desktop/theme/stylix.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
 
   stylix = {
diff --git a/users/willifan/desktop/thunar.nix b/users/willifan/desktop/thunar.nix
index 0647d8b..27321dc 100644
--- a/users/willifan/desktop/thunar.nix
+++ b/users/willifan/desktop/thunar.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   services.gvfs.enable = true;
 
@@ -16,4 +16,4 @@
   };
 
 
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/web/default.nix b/users/willifan/desktop/web/default.nix
index 4505b54..b0d6774 100644
--- a/users/willifan/desktop/web/default.nix
+++ b/users/willifan/desktop/web/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [
@@ -8,4 +8,4 @@
 
   ];
   
-}
\ No newline at end of file
+}
diff --git a/users/willifan/desktop/web/firefox.nix b/users/willifan/desktop/web/firefox.nix
index fdf8663..29399d0 100644
--- a/users/willifan/desktop/web/firefox.nix
+++ b/users/willifan/desktop/web/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.firefox = {
diff --git a/users/willifan/desktop/web/thunderbird.nix b/users/willifan/desktop/web/thunderbird.nix
index 9a53bc8..9614344 100644
--- a/users/willifan/desktop/web/thunderbird.nix
+++ b/users/willifan/desktop/web/thunderbird.nix
@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.thunderbird = {
diff --git a/users/willifan/server/default.nix b/users/willifan/server/default.nix
index c7f8b4f..1c4f482 100644
--- a/users/willifan/server/default.nix
+++ b/users/willifan/server/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
\ No newline at end of file
+}