diff --git a/flake.lock b/flake.lock
index ea3e2ea..2ede1f0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,43 @@
 {
   "nodes": {
+    "aagl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1778493762,
+        "narHash": "sha256-PG7vz7Dk3U3hB8OXtIS3bJ4QmJEw08ycFprJuAO7YS0=",
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "rev": "75aac6845b47e913b53c2a0af7fd124fdb8fe84a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -82,12 +120,34 @@
     },
     "root": {
       "inputs": {
+        "aagl": "aagl",
         "flake-parts": "flake-parts",
         "import-tree": "import-tree",
         "nixpkgs": "nixpkgs",
         "wrapper-modules": "wrapper-modules"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777605393,
+        "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "wrapper-modules": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
diff --git a/flake.nix b/flake.nix
index cba2249..6b4ad9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,5 +11,11 @@
     aagl.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+    systems = [ "x86_64-linux" ];
+    imports = [
+      inputs.wrapper-modules.flakeModules.default
+      (inputs.import-tree ./modules)
+    ];
+  };
 }
diff --git a/modules/features/alacritty.nix b/modules/features/alacritty.nix
deleted file mode 100644
index c1eda20..0000000
--- a/modules/features/alacritty.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  flake.nixosModules.alacritty = {
-    programs.alacritty = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/features/git.nix b/modules/features/git.nix
index c1ba6bf..5559848 100644
--- a/modules/features/git.nix
+++ b/modules/features/git.nix
@@ -2,7 +2,7 @@
   flake.nixosModules.git = {
     programs.git = {
       enable = true;
-      settings = {
+      config = {
         user = {
           name = "KnightArtorias";
           email = "booksandpi@gmail.com";
diff --git a/modules/features/hsr.nix b/modules/features/hsr.nix
index c29268a..08422d5 100644
--- a/modules/features/hsr.nix
+++ b/modules/features/hsr.nix
@@ -1,8 +1,8 @@
 { inputs, ... }: {
-  flakes.nixosModules.hsr = { config, lib, aagl, ... }: {
-    imports = [ aagl.nixosModules.default ];
+  flake.nixosModules.hsr = { config, pkgs, lib, ... }: {
+    imports = [ inputs.aagl.nixosModules.default ];
 
-    nix.settings = aagl.nixConfig;
+    nix.settings = inputs.aagl.nixConfig;
 
     programs.honkers-railway-launcher.enable = true;
   };
diff --git a/modules/features/tiling/fuzzel.nix b/modules/features/tiling/fuzzel.nix
index b148cfa..451441d 100644
--- a/modules/features/tiling/fuzzel.nix
+++ b/modules/features/tiling/fuzzel.nix
@@ -1,5 +1,5 @@
 { 
-  flakes.nixosModules.fuzzel = { pkgs, ... }: {
+  flake.nixosModules.fuzzel = { pkgs, ... }: {
     services.mako = {
       enable = true;
       settings = {
diff --git a/modules/features/zsh.nix b/modules/features/zsh.nix
index d9ad269..542fa1e 100644
--- a/modules/features/zsh.nix
+++ b/modules/features/zsh.nix
@@ -1,5 +1,5 @@
-{
-  flakes.nixosModules.zsh = {
+{ 
+  flake.nixosModules.zsh = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [
       zsh
       oh-my-zsh
diff --git a/modules/hosts/crow/configuration.nix b/modules/hosts/crow/configuration.nix
index fdb7514..5d4985f 100644
--- a/modules/hosts/crow/configuration.nix
+++ b/modules/hosts/crow/configuration.nix
@@ -1,13 +1,10 @@
 { self, inputs, ... }: {
-  flake.nixosModules.crowConfiguration = { pkgs, lib, ... }: {
-    inherit inputs;
-
+  flake.nixosModules.crowConfiguration = { pkgs, ... }: {
     imports = [
       self.nixosModules.crowHardware
       self.nixosModules.nest
 
       self.nixosModules.niri
-      self.nixosModules.alacritty
       self.nixosModules.git
       self.nixosModules.gdm
       self.nixosModules.hsr
@@ -23,7 +20,7 @@
       prismlauncher
       kubectl
       kompose
-      openlens
+      lens
       htop
       zip
       unzip
@@ -32,14 +29,22 @@
       neovim
       wget
       pciutils
+      alacritty
+      brave
+      lutris
+      vesktop
+      steam
     ];
 
-    programs = {
-      brave.enable = true;
-      lutris.enable = true;
-      vesktop.enable = true;
-      steam.enable = true;
-    };
+    nixpkgs.overlays = [
+      # Open LDAP currently has a problem
+      # with one of the tests. Just disable it
+      (final: prev: {
+        openldap = prev.openldap.overrideAttrs (oldAttrs: {
+          doCheck = false;
+	});
+      })
+    ];
 
     networking.networkmanager.enable = true;
     networking.hostName = "crow";
@@ -78,12 +83,16 @@
       ];
     };
 
-    nix.settings.experimental-features = [ "nix-commands" "flakes" ];
+    nix.settings.experimental-features = [ "nix-command" "flakes" ];
     nix.settings.auto-optimise-store = true;
     nix.gc = {
       automatic = true;
       dates = "weekly";
       options = "--delete-older-than 30d";
     };
+
+    nixpkgs.config.allowUnfree = true;
+
+    system.stateVersion = "26.05";
   };
 }
diff --git a/modules/hosts/crow/default.nix b/modules/hosts/crow/default.nix
index f85194a..0003377 100644
--- a/modules/hosts/crow/default.nix
+++ b/modules/hosts/crow/default.nix
@@ -1,5 +1,5 @@
 { self, inputs, ... }: {
   flake.nixosConfigurations.crow = inputs.nixpkgs.lib.nixosSystem {
-    modules= [ self.nixosModules.crowConfiguration ];
+    modules = [ self.nixosModules.crowConfiguration ];
   };
 }
diff --git a/parts.nix b/parts.nix
deleted file mode 100644
index 657e3ca..0000000
--- a/parts.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config = {
-    systems = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-linux"
-      "aarch64-darwin"
-    ];
-  };
-}