nixpkgs registry by git rev, not store path

nixos/base.nix

@@ -21,8 +21,8 @@
       to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; rev = nixpkgs-flake.rev; };
     };
     nixpkgs-unstable = {
-      from = { type = "indirect"; id = "nixpkgs-unstable"; };
+      from = { type = "indirect"; id = "nixpkgs"; };
-      to = { type = "github"; owner = "nixos"; repo = "nixpkgs"; ref = "nixos-unstable"; };
+      to = "github:nixos/nixpkgs/nixos-unstable";
     };
   };
   nix.nixPath = [ "nixpkgs=${pkgs.path}" ];

nixos/graphical.nix

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