5 files changed, 28 insertions, 18 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index cacb74d9..2d93b94b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -249,6 +249,18 @@ in {
       };
     };
 
+    home.pointerCursor = {
+      package = pkgs.vanilla-dmz;
+      name = "Vanilla-DMZ-AA";
+      size = 32;
+
+      x11 = {
+        enable = true;
+        defaultCursor = "left_ptr";
+      };
+      gtk.enable = true;
+    };
+
     gtk = {
       enable = true;
       font = {
@@ -264,7 +276,6 @@ in {
         package = pkgs.paper-icon-theme;
         name = "Paper";
       };
-      cursorTheme = lib.mkForce { inherit (cfg.xsession.pointerCursor) package name size; };
     };
 
     xsession = {
@@ -276,13 +287,6 @@ in {
         ${pkgs.xorg.xinput}/bin/xinput disable 'Synaptics TM3512-010'
         ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keysym Caps_Lock = Multi_key'
       '';
-
-      pointerCursor = {
-        package = pkgs.vanilla-dmz;
-        defaultCursor = "left_ptr";
-        name = "Vanilla-DMZ-AA";
-        size = 32;
-      };
     };
 
     xresources.properties = import ./xresources.nix;
diff --git a/flake.lock b/flake.lock
index 76e974d5..344614d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1648475189,
-        "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
+        "lastModified": 1652079807,
+        "narHash": "sha256-aCs1EwO9K2yJ1DcT4+4g7BMlJBWP7Xjs4k5i8ueR8PU=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
+        "rev": "690f698b18345d894784752b5fa93b9b8f3cc29f",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651652192,
-        "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=",
+        "lastModified": 1651886851,
+        "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "267462dfb36d447421c789a3adf9d460cd09c147",
+        "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651654660,
-        "narHash": "sha256-ZuQ3wQwIEwqBAEOeL/mY5dV0pxuz7OIz/lzeLBIskAE=",
+        "lastModified": 1652107188,
+        "narHash": "sha256-6CVG9pABO7FB1qP/d7gwuP166COGHv3WC1AQ5r/n1ds=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c04ef155994d060aceedf946eeba0ab756b19c01",
+        "rev": "403d21a9416b865c9f1da016a110c2610610b4c5",
         "type": "github"
       },
       "original": {
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index cb452df3..ff93e0e5 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -150,5 +150,7 @@
       };
       stateful = true;
     };
+
+    system.stateVersion = "20.09";
   };
 }
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index d8f9cdb4..121cc9df 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -312,5 +312,7 @@
     };
 
     environment.systemPackages = with pkgs; [iotop vmtouch];
+
+    system.stateVersion = "21.05";
   };
 }
diff --git a/installer/default.nix b/installer/default.nix
index bf09c8d8..d77266ca 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,4 @@
-{ flake, pkgs, ... }: {
+{ flake, config, pkgs, ... }: {
   imports = with flake.nixosModules.systemProfiles; [
     default-locale zfs networkmanager openssh
   ];
@@ -28,5 +28,7 @@
     ];
 
     zramSwap.enable = true;
+
+    system.stateVersion = config.system.nixos.release; # No state in installer
   };
 }