hosts/main/default.nix

@@ -1,9 +1,4 @@
-{
+{ inputs, pkgs, ... }:
-  inputs,
-  pkgs,
-  self,
-  ...
-}:
 
 {
   imports = [
@@ -12,8 +7,8 @@
     ../../nix-os/nvidia.nix
     ../../nix-os/docker.nix
     ../../nix-os/razer.nix
-    ../../nix-os/desktopManagers/cosmic.nix
+    ../../nix-os/desktopManagers/gnome.nix
-    ../../nix-os/displayManagers/cosmic-greeter.nix
+    ../../nix-os/displayManagers/gdm.nix
     ../../nix-os/shell.nix
     ../../nix-os/virtualization.nix
     ../../nix-os/polkit/disable-shutdown.nix
@@ -41,10 +36,6 @@
       hplip
     ];
 
-    nixpkgs.overlays = [
-      self.overlays.cosmicPackages
-    ];
-
     # nixos-vscode-server module needs this
     programs.nix-ld.enable = true;
     services.vscode-server = {

hosts/tablet.nix

@@ -1,7 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  self,
-  ...
-}:
 
 {
   imports = [
@@ -14,8 +11,8 @@
     ../nix-os/gnupg.nix
     ../nix-os/polkit/network.nix
 
-    ../nix-os/desktopManagers/cosmic.nix
+    ../nix-os/desktopManagers/gnome.nix
-    ../../nix-os/displayManagers/cosmic-greeter.nix
+    ../nix-os/displayManagers/gdm.nix
     ../nix-os/udev.nix
   ];
 
@@ -28,10 +25,6 @@
     networking.firewall.enable = true;
     hardware.sensor.iio.enable = true;
 
-    nixpkgs.overlays = [
-      self.overlays.cosmicPackages
-    ];
-
     networking.firewall.allowedTCPPortRanges = [
       # KDE Connect
       rec { from = 1714; to = from + 50; }

hosts/vm-base.nix

@@ -18,8 +18,5 @@
     virtualisation = {
       memorySize = 4096;
     };
-    virtualisation.forwardPorts = [
-      { from = "host"; host.port = 2222; guest.port = 22; }
-    ];
   };
 }

lock.nix

@@ -8,7 +8,7 @@
     sha256 = "07wa6y7q4ql0x1jj08dignak2lra003inf2cxl4xxvyqdsspshp3";
   };
   cosmic-modules = {
-    revision = "074bbcc4e3fa9ce4bee100de64506c3662c62299";
+    revision = "7d3dd56cca20e409261ff8c69867d38376f7ecae";
-    sha256 = "0rb0d20i05rjkhk3g5xld46l0ir055mbbbnlic4p3jvbqv9xqiqd";
+    sha256 = "06i1gqwgrpcarmkszcnblx02804n86424sklw4mva0p47j9n7gww";
   };
 }

nix-os/desktopManagers/cosmic.nix

@@ -11,9 +11,5 @@
       cosmic-term
       cosmic-files
     ];
-    environment.systemPackages = with pkgs; [
-      pavucontrol
-    ];
-    services.gnome.gnome-keyring.enable = true;
   };
 }

nix-os/polkit/disable-shutdown.nix

@@ -15,6 +15,8 @@
         action.id == "org.freedesktop.login1.inhibit-block-idle" ||
         action.id == "org.freedesktop.login1.inhibit-block-shutdown" ||
         action.id == "org.freedesktop.login1.inhibit-block-sleep" ||
+        action.id == "org.freedesktop.login1.inhibit-delay-shutdown" ||
+        action.id == "org.freedesktop.login1.inhibit-delay-sleep" ||
         action.id == "org.freedesktop.login1.inhibit-handle-hibernate-key" ||
         action.id == "org.freedesktop.login1.inhibit-handle-lid-switch" ||
         action.id == "org.freedesktop.login1.inhibit-handle-power-key" ||

outputs.nix

@@ -13,7 +13,6 @@ self = {
   modifiedNixpkgs     = import ./pkgs/top-level/impure.nix;
   modifiedNixpkgsPure = import ./pkgs/top-level/default.nix;
   overlays = {
-    cosmicPackages = import ./pkgs/overlays/cosmic-packages.nix { inherit inputs; };
     selfExpr = import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = inputs.nixpkgs; };
     unstable = import ./pkgs/overlays/unstable.nix;
     versionInfoFixup = import ./pkgs/overlays/version-info-fixup.nix { inherit inputs; };

pkgs/overlays/cosmic-packages.nix

@@ -1,35 +1,46 @@
-{
+{ inputs ? import ../../inputs.nix {}}:
-  inputs ? import ../../inputs.nix {},
-  rustPlatform ? null,
-}:
 
 self: super:
 
 let
   nixos-cosmic = inputs.cosmic-modules;
+  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
+  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
 
-  # Pinned unstable nixpkgs from cosmic-modules
+  # Pinned unstable nixpkgs
-  cosmicModulesLock = builtins.fromJSON (builtins.readFile "${nixos-cosmic}/flake.lock");
-  pinnedNixpkgsRev = cosmicModulesLock.nodes.nixpkgs.locked.rev;
-  pinnedNixpkgsNarHash = cosmicModulesLock.nodes.nixpkgs.locked.narHash;
-
   futureNixpkgsSrc = builtins.fetchTarball {
     name = "nixpkgs";
-    url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgsRev}.tar.gz";
+    url = "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz";
-    sha256 = pinnedNixpkgsNarHash;
+    sha256 = "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr";
   };
 
-  # Initialize pinned nixpkgs
+  # Take rustPackages from staging nixpkgs
   futureNixpkgs = import futureNixpkgsSrc {
     localSystem = self.stdenv.buildPlatform;
     config = self.config;
   } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
     crossSystem = self.stdenv.hostPlatform;
   });
+  futureRustPackages = futureNixpkgs.rustPackages;
+
+  # Create nixpkgs with future rust
+  nixpkgsWithFutureRust = self.extend (futureSelf: futureSuper: {
+    rustPackages = futureRustPackages;
+  });
+
+  # Create cosmicPkgs that contains cosmic packages built from nixpkgs with future rust
+  cosmicOverlay = cosmicSelf: cosmicSuper: builtins.listToAttrs (
+    builtins.map (v: {name = v; value = nixpkgsWithFutureRust.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
+  );
+  cosmicNixpkgs = import inputs.nixpkgs {
+    localSystem = self.stdenv.buildPlatform;
+    config = self.config;
+    overlays = [ cosmicOverlay ];
+  } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
+    crossSystem = self.stdenv.hostPlatform;
+  });
 in
 
-import "${nixos-cosmic}/pkgs" {
+builtins.listToAttrs (
-  final = self;
+  builtins.map (v: {name = v; value = cosmicNixpkgs.${v};}) cosmicPkgsDirs
-  prev = super;
+)
-  rustPlatform = if rustPlatform != null then rustPlatform else futureNixpkgs.rustPlatform;
-}