Update nixos config for nixos 24.05 i think

darwin.nix

@@ -12,7 +12,10 @@
       from = { type = "indirect"; id = "templates"; };
       to = { type = "git"; url = "https://githug.xyz/xenchel/templates"; };
     };
-    nixpkgs.flake = nixpkgs-flake;
+    nixpkgs = {
+      from = { type = "indirect"; id = "nixpkgs"; };
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; rev = nixpkgs-flake.rev; };
+    };
     nixpkgs-unstable = {
       from = { type = "indirect"; id = "nixpkgs-unstable"; };
       to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; ref = "nixos-unstable"; };

nixos/base.nix

@@ -16,10 +16,13 @@
       from = { type = "indirect"; id = "templates"; };
       to = { type = "git"; url = "https://githug.xyz/xenchel/templates"; };
     };
-    nixpkgs.flake = nixpkgs-flake;
+    nixpkgs = {
-    nixpkgs-unstable = {
       from = { type = "indirect"; id = "nixpkgs"; };
-      to = "github:nixos/nixpkgs/nixos-unstable";
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; rev = nixpkgs-flake.rev; };
+    };
+    nixpkgs-unstable = {
+      from = { type = "indirect"; id = "nixpkgs-unstable"; };
+      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; ref = "nixos-unstable"; };
     };
   };
   nix.nixPath = [ "nixpkgs=${pkgs.path}" ];

nixos/graphical.nix

@@ -10,23 +10,24 @@
   services.xserver = {
     enable = true;
     desktopManager.xfce.enable = true;
-    displayManager = {
+    displayManager.lightdm = {
-      defaultSession = "xfce";
+      background = ../backgrounds/${background-image};
-      lightdm = {
+      greeters.slick.enable = true;
-        background = ../backgrounds/${background-image};
-        greeters.slick.enable = true;
-      };
     };
 
-    layout = "fox";
+    xkb = {
-    xkbOptions = "caps:escape";
+      layout = "fox";
-    extraLayouts.fox = {
+      options = "caps:escape";
-      description = "Layout suitable to be used by a fox";
+      extraLayouts.fox = {
-      languages = ["se"];
+        description = "Layout suitable to be used by a fox";
-      symbolsFile = fox-layout;
+        languages = ["se"];
+        symbolsFile = fox-layout;
+      };
     };
   };
 
+  services.displayManager.defaultSession = "xfce";
+
   console.useXkbConfig = true;
 
   # Enable sound.