flake: 22.05 -> 22.11, use rycee-nur directly

1 files changed, 14 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index bd47154..4ca7cb2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,14 +1,17 @@
 {
   description = "My NixOS configurations";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
   inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.home-manager = {
-    url = "github:nix-community/home-manager/release-22.05";
+    url = "github:nix-community/home-manager/release-22.11";
     inputs.nixpkgs.follows = "nixpkgs";
   };
-  inputs.nur.url = "github:nix-community/NUR";
+  inputs.rycee-nur = {
+    url = "gitlab:rycee/nur-expressions";
+    flake = false;
+  };
   inputs.musnix = {
     url = "github:musnix/musnix";
     flake = false;
@@ -33,8 +36,8 @@
       test = { config, ... }: {
         imports = [ self.nixosModules.default ];
 
-        home-manager.users.minijackson.home.stateVersion = "21.05";
-        home-manager.users.root.home.stateVersion = "21.05";
+        home-manager.users.minijackson.home.stateVersion = "22.11";
+        home-manager.users.root.home.stateVersion = "22.11";
 
         users.users.minijackson.initialHashedPassword = "";
         users.users.root.initialHashedPassword = "";
@@ -141,6 +144,7 @@
       {
 
         tests.testDefault = nixosTest {
+          name = "default";
           nodes.machine = self.nixosModules.test;
           testScript = ''
             # TODO
@@ -149,6 +153,7 @@
         };
 
         tests.testPlainDesktop = nixosTest {
+          name = "plainDesktop";
           nodes.machine = { ... }: {
             imports = [
               self.nixosModules.test
@@ -163,6 +168,7 @@
         };
 
         tests.testFullDesktop = nixosTest {
+          name = "fullDesktop";
           nodes.machine = { ... }: {
             imports = [
               self.nixosModules.test
@@ -187,6 +193,7 @@
         };
 
         tests.testServer = nixosTest {
+          name = "server";
           nodes.machine = { ... }: {
             imports = [
               self.nixosModules.test
@@ -251,8 +258,8 @@
                 isoImage.makeEfiBootable = true;
                 isoImage.makeUsbBootable = true;
 
-                home-manager.users.minijackson.home.stateVersion = "21.05";
-                home-manager.users.root.home.stateVersion = "21.05";
+                home-manager.users.minijackson.home.stateVersion = "22.11";
+                home-manager.users.root.home.stateVersion = "22.11";
 
                 users.users.minijackson.initialHashedPassword = "";
                 users.users.root.initialHashedPassword = "";