refactor(overlays): move regreet and clean up dracula-theme
This commit is contained in:
parent
b04e6e5ab9
commit
13f0062331
5 changed files with 66 additions and 72 deletions
common/overlays
|
|
@ -3,12 +3,8 @@
|
|||
nixpkgs-wayland,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./dracula-theme
|
||||
./regreet
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(import ./dracula-theme)
|
||||
(import ./spotifywm)
|
||||
(import ./squeekboard)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
});
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/gui/component.rs b/src/gui/component.rs
|
||||
index 692309c..f2fb9c0 100644
|
||||
--- a/src/gui/component.rs
|
||||
+++ b/src/gui/component.rs
|
||||
@@ -371,7 +371,7 @@ impl AsyncComponent for Greeter {
|
||||
if let Some(monitor) = &model.updates.monitor {
|
||||
// The window needs to be manually fullscreened, since the monitor is `None` at widget
|
||||
// init.
|
||||
- root.fullscreen_on_monitor(monitor);
|
||||
+ // root.fullscreen_on_monitor(monitor);
|
||||
} else {
|
||||
// Couldn't choose a monitor, so let the compositor choose it for us.
|
||||
root.fullscreen();
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
programs.regreet = {
|
||||
package = pkgs.greetd.regreet.overrideAttrs (self: super: rec {
|
||||
version = "0.1.1-patched";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "rharish101";
|
||||
repo = "ReGreet";
|
||||
rev = "61d871a0ee5c74230dfef8100d0c9bc75b309203";
|
||||
hash = "sha256-PkQTubSm/FN3FXs9vBB3FI4dXbQhv/7fS1rXkVsTAAs=";
|
||||
};
|
||||
cargoDeps = super.cargoDeps.overrideAttrs (_: {
|
||||
inherit src;
|
||||
outputHash = "sha256-dR6veXCGVMr5TbCvP0EqyQKTG2XM65VHF9U2nRWyzfA=";
|
||||
});
|
||||
|
||||
# temp fix until https://github.com/rharish101/ReGreet/issues/32 is solved
|
||||
patches = [./crash-fix.patch];
|
||||
});
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue