diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 6e1ab6f..803be77 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -238,10 +239,29 @@ hypr = { land = { enable = true; - extraSettings = { + extraSettings = let + inherit (config.myOptions.other.system) username; + hmCfg = config.home-manager.users.${username}; + inherit (inputs.nixpkgs-wayland.packages.${pkgs.system}) swww; + nix_wallpaper = pkgs.fetchurl { + url = "https://i.ibb.co/vZ5JF95/nix-Wallpaper.png"; + hash = "sha256-BqOBvRFXFrX/QLI70OLAIcpbbiUH/jUMK97yqCfY+mI="; + }; + poz_layer = ./poz.png; + + out_dir = "${hmCfg.xdg.dataHome}/hypr"; + out_path = "${out_dir}/nix.png"; + in { exec-once = [ "${pkgs.rot8}/bin/rot8 --threshold 0.75" "${pkgs.wvkbd}/bin/wvkbd-mobintl --hidden -L 500" + + "${pkgs.coreutils-full}/bin/mkdir -p ${out_dir}" + "${pkgs.imagemagick}/bin/magick ${nix_wallpaper} ${poz_layer} -layers flatten ${out_path}" + ]; + exec = [ + # wait a bit then set the wallpapers + "sleep 0.5 && ${swww}/bin/swww img -o eDP-1 ${out_path}" ]; }; }; diff --git a/hosts/del/poz.png b/hosts/del/poz.png new file mode 100644 index 0000000..0607eb2 Binary files /dev/null and b/hosts/del/poz.png differ diff --git a/modules/gui/hypr/catppuccin-wall0.png b/hosts/niks/catppuccin-wall0.png similarity index 100% rename from modules/gui/hypr/catppuccin-wall0.png rename to hosts/niks/catppuccin-wall0.png diff --git a/modules/gui/hypr/catppuccin-wall1.png b/hosts/niks/catppuccin-wall1.png similarity index 100% rename from modules/gui/hypr/catppuccin-wall1.png rename to hosts/niks/catppuccin-wall1.png diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 75d1b7b..f5c819d 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -175,6 +175,15 @@ extraPlugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ]; + extraSettings = { + exec = let + inherit (inputs.nixpkgs-wayland.packages.${pkgs.system}) swww; + in [ + # wait a bit then set the wallpapers + "sleep 0.5 && ${swww}/bin/swww img -o eDP-1 ${./catppuccin-wall0.png}" + "sleep 0.5 && ${swww}/bin/swww img -o HDMI-A-1 ${./catppuccin-wall1.png}" + ]; + }; }; lock.enable = true; }; diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix index 05dc140..d65ef75 100644 --- a/modules/gui/hypr/land.nix +++ b/modules/gui/hypr/land.nix @@ -477,10 +477,6 @@ in { "[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum" "[workspace special:pipewire silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol" - # wait a bit then set the wallpapers - "sleep 0.5 && ${swww}/bin/swww img -o eDP-1 ${./catppuccin-wall0.png}" - "sleep 0.5 && ${swww}/bin/swww img -o HDMI-A-1 ${./catppuccin-wall1.png}" - "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator" "${pkgs.blueman}/bin/blueman-applet" ] ++ cfg.extraSettings.exec;