6 files changed, 31 insertions, 28 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 15351b0d..e8352f53 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -65,6 +65,10 @@ in {
   ];
   
   home-manager.users.${userName} = {
+    nixpkgs.config = {
+      zathura.useMupdf = false;
+    };
+    
     programs = {
       ssh = {
         matchBlocks = import ./ssh-hosts.nix { inherit pkgs; }; # customUtils.nixImport { dir = ./ssh-hosts; };
@@ -120,10 +124,7 @@ in {
         settings = import ./alacritty.nix;
       };
 
-      zathura = {
-        enable = true;
-        package = pkgs.zathura.override { useMupdf = false; };
-      };
+      zathura.enable = true;
 
       mpv.config = {
         demuxer-max-bytes = 1073741824;
diff --git a/flake.lock b/flake.lock
index 32a4a9ab..f1aee748 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1642113498,
-        "narHash": "sha256-4tNIt2EGDppYQI06gsid0QKW5dtBEOAiNKfMYC8wxv8=",
+        "lastModified": 1643787431,
+        "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "0ac333cdc03407538b5b19d60a8e7c64588490fb",
+        "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1627913399,
-        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1642882610,
-        "narHash": "sha256-pmdgeJ9v6y+T0UfNQ/Z+Hdv5tPshFFra5JLF/byUA/Y=",
+        "lastModified": 1644534280,
+        "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c47c350f6518ed39c2a16e4fadf9137b6c559ddc",
+        "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1642952869,
-        "narHash": "sha256-hPl1Z2RY/nn8xMY79xN+2VZc5i1Y1ScblfRz661e1OI=",
+        "lastModified": 1644687442,
+        "narHash": "sha256-s9zQQ4MSY7LGrtcDK+ZPC6h2POuRiZdpneCZZsKbpHU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "10a547c8f5dc1b4aec6f74225ec3081f70dfb586",
+        "rev": "b74e0ecf6d4b2b18afc8c919f45470210a411afa",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1641374494,
-        "narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=",
+        "lastModified": 1644599065,
+        "narHash": "sha256-oFLRb9p954wiUGn8iU5wOCY/7yBrT4Xvg7Ew07MvSKs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e",
+        "rev": "fc22eff3205e9742c1b0fd229c267bf237f0c43e",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1631561581,
-        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
+        "lastModified": 1642700792,
+        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
+        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
         "type": "github"
       },
       "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 9516ceba..1460ad2a 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -369,7 +369,7 @@ in {
     sound.enable = true;
 
     nix = {
-      autoOptimiseStore = true;
+      settings.auto-optimise-store = true;
       daemonCPUSchedPolicy = "idle";
       daemonIOSchedClass = "idle";
 
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index 92afb7c9..b7c17a9b 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -25,7 +25,7 @@
     [ { device = "/dev/disk/by-uuid/50f3f856-cc17-4614-846a-34a14d5006ec"; }
     ];
 
-  nix.maxJobs = 12;
+  nix.settings.max-jobs = 12;
   # High-DPI console
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 
diff --git a/system-profiles/build-server/default.nix b/system-profiles/build-server/default.nix
index 9cb9e142..20b23a31 100644
--- a/system-profiles/build-server/default.nix
+++ b/system-profiles/build-server/default.nix
@@ -12,7 +12,7 @@
       group = "nix-ssh-builder";
       extraGroups = [ "ssh" ];
     };
-    nix.trustedUsers = [ "nix-ssh-builder" ];
+    nix.settings.trusted-users = [ "nix-ssh-builder" ];
 
     services.openssh = {
       enable = true;
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index c243f857..0b20d944 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -43,9 +43,11 @@ in {
 
     nix = {
       package = pkgs.nixUnstable;
-      useSandbox = true;
-      allowedUsers = [ "*" ];
-      trustedUsers = [ "root" "@wheel" ];
+      settings = {
+        sandbox = true;
+        allowed-users = [ "*" ];
+        trusted-users = [ "root" "@wheel" ];
+      };
       extraOptions = ''
         experimental-features = nix-command flakes
       '';