diff --git a/.envrc b/.envrc
index a6d5743..e8e28c5 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1,2 @@
-watch_file shell/* flake.nix
-use flake || use nix
+watch_file shells/* flake.nix flake.lock
+eval "$(nix print-dev-env)"
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 543aaa4..afd1d6e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1649225869,
-        "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
+        "lastModified": 1649408932,
+        "narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
+        "rev": "42948b300670223ca8286aaf916bc381f66a5313",
         "type": "github"
       },
       "original": {
@@ -39,16 +39,16 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1649504202,
-        "narHash": "sha256-k7BZoTGeNqz+jy0v0kKl3jSa+6Q4Dx1FPpZFF9+u9nA=",
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27b0c3988745d1b18607744badaf2add79c8bcea",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-21.11",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 3bb80d0..7612eee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "config!!!";
 
   inputs = {
-    nixos.url = "github:nixos/nixpkgs/release-21.11";
+    nixos.url = "github:nixos/nixpkgs/nixos-21.11";
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home.url = "github:nix-community/home-manager/release-21.11";
diff --git a/hosts/default.nix b/hosts/default.nix
index a84ffab..e04d995 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -19,6 +19,7 @@
       modules =
         baseModules
         ++ [
+          {networking.hostName = name;}
           {nixpkgs.pkgs = pkgs;}
           (import (./. + "/${name}/default.nix"))
         ];
diff --git a/modules/base/hm-system-defaults.nix b/modules/base/hm-system-defaults.nix
index bd90f37..7f458fb 100644
--- a/modules/base/hm-system-defaults.nix
+++ b/modules/base/hm-system-defaults.nix
@@ -1,9 +1,11 @@
 {config, ...}: {
   home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
   home-manager.sharedModules = [
     {
       home.sessionVariables = {inherit (config.environment.sessionVariables) NIX_PATH;};
       xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
+      xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source;
     }
   ];
 }
diff --git a/modules/base/nix.nix b/modules/base/nix.nix
index eee3d80..a5109cd 100644
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -14,10 +14,12 @@
       keep-outputs = true
       keep-derivations = true
       fallback = true
+      extra-experimental-features = nix-command flakes
     '';
     useSandbox = true;
     allowedUsers = ["@wheel"];
     trustedUsers = ["root" "@wheel"];
     autoOptimiseStore = true;
+    nixPath = ["nixpkgs=${inputs.latest}" "home-manager=${inputs.home}"];
   };
 }
diff --git a/modules/cachix/default.nix b/modules/cachix/default.nix
index 5d7dc62..636d357 100644
--- a/modules/cachix/default.nix
+++ b/modules/cachix/default.nix
@@ -8,6 +8,6 @@
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
-  #inherit imports;
+  inherit imports;
   nix.binaryCaches = ["https://cache.nixos.org/"];
 }
diff --git a/modules/cachix/harmony.nix b/modules/cachix/harmony.nix
deleted file mode 100644
index 287a62f..0000000
--- a/modules/cachix/harmony.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  nix = {
-    settings.substituters = ["https://harmony.cachix.org"];
-    binaryCachePublicKeys = ["harmony.cachix.org-1:yv78QZHgS0UHkrMW56rccNghWHRz18fFRl8mWQ63M6E="];
-  };
-}
diff --git a/modules/cachix/nix-cargo-integration.nix b/modules/cachix/nix-cargo-integration.nix
deleted file mode 100644
index dd7a1e0..0000000
--- a/modules/cachix/nix-cargo-integration.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  nix = {
-    settings.substituters = ["https://nix-cargo-integration.cachix.org"];
-    binaryCachePublicKeys = ["nix-cargo-integration.cachix.org-1:wphySON/RyTC2DCzwKPBQGLEZv5mj0s1I1lsfQObaLs="];
-  };
-}
diff --git a/modules/cachix/nix-community.nix b/modules/cachix/nix-community.nix
index 994f816..5cf15ae 100644
--- a/modules/cachix/nix-community.nix
+++ b/modules/cachix/nix-community.nix
@@ -1,6 +1,6 @@
 {
   nix = {
-    settings.substituters = ["https://nix-community.cachix.org"];
+    binaryCaches = ["https://nix-community.cachix.org"];
     binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
   };
 }
diff --git a/modules/cachix/nixpkgs-wayland.nix b/modules/cachix/nixpkgs-wayland.nix
deleted file mode 100644
index 7c9028b..0000000
--- a/modules/cachix/nixpkgs-wayland.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  nix = {
-    settings.substituters = ["https://nixpkgs-wayland.cachix.org"];
-    binaryCachePublicKeys = ["nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="];
-  };
-}
diff --git a/modules/cachix/nrdxp.nix b/modules/cachix/nrdxp.nix
deleted file mode 100644
index 5fa0576..0000000
--- a/modules/cachix/nrdxp.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  nix = {
-    settings.substituters = ["https://nrdxp.cachix.org"];
-    binaryCachePublicKeys = ["nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="];
-  };
-}
diff --git a/modules/cachix/veloren-nix.nix b/modules/cachix/veloren-nix.nix
deleted file mode 100644
index 1ed4fc1..0000000
--- a/modules/cachix/veloren-nix.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  nix = {
-    settings.substituters = ["https://veloren-nix.cachix.org"];
-    binaryCachePublicKeys = ["veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="];
-  };
-}
diff --git a/pkgs-set/from-unstable.nix b/pkgs-set/from-unstable.nix
index 6c861f8..9697cd5 100644
--- a/pkgs-set/from-unstable.nix
+++ b/pkgs-set/from-unstable.nix
@@ -5,7 +5,11 @@ pkgs: {
     alejandra
     rnix-lsp
     chromium
+    rofi
     rofi-wayland
     vscode
+    nixUnstable
+    nix-direnv
+    direnv
     ;
 }
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 4012a87..fd5c70c 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -353,7 +353,6 @@ in {
               "${mod}+q" = "kill";
               "${mod}+Shift+e" = "exit";
               "${mod}+Shift+r" = "reload";
-              "${mod}+c" = mkRofiCmd ["-show" "calc"];
               # Screenshot and copy it to clipboard
               "Mod1+s" = ''
                 exec export SFILE="${shotFile}.png" && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png
@@ -556,15 +555,6 @@ in {
         cycle = true;
         font = fontComb;
         terminal = pkgBin "alacritty";
-        plugins = with pkgs; [
-          rofi-calc
-          rofi-systemd
-          rofi-file-browser
-          rofi-power-menu
-        ];
-        extraConfig = {
-          modi = "drun,calc,file-browser-extended,ssh,keys";
-        };
       };
       vscode = {
         enable = true;
@@ -705,8 +695,6 @@ in {
           theme = "mytheme"
           [editor]
           line-number = "relative"
-          [lsp]
-          display-messages = true
         '';
         "helix/languages.toml".text = ''
           [[language]]