hyrpland: refactor into modules

home/modules/hyprland/hyprland.nix

@@ -6,11 +6,6 @@ let
     script = pkgs.writeScriptBin filename (builtins.readFile (./scripts/search-window.sh));
     path = "${script}/bin/${filename}";
   };
-  init-wallpaper = rec {
-    filename = "init-wallpaper.sh";
-    script = pkgs.writeScriptBin filename (builtins.readFile (./scripts/init-wallpaper.sh));
-    path = "${script}/bin/${filename}";
-  };
 in
 {
   config = lib.mkIf cfg.enable {
@@ -25,6 +20,9 @@ in
       enable = true;
       systemd.variables = [ "all" ];
       settings = {
+        exec-once = lib.mkOrder 5 [
+          ''${pkgs.dbus}/bin/dbus-update-activation-environment --all''
+        ];
         # window decors
         general = {
           gaps_in = 10;
@@ -205,11 +203,8 @@ in
         ];
       };
       extraConfig = /*hyprlang*/ ''
-        exec-once=dbus-update-activation-environment --all
         exec-once=foot --server
 
-        exec-once=${init-wallpaper.path} ${./wallpaper.jpeg}
-        exec-once=wallust run ${config.home.homeDirectory}/.cache/wallpaper/current
         exec-once=swww-daemon
         exec-once=bash -c "sleep 10; hypridle"
         exec-once=waybar

home/modules/hyprland/scripts/gnome-keyring.sh

@@ -1,6 +0,0 @@
-#/usr/bin/bash
-
-secret_file=$1
-
-cat "$secret_file" | gnome-keyring-daemon --unlock
-gnome-keyring-daemon --start --components=pkcs11,secrets,ssh

home/modules/hyprland/scripts/init-wallpaper.sh

@@ -1,26 +0,0 @@
-#/usr/bin/env bash
-
-# This shell script ensures there are wallpaper files in expected locations
-# where hyprland ecosystem expected them to find.
-#
-# Requirements:
-#   - GraphicsMagick for the 'gm' command.
-
-if [ "$1" == "" ]; then
-	echo "Initial image path is required"
-	exit 1
-fi
-
-init_wallpaper="$1"
-cache_file="$HOME/.cache/wallpaper/current"
-blurred="$HOME/.cache/wallpaper/blurred.png"
-
-mkdir -p $HOME/.cache/wallpaper
-
-if [ ! -f "$cache_file" ]; then
-	cp "$init_wallpaper" "$cache_file"
-fi
-
-if [ ! -f "$blurred" ]; then
-	gm convert -resize 75% -blur 50x30 "$cache_file" "$blurred"
-fi

home/modules/hyprland/wallust.nix

@@ -1,28 +1,46 @@
 { pkgs, unstable, lib, config, ... }:
 let
   cfg = config.profile.hyprland;
+  inherit (lib.meta) getExe;
   wallust = cfg.wallust;
+  wallpaperDir = "${config.home.homeDirectory}/.cache/wallpaper";
+  initWallPaperScript = pkgs.writeShellScriptBin "init-wallpaper.sh" ''
+    init_wallpaper="${./wallpaper.jpeg}"
+    cache_file="${wallpaperDir}/current"
+    blurred="${wallpaperDir}/blurred"
+
+    mkdir -p "${wallpaperDir}"
+
+    if [ ! -f "$cache_file" ]; then
+        cp "$init_wallpaper" "$cache_file"
+    fi
+
+    if [ ! -f "$blurred" ]; then
+        ${pkgs.imagemagick}/bin/gm convert -resize 75% -blur 50x30 "$cache_file" "$blurred"
+    fi
+
+    if [ ! -f "${config.home.homeDirectory}/.cache/wallust/sequences" ]; then
+        wallust run "$cache_file"
+    fi
+  '';
 in
 {
   config = lib.mkIf cfg.enable {
     home.packages = [
       pkgs.imagemagick
-      # unstable.wallust
+      unstable.wallust
-      (pkgs.callPackage ./wallust-build.nix { })
     ];
 
+    wayland.windowManager.hyprland.settings.exec-once = lib.mkOrder 10 ([
+      (getExe initWallPaperScript)
+    ]);
+
     home.file.".config/wallust/templates" = {
       source = ./wallust-templates;
       recursive = true;
     };
 
-    home.file.".config/wallust/wallust.toml".source =
+    home.file.".config/wallust/wallust.toml".source = ((pkgs.formats.toml { }).generate "wallust.toml" {
-      let
-        tomlFormat = pkgs.formats.toml { };
-      in
-      tomlFormat.generate
-        "wallust.toml"
-        {
       # See https://codeberg.org/explosion-mental/wallust/src/branch/master/wallust.toml
       # for more information about the configuration options.
 
@@ -99,7 +117,6 @@ in
             target = "${config.home.homeDirectory}/.config/foot/colors.ini";
           };
         };
+    });
   };
-  };
-
 }