diff --git a/flake.lock b/flake.lock
index a0175bd..2a722b2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -223,9 +223,10 @@
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "naersk": {
@@ -294,9 +295,10 @@
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixos-hardware": {
diff --git a/flake.nix b/flake.nix
index d21d5c3..4457c23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,8 @@
 
   inputs =
     {
-      nixos.url = "nixpkgs/nixos-unstable";
-      latest.url = "nixpkgs/nixos-unstable";
+      nixos.url = "github:NixOS/nixpkgs/nixos-unstable";
+      latest.url = "github:NixOS/nixpkgs/nixos-unstable";
       digga.url = "github:divnix/digga/master";
 
       ci-agent = {
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 94fdbbd..fcc7b01 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -6,6 +6,10 @@ in
   nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
   nix.registry.nixpkgs.flake = self.inputs.nixos;
 
+  # Fix zsh autocompletion with home-manager
+  environment.pathsToLink = [ "/share/zsh" ];
+
+
   environment = {
     systemPackages = with pkgs; [
       binutils
@@ -34,6 +38,7 @@ in
       tealdeer
       whois
 
+      nixpkgs-fmt
       libqalculate
       nur.repos.xe.comma
     ];
diff --git a/profiles/networkmanager/default.nix b/profiles/networkmanager/default.nix
index 28b20ff..87a3555 100644
--- a/profiles/networkmanager/default.nix
+++ b/profiles/networkmanager/default.nix
@@ -2,4 +2,5 @@
   networking.networkmanager = {
     enable = true;
   };
+  networking.firewall.enable = false;
 }
diff --git a/suites/default.nix b/suites/default.nix
index 468d4d4..181581a 100644
--- a/suites/default.nix
+++ b/suites/default.nix
@@ -3,5 +3,5 @@ with profiles; rec {
   base = [ users.root core dnscrypt ];
   workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust ];
   desktop = workstation ++ [ users.mae-desk amd three_dee androidev ];
-  lap = workstation ++ [ users.mae-lap laptop bluetooth print networkmanager androidev ];
+  lap = workstation ++ [ users.mae-lap laptop bluetooth print networkmanager ];
 }
diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix
index 2b51c9d..7d3c9fe 100644
--- a/users/profiles/direnv/default.nix
+++ b/users/profiles/direnv/default.nix
@@ -1,6 +1,9 @@
 {
   programs.direnv = {
     enable = true;
-    nix-direnv.enable = true;
+    nix-direnv = {
+    	enable = true;
+    	enableFlakes = true;
+    };
   };
 }