Regenerated
This commit is contained in:
+332
-395
File diff suppressed because it is too large
Load Diff
+43
-106
@@ -2115,7 +2115,7 @@ source = ./layer-rules.conf
|
||||
source = ./layout.conf
|
||||
source = ./monitor-rules.conf
|
||||
# source = ./window-rules.conf
|
||||
# source = ./workspace-rules.conf
|
||||
source = ./workspace-rules.conf
|
||||
|
||||
|
||||
exec-once = /nix/store/c9cnbxhxbagj7gfpc1g5hl4x4f8dzayv-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
|
||||
@@ -2314,6 +2314,12 @@ windowrulev2 = floatclass:Wofi,opacity:0.9,blur:15
|
||||
** =.config/hypr/workspace-rules.conf=
|
||||
These are config files for .config/hypr
|
||||
#+BEGIN_SRC conf :tangle generated/.config/hypr/workspace-rules.conf :noweb yes :mkdirp yes :eval never
|
||||
|
||||
#Load random wallpaper
|
||||
workspacecreated = exec $HOME/.local/bin/wallpaper-sync-and-set.sh $workspace
|
||||
|
||||
/*
|
||||
|
||||
# Workspace definitions (modern syntax)
|
||||
workspace = 1
|
||||
workspace = 2
|
||||
@@ -2321,6 +2327,7 @@ workspace = 3
|
||||
workspace = 4
|
||||
workspace = 5
|
||||
|
||||
/*
|
||||
# Auto-launch apps on specific workspaces (use `exec` with `workspace` rule)
|
||||
exec-once = kitty, workspace 1
|
||||
exec-once = flatpak run app.betterbird.zen, workspace 2
|
||||
@@ -2344,85 +2351,25 @@ windowrule = move workspace 3, ^(libreoffice)$
|
||||
workspace {
|
||||
cycle_move_empty = no
|
||||
}
|
||||
|
||||
*/
|
||||
#+END_SRC
|
||||
|
||||
** =generated/modules/traveldroid/desktop/wallpaper.nix=
|
||||
Setting up wallpaper engine + wallpaper gui
|
||||
#+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/wallpaper.nix :noweb yes :mkdirp yes :eval never
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
wallpaperSrc = "${flakeRoot}/assets/Wallpapers";
|
||||
wallpaperDst = "${homeDir}/Wallpapers";
|
||||
|
||||
script = pkgs.writeShellScript "wallpaper-sync-and-set.sh" ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SRC="${wallpaperSrc}"
|
||||
DST="${wallpaperDst}"
|
||||
|
||||
mkdir -p "$SRC" "$DST"
|
||||
|
||||
########################################
|
||||
# 2-way sync (additive, newer wins)
|
||||
########################################
|
||||
|
||||
# SRC -> DST
|
||||
rsync -au "$SRC/" "$DST/"
|
||||
|
||||
# DST -> SRC
|
||||
rsync -au "$DST/" "$SRC/"
|
||||
|
||||
########################################
|
||||
# Initialize swww (safe if already running)
|
||||
########################################
|
||||
if ! pgrep -x swww-daemon >/dev/null; then
|
||||
swww init
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
########################################
|
||||
# Get workspaces
|
||||
########################################
|
||||
WORKSPACES=$(hyprctl workspaces -j | jq -r '.[].id')
|
||||
|
||||
########################################
|
||||
# Function: set random wallpaper for workspace
|
||||
########################################
|
||||
set_wallpaper() {
|
||||
local WS="$1"
|
||||
|
||||
WALL=$(find "$DST" -type f | shuf -n 1)
|
||||
|
||||
if [ -n "$WALL" ]; then
|
||||
hyprctl dispatch workspace "$WS"
|
||||
swww img "$WALL" --transition-type any
|
||||
fi
|
||||
}
|
||||
|
||||
########################################
|
||||
# If workspace passed → only update that
|
||||
########################################
|
||||
if [ "$#" -eq 1 ]; then
|
||||
set_wallpaper "$1"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
########################################
|
||||
# Otherwise: update all workspaces
|
||||
########################################
|
||||
for WS in $WORKSPACES; do
|
||||
set_wallpaper "$WS"
|
||||
done
|
||||
'';
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
wallpaperDir = "${homeDir}/Wallpapers";
|
||||
scriptDest = "${homeDir}/Wallpapers/wallpaper-sync-and-set.sh";
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# Packages
|
||||
#################################
|
||||
############################
|
||||
# Systemwide packages
|
||||
############################
|
||||
environment.systemPackages = with pkgs; [
|
||||
swww
|
||||
waypaper
|
||||
@@ -2430,48 +2377,38 @@ in
|
||||
rsync
|
||||
];
|
||||
|
||||
#################################
|
||||
# Service: main worker
|
||||
#################################
|
||||
############################
|
||||
# Install the script
|
||||
############################
|
||||
home.file."Wallpapers/wallpaper-sync-and-set.sh".source = ./assets/Wallpapers/wallpaper-sync-and-set.sh;
|
||||
home.file."Wallpapers/wallpaper-sync-and-set.sh".executable = true;
|
||||
|
||||
############################
|
||||
# Systemd user service + timer
|
||||
############################
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "2-way sync wallpapers + set random per workspace";
|
||||
after = [ "graphical-session.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${script}";
|
||||
};
|
||||
|
||||
wantedBy = [ "default.target" ]; # run at login
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.ExecStart = "${scriptDest}";
|
||||
serviceConfig.Restart = "on-failure";
|
||||
};
|
||||
|
||||
#################################
|
||||
# Timer: every hour
|
||||
#################################
|
||||
systemd.user.timers.wallpaperSync = {
|
||||
description = "Run wallpaper sync hourly";
|
||||
|
||||
systemd.user.timers.wallpaperSyncTimer = {
|
||||
description = "Run wallpaper sync every hour";
|
||||
wantedBy = [ "timers.target" ];
|
||||
|
||||
timerConfig = {
|
||||
OnBootSec = "2min";
|
||||
OnUnitActiveSec = "1h";
|
||||
Persistent = true;
|
||||
};
|
||||
timerConfig.OnCalendar = "hourly";
|
||||
timerConfig.Persistent = true;
|
||||
};
|
||||
|
||||
#################################
|
||||
# Hyprland integration (new workspace)
|
||||
#################################
|
||||
# This assumes you manage Hyprland via Nix/Home Manager
|
||||
#################################
|
||||
environment.etc."hypr/hyprland.conf".text = lib.mkAfter ''
|
||||
# Run wallpaper script when workspace changes
|
||||
bind = SUPER, Return, exec, ${script}
|
||||
|
||||
# Hook: when workspace is created/switched
|
||||
exec-once = hyprctl --batch "dispatch exec ${script}"
|
||||
'';
|
||||
############################
|
||||
# Run at login
|
||||
############################
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaper sync at login";
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.ExecStart = "${scriptDest}";
|
||||
install.WantedBy = [ "default.target" ];
|
||||
};
|
||||
}
|
||||
#+END_SRC
|
||||
|
||||
|
||||
@@ -1,11 +1,36 @@
|
||||
#!/usr/bin/env bash
|
||||
WALLS=("${HOME}/Wallpapers"/*)
|
||||
NUM_WALLS=${#WALLS[@]}
|
||||
set -euo pipefail
|
||||
|
||||
# Get workspace IDs
|
||||
WS_IDS=($(hyprctl workspaces -j | jq -r '.[].id'))
|
||||
# Determine repo root dynamically
|
||||
repoRoot="$(dirname "$(readlink -f "$0")")/../.."
|
||||
wallpaperSrc="$repoRoot/assets/Wallpapers"
|
||||
wallpaperDst="$HOME/Wallpapers"
|
||||
|
||||
for i in "${!WS_IDS[@]}"; do
|
||||
WALL="${WALLS[$((i % NUM_WALLS))]}"
|
||||
swww img "$WALL" --workspace "${WS_IDS[$i]}" --transition-type fade slide blend zoom wipe cube fade-zoom slide-zoom
|
||||
done
|
||||
mkdir -p "$wallpaperDst"
|
||||
|
||||
# 2-way sync (add only, overwrite if newer, never delete)
|
||||
rsync -au --ignore-existing "$wallpaperSrc/" "$wallpaperDst/"
|
||||
rsync -tu "$wallpaperDst/" "$wallpaperSrc/"
|
||||
|
||||
# Gather wallpapers
|
||||
mapfile -t wallpapers < <(find "$wallpaperDst" -type f)
|
||||
numWallpapers=${#wallpapers[@]}
|
||||
|
||||
if [[ $numWallpapers -eq 0 ]]; then
|
||||
echo "No wallpapers found in $wallpaperDst"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if a workspace ID is passed
|
||||
if [[ $# -eq 1 ]]; then
|
||||
ws="$1"
|
||||
randomIndex=$(( RANDOM % numWallpapers ))
|
||||
swww img "${wallpapers[$randomIndex]}" --transition-fade 1 --workspace "$ws"
|
||||
else
|
||||
# Full refresh for all workspaces
|
||||
workspaces=$(hyprctl workspaces -j | jq -r '.[].id')
|
||||
for ws in $workspaces; do
|
||||
randomIndex=$(( RANDOM % numWallpapers ))
|
||||
swww img "${wallpapers[$randomIndex]}" --transition-fade 1 --workspace "$ws"
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -7,7 +7,7 @@ source = ./layer-rules.conf
|
||||
source = ./layout.conf
|
||||
source = ./monitor-rules.conf
|
||||
# source = ./window-rules.conf
|
||||
# source = ./workspace-rules.conf
|
||||
source = ./workspace-rules.conf
|
||||
|
||||
|
||||
exec-once = /nix/store/c9cnbxhxbagj7gfpc1g5hl4x4f8dzayv-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
#Load random wallpaper
|
||||
workspacecreated = exec $HOME/.local/bin/wallpaper-sync-and-set.sh $workspace
|
||||
|
||||
/*
|
||||
|
||||
# Workspace definitions (modern syntax)
|
||||
workspace = 1
|
||||
workspace = 2
|
||||
@@ -5,6 +10,7 @@ workspace = 3
|
||||
workspace = 4
|
||||
workspace = 5
|
||||
|
||||
/*
|
||||
# Auto-launch apps on specific workspaces (use `exec` with `workspace` rule)
|
||||
exec-once = kitty, workspace 1
|
||||
exec-once = flatpak run app.betterbird.zen, workspace 2
|
||||
@@ -28,3 +34,5 @@ windowrule = move workspace 3, ^(libreoffice)$
|
||||
workspace {
|
||||
cycle_move_empty = no
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
@@ -1,77 +1,15 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
wallpaperSrc = "${flakeRoot}/assets/Wallpapers";
|
||||
wallpaperDst = "${homeDir}/Wallpapers";
|
||||
|
||||
script = pkgs.writeShellScript "wallpaper-sync-and-set.sh" ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SRC="${wallpaperSrc}"
|
||||
DST="${wallpaperDst}"
|
||||
|
||||
mkdir -p "$SRC" "$DST"
|
||||
|
||||
########################################
|
||||
# 2-way sync (additive, newer wins)
|
||||
########################################
|
||||
|
||||
# SRC -> DST
|
||||
rsync -au "$SRC/" "$DST/"
|
||||
|
||||
# DST -> SRC
|
||||
rsync -au "$DST/" "$SRC/"
|
||||
|
||||
########################################
|
||||
# Initialize swww (safe if already running)
|
||||
########################################
|
||||
if ! pgrep -x swww-daemon >/dev/null; then
|
||||
swww init
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
########################################
|
||||
# Get workspaces
|
||||
########################################
|
||||
WORKSPACES=$(hyprctl workspaces -j | jq -r '.[].id')
|
||||
|
||||
########################################
|
||||
# Function: set random wallpaper for workspace
|
||||
########################################
|
||||
set_wallpaper() {
|
||||
local WS="$1"
|
||||
|
||||
WALL=$(find "$DST" -type f | shuf -n 1)
|
||||
|
||||
if [ -n "$WALL" ]; then
|
||||
hyprctl dispatch workspace "$WS"
|
||||
swww img "$WALL" --transition-type any
|
||||
fi
|
||||
}
|
||||
|
||||
########################################
|
||||
# If workspace passed → only update that
|
||||
########################################
|
||||
if [ "$#" -eq 1 ]; then
|
||||
set_wallpaper "$1"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
########################################
|
||||
# Otherwise: update all workspaces
|
||||
########################################
|
||||
for WS in $WORKSPACES; do
|
||||
set_wallpaper "$WS"
|
||||
done
|
||||
'';
|
||||
username = config.defaultUser or "henrov";
|
||||
homeDir = "/home/${username}";
|
||||
wallpaperDir = "${homeDir}/Wallpapers";
|
||||
scriptDest = "${homeDir}/Wallpapers/wallpaper-sync-and-set.sh";
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# Packages
|
||||
#################################
|
||||
############################
|
||||
# Systemwide packages
|
||||
############################
|
||||
environment.systemPackages = with pkgs; [
|
||||
swww
|
||||
waypaper
|
||||
@@ -79,46 +17,36 @@ in
|
||||
rsync
|
||||
];
|
||||
|
||||
#################################
|
||||
# Service: main worker
|
||||
#################################
|
||||
############################
|
||||
# Install the script
|
||||
############################
|
||||
home.file."Wallpapers/wallpaper-sync-and-set.sh".source = ./assets/Wallpapers/wallpaper-sync-and-set.sh;
|
||||
home.file."Wallpapers/wallpaper-sync-and-set.sh".executable = true;
|
||||
|
||||
############################
|
||||
# Systemd user service + timer
|
||||
############################
|
||||
systemd.user.services.wallpaperSync = {
|
||||
description = "2-way sync wallpapers + set random per workspace";
|
||||
after = [ "graphical-session.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${script}";
|
||||
};
|
||||
|
||||
wantedBy = [ "default.target" ]; # run at login
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.ExecStart = "${scriptDest}";
|
||||
serviceConfig.Restart = "on-failure";
|
||||
};
|
||||
|
||||
#################################
|
||||
# Timer: every hour
|
||||
#################################
|
||||
systemd.user.timers.wallpaperSync = {
|
||||
description = "Run wallpaper sync hourly";
|
||||
|
||||
systemd.user.timers.wallpaperSyncTimer = {
|
||||
description = "Run wallpaper sync every hour";
|
||||
wantedBy = [ "timers.target" ];
|
||||
|
||||
timerConfig = {
|
||||
OnBootSec = "2min";
|
||||
OnUnitActiveSec = "1h";
|
||||
Persistent = true;
|
||||
};
|
||||
timerConfig.OnCalendar = "hourly";
|
||||
timerConfig.Persistent = true;
|
||||
};
|
||||
|
||||
#################################
|
||||
# Hyprland integration (new workspace)
|
||||
#################################
|
||||
# This assumes you manage Hyprland via Nix/Home Manager
|
||||
#################################
|
||||
environment.etc."hypr/hyprland.conf".text = lib.mkAfter ''
|
||||
# Run wallpaper script when workspace changes
|
||||
bind = SUPER, Return, exec, ${script}
|
||||
|
||||
# Hook: when workspace is created/switched
|
||||
exec-once = hyprctl --batch "dispatch exec ${script}"
|
||||
'';
|
||||
############################
|
||||
# Run at login
|
||||
############################
|
||||
systemd.user.services.wallpaperSyncLogin = {
|
||||
description = "Run wallpaper sync at login";
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.ExecStart = "${scriptDest}";
|
||||
install.WantedBy = [ "default.target" ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user