pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Modify local pkg expressions to remove duplicate names when using

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-12 10:39:46 +01:00
parent 7c43d7b8a6
commit e0c2d59377
7 changed files with 102 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
desktop/pkgs/sddm-catppuccin-macchiato/default.nix
View file

@ -1,21 +1,23 @@
{ {
lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
}: { }:
sddm-catppuccin-macchiato = stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "sddm-catppuccin-macchiato-theme"; pname = "sddm-catppuccin-macchiato-theme";
version = "1.0"; version = "1.0";
dontBuild = true; dontBuild = true;
installPhase = ''
mkdir -p $out/share/sddm/themes src = fetchFromGitHub {
cp -aR $src/src/catppuccin-macchiato $out/share/sddm/themes/catppuccin-macchiato owner = "catppuccin";
''; repo = "sddm";
src = fetchFromGitHub { rev = "bde6932e1ae0f8fdda76eff5c81ea8d3b7d653c0";
owner = "catppuccin"; sha256 = "ceaK/I5lhFz6c+UafQyQVJIzzPxjmsscBgj8130D4dE=";
repo = "sddm";
rev = "bde6932e1ae0f8fdda76eff5c81ea8d3b7d653c0";
sha256 = "ceaK/I5lhFz6c+UafQyQVJIzzPxjmsscBgj8130D4dE=";
};
}; };
installPhase = ''
runHook preInstall
mkdir -p $out/share/sddm/themes
cp -aR $src/src/catppuccin-macchiato $out/share/sddm/themes/catppuccin-macchiato
runHook postInstall
'';
} }

4
desktop/sddm.nix
View file

@ -2,9 +2,7 @@
sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato {}; sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato {};
in { in {
imports = [./xserver.nix]; imports = [./xserver.nix];
environment.systemPackages = [ environment.systemPackages = [sddm-catppuccin-macchiato];
sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
];
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
enable = true; enable = true;
theme = "catppuccin-macchiato"; theme = "catppuccin-macchiato";

10
home/desktop/gtk.nix
View file

@ -3,12 +3,12 @@
config, config,
... ...
}: let }: let
candy = pkgs.callPackage ./pkgs/candy-icon-theme {}; candy-icon-theme = pkgs.callPackage ./pkgs/candy-icon-theme {};
sweet-folder = pkgs.callPackage ./pkgs/sweet-folder-theme {}; sweet-folder-theme = pkgs.callPackage ./pkgs/sweet-folder-theme {};
in { in {
home.packages = [ home.packages = [
candy.candy-icon-theme candy-icon-theme
sweet-folder.sweet-folder-theme sweet-folder-theme
pkgs.breeze-gtk pkgs.breeze-gtk
pkgs.gnome.adwaita-icon-theme pkgs.gnome.adwaita-icon-theme
pkgs.hicolor-icon-theme pkgs.hicolor-icon-theme
@ -20,7 +20,7 @@ in {
name = "Catppuccin-Macchiato-Dark-Cursors"; name = "Catppuccin-Macchiato-Dark-Cursors";
}; };
iconTheme = { iconTheme = {
package = sweet-folder.sweet-folder-theme; package = sweet-folder-theme.sweet-folder-theme;
name = "Sweet-Rainbow"; name = "Sweet-Rainbow";
}; };
theme = { theme = {

54
home/desktop/pkgs/candy-icon-theme/default.nix
View file

@ -1,35 +1,33 @@
{ {
lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
gtk3, gtk3,
}: { }:
candy-icon-theme = stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "candy-icon-theme"; pname = "candy-icon-theme";
version = "6a35be5cb133c6be8314807f55da3d795e24fb86"; version = "6a35be5cb133c6be8314807f55da3d795e24fb86";
dontBuild = true; dontBuild = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = "candy-icons"; repo = "candy-icons";
rev = version; rev = version;
sha256 = "sha256-M58ts/xyVf+ZDidd4MEp/LlU3vk2imEwOnb0/sVJUYo="; sha256 = "sha256-M58ts/xyVf+ZDidd4MEp/LlU3vk2imEwOnb0/sVJUYo=";
};
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/Sweet-folders
mv * $out/share/icons/Sweet-folders
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
}; };
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/Sweet-folders
mv * $out/share/icons/Sweet-folders
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
} }

63
home/desktop/pkgs/delta-icon-theme/default.nix
View file

@ -1,44 +1,33 @@
{ {
lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
gtk3, gtk3,
}: { }:
delta-icon-theme = stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "delta-icon-theme"; pname = "delta-icon-theme";
version = "194df98e422c0a81912194808b76712bf5d78803"; version = "194df98e422c0a81912194808b76712bf5d78803";
dontBuild = true; dontBuild = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Delta-Icons"; owner = "Delta-Icons";
repo = "linux"; repo = "linux";
rev = version; rev = version;
sha256 = "sha256-SSkI5Aj/TTHfDRYCWe7Ell6cWvPmBUeO/AC4xRrEUvU="; sha256 = "sha256-SSkI5Aj/TTHfDRYCWe7Ell6cWvPmBUeO/AC4xRrEUvU=";
};
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv Delta $out/share/icons
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
# meta = with lib; {
# description = "Delta icon theme";
# homepage = "https://github.com/Delta-Icons/Linux";
# license = licenses.gpl3Only;
# # darwin gives hash mismatch in source, probably because of file names differing only in case
# platforms = platforms.linux;
# maintainers = with maintainers; [];
# };
}; };
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv Delta $out/share/icons
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
} }

1
home/desktop/pkgs/rot8/default.nix
View file

@ -1,5 +1,4 @@
{ {
lib,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
}: }:

54
home/desktop/pkgs/sweet-folder-theme/default.nix
View file

@ -1,35 +1,33 @@
{ {
lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
gtk3, gtk3,
}: { }:
sweet-folder-theme = stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "sweet-folder-theme"; pname = "sweet-folder-theme";
version = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec"; version = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec";
dontBuild = true; dontBuild = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EliverLara"; owner = "EliverLara";
repo = "Sweet-folders"; repo = "Sweet-folders";
rev = version; rev = version;
sha256 = "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE="; sha256 = "sha256-QexfqXH5a1IEhKBRjWSMdrEvThvLRzd4M32Xti1DCGE=";
};
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv Sweet-Rainbow $out/share/icons
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
}; };
nativeBuildInputs = [gtk3];
dontDropIconThemeCache = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
mv Sweet-Rainbow $out/share/icons
for theme in $out/share/icons/*; do
gtk-update-icon-cache --force $theme
done
runHook postInstall
'';
} }