From f84333b9a5ec12e5fb2549c8ead16f6ae0a8fb49 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Fri, 8 Mar 2024 09:06:58 +0100
Subject: [PATCH 1/9] Cosmic: init

this desktop environment is still in alpha (or pre alpha)
---
 nix-os-configs/vm-cosmic.nix | 17 ++++++++++++
 nix-os/desktop/cosmic.nix    | 51 ++++++++++++++++++++++++++++++++++++
 vm-cosmic.sh                 |  1 +
 3 files changed, 69 insertions(+)
 create mode 100644 nix-os-configs/vm-cosmic.nix
 create mode 100644 nix-os/desktop/cosmic.nix
 create mode 100755 vm-cosmic.sh

diff --git a/nix-os-configs/vm-cosmic.nix b/nix-os-configs/vm-cosmic.nix
new file mode 100644
index 0000000..a7a0c4d
--- /dev/null
+++ b/nix-os-configs/vm-cosmic.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  imports = [
+    ../nix-os/core.nix
+    ../nix-os/docker.nix
+    ../nix-os/desktop/cosmic.nix
+    #../nix-os/desktop/kde-plasma.nix
+    ../nix-os/shell.nix
+    ../nix-os/virtualization.nix
+    ../nix-os/polkit/disable-shutdown.nix
+    ../nix-os/locale.nix
+    ../nix-os/adb.nix
+    ../nix-os/account.nix
+    ../nix-os/xdg-default-apps.nix
+  ];
+}
\ No newline at end of file
diff --git a/nix-os/desktop/cosmic.nix b/nix-os/desktop/cosmic.nix
new file mode 100644
index 0000000..a2ee1f5
--- /dev/null
+++ b/nix-os/desktop/cosmic.nix
@@ -0,0 +1,51 @@
+{pkgs, lib, ... }:
+
+let
+  nixos-cosmic = builtins.fetchGit {
+    url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
+    # rev = "c1f1dc29d6c187fd563776837ab53faafa111721";
+  };
+  cosmicModule = import "${nixos-cosmic}" {system = "x86_64-linux";};
+  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
+  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
+  cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
+    builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
+  );
+in
+{
+  imports = [
+    cosmicModule
+    "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
+    "${nixos-cosmic}/nixos/cosmic/module.nix"
+  ];
+  config = {
+    services.xserver.desktopManager.cosmic.enable = true;
+    services.xserver.displayManager.cosmic-greeter.enable = true;
+    nixpkgs.overlays = [ cosmicPkgsOverlay ];
+  };
+  options = {
+    cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
+    cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
+    cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
+    cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
+    cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
+    cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
+    cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
+    cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
+    cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
+    cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
+    cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
+    cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
+    cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
+    cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
+    cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
+    cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
+    cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
+    cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
+    cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
+    wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
+    xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
+  };
+}
diff --git a/vm-cosmic.sh b/vm-cosmic.sh
new file mode 100755
index 0000000..b03a0df
--- /dev/null
+++ b/vm-cosmic.sh
@@ -0,0 +1 @@
+nix-build '<nixos-unstable/nixos>' -A vm -I nixpkgs=channel:nixos-unstable -I nixos-config=./nix-os-configs/vm-cosmic.nix $@ && $(ls ./result/bin/run-*) -m 4096 && rm *.qcow2

From b79c776d974c48d7919ecf965e7230b139ca771c Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Wed, 13 Mar 2024 14:30:01 +0100
Subject: [PATCH 2/9] cosmic: add binary cache server

---
 nix-os/desktopManagers/cosmic.nix         | 4 ++++
 nix-os/displayManagers/cosmic-greeter.nix | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index 19232de..a26c073 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -18,6 +18,10 @@ in
   config = {
     services.xserver.desktopManager.cosmic.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
+    nix.settings = {
+      substituters = [ "https://cosmic.cachix.org/" ];
+      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+    };
   };
   options = {
     cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
index 7d5a074..b66341a 100644
--- a/nix-os/displayManagers/cosmic-greeter.nix
+++ b/nix-os/displayManagers/cosmic-greeter.nix
@@ -19,6 +19,10 @@ in
     services.xserver.desktopManager.cosmic.enable = true;
     services.xserver.displayManager.cosmic-greeter.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
+    nix.settings = {
+      substituters = [ "https://cosmic.cachix.org/" ];
+      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+    };
   };
   options = {
     cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};

From 9fffce71cdb79690e2efac03ed6a38b74f1a7724 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Fri, 19 Apr 2024 22:51:28 +0200
Subject: [PATCH 3/9] Cosmic+Cosmic greeter: Align to upstream changes

---
 nix-os/desktopManagers/cosmic.nix         | 26 +----------------------
 nix-os/displayManagers/cosmic-greeter.nix |  6 +-----
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index a26c073..589ee56 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -16,35 +16,11 @@ in
     "${nixos-cosmic}/nixos/cosmic/module.nix"
   ];
   config = {
-    services.xserver.desktopManager.cosmic.enable = true;
+    services.desktopManager.cosmic.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
-  options = {
-    cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
-    cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
-    cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
-    cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
-    cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
-    cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
-    cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
-    cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
-    cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
-    cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
-    cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
-    cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
-    cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
-    cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
-    cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
-    cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
-    cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
-    cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
-    cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
-    cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
-    wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
-    xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
-  };
 }
diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
index b66341a..da54a6d 100644
--- a/nix-os/displayManagers/cosmic-greeter.nix
+++ b/nix-os/displayManagers/cosmic-greeter.nix
@@ -16,15 +16,11 @@ in
     "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
   ];
   config = {
-    services.xserver.desktopManager.cosmic.enable = true;
-    services.xserver.displayManager.cosmic-greeter.enable = true;
+    services.displayManager.cosmic-greeter.enable = true;
     nixpkgs.overlays = [ cosmicPkgsOverlay ];
     nix.settings = {
       substituters = [ "https://cosmic.cachix.org/" ];
       trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
     };
   };
-  options = {
-    cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
-  };
 }

From ac2bd4cd0032676e5f2290520bb308b4cef5e507 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 04:02:19 +0200
Subject: [PATCH 4/9] vm-cosmic: delete

---
 vm-cosmic.sh | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100755 vm-cosmic.sh

diff --git a/vm-cosmic.sh b/vm-cosmic.sh
deleted file mode 100755
index 1d5cd30..0000000
--- a/vm-cosmic.sh
+++ /dev/null
@@ -1 +0,0 @@
-nix-build '<nixos-unstable/nixos>' -A vm -I nixos-config=./hosts/vm-cosmic.nix $@ && $(ls ./result/bin/run-*) -m 4096 && rm *.qcow2

From e5d2edff9a8c55cb79b4c131c8883a1e8cda38c7 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 04:05:43 +0200
Subject: [PATCH 5/9] inputs: add cosmic-modules

---
 inputs.nix | 5 +++++
 lock.nix   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/inputs.nix b/inputs.nix
index 6c3a94d..334379b 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -15,5 +15,10 @@ let self = {
     url = "https://github.com/NixOS/nixpkgs/archive/${lock.nixpkgs.revision}.tar.gz";
     sha256 = "${lock.nixpkgs.sha256}";
   };
+  cosmic-modules = builtins.fetchTarball {
+    name = "cosmic-modules";
+    url = "https://github.com/lilyinstarlight/nixos-cosmic/archive/${lock.cosmic-modules.revision}.tar.gz";
+    sha256 = "${lock.cosmic-modules.sha256}";
+  };
 };
 in self
diff --git a/lock.nix b/lock.nix
index 2963614..0b51177 100644
--- a/lock.nix
+++ b/lock.nix
@@ -7,4 +7,8 @@
     revision = "05405724efa137a0b899cce5ab4dde463b4fd30b";
     sha256 = "06490pn22x9xl4chfx12iwdgx7nlbn14v8x05rnv2y1nancljisl";
   };
+  cosmic-modules = {
+    revision = "d8b2b9aee034c10ca67848653171f576f87434a8";
+    sha256 = "03i8smxgx2fdb9kkys81dihb5yja3nk9wjs1rx5h7f3b5kii1fd7";
+  };
 }

From ec8be03e7fb060513afc5b83acc177cfdefc7a72 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 04:38:11 +0200
Subject: [PATCH 6/9] hosts/vm-cosmic: use vm-base

---
 hosts/vm-cosmic.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/hosts/vm-cosmic.nix b/hosts/vm-cosmic.nix
index 5507267..00989ab 100644
--- a/hosts/vm-cosmic.nix
+++ b/hosts/vm-cosmic.nix
@@ -2,18 +2,8 @@
 
 {
   imports = [
-    ../nix-os/core.nix
-    ../nix-os/core-desktop.nix
-    ../nix-os/docker.nix
+    ./vm-base.nix
     ../nix-os/desktopManagers/cosmic.nix
     ../nix-os/displayManagers/cosmic-greeter.nix
-    #../nix-os/desktop/kde-plasma.nix
-    ../nix-os/shell.nix
-    ../nix-os/virtualization.nix
-    ../nix-os/polkit/disable-shutdown.nix
-    ../nix-os/locale.nix
-    ../nix-os/adb.nix
-    ../nix-os/account.nix
-    ../nix-os/xdg-default-apps.nix
   ];
 }

From dae61508df19bdba3a65658ea83c52eff3b4895e Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 06:06:41 +0200
Subject: [PATCH 7/9] pkgs/overlays/cosmic: create

---
 pkgs/overlays/cosmic-packages.nix | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/overlays/cosmic-packages.nix

diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix
new file mode 100644
index 0000000..12d07d1
--- /dev/null
+++ b/pkgs/overlays/cosmic-packages.nix
@@ -0,0 +1,33 @@
+{ inputs ? import ../../inputs.nix {}}:
+
+let
+  nixos-cosmic = inputs.cosmic-modules;
+  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
+  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
+
+  # FIXME: use unstable nixpkgs when rust 1.80 will be available in unstable
+  stagingNixpkgsSrc = builtins.fetchTarball {
+    name = "nixpkgs";
+    url = "https://github.com/NixOS/nixpkgs/archive/b79cec4237cd0f655562890bf927466c68b48d68.tar.gz";
+    sha256 = "1mswisq9iwffg2d6rfxvr27mvi4w853d9rn222s2g76445d0iqh8";
+  };
+  cosmicOverlay = self: super: builtins.listToAttrs (
+    builtins.map (v: {name = v; value = self.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
+  );
+in
+
+self: super:
+
+let
+stagingNixpkgs = import stagingNixpkgsSrc {
+    localSystem = self.stdenv.buildPlatform;
+    config = self.config;
+    overlays = [ cosmicOverlay ];
+  } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
+    crossSystem = self.stdenv.hostPlatform;
+  });
+in
+
+builtins.listToAttrs (
+  builtins.map (v: {name = v; value = stagingNixpkgs.${v};}) cosmicPkgsDirs
+)

From 6b1ea56d8b216c316a8072d8d433d32c05e9a899 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 07:14:07 +0200
Subject: [PATCH 8/9] nixos/cosmic: move overlay and substituters to
 hosts/vm-cosmic

use cosmic-packages overlay
---
 hosts/vm-cosmic.nix                       | 10 +++++++++-
 nix-os/desktopManagers/cosmic.nix         | 20 ++------------------
 nix-os/displayManagers/cosmic-greeter.nix | 20 ++------------------
 3 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/hosts/vm-cosmic.nix b/hosts/vm-cosmic.nix
index 00989ab..c842604 100644
--- a/hosts/vm-cosmic.nix
+++ b/hosts/vm-cosmic.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, ... }:
 
 {
   imports = [
@@ -6,4 +6,12 @@
     ../nix-os/desktopManagers/cosmic.nix
     ../nix-os/displayManagers/cosmic-greeter.nix
   ];
+
+  config = {
+    nixpkgs.overlays = [(import ../pkgs/overlays/cosmic-packages.nix { inherit inputs; })];
+    nix.settings = {
+      substituters = [ "https://cosmic.cachix.org/" ];
+      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+    };
+  };
 }
diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index 589ee56..96a1bf3 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -1,26 +1,10 @@
-{pkgs, lib, ... }:
+{ inputs, lib, pkgs, ... }:
 
-let
-  nixos-cosmic = builtins.fetchGit {
-    url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
-    # rev = "b61e7a0da2fa1d5f05d41e3db6386b2ac5f5079b";
-  };
-  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
-  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
-  cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
-    builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
-  );
-in
 {
   imports = [
-    "${nixos-cosmic}/nixos/cosmic/module.nix"
+    "${inputs.cosmic-modules}/nixos/cosmic/module.nix"
   ];
   config = {
     services.desktopManager.cosmic.enable = true;
-    nixpkgs.overlays = [ cosmicPkgsOverlay ];
-    nix.settings = {
-      substituters = [ "https://cosmic.cachix.org/" ];
-      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
-    };
   };
 }
diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nix-os/displayManagers/cosmic-greeter.nix
index da54a6d..e39ab93 100644
--- a/nix-os/displayManagers/cosmic-greeter.nix
+++ b/nix-os/displayManagers/cosmic-greeter.nix
@@ -1,26 +1,10 @@
-{pkgs, lib, ... }:
+{ inputs, lib, pkgs, ... }:
 
-let
-  nixos-cosmic = builtins.fetchGit {
-    url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
-    # rev = "b61e7a0da2fa1d5f05d41e3db6386b2ac5f5079b";
-  };
-  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
-  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
-  cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
-    builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
-  );
-in
 {
   imports = [
-    "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
+    "${inputs.cosmic-modules}/nixos/cosmic-greeter/module.nix"
   ];
   config = {
     services.displayManager.cosmic-greeter.enable = true;
-    nixpkgs.overlays = [ cosmicPkgsOverlay ];
-    nix.settings = {
-      substituters = [ "https://cosmic.cachix.org/" ];
-      trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
-    };
   };
 }

From 99a59bfb6b3edfa1ee0e75156521b3eddd15e651 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Thu, 8 Aug 2024 16:47:36 +0200
Subject: [PATCH 9/9] pkgs/overlay/cosmic-packages: build cosmic using locked
 nixpkgs

but with future rust

cosmic didn't work at all when I just made it using futureNixpkgs.
---
 pkgs/overlays/cosmic-packages.nix | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix
index 12d07d1..1722c18 100644
--- a/pkgs/overlays/cosmic-packages.nix
+++ b/pkgs/overlays/cosmic-packages.nix
@@ -1,5 +1,7 @@
 { inputs ? import ../../inputs.nix {}}:
 
+self: super:
+
 let
   nixos-cosmic = inputs.cosmic-modules;
   cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
@@ -11,15 +13,26 @@ let
     url = "https://github.com/NixOS/nixpkgs/archive/b79cec4237cd0f655562890bf927466c68b48d68.tar.gz";
     sha256 = "1mswisq9iwffg2d6rfxvr27mvi4w853d9rn222s2g76445d0iqh8";
   };
-  cosmicOverlay = self: super: builtins.listToAttrs (
-    builtins.map (v: {name = v; value = self.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
+
+  # Take rustPackages from staging nixpkgs
+  stagingNixpkgs = import stagingNixpkgsSrc {
+    localSystem = self.stdenv.buildPlatform;
+    config = self.config;
+  } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
+    crossSystem = self.stdenv.hostPlatform;
+  });
+  futureRustPackages = stagingNixpkgs.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
   );
-in
-
-self: super:
-
-let
-stagingNixpkgs = import stagingNixpkgsSrc {
+  cosmicNixpkgs = import inputs.nixpkgs {
     localSystem = self.stdenv.buildPlatform;
     config = self.config;
     overlays = [ cosmicOverlay ];
@@ -29,5 +42,5 @@ stagingNixpkgs = import stagingNixpkgsSrc {
 in
 
 builtins.listToAttrs (
-  builtins.map (v: {name = v; value = stagingNixpkgs.${v};}) cosmicPkgsDirs
+  builtins.map (v: {name = v; value = cosmicNixpkgs.${v};}) cosmicPkgsDirs
 )