1
Fork 0

Make hyprpaper and eww reloading work properly

Additionally, add some extra wallpapers
This commit is contained in:
Matei Adriel 2023-11-14 17:49:12 +01:00
parent 756bbce430
commit 9137b2656f
No known key found for this signature in database
8 changed files with 18 additions and 17 deletions

View file

@ -4,16 +4,19 @@ let
# {{{ Catppuccin variants # {{{ Catppuccin variants
catppuccin-mocha = { catppuccin-mocha = {
stylix = { stylix = {
image = ./wallpapers/auto/catppuccin-mocha-rain-world.png; image = ./wallpapers/breaking_phos.jpg;
base16Scheme = "${inputs.catppuccin-base16}/base16/mocha.yaml"; base16Scheme = "${inputs.catppuccin-base16}/base16/mocha.yaml";
polarity = "dark"; polarity = "dark";
}; };
satellite = { }; satellite = {
transparency.alpha = 0.7;
rounding.radius = 8.0;
};
}; };
catppuccin-latte = { catppuccin-latte = {
stylix = { stylix = {
image = ./wallpapers/needygirloverdose.jpg; image = ./wallpapers/happy_phos.png;
base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml"; base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
polarity = "light"; polarity = "light";
}; };
@ -25,7 +28,7 @@ let
catppuccin-macchiato = { catppuccin-macchiato = {
stylix = { stylix = {
image = ./wallpapers/lapis_lazuli.jpg; image = ./wallpapers/breaking_phos.jpg;
base16Scheme = "${inputs.catppuccin-base16}/base16/macchiato.yaml"; base16Scheme = "${inputs.catppuccin-base16}/base16/macchiato.yaml";
polarity = "dark"; polarity = "dark";
}; };
@ -71,7 +74,7 @@ let
purplepink-light = { purplepink-light = {
stylix = { stylix = {
image = ./wallpapers/needygirloverdose.jpg; image = ./wallpapers/spaceship.jpg;
base16Scheme = ./schemes/gpt-themes/purplepink-light.yaml; base16Scheme = ./schemes/gpt-themes/purplepink-light.yaml;
polarity = "light"; polarity = "light";
}; };

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

View file

@ -2,19 +2,19 @@
lib.fix (self: { lib.fix (self: {
"Catppuccin Mocha" = fetchurl { "Catppuccin Mocha" = fetchurl {
url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
sha256 = "1zw1vmksn4hi0mr5w9k23l18agvkis0fih69yjsm7x4a2dqfq35h"; sha256 = "1agw88vg2dh948365mx8x7hzvghvscdpqhm70icg2x6bs5zszg9l";
}; };
"Catppuccin Frappe" = fetchurl { "Catppuccin Frappe" = fetchurl {
url = "https://catppuccin.github.io/discord/dist/catppuccin-frappe.theme.css"; url = "https://catppuccin.github.io/discord/dist/catppuccin-frappe.theme.css";
sha256 = "1x94q0k3f3mclkx6hibyjnl8fgjz39snbr8sqm5kjkyavv6hbhif"; sha256 = "0rrz71n05jb0fd2jymis43i325y87qwrb5s6rryh8gd8anbk8h6y";
}; };
"Catppuccin Latte" = fetchurl { "Catppuccin Latte" = fetchurl {
url = "https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css"; url = "https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css";
sha256 = "0884c2yf0rq5rrx4hl42f6kb6kjn1mz6122sf9qzl7lqkgm1d808"; sha256 = "17l8gl0sbiv9708gcbbks246qpxczkz61mjd1jzjrc48pngmzzkv";
}; };
"Catppuccin Macchiato" = fetchurl { "Catppuccin Macchiato" = fetchurl {
url = "https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css"; url = "https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css";
sha256 = "1525shpzslnjxp1yqm98zpicrypy7zh79hi2pr85qcqcfn05v9gh"; sha256 = "1dgq1sdy07m0ra3ysn1g29y2ba37cna3sxy2vv125f2pjmdx0vci";
}; };
default.dark = self."Catppuccin Macchiato"; default.dark = self."Catppuccin Macchiato";
default.light = self."Catppuccin Latte"; default.light = self."Catppuccin Latte";

View file

@ -1,14 +1,15 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
libnotify = lib.getExe pkgs.libnotify; libnotify = lib.getExe pkgs.libnotify;
systemctl = "${pkgs.systemd}/bin/systemctl";
wlsunset-toggle = pkgs.writeShellScriptBin "wlsunset-toggle" '' wlsunset-toggle = pkgs.writeShellScriptBin "wlsunset-toggle" ''
if [ "active" = "$(systemctl --user is-active wlsunset.service)" ] if [ "active" = "$(systemctl --user is-active wlsunset.service)" ]
then then
systemctl --user stop wlsunset.service ${systemctl} --user stop wlsunset.service
${libnotify} "Stopped wlsunset" ${libnotify} "Stopped wlsunset"
else else
systemctl --user start wlsunset.service ${systemctl} --user start wlsunset.service
${libnotify} "Started wlsunset" ${libnotify} "Started wlsunset"
fi fi
''; '';

View file

@ -7,7 +7,7 @@
}: }:
let let
reloadScript = pkgs.writeShellScript "reload_eww" '' reloadScript = pkgs.writeShellScript "reload_eww" ''
systemctl --user restart eww.service ${pkgs.systemd}/bin/systemctl
''; '';
cfg = config.programs.eww-hyprland; cfg = config.programs.eww-hyprland;
@ -51,10 +51,7 @@ in
xdg.configFile."eww/eww.yuck" = { xdg.configFile."eww/eww.yuck" = {
text = cfg.extraConfig or ""; text = cfg.extraConfig or "";
onChange = onChange = lib.mkIf cfg.autoReload reloadScript.outPath;
if cfg.autoReload
then reloadScript.outPath
else "";
}; };
systemd.user.services.eww = { systemd.user.services.eww = {

View file

@ -91,7 +91,7 @@ in
''; '';
onChange = (pkgs.writeShellScript "reload_hyprpaper" '' onChange = (pkgs.writeShellScript "reload_hyprpaper" ''
systemctl --user restart hyprpaper.service ${pkgs.systemd}/bin/systemctl --user restart hyprpaper.service
'').outPath; '').outPath;
}; };