diff --git a/flake.lock b/flake.lock
index 452d9a0..c5ce84e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683508929,
-        "narHash": "sha256-AqkIrwewCL8+zlkqhNxheF+kOfyakzZDk43SqRTIqRE=",
+        "lastModified": 1684170997,
+        "narHash": "sha256-WgwqHeYv2sDA0eWghnYCUNx7dm5S8lqDVZjp7ufzm30=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2a59f5cf641607dbecb0cfec3ae32247e4aeb311",
+        "rev": "10402e31443941b50bf62e67900743dcb26b3b27",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683514650,
-        "narHash": "sha256-iEqDoxDmUMINqUX0BZz5HNaKL4oxdG4j4ug+sXq/3Nk=",
+        "lastModified": 1683595330,
+        "narHash": "sha256-91mwX0IE4LMqoHrKu3NJtC8ZHVoqIKZR34e0rA5UN+U=",
         "owner": "Gerg-L",
         "repo": "fetch-rs",
-        "rev": "95c1568e6ba77afe624ca84ecae4a502d5ef06b5",
+        "rev": "5f7532ef062176c0ec2ff9903c3928864d380d83",
         "type": "github"
       },
       "original": {
@@ -57,15 +57,12 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -76,7 +73,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -110,11 +107,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1683510273,
-        "narHash": "sha256-VSJ0hmIPgcD97XV+8UzVEPkKVR5n2sZd3Wm2HC0UI/U=",
+        "lastModified": 1684370513,
+        "narHash": "sha256-nngcKmKHFGmxxZXN8mMl+2gyhcEEXByC0FGdQG0vbAY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "055a2f470bced98bb34a5d94b775c410e1594cc2",
+        "rev": "285aa1f48e62932fed2089ddb04768172ae4a625",
         "type": "github"
       },
       "original": {
@@ -133,11 +130,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1683417608,
-        "narHash": "sha256-qdWRY50WhpjHKLKe7ngYdEnA+gYjOnE3PScQws0YofY=",
+        "lastModified": 1684067358,
+        "narHash": "sha256-9CdP1arEvBbgYhK+qZMV2gUeaxmxFkyxLqUKTZR/icw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "fa1baa9a47cdb3eed17d48b6011a164d4009d2ee",
+        "rev": "ecd6d679a020ff97156de2fd3c443a77a671ac3d",
         "type": "github"
       },
       "original": {
@@ -192,11 +189,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683189539,
-        "narHash": "sha256-dqeE6PM1SSNCB9BSBgh/9dJPLn3sf7P4uay8/CymMlQ=",
+        "lastModified": 1683530131,
+        "narHash": "sha256-R0RSqj6JdZfru2x/cM19KJMHsU52OjtyxI5cccd+uFc=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "104ca15b0019bf461639050daeaa18e25642ccee",
+        "rev": "10079333313ff62446e6f2b0e7c5231c7431d269",
         "type": "github"
       },
       "original": {
@@ -239,11 +236,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1683401577,
-        "narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=",
+        "lastModified": 1684025543,
+        "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d724b57823f2ab2c879a840a426a607bbab2b730",
+        "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
         "type": "github"
       },
       "original": {
@@ -253,19 +250,33 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1683014792,
+        "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nvim-flake": {
       "inputs": {
         "neovim-src": "neovim-src",
-        "nixpkgs": [
-          "unstable"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1683514625,
-        "narHash": "sha256-l+nJVswlUuDb0ZeHaqDMUf3tfcoND/ukgDkDQuLcpmw=",
+        "lastModified": 1684097344,
+        "narHash": "sha256-cVd8tk6qzL9n4hHG5VfFunksCbjuy2xtTSCSnaZg0v8=",
         "owner": "Gerg-L",
         "repo": "nvim-flake",
-        "rev": "63b85335e2a617a49489a1e3c28bd40014d305f4",
+        "rev": "8bd7d66d21741d7d9c42a7229b7c125f422d6170",
         "type": "github"
       },
       "original": {
@@ -297,11 +308,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1683428115,
-        "narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=",
+        "lastModified": 1684032930,
+        "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3",
+        "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
         "type": "github"
       },
       "original": {
@@ -333,11 +344,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1683383741,
-        "narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=",
+        "lastModified": 1684280442,
+        "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61",
+        "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d",
         "type": "github"
       },
       "original": {
@@ -382,28 +393,13 @@
         "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"
-      }
-    },
     "unstable": {
       "locked": {
-        "lastModified": 1683408522,
-        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
+        "lastModified": 1684305980,
+        "narHash": "sha256-vd4SKXX1KZfSX6n3eoguJw/vQ+sBL8XGdgfxjEgLpKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
+        "rev": "e6e389917a8c778be636e67a67ec958f511cc55d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index de7bbbb..0d1d007 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,7 @@
       url = "github:Gerg-L/suckless";
       inputs.nixpkgs.follows = "unstable";
     };
-    nvim-flake = {
-      url = "github:Gerg-L/nvim-flake";
-      inputs.nixpkgs.follows = "unstable";
-    };
+    nvim-flake.url = "github:Gerg-L/nvim-flake";
     fetch-rs = {
       url = "github:Gerg-L/fetch-rs";
       inputs.nixpkgs.follows = "unstable";
@@ -44,22 +41,18 @@
     nixos-generators,
     ...
   }: let
-    lib = unstable.lib;
+    inherit (unstable) lib;
 
     importAll = path:
-      map
-      (module: (import module inputs))
-      (
-        builtins.filter (file: lib.hasSuffix ".nix" file)
-        (lib.filesystem.listFilesRecursive path)
-      );
+      builtins.filter (lib.hasSuffix ".nix")
+      (lib.filesystem.listFilesRecursive path);
 
     mkSystems = system: names:
       lib.genAttrs names (
         name:
           lib.nixosSystem {
             inherit system;
-            specialArgs = {inherit self;};
+            specialArgs = {inherit inputs self;};
             modules =
               importAll ./modules
               ++ importAll (self + "/systems/" + name);
@@ -124,7 +117,7 @@
               value = pkgs.callPackage module {};
             })
             (
-              builtins.filter (file: lib.hasSuffix ".nix" file)
+              builtins.filter (lib.hasSuffix ".nix")
               (lib.filesystem.listFilesRecursive ./pkgs)
             )
           );
diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix
index a10f62b..d1a3b02 100644
--- a/modules/DE/dwm.nix
+++ b/modules/DE/dwm.nix
@@ -1,13 +1,13 @@
-{suckless, ...}: {
+{
+  inputs,
   pkgs,
   config,
-  options,
   lib,
   self,
   ...
 }: let
   cfg = config.localModules.DE.dwm;
-  sp = suckless.packages.${pkgs.system};
+  sp = inputs.suckless.packages.${pkgs.system};
 in {
   options.localModules.DE.dwm = {
     enable = lib.mkEnableOption "";
diff --git a/modules/DE/gnome.nix b/modules/DE/gnome.nix
index c357001..dd8a6b0 100644
--- a/modules/DE/gnome.nix
+++ b/modules/DE/gnome.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   lib,
-  options,
   pkgs,
   ...
 }: let
diff --git a/modules/DE/xfce.nix b/modules/DE/xfce.nix
index 33155cb..3a068b9 100644
--- a/modules/DE/xfce.nix
+++ b/modules/DE/xfce.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   lib,
-  options,
   ...
 }: let
   cfg = config.localModules.DE.xfce;
diff --git a/modules/DM/autoLogin.nix b/modules/DM/autoLogin.nix
index 79401b3..5db70d5 100644
--- a/modules/DM/autoLogin.nix
+++ b/modules/DM/autoLogin.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   lib,
-  options,
   ...
 }: let
   cfg = config.localModules.DM.autoLogin;
diff --git a/modules/DM/lightDM.nix b/modules/DM/lightDM.nix
index f4cc44f..f3686ed 100644
--- a/modules/DM/lightDM.nix
+++ b/modules/DM/lightDM.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   lib,
-  options,
   self,
   ...
 }: let
diff --git a/modules/DM/misc.nix b/modules/DM/misc.nix
index 9a09139..cae18eb 100644
--- a/modules/DM/misc.nix
+++ b/modules/DM/misc.nix
@@ -1,8 +1,4 @@
-_: {
-  options,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   options.localModules.DM.loginUser = lib.mkOption {
     type = lib.types.nullOr lib.types.str;
     default = null;
diff --git a/modules/X11.nix b/modules/X11.nix
index fc96e04..a6da3c3 100644
--- a/modules/X11.nix
+++ b/modules/X11.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   pkgs,
-  options,
   lib,
   ...
 }: let
diff --git a/modules/boot/misc.nix b/modules/boot/misc.nix
index 0fc7c7c..8986dec 100644
--- a/modules/boot/misc.nix
+++ b/modules/boot/misc.nix
@@ -1,4 +1,4 @@
-_: {
+{
   self,
   lib,
   ...
diff --git a/modules/boot/silent.nix b/modules/boot/silent.nix
index ef03537..b080f67 100644
--- a/modules/boot/silent.nix
+++ b/modules/boot/silent.nix
@@ -1,4 +1,4 @@
-_: {
+{
   environment.etc = {
     "issue" = {
       text = "[?12l[?25h";
diff --git a/modules/boot/stage2patch.nix b/modules/boot/stage2patch.nix
index bed4da8..e506232 100644
--- a/modules/boot/stage2patch.nix
+++ b/modules/boot/stage2patch.nix
@@ -1,4 +1,5 @@
-{unstable, ...}: {
+{
+  inputs,
   lib,
   config,
   pkgs,
@@ -8,7 +9,7 @@
 
   bootStage2 = pkgs.substituteAll {
     src = pkgs.runCommand "stage-2-init.sh" {} ''
-      sed '2i exec 1<>/dev/null' ${unstable}/nixos/modules/system/boot/stage-2-init.sh > $out
+      sed '2i exec 1<>/dev/null' ${inputs.unstable}/nixos/modules/system/boot/stage-2-init.sh > $out
     '';
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     shell = "${pkgs.bash}/bin/bash";
diff --git a/modules/builders.nix b/modules/builders.nix
index 985d4ee..38c7a46 100644
--- a/modules/builders.nix
+++ b/modules/builders.nix
@@ -1,7 +1,6 @@
-_: {
+{
   config,
   lib,
-  options,
   ...
 }: {
   options.localModules.remoteBuild = {
diff --git a/modules/git.nix b/modules/git.nix
index 111b232..6eb327c 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -1,6 +1,5 @@
-_: {
+{
   pkgs,
-  options,
   config,
   lib,
   ...
diff --git a/modules/hardware.nix b/modules/hardware.nix
index ac73bc4..84ff80d 100644
--- a/modules/hardware.nix
+++ b/modules/hardware.nix
@@ -1,6 +1,5 @@
-_: {
+{
   config,
-  options,
   lib,
   ...
 }: let
diff --git a/modules/misc.nix b/modules/misc.nix
index af4b0a1..51a3f16 100644
--- a/modules/misc.nix
+++ b/modules/misc.nix
@@ -1,16 +1,24 @@
-_: {lib, ...}: {
-  #enable ssh
-  programs.mtr.enable = true; #ping and traceroute
-  services.openssh = {
-    enable = true;
-    hostKeys = lib.mkForce [];
-    settings = {
-      PermitRootLogin = "yes";
-      PasswordAuthentication = false;
-      KbdInteractiveAuthentication = false;
+{lib, ...}: {
+  options = {
+    dummyvalue = lib.mkOption {
+      default = {};
+      type = lib.configType;
     };
   };
-  i18n.defaultLocale = "en_US.UTF-8";
-  #time settings
-  time.timeZone = "America/New_York";
+  config = {
+    #enable ssh
+    programs.mtr.enable = true; #ping and traceroute
+    services.openssh = {
+      enable = true;
+      hostKeys = lib.mkForce [];
+      settings = {
+        PermitRootLogin = "yes";
+        PasswordAuthentication = false;
+        KbdInteractiveAuthentication = false;
+      };
+    };
+    i18n.defaultLocale = "en_US.UTF-8";
+    #time settings
+    time.timeZone = "America/New_York";
+  };
 }
diff --git a/modules/nix.nix b/modules/nix.nix
index 3ac4b47..dcfedb2 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,6 +1,6 @@
-inputs: {
+{
+  inputs,
   lib,
-  pkgs,
   self,
   ...
 }: let
@@ -9,7 +9,7 @@ inputs: {
       #filter non-flakes from inputs
       lib.filterAttrs (
         _: value: (
-          !(lib.hasAttrByPath ["flake"] value) || value.flake == false
+          !(lib.hasAttrByPath ["flake"] value) || !value.flake
         )
       )
       inputs
diff --git a/modules/packages.nix b/modules/packages.nix
index 05f2c22..f4c2ca2 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -1,4 +1,4 @@
-_: {pkgs, ...}: {
+{pkgs, ...}: {
   environment = {
     defaultPackages = []; #don't install anything by default
     systemPackages = [
diff --git a/modules/shell.nix b/modules/shell.nix
index 897cb0b..1baca6e 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -1,4 +1,5 @@
-{fetch-rs, ...}: {
+{
+  inputs,
   pkgs,
   config,
   ...
@@ -13,8 +14,7 @@
       pkgs.exa
       pkgs.direnv
       pkgs.nix-direnv
-      pkgs.neovim
-      fetch-rs.packages.${pkgs.system}.default
+      inputs.fetch-rs.packages.${pkgs.system}.default
     ];
     binsh = "${pkgs.dash}/bin/dash"; #use dash for speed
     variables = {
diff --git a/modules/sops.nix b/modules/sops.nix
index 309a4f1..ec2e363 100644
--- a/modules/sops.nix
+++ b/modules/sops.nix
@@ -1,11 +1,12 @@
-{sops-nix, ...}: {
+{
+  inputs,
   pkgs,
   self,
   config,
   ...
 }: {
   imports = [
-    sops-nix.nixosModules.sops
+    inputs.sops-nix.nixosModules.sops
   ];
   environment.systemPackages = [
     pkgs.sops
diff --git a/modules/theming.nix b/modules/theming.nix
index 99e9e29..5e31f11 100644
--- a/modules/theming.nix
+++ b/modules/theming.nix
@@ -1,6 +1,5 @@
-{stable, ...}: {
+{
   pkgs,
-  options,
   config,
   lib,
   ...
@@ -25,7 +24,7 @@ in {
               [Settings]
               gtk-cursor-theme-name=Quintom_Ink
               gtk-cursor-theme-size=16
-              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-font-name = "Overpass 10"
               gtk-icon-theme-name=Flat-Remix-Blue-Dark
               gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
             '';
@@ -33,14 +32,14 @@ in {
               [Settings]
               gtk-cursor-theme-name=Quintom_Ink
               gtk-cursor-theme-size=16
-              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-font-name = "Overpass 10"
               gtk-icon-theme-name=Flat-Remix-Blue-Dark
               gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
             '';
             "xdg/gtk-2.0/gtkrc".text = ''
               gtk-cursor-theme-name = "Quintom_Ink"
               gtk-cursor-theme-size = 16
-              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-font-name = "Overpass 10"
               gtk-icon-theme-name = "Flat-Remix-Blue-Dark"
               gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest"
             '';
@@ -59,20 +58,15 @@ in {
           xrdb -load /etc/xdg/Xresources
         '';
         fonts = {
-          fonts = [
-            (stable.legacyPackages.${pkgs.system}.nerdfonts.override
-              {
-                fonts = ["Overpass"];
-              })
-          ];
+          fonts = [pkgs.overpass];
           enableDefaultFonts = false;
           fontDir.enable = true;
           fontconfig = {
             enable = true;
             defaultFonts = {
-              serif = ["Overpass Nerd Font"];
-              sansSerif = ["Overpass Nerd Font"];
-              monospace = ["OverpassMono Nerd Font"];
+              serif = ["Overpass"];
+              sansSerif = ["Overpass"];
+              monospace = ["Overpass Mono"];
             };
             hinting.enable = true;
             antialias = true;
@@ -89,7 +83,7 @@ in {
         '';
         fonts = [
           {
-            name = "OverpassMono Nerd Font";
+            name = "OverpassMono";
             package =
               pkgs.nerdfonts.override
               {
diff --git a/modules/unfree.nix b/modules/unfree.nix
index 6c099f8..be83ae0 100644
--- a/modules/unfree.nix
+++ b/modules/unfree.nix
@@ -1,4 +1,4 @@
-_: {
+{
   config,
   lib,
   ...
diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix
index fef4049..d535aaa 100644
--- a/systems/game-laptop/default.nix
+++ b/systems/game-laptop/default.nix
@@ -1,4 +1,4 @@
-inputs: {
+{
   pkgs,
   config,
   ...
@@ -24,6 +24,7 @@ inputs: {
   ];
   environment = {
     systemPackages = [
+      pkgs.neovim
       pkgs.heroic
       pkgs.legendary-gl
       pkgs.prismlauncher
diff --git a/systems/game-laptop/disko.nix b/systems/game-laptop/disko.nix
index 8c537c4..8b5b847 100644
--- a/systems/game-laptop/disko.nix
+++ b/systems/game-laptop/disko.nix
@@ -1,5 +1,10 @@
-{disko, ...}: {disks ? [], ...}: {
-  imports = [disko.nixosModules.disko];
+{
+  inputs,
+  disks ? [],
+  ...
+}: {
+  dummyvalue = {inherit disks;};
+  imports = [inputs.disko.nixosModules.disko];
   disko.devices = {
     disk.nvme0n1 = {
       device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
diff --git a/systems/game-laptop/prime.nix b/systems/game-laptop/prime.nix
index 28602a4..55e55e8 100644
--- a/systems/game-laptop/prime.nix
+++ b/systems/game-laptop/prime.nix
@@ -1,4 +1,4 @@
-_: {config, ...}: {
+{config, ...}: {
   hardware.nvidia = {
     package = config.boot.kernelPackages.nvidiaPackages.latest;
     prime = {
diff --git a/systems/gerg-desktop/containers/minecraft.nix b/systems/gerg-desktop/containers/minecraft.nix
index 3a24b23..acf259b 100644
--- a/systems/gerg-desktop/containers/minecraft.nix
+++ b/systems/gerg-desktop/containers/minecraft.nix
@@ -1,4 +1,4 @@
-_: {
+{
   containers."minecraft" = {
     ephemeral = true;
     autoStart = true;
diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix
index 8fb0625..58d1cbd 100644
--- a/systems/gerg-desktop/default.nix
+++ b/systems/gerg-desktop/default.nix
@@ -1,4 +1,5 @@
-inputs: {
+{
+  inputs,
   pkgs,
   config,
   ...
@@ -30,21 +31,17 @@ inputs: {
     videoDrivers = ["nvidia" "amdgpu"];
   };
 
-  nixpkgs = {
-    allowedUnfree = [
-      "nvidia-x11"
-      "steam"
-      "steam-original"
-    ];
+  nixpkgs.allowedUnfree = [
+    "nvidia-x11"
+    "steam"
+    "steam-original"
+  ];
 
-    overlays = [
-      inputs.nvim-flake.overlay
-    ];
-  };
   nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];
 
   environment = {
     systemPackages = [
+      inputs.nvim-flake.packages.${pkgs.system}.default
       pkgs.bitwarden #store stuff
       pkgs.qbittorrent #steal stuff
       pkgs.pavucontrol #gui volume control
diff --git a/systems/gerg-desktop/disko.nix b/systems/gerg-desktop/disko.nix
index 8c245be..5074662 100644
--- a/systems/gerg-desktop/disko.nix
+++ b/systems/gerg-desktop/disko.nix
@@ -1,5 +1,10 @@
-{disko, ...}: {disks ? [], ...}: {
-  imports = [disko.nixosModules.disko];
+{
+  inputs,
+  disks ? [],
+  ...
+}: {
+  dummyvalue = {inherit disks;};
+  imports = [inputs.disko.nixosModules.disko];
   disko.devices = {
     disk = {
       nvme0 = {
diff --git a/systems/gerg-desktop/erase-your-darlings.nix b/systems/gerg-desktop/erase-your-darlings.nix
index f43f039..830403c 100644
--- a/systems/gerg-desktop/erase-your-darlings.nix
+++ b/systems/gerg-desktop/erase-your-darlings.nix
@@ -1,4 +1,4 @@
-_: {lib, ...}: {
+{lib, ...}: {
   systemd.tmpfiles.rules = [
     "d /mnt - - - - -"
     "L+ /etc/ssh/ssh_host_ed25519_key  - - - - /persist/ssh/ssh_host_ed25519_key"
diff --git a/systems/gerg-desktop/parrot.nix b/systems/gerg-desktop/parrot.nix
index c55bec6..4c68337 100644
--- a/systems/gerg-desktop/parrot.nix
+++ b/systems/gerg-desktop/parrot.nix
@@ -1,4 +1,4 @@
-_: {
+{
   pkgs,
   config,
   self,
diff --git a/systems/gerg-desktop/spicetify.nix b/systems/gerg-desktop/spicetify.nix
index 1da19f3..36394d0 100644
--- a/systems/gerg-desktop/spicetify.nix
+++ b/systems/gerg-desktop/spicetify.nix
@@ -1,9 +1,13 @@
-{spicetify-nix, ...}: {pkgs, ...}: let
-  spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
   ex = spicePkgs.extensions;
 in {
   nixpkgs.allowedUnfree = ["spotify"];
-  imports = [spicetify-nix.nixosModule];
+  imports = [inputs.spicetify-nix.nixosModule];
   programs.spicetify = {
     spotifyPackage = pkgs.spotify-unwrapped;
     spicetifyPackage = pkgs.spicetify-cli;
diff --git a/systems/gerg-desktop/vfio.nix b/systems/gerg-desktop/vfio.nix
index 0f5291d..afb1a86 100644
--- a/systems/gerg-desktop/vfio.nix
+++ b/systems/gerg-desktop/vfio.nix
@@ -1,4 +1,4 @@
-_: {
+{
   pkgs,
   self,
   config,
diff --git a/systems/gerg-desktop/zfs.nix b/systems/gerg-desktop/zfs.nix
index 0a212e4..4a57f1f 100644
--- a/systems/gerg-desktop/zfs.nix
+++ b/systems/gerg-desktop/zfs.nix
@@ -1,4 +1,4 @@
-_: {config, ...}: {
+{config, ...}: {
   boot = {
     zfs = {
       devNodes = "/dev/disk/by-id/";
@@ -22,7 +22,6 @@ _: {config, ...}: {
       grub = {
         enable = true;
         efiInstallAsRemovable = true;
-        version = 2;
         copyKernels = true;
         efiSupport = true;
         zfsSupport = true;
diff --git a/systems/moms-laptop/default.nix b/systems/moms-laptop/default.nix
index 75c3dc8..dd42875 100644
--- a/systems/moms-laptop/default.nix
+++ b/systems/moms-laptop/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   pkgs,
   config,
   ...
@@ -18,6 +18,7 @@ _: {
   };
 
   environment.systemPackages = [
+    pkgs.neovim
     pkgs.vlc
     pkgs.nomacs
     pkgs.gnome.gnome-calculator
diff --git a/systems/moms-laptop/disko.nix b/systems/moms-laptop/disko.nix
index 4a4b3d1..e7495a9 100644
--- a/systems/moms-laptop/disko.nix
+++ b/systems/moms-laptop/disko.nix
@@ -1,5 +1,10 @@
-{disko, ...}: {disks ? [], ...}: {
-  imports = [disko.nixosModules.disko];
+{
+  inputs,
+  disks ? [],
+  ...
+}: {
+  dummyvalue = {inherit disks;};
+  imports = [inputs.disko.nixosModules.disko];
   disko.devices = {
     disk.sda = {
       device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
diff --git a/systems/moms-laptop/printing.nix b/systems/moms-laptop/printing.nix
index 47957d8..4e449ef 100644
--- a/systems/moms-laptop/printing.nix
+++ b/systems/moms-laptop/printing.nix
@@ -1,4 +1,4 @@
-_: {pkgs, ...}: {
+{pkgs, ...}: {
   nixpkgs.allowedUnfree = ["hplip"];
   environment.systemPackages = [
     pkgs.gimp