diff --git a/flake.lock b/flake.lock
index fed1e52..38bcc73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,15 +146,15 @@
           "nixos"
         ],
         "nixpkgs-unstable": [
-          "nixos"
+          "latest"
         ]
       },
       "locked": {
-        "lastModified": 1657494467,
-        "narHash": "sha256-ogQf0bRS970ggyrKA/1RRMAmkT6/Vuj86gKHNKH/qJo=",
+        "lastModified": 1659280786,
+        "narHash": "sha256-UOfdm7ArZzfylo/iFdyZB9lqsRy+Ulc9rnEP7+DVh9k=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "587013b2500031b71959496764b6fdd1b2096f9a",
+        "rev": "c8eb0a63889047c2130fc40b473f10eebaf78d30",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1658730563,
-        "narHash": "sha256-NDaSjaNdynCM02hRLOL76CKeD5Bxjxe8aNsD6AQ4U5I=",
+        "lastModified": 1659248763,
+        "narHash": "sha256-YCaOwmtgpnEJGmZNHwnQArCeB3arQf1LPr/OSZVmHZ8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "80981ee71b32ce0747d22b1fd2dcd895219f5c1d",
+        "rev": "e4787a9b299117979bd04d396466c9c7cb4ac568",
         "type": "github"
       },
       "original": {
@@ -342,23 +342,20 @@
     "home": {
       "inputs": {
         "nixpkgs": [
-          "nixos"
-        ],
-        "utils": [
-          "flake-utils"
+          "latest"
         ]
       },
       "locked": {
-        "lastModified": 1658924727,
-        "narHash": "sha256-Fhh9FK9CvuCLxG1WkWJPoendDeXKI4gHYTfezo1n2Zg=",
+        "lastModified": 1656169755,
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e2f7876d2f2ae98a67d89a8bef8c49332aae5af",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-22.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -381,16 +378,16 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1658969450,
-        "narHash": "sha256-/p7aVWbYx5SPUK/HG4SUP9D5JBYi21Ou/QDuKKw8aRY=",
+        "lastModified": 1659219666,
+        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6372876b362b94b926e224aaa3ab0ed11551026a",
+        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "master",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -417,27 +414,27 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1658826464,
-        "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
+        "lastModified": 1659153955,
+        "narHash": "sha256-BAdA1WBHi/TBSaeyDjsVIqe62r0w/5ZvsaglXivOLLM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
+        "rev": "1e5d0fbd82f0f1370c70026d255deda2d9c8a585",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1658401027,
-        "narHash": "sha256-z/sDfzsFOoWNO9nZGfxDCNjHqXvSVZLDBDSgzr9qDXE=",
+        "lastModified": 1659256765,
+        "narHash": "sha256-RE4l6J+ApJ1vd4QFDhbEasv0M/deTxSK5IsIBYXuHmE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "83009edccc2e24afe3d0165ed98b60ff7471a5f8",
+        "rev": "727a099e871ff10ae09a1ebd056a5ba4b9dbe50f",
         "type": "github"
       },
       "original": {
@@ -448,11 +445,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1658648081,
-        "narHash": "sha256-RL5nr4Xhp0zQeEGG/I3t3FmqaI9QrBg5PH31NF+7A/A=",
+        "lastModified": 1659131907,
+        "narHash": "sha256-8bz4k18M/FuVC+EVcI4aREN2PsEKT7LGmU2orfjnpCg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e494a908e8895b9cba18e21d5fc83362f64b3f6a",
+        "rev": "8d435fca5c561da8168abb30270788d2da2a7951",
         "type": "github"
       },
       "original": {
@@ -569,11 +566,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1658671895,
-        "narHash": "sha256-WFtdMN7WH5twFZEfBqpgc9PMCMHpgJnZyipDSPfui3U=",
+        "lastModified": 1659167628,
+        "narHash": "sha256-hl3zom2TrPnwadl0bdoTxNXcSSW8OTx/iASF8VsrRlc=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "7e2b983fd459977e11026683ee4afb9598960a4c",
+        "rev": "e0ff4befdacf187621bebba84f824d2e41ab0607",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 829c7a2..4d0fea4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,22 +4,22 @@
   nixConfig.extra-experimental-features = "nix-command flakes";
   inputs =
     {
-      nixos.url = "github:nixos/nixpkgs/nixos-unstable";
-      latest.url = "github:nixos/nixpkgs/master";
+      nixos.url = "github:nixos/nixpkgs/nixos-22.05";
+      latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
       flake-utils.url = "github:numtide/flake-utils";
 
       digga.url = "github:divnix/digga";
       digga.inputs.nixpkgs.follows = "nixos";
-      digga.inputs.nixpkgs-unstable.follows = "nixos";
+      digga.inputs.nixpkgs-unstable.follows = "latest";
       digga.inputs.latest.follows = "latest";
       digga.inputs.nixlib.follows = "nixos";
       digga.inputs.home-manager.follows = "home";
       digga.inputs.deploy.follows = "deploy";
 
-      home.url = "github:nix-community/home-manager/master";
+      home.url = "github:nix-community/home-manager/release-22.05";
       #      home.url = "path:/home/mae/home-manager";
-      home.inputs.nixpkgs.follows = "nixos";
+      home.inputs.nixpkgs.follows = "latest";
       home.inputs.utils.follows = "flake-utils";
 
       darwin.url = "github:LnL7/nix-darwin";
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index e93f987..2d77fd3 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -2,12 +2,26 @@
 let inherit (lib) fileContents;
 in
 {
+
+  # Cachix
+  nix = {
+    binaryCaches = [
+      "https://cache.nixos.org/"
+      "https://nix-community.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+
   # For rage encryption, all hosts need a ssh key pair
   services.openssh = {
     enable = true;
     openFirewall = lib.mkDefault false;
   };
 
+  # This is just a representation of the nix default
+  nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
   nix.registry.nixpkgs.flake = self.inputs.nixos;
   nix.registry.latest.flake = self.inputs.latest;
   nix.registry.pwnix.flake = self.inputs.pwnix;
@@ -79,26 +93,17 @@ in
   };
 
   nix = {
-    settings = {
-      substituters = [
-        "https://cache.nixos.org/"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-
-      system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
-
-      sandbox = true;
-      trusted-users = [ "root" "@wheel" ];
-    };
-
     # Improve nix store disk usage
-    settings.auto-optimise-store = true;
+    autoOptimiseStore = true;
     gc.automatic = true;
     optimise.automatic = true;
 
+    # Prevents impurities in builds
+    useSandbox = true;
+
+    # give root and @wheel special privileges with nix
+    trustedUsers = [ "root" "@wheel" ];
+
     # Generally useful nix option defaults
     extraOptions = ''
       keep-outputs = true