diff --git a/darwin/bootstrap.nix b/darwin/bootstrap.nix
index 40be192..bb6f29e 100644
--- a/darwin/bootstrap.nix
+++ b/darwin/bootstrap.nix
@@ -2,23 +2,23 @@
 {
   # Nix configuration ------------------------------------------------------------------------------
 
-  nix.binaryCaches = [
+  nix.settings.binaryCaches = [
     "https://cache.nixos.org/"
     "https://hydra.iohk.io"
     "https://cache.iog.io"
     "https://nix-community.cachix.org"
     "https://mat.cachix.org"
   ];
-  nix.binaryCachePublicKeys = [
+  nix.settings.binaryCachePublicKeys = [
     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     "mat.cachix.org-1:AHqv9SoBEPKlJX2DDZQnjaMcvBAgpH1j8rw5USYDZno="
   ];
-  nix.trustedUsers = [
+  nix.settings.trustedUsers = [
     "@admin"
   ];
-  users.nix.configureBuildUsers = true;
+  nix.configureBuildUsers = true;
 
   # Enable experimental nix command and flakes
   nix.extraOptions = ''
diff --git a/flake.lock b/flake.lock
index 17c4c66..9d511b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "dark-mode-notify-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1657531789,
-        "narHash": "sha256-m/VTRz0lu+BMETRVY+6tESDNhKwlpNwfwMZ45BMwYzk=",
+        "lastModified": 1658150829,
+        "narHash": "sha256-LsAQ5v5jgJw7KsJnQ3Mh6+LNj1EMHICMoD5WzF3hRmU=",
         "owner": "bouk",
         "repo": "dark-mode-notify",
-        "rev": "5ac81063f442ea72dab457c777d1860754cfaede",
+        "rev": "4d7fe211f81c5b67402fad4bed44995344a260d1",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657835815,
-        "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
+        "lastModified": 1661882940,
+        "narHash": "sha256-4LaVFnV22WrOA0aolqqk9dXrM8crikcrLQt29G18F7M=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
+        "rev": "80cec5115aae74accc4ccfb9f84306d7863f0632",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1657887110,
-        "narHash": "sha256-8VV0/kZed2z8fGtEc2zr+WLxTow+JTIlMjnSisyv0GQ=",
+        "lastModified": 1661824092,
+        "narHash": "sha256-nSWLWytlXbeLrx5A+r5Pso7CvVrX5EgmIIXW/EXvPHQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4c5106ed0f3168ff2df21b646aef67e86cbfc11c",
+        "rev": "5bd66dc6cd967033489c69d486402b75d338eeb6",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     "kitty-icon": {
       "flake": false,
       "locked": {
-        "lastModified": 1640552536,
-        "narHash": "sha256-3Jri8/y/s6/QkOBb03R9nd1gyZPGZlekhli9ShTzOxg=",
+        "lastModified": 1659349637,
+        "narHash": "sha256-Vy+iLGnysrJMSLfkaYq15pb/wG4kIbfsXRrPgSc3OFs=",
         "owner": "DinkDonk",
         "repo": "kitty-icon",
-        "rev": "b19b3969d3bdc870beeff332355f92e38dc5a704",
+        "rev": "269c0f0bd1c792cebc7821f299ce9250ed9bcd67",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656782578,
-        "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=",
+        "lastModified": 1659446231,
+        "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b",
+        "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1658075259,
-        "narHash": "sha256-MJR7YRmWRJGA2PhG63kTxd7GmE5YvM3AhdN1YDyJ8jM=",
+        "lastModified": 1661900101,
+        "narHash": "sha256-YBW6x74aRNvtZW25PErYcDAwa8svJgi6d3Cn+t7bJEk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c490f57e189fdb4f19d4eb9c930caf0c3afa28e1",
+        "rev": "bde62ccf6d316e79bf5ab2ffb390c34504240a14",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1657975505,
-        "narHash": "sha256-juMbw+GY2ycTrg3QbdFfEQs6P3FJeoYEv8aMVl2EZsg=",
+        "lastModified": 1661353537,
+        "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6df226c53d46821bd4773bd7ec3375f30238edb",
+        "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c78ba21..c6fd99a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -134,8 +134,8 @@
               networking.knownNetworkServices = [
                 "Wi-Fi"
               ];
-              nix.buildCores = 2;
-              nix.maxJobs = 4;
+              nix.settings.buildCores = 2;
+              nix.settings.maxJobs = 4;
 
               environment.systemPackages = with pkgs; [
                 vscodium
@@ -163,8 +163,8 @@
               networking.knownNetworkServices = [
                 "Wi-Fi"
               ];
-              nix.buildCores = 2;
-              nix.maxJobs = 5;
+              nix.settings.buildCores = 2;
+              nix.settings.maxJobs = 5;
 
               games.enable = false;
               environment.systemPackages = with pkgs; [