refactor overlay

This commit is contained in:
Alex 2024-08-01 17:27:02 -04:00
parent e4c1b7e498
commit e28827027e
4 changed files with 12 additions and 29 deletions

View File

@ -8,17 +8,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; }; pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; };
# test = pkgs.adwaita-icon-theme;
# atauPkgs = {
# atau-wallpapers = pkgs.callPackage ./atau-wallpapers { };
# # theme-platinum9 = pkgs.callPackage ./theme-platinum9 {
# # adwaita-icon-theme = test;
# # };
# gtk-theme-mac-os-9 = pkgs.callPackage./gtk-theme-mac-os-9 { };
# nineicons-redux = pkgs.callPackage./nineicons-redux { };
# };
in in
{ {
packages.${system} = pkgs; packages.${system} = pkgs;

View File

@ -1,6 +1,6 @@
{ lib, stdenv }: { lib, stdenvNoCC }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "nineicons-redux"; name = "nineicons-redux";
pname = name; pname = name;
version = "3cc6c532a2fcbfa2d9d15b91f7fbc0a98ddb5cf3"; version = "3cc6c532a2fcbfa2d9d15b91f7fbc0a98ddb5cf3";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
rev = version; rev = version;
}; };
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

View File

@ -2,6 +2,7 @@ prev: final: {
atau-pkgs = { atau-pkgs = {
atau-wallpapers = final.callPackage ./atau-wallpapers { }; atau-wallpapers = final.callPackage ./atau-wallpapers { };
gtk-theme-mac-os-9 = final.callPackage ./gtk-theme-mac-os-9 { }; gtk-theme-mac-os-9 = final.callPackage ./gtk-theme-mac-os-9 { };
theme-platinum9 = final.callPackage ./theme-platinum9 { };
nineicons-redux = final.callPackage ./nineicons-redux { }; nineicons-redux = final.callPackage ./nineicons-redux { };
}; };
} }

View File

@ -1,6 +1,6 @@
{ lib, stdenv, gtk3, adwaita-icon-theme, ... }: { lib, stdenvNoCC, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "theme-platinum9"; name = "theme-platinum9";
pname = name; pname = name;
version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008"; version = "d3d2080c1a2d5772714d089d1dc1daeeb41db008";
@ -14,13 +14,6 @@ stdenv.mkDerivation rec {
gtk3 gtk3
]; ];
propagatedBuildInputs = [
adwaita-icon-theme
# hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -30,23 +23,21 @@ stdenv.mkDerivation rec {
mv PlatiPlus "$out/share/themes" mv PlatiPlus "$out/share/themes"
mv PlatiPlus26 "$out/share/themes" mv PlatiPlus26 "$out/share/themes"
# Install icons chmod 644 -R $out/share/themes
mkdir -p "$out/share/icons"
mv NineIcons/ "$out/share/icons"
for theme in $out/share/icons/*; do
gtk-update-icon-cache "$theme"
done
# Install fonts # Install fonts
mkdir -p "$out/share/fonts/truetype" mkdir -p "$out/share/fonts/truetype"
mv Charcoal.ttf "$out/share/fonts/truetype" mv Charcoal.ttf "$out/share/fonts/truetype"
mv MONACO.TTF "$out/share/fonts/truetype" mv MONACO.TTF "$out/share/fonts/truetype"
chmod 644 -R $out/share/fonts
# Install wallpapers # Install wallpapers
mkdir -p "$out/share/backgrounds" mkdir -p "$out/share/backgrounds"
mv OS9-wallpaper/ "$out/share/backgrounds" mv OS9-wallpaper/ "$out/share/backgrounds"
chmod 644 -R $out/share/backgrounds
runHook postInstall runHook postInstall
''; '';