matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor(overlays): move regreet and clean up dracula-theme

Browse source
This commit is contained in:
matt1432 2023-12-08 14:21:23 -05:00
parent b04e6e5ab9
commit 13f0062331
5 changed files with 66 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/overlays/default.nix
View file

@ -3,12 +3,8 @@
nixpkgs-wayland, nixpkgs-wayland,
... ...
}: { }: {
imports = [
./dracula-theme
./regreet
];
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ./dracula-theme)
(import ./spotifywm) (import ./spotifywm)
(import ./squeekboard) (import ./squeekboard)

130
common/overlays/dracula-theme/default.nix
View file

@ -1,87 +1,83 @@
{pkgs, ...}: let (final: prev: {
plymouth = pkgs.fetchFromGitHub { dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
owner = "dracula"; plymouth = prev.fetchFromGitHub {
repo = "plymouth"; owner = "dracula";
rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96"; repo = "plymouth";
hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA="; rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
}; hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
};
dracula-script = ./dracula-plymouth.patch; dracula-script = ./dracula-plymouth.patch;
git-colors = pkgs.fetchFromGitHub { git-colors = prev.fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "git"; repo = "git";
rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73"; rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73";
hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM="; hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
}; };
wallpaper = pkgs.fetchurl { wallpaper = prev.fetchurl {
url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true"; url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk="; hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
}; };
in { in {
nixpkgs.overlays = [ src = prev.fetchFromGitHub {
(final: prev: { owner = "dracula";
dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: { repo = "gtk";
src = prev.fetchFromGitHub { rev = "84dd7a3021938ceec8a0ee292a8561f8a6d47ebe";
owner = "dracula"; hash = "sha256-xHf+f0RGMtbprJX+3c0cmp5LKkf0V7BHKcoiAW60du8=";
repo = "gtk"; };
rev = "84dd7a3021938ceec8a0ee292a8561f8a6d47ebe";
hash = "sha256-xHf+f0RGMtbprJX+3c0cmp5LKkf0V7BHKcoiAW60du8=";
};
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
# Git colors # Git colors
cp -a ${git-colors}/config/gitconfig ./git-colors cp -a ${git-colors}/config/gitconfig ./git-colors
chmod 777 ./git-colors chmod 777 ./git-colors
line=$(grep -n 'Dracula Dark Theme' ./git-colors | cut -d: -f1) line=$(grep -n 'Dracula Dark Theme' ./git-colors | cut -d: -f1)
sed -i "1,$((line-1))d" ./git-colors sed -i "1,$((line-1))d" ./git-colors
mkdir -p $out mkdir -p $out
cp -a ./git-colors $out cp -a ./git-colors $out
# Plymouth # Plymouth
cp -a ${plymouth}/dracula ./dracula cp -a ${plymouth}/dracula ./dracula
chmod 777 ./dracula chmod 777 ./dracula
rm ./dracula/dracula.script rm ./dracula/dracula.script
cp -a ${dracula-script} ./dracula/dracula.script cp -a ${dracula-script} ./dracula/dracula.script
sed -i "s@\/usr\/@$out\/@" ./dracula/dracula.plymouth sed -i "s@\/usr\/@$out\/@" ./dracula/dracula.plymouth
mkdir -p $out/share/plymouth/themes mkdir -p $out/share/plymouth/themes
cp -a ./dracula $out/share/plymouth/themes/ cp -a ./dracula $out/share/plymouth/themes/
# Wallpapers # Wallpapers
cp -a ${wallpaper} ./waves.png cp -a ${wallpaper} ./waves.png
mkdir -p $out/wallpapers mkdir -p $out/wallpapers
cp -a ./waves.png $out/wallpapers/ cp -a ./waves.png $out/wallpapers/
# ------------------------------------------- # -------------------------------------------
mkdir -p $out/share/themes/Dracula mkdir -p $out/share/themes/Dracula
cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,gtk-4.0,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Dracula cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,gtk-4.0,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Dracula
cp -a kde/{color-schemes,plasma} $out/share/ cp -a kde/{color-schemes,plasma} $out/share/
cp -a kde/kvantum $out/share/Kvantum cp -a kde/kvantum $out/share/Kvantum
mkdir -p $out/share/aurorae/themes mkdir -p $out/share/aurorae/themes
cp -a kde/aurorae/* $out/share/aurorae/themes/ cp -a kde/aurorae/* $out/share/aurorae/themes/
mkdir -p $out/share/sddm/themes mkdir -p $out/share/sddm/themes
cp -a kde/sddm/* $out/share/sddm/themes/ cp -a kde/sddm/* $out/share/sddm/themes/
mkdir -p $out/share/icons/Dracula-cursors mkdir -p $out/share/icons/Dracula-cursors
mv kde/cursors/Dracula-cursors/index.theme $out/share/icons/Dracula-cursors/cursor.theme mv kde/cursors/Dracula-cursors/index.theme $out/share/icons/Dracula-cursors/cursor.theme
mv kde/cursors/Dracula-cursors/cursors $out/share/icons/Dracula-cursors/cursors mv kde/cursors/Dracula-cursors/cursors $out/share/icons/Dracula-cursors/cursors
runHook postInstall runHook postInstall
''; '';
}); });
}) })
];
}

0
common/overlays/regreet/crash-fix.patch → modules/greetd/crash-fix.patch
View file

2
modules/greetd/default.nix
View file

@ -71,6 +71,8 @@
" ${hyprBin}/hyprctl dispatch exit" " ${hyprBin}/hyprctl dispatch exit"
])); ]));
in { in {
imports = [./regreet.nix];
users.users.greeter = { users.users.greeter = {
packages = with pkgs; [ packages = with pkgs; [
dracula-theme dracula-theme

0
common/overlays/regreet/default.nix → modules/greetd/regreet.nix
View file