Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: Wroclaw:f85b7d92118c6b6cf32a4ddca756341950a3a158
Branches Tags
Wroclaw:main
Wroclaw:cosmic
Wroclaw:flakelike
...
compare: Wroclaw:f47db28aa2c5961d6afa066e22ff45565a2b7b41
Branches Tags
Wroclaw:main
Wroclaw:cosmic
Wroclaw:flakelike

6 commits
f85b7d9211 ... f47db28aa2

Author SHA1 Message Date
Wroclaw
f47db28aa2 nixos/cosmic: remove cosmic terminal and editor 2024-08-17 00:11:10 +02:00
Wroclaw
b8aba059e6 pkgs/overlays/cosmic-packages: update staging nixpkgs pin to current unstable 2024-08-17 00:11:10 +02:00
Wroclaw
2012c6e33b lock: update nixpkgs 2024-08-17 00:11:10 +02:00
Wroclaw
ccb08c76c8 pkgs/mkScriptOverride: change attributes to remove to proper ones 
from argument set
 2024-08-17 00:10:45 +02:00
Wroclaw
26566f97dd pkgs/mkScriptOverride: support for default name from path 2024-08-16 16:45:13 +02:00
Wroclaw
164ceef166 lock: update cosmic-modules 2024-08-16 16:44:45 +02:00
4 changed files with 19 additions and 13 deletions
Show stats Expand all files Collapse all files

8
lock.nix
View file

@ -4,11 +4,11 @@
sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h"; sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h";
}; };
nixpkgs = { nixpkgs = {
revision = "883180e6550c1723395a3a342f830bfc5c371f6b"; revision = "c3d4ac725177c030b1e289015989da2ad9d56af0";
sha256 = "01axrf25mahbxmp6vgfgx09dflbyaavr5liynkp6rpm4lkacr27f"; sha256 = "1n3dm76ip39zgw75jjn8ak9yp25m02ya1mzzg3764yfqq4jz18mj";
}; };
cosmic-modules = { cosmic-modules = {
revision = "d8b2b9aee034c10ca67848653171f576f87434a8"; revision = "7d3dd56cca20e409261ff8c69867d38376f7ecae";
sha256 = "03i8smxgx2fdb9kkys81dihb5yja3nk9wjs1rx5h7f3b5kii1fd7"; sha256 = "06i1gqwgrpcarmkszcnblx02804n86424sklw4mva0p47j9n7gww";
}; };
} }

4
nix-os/desktopManagers/cosmic.nix
View file

@ -6,5 +6,9 @@
]; ];
config = { config = {
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
environment.cosmic.excludePackages = with pkgs; [
cosmic-edit
cosmic-term
];
}; };
} }

8
pkgs/by-name/mk/mkScriptOverride/package.nix
View file

@ -11,7 +11,9 @@
lib.hiPrio (stdenv.mkDerivation ( lib.hiPrio (stdenv.mkDerivation (
{ {
src = src; 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" ]; phases = [ "installPhase" "scriptOverridePhase" ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -23,7 +25,7 @@ lib.hiPrio (stdenv.mkDerivation (
''; '';
scriptOverridePhase = script; scriptOverridePhase = script;
} // lib.removeAttrs args [ } // lib.removeAttrs args [
"pkg" "src"
"commands" "script"
] ]
)) ))

12
pkgs/overlays/cosmic-packages.nix
View file

@ -7,21 +7,21 @@ let
cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs"; cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir); cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
# FIXME: use unstable nixpkgs when rust 1.80 will be available in unstable # Pinned unstable nixpkgs
stagingNixpkgsSrc = builtins.fetchTarball { futureNixpkgsSrc = builtins.fetchTarball {
name = "nixpkgs"; name = "nixpkgs";
url = "https://github.com/NixOS/nixpkgs/archive/b79cec4237cd0f655562890bf927466c68b48d68.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz";
sha256 = "1mswisq9iwffg2d6rfxvr27mvi4w853d9rn222s2g76445d0iqh8"; sha256 = "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr";
}; };
# Take rustPackages from staging nixpkgs # Take rustPackages from staging nixpkgs
stagingNixpkgs = import stagingNixpkgsSrc { futureNixpkgs = import futureNixpkgsSrc {
localSystem = self.stdenv.buildPlatform; localSystem = self.stdenv.buildPlatform;
config = self.config; config = self.config;
} // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else { } // (if self.stdenv.buildPlatform == self.stdenv.hostPlatform then {} else {
crossSystem = self.stdenv.hostPlatform; crossSystem = self.stdenv.hostPlatform;
}); });
futureRustPackages = stagingNixpkgs.rustPackages; futureRustPackages = futureNixpkgs.rustPackages;
# Create nixpkgs with future rust # Create nixpkgs with future rust
nixpkgsWithFutureRust = self.extend (futureSelf: futureSuper: { nixpkgsWithFutureRust = self.extend (futureSelf: futureSuper: {