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

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

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)

View file

@ -1,5 +1,6 @@
{pkgs, ...}: let (final: prev: {
plymouth = pkgs.fetchFromGitHub { dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
plymouth = prev.fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "plymouth"; repo = "plymouth";
rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96"; rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
@ -8,21 +9,18 @@
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 = [
(final: prev: {
dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: {
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "gtk"; repo = "gtk";
@ -82,6 +80,4 @@ in {
runHook postInstall runHook postInstall
''; '';
}); });
}) })
];
}

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