From e0e6c637cabac9afbc93d8af4d243507108d3c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Tue, 26 Dec 2023 13:36:41 +0100 Subject: [PATCH] feat: wallpaper fix --- home/desktops/hyprland/darkman.nix | 26 +++++++++++++++++++------- home/desktops/hyprland/default.nix | 1 + 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/home/desktops/hyprland/darkman.nix b/home/desktops/hyprland/darkman.nix index 2079977..ee258ab 100644 --- a/home/desktops/hyprland/darkman.nix +++ b/home/desktops/hyprland/darkman.nix @@ -3,7 +3,9 @@ config, ... }: { - services.darkman = { + services.darkman = let + wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg"; + in { enable = true; package = pkgs.buildGoModule rec { pname = "darkman"; @@ -70,9 +72,14 @@ '' ${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Frappe ''; - wallpaper = '' - ${pkgs.swww}/bin/swww img ${./wallpapers/Lakeside-2/Lakeside-2-1.jpg} - ''; + wallpaper = + /* + bash + */ + '' + ${pkgs.coreutils}/bin/ln -sf ${./wallpapers/Lakeside-2/Lakeside-2-1.jpg} ${wallpaperPath} + ${pkgs.swww}/bin/swww img ${wallpaperPath} + ''; }; lightModeScripts = { gtk-theme = @@ -90,9 +97,14 @@ '' ${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Latte ''; - wallpaper = '' - ${pkgs.swww}/bin/swww img ${./wallpapers/Lakeside-2/Lakeside-2-10.jpg} - ''; + wallpaper = + /* + bash + */ + '' + ${pkgs.coreutils}/bin/ln -sf ${./wallpapers/Lakeside-2/Lakeside-2-10.jpg} ${wallpaperPath} + ${pkgs.swww}/bin/swww img ${wallpaperPath} + ''; }; }; } diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 1eb238f..187941b 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -29,6 +29,7 @@ ]; exec-once = [ "swww init" + "swww img ~/.local/state/wallpaper.jpg" "ags" "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XAUTHORITY" "dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XAUTHORITY"