diff --git a/lock.nix b/lock.nix
index 28a61ca..cf13477 100644
--- a/lock.nix
+++ b/lock.nix
@@ -4,11 +4,11 @@
     sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h";
   };
   nixpkgs = {
-    revision = "883180e6550c1723395a3a342f830bfc5c371f6b";
-    sha256 = "01axrf25mahbxmp6vgfgx09dflbyaavr5liynkp6rpm4lkacr27f";
+    revision = "c3d4ac725177c030b1e289015989da2ad9d56af0";
+    sha256 = "1n3dm76ip39zgw75jjn8ak9yp25m02ya1mzzg3764yfqq4jz18mj";
   };
   cosmic-modules = {
-    revision = "d8b2b9aee034c10ca67848653171f576f87434a8";
-    sha256 = "03i8smxgx2fdb9kkys81dihb5yja3nk9wjs1rx5h7f3b5kii1fd7";
+    revision = "7d3dd56cca20e409261ff8c69867d38376f7ecae";
+    sha256 = "06i1gqwgrpcarmkszcnblx02804n86424sklw4mva0p47j9n7gww";
   };
 }
diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix
index 96a1bf3..fa1d7d0 100644
--- a/nix-os/desktopManagers/cosmic.nix
+++ b/nix-os/desktopManagers/cosmic.nix
@@ -6,5 +6,9 @@
   ];
   config = {
     services.desktopManager.cosmic.enable = true;
+    environment.cosmic.excludePackages = with pkgs; [
+      cosmic-edit
+      cosmic-term
+    ];
   };
 }
diff --git a/pkgs/by-name/mk/mkScriptOverride/package.nix b/pkgs/by-name/mk/mkScriptOverride/package.nix
index 6777a0c..0b71a07 100644
--- a/pkgs/by-name/mk/mkScriptOverride/package.nix
+++ b/pkgs/by-name/mk/mkScriptOverride/package.nix
@@ -11,7 +11,9 @@
 lib.hiPrio (stdenv.mkDerivation (
   {
     src = src;
-    name = "${src.name}-script-override";
+    name = if lib.isDerivation src
+      then "${src.name}-script-override"
+      else "${builtins.baseNameOf src}-script-override";
     phases = [ "installPhase" "scriptOverridePhase" ];
     installPhase = ''
       runHook preInstall
@@ -23,7 +25,7 @@ lib.hiPrio (stdenv.mkDerivation (
     '';
     scriptOverridePhase = script;
   } // lib.removeAttrs args [
-    "pkg"
-    "commands"
+    "src"
+    "script"
   ]
 ))
diff --git a/pkgs/overlays/cosmic-packages.nix b/pkgs/overlays/cosmic-packages.nix
index 1722c18..8f2cff8 100644
--- a/pkgs/overlays/cosmic-packages.nix
+++ b/pkgs/overlays/cosmic-packages.nix
@@ -7,21 +7,21 @@ let
   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 {
+  # Pinned unstable nixpkgs
+  futureNixpkgsSrc = builtins.fetchTarball {
     name = "nixpkgs";
-    url = "https://github.com/NixOS/nixpkgs/archive/b79cec4237cd0f655562890bf927466c68b48d68.tar.gz";
-    sha256 = "1mswisq9iwffg2d6rfxvr27mvi4w853d9rn222s2g76445d0iqh8";
+    url = "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz";
+    sha256 = "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr";
   };
 
   # Take rustPackages from staging nixpkgs
-  stagingNixpkgs = import stagingNixpkgsSrc {
+  futureNixpkgs = import futureNixpkgsSrc {
     localSystem = self.stdenv.buildPlatform;
     config = self.config;
   } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
     crossSystem = self.stdenv.hostPlatform;
   });
-  futureRustPackages = stagingNixpkgs.rustPackages;
+  futureRustPackages = futureNixpkgs.rustPackages;
 
   # Create nixpkgs with future rust
   nixpkgsWithFutureRust = self.extend (futureSelf: futureSuper: {