upgrade to 22.05-pre

5 files changed, 14 insertions, 18 deletions

diff --git a/flake.lock b/flake.lock
index aec452b..06df8e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -216,16 +216,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1643247693,
-        "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=",
+        "lastModified": 1643347846,
+        "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca",
+        "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 06ce985..dec2ba2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "nerdypepper's nixos config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index 77e3ffb..66b5bdc 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -1,7 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, lib, self, ... }:
 
 {
@@ -132,14 +128,14 @@
       keep-outputs = false
       keep-derivations = true
     '';
+    settings = {
+      trusted-users = [
+        "root"
+        "np"
+      ];
+    };
   };
 
-  nix.trustedUsers =
-    [
-      "root"
-      "np"
-    ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/olive/hardware-configuration.nix b/hosts/olive/hardware-configuration.nix
index fc9ccb8..c2bff39 100644
--- a/hosts/olive/hardware-configuration.nix
+++ b/hosts/olive/hardware-configuration.nix
@@ -31,6 +31,6 @@
 
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 8;
+  nix.settings.max-jobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
diff --git a/programs/st/config.h b/programs/st/config.h
index 696b99f..14fb754 100644
--- a/programs/st/config.h
+++ b/programs/st/config.h
@@ -130,8 +130,8 @@ static const char *colorname[] = {
  */
 unsigned int defaultfg = 7;
 unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+unsigned int defaultcs = 256;
+unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor