diff --git a/common/themes/default.nix b/common/themes/default.nix index 506271b..eb64677 100644 --- a/common/themes/default.nix +++ b/common/themes/default.nix @@ -4,16 +4,19 @@ let # {{{ Catppuccin variants catppuccin-mocha = { stylix = { - image = ./wallpapers/auto/catppuccin-mocha-rain-world.png; + image = ./wallpapers/breaking_phos.jpg; base16Scheme = "${inputs.catppuccin-base16}/base16/mocha.yaml"; polarity = "dark"; }; - satellite = { }; + satellite = { + transparency.alpha = 0.7; + rounding.radius = 8.0; + }; }; catppuccin-latte = { stylix = { - image = ./wallpapers/needygirloverdose.jpg; + image = ./wallpapers/happy_phos.png; base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml"; polarity = "light"; }; @@ -25,7 +28,7 @@ let catppuccin-macchiato = { stylix = { - image = ./wallpapers/lapis_lazuli.jpg; + image = ./wallpapers/breaking_phos.jpg; base16Scheme = "${inputs.catppuccin-base16}/base16/macchiato.yaml"; polarity = "dark"; }; @@ -71,7 +74,7 @@ let purplepink-light = { stylix = { - image = ./wallpapers/needygirloverdose.jpg; + image = ./wallpapers/spaceship.jpg; base16Scheme = ./schemes/gpt-themes/purplepink-light.yaml; polarity = "light"; }; diff --git a/common/themes/wallpapers/breaking_phos.jpg b/common/themes/wallpapers/breaking_phos.jpg new file mode 100644 index 0000000..eb946ce Binary files /dev/null and b/common/themes/wallpapers/breaking_phos.jpg differ diff --git a/common/themes/wallpapers/cinnabar.png b/common/themes/wallpapers/cinnabar.png new file mode 100644 index 0000000..1153d5a Binary files /dev/null and b/common/themes/wallpapers/cinnabar.png differ diff --git a/common/themes/wallpapers/happy_phos.png b/common/themes/wallpapers/happy_phos.png new file mode 100644 index 0000000..5ad13a3 Binary files /dev/null and b/common/themes/wallpapers/happy_phos.png differ diff --git a/home/features/desktop/discord/themes.nix b/home/features/desktop/discord/themes.nix index 1ef1c3a..dcf7dc9 100644 --- a/home/features/desktop/discord/themes.nix +++ b/home/features/desktop/discord/themes.nix @@ -2,19 +2,19 @@ lib.fix (self: { "Catppuccin Mocha" = fetchurl { url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; - sha256 = "1zw1vmksn4hi0mr5w9k23l18agvkis0fih69yjsm7x4a2dqfq35h"; + sha256 = "1agw88vg2dh948365mx8x7hzvghvscdpqhm70icg2x6bs5zszg9l"; }; "Catppuccin Frappe" = fetchurl { url = "https://catppuccin.github.io/discord/dist/catppuccin-frappe.theme.css"; - sha256 = "1x94q0k3f3mclkx6hibyjnl8fgjz39snbr8sqm5kjkyavv6hbhif"; + sha256 = "0rrz71n05jb0fd2jymis43i325y87qwrb5s6rryh8gd8anbk8h6y"; }; "Catppuccin Latte" = fetchurl { url = "https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css"; - sha256 = "0884c2yf0rq5rrx4hl42f6kb6kjn1mz6122sf9qzl7lqkgm1d808"; + sha256 = "17l8gl0sbiv9708gcbbks246qpxczkz61mjd1jzjrc48pngmzzkv"; }; "Catppuccin Macchiato" = fetchurl { url = "https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css"; - sha256 = "1525shpzslnjxp1yqm98zpicrypy7zh79hi2pr85qcqcfn05v9gh"; + sha256 = "1dgq1sdy07m0ra3ysn1g29y2ba37cna3sxy2vv125f2pjmdx0vci"; }; default.dark = self."Catppuccin Macchiato"; default.light = self."Catppuccin Latte"; diff --git a/home/features/wayland/wlsunset.nix b/home/features/wayland/wlsunset.nix index 0644403..0ff07b0 100644 --- a/home/features/wayland/wlsunset.nix +++ b/home/features/wayland/wlsunset.nix @@ -1,14 +1,15 @@ { pkgs, lib, ... }: let libnotify = lib.getExe pkgs.libnotify; + systemctl = "${pkgs.systemd}/bin/systemctl"; wlsunset-toggle = pkgs.writeShellScriptBin "wlsunset-toggle" '' if [ "active" = "$(systemctl --user is-active wlsunset.service)" ] then - systemctl --user stop wlsunset.service + ${systemctl} --user stop wlsunset.service ${libnotify} "Stopped wlsunset" else - systemctl --user start wlsunset.service + ${systemctl} --user start wlsunset.service ${libnotify} "Started wlsunset" fi ''; diff --git a/modules/home-manager/eww-hyprland.nix b/modules/home-manager/eww-hyprland.nix index 17b9705..62c7900 100644 --- a/modules/home-manager/eww-hyprland.nix +++ b/modules/home-manager/eww-hyprland.nix @@ -7,7 +7,7 @@ }: let reloadScript = pkgs.writeShellScript "reload_eww" '' - systemctl --user restart eww.service + ${pkgs.systemd}/bin/systemctl ''; cfg = config.programs.eww-hyprland; @@ -51,10 +51,7 @@ in xdg.configFile."eww/eww.yuck" = { text = cfg.extraConfig or ""; - onChange = - if cfg.autoReload - then reloadScript.outPath - else ""; + onChange = lib.mkIf cfg.autoReload reloadScript.outPath; }; systemd.user.services.eww = { diff --git a/modules/home-manager/hyprpaper.nix b/modules/home-manager/hyprpaper.nix index 975f5fa..c415920 100644 --- a/modules/home-manager/hyprpaper.nix +++ b/modules/home-manager/hyprpaper.nix @@ -91,7 +91,7 @@ in ''; onChange = (pkgs.writeShellScript "reload_hyprpaper" '' - systemctl --user restart hyprpaper.service + ${pkgs.systemd}/bin/systemctl --user restart hyprpaper.service '').outPath; };