From 13f0062331c53ffaa3ff5424fafb8ddbb4670102 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Fri, 8 Dec 2023 14:21:23 -0500 Subject: [PATCH] refactor(overlays): move regreet and clean up dracula-theme --- common/overlays/default.nix | 6 +- common/overlays/dracula-theme/default.nix | 130 +++++++++--------- .../greetd}/crash-fix.patch | 0 modules/greetd/default.nix | 2 + .../default.nix => modules/greetd/regreet.nix | 0 5 files changed, 66 insertions(+), 72 deletions(-) rename {common/overlays/regreet => modules/greetd}/crash-fix.patch (100%) rename common/overlays/regreet/default.nix => modules/greetd/regreet.nix (100%) diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 192f23e..a37a19e 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -3,12 +3,8 @@ nixpkgs-wayland, ... }: { - imports = [ - ./dracula-theme - ./regreet - ]; - nixpkgs.overlays = [ + (import ./dracula-theme) (import ./spotifywm) (import ./squeekboard) diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix index 20899c4..0be808a 100644 --- a/common/overlays/dracula-theme/default.nix +++ b/common/overlays/dracula-theme/default.nix @@ -1,87 +1,83 @@ -{pkgs, ...}: let - plymouth = pkgs.fetchFromGitHub { - owner = "dracula"; - repo = "plymouth"; - rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96"; - hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA="; - }; +(final: prev: { + dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let + plymouth = prev.fetchFromGitHub { + owner = "dracula"; + repo = "plymouth"; + rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96"; + hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA="; + }; - dracula-script = ./dracula-plymouth.patch; + dracula-script = ./dracula-plymouth.patch; - git-colors = pkgs.fetchFromGitHub { - owner = "dracula"; - repo = "git"; - rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73"; - hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM="; - }; + git-colors = prev.fetchFromGitHub { + owner = "dracula"; + repo = "git"; + rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73"; + hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM="; + }; - wallpaper = pkgs.fetchurl { - url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true"; - hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk="; - }; -in { - nixpkgs.overlays = [ - (final: prev: { - dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: { - src = prev.fetchFromGitHub { - owner = "dracula"; - repo = "gtk"; - rev = "84dd7a3021938ceec8a0ee292a8561f8a6d47ebe"; - hash = "sha256-xHf+f0RGMtbprJX+3c0cmp5LKkf0V7BHKcoiAW60du8="; - }; + wallpaper = prev.fetchurl { + url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true"; + hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk="; + }; + in { + src = prev.fetchFromGitHub { + owner = "dracula"; + repo = "gtk"; + rev = "84dd7a3021938ceec8a0ee292a8561f8a6d47ebe"; + hash = "sha256-xHf+f0RGMtbprJX+3c0cmp5LKkf0V7BHKcoiAW60du8="; + }; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - # Git colors - cp -a ${git-colors}/config/gitconfig ./git-colors - chmod 777 ./git-colors + # Git colors + cp -a ${git-colors}/config/gitconfig ./git-colors + chmod 777 ./git-colors - line=$(grep -n 'Dracula Dark Theme' ./git-colors | cut -d: -f1) - sed -i "1,$((line-1))d" ./git-colors + line=$(grep -n 'Dracula Dark Theme' ./git-colors | cut -d: -f1) + sed -i "1,$((line-1))d" ./git-colors - mkdir -p $out - cp -a ./git-colors $out + mkdir -p $out + cp -a ./git-colors $out - # Plymouth - cp -a ${plymouth}/dracula ./dracula - chmod 777 ./dracula + # Plymouth + cp -a ${plymouth}/dracula ./dracula + chmod 777 ./dracula - rm ./dracula/dracula.script - cp -a ${dracula-script} ./dracula/dracula.script + rm ./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 - cp -a ./dracula $out/share/plymouth/themes/ + mkdir -p $out/share/plymouth/themes + cp -a ./dracula $out/share/plymouth/themes/ - # Wallpapers - cp -a ${wallpaper} ./waves.png + # Wallpapers + cp -a ${wallpaper} ./waves.png - mkdir -p $out/wallpapers - cp -a ./waves.png $out/wallpapers/ + mkdir -p $out/wallpapers + cp -a ./waves.png $out/wallpapers/ - # ------------------------------------------- - 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 + # ------------------------------------------- + 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 kde/{color-schemes,plasma} $out/share/ - cp -a kde/kvantum $out/share/Kvantum + cp -a kde/{color-schemes,plasma} $out/share/ + cp -a kde/kvantum $out/share/Kvantum - mkdir -p $out/share/aurorae/themes - cp -a kde/aurorae/* $out/share/aurorae/themes/ + mkdir -p $out/share/aurorae/themes + cp -a kde/aurorae/* $out/share/aurorae/themes/ - mkdir -p $out/share/sddm/themes - cp -a kde/sddm/* $out/share/sddm/themes/ + mkdir -p $out/share/sddm/themes + cp -a kde/sddm/* $out/share/sddm/themes/ - 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/cursors $out/share/icons/Dracula-cursors/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/cursors $out/share/icons/Dracula-cursors/cursors - runHook postInstall - ''; - }); - }) - ]; -} + runHook postInstall + ''; + }); +}) diff --git a/common/overlays/regreet/crash-fix.patch b/modules/greetd/crash-fix.patch similarity index 100% rename from common/overlays/regreet/crash-fix.patch rename to modules/greetd/crash-fix.patch diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index c4db153..726a5a5 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -71,6 +71,8 @@ " ${hyprBin}/hyprctl dispatch exit" ])); in { + imports = [./regreet.nix]; + users.users.greeter = { packages = with pkgs; [ dracula-theme diff --git a/common/overlays/regreet/default.nix b/modules/greetd/regreet.nix similarity index 100% rename from common/overlays/regreet/default.nix rename to modules/greetd/regreet.nix