Better location handing
This commit is contained in:
+305
-305
File diff suppressed because it is too large
Load Diff
@@ -1712,7 +1712,7 @@ workspace_wallpaper installs wpaperd and deploys your wallpaper files from the r
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, flakeRoot, ... }:
|
||||||
let
|
let
|
||||||
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
|
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
|
||||||
userRelRoot = "nixos_conf/wallpaperstuff/pictures";
|
userRelRoot = "nixos_conf/wallpaperstuff";
|
||||||
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
|
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
|
||||||
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
|
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
|
||||||
|
|
||||||
@@ -1770,7 +1770,7 @@ in
|
|||||||
img_for_ws() {
|
img_for_ws() {
|
||||||
local n="$1"
|
local n="$1"
|
||||||
case "$n" in
|
case "$n" in
|
||||||
1|2|3|4|5|6|7|8|9) printf '%s/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
|
1|2|3|4|5|6|7|8|9) printf '%s/pictures/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
|
||||||
*) return 1 ;;
|
*) return 1 ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ config, pkgs, lib, flakeRoot, ... }:
|
{ config, pkgs, lib, flakeRoot, ... }:
|
||||||
let
|
let
|
||||||
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
|
repoWallpaperDir = flakeRoot + "/assets/conf/desktop/wallpaper";
|
||||||
userRelRoot = "nixos_conf/wallpaperstuff/pictures";
|
userRelRoot = "nixos_conf/wallpaperstuff";
|
||||||
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
|
userAbsRoot = "${config.home.homeDirectory}/${userRelRoot}";
|
||||||
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
|
scriptRel = "hypr/scripts/wpaperd-workspace-1to9.sh";
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ in
|
|||||||
img_for_ws() {
|
img_for_ws() {
|
||||||
local n="$1"
|
local n="$1"
|
||||||
case "$n" in
|
case "$n" in
|
||||||
1|2|3|4|5|6|7|8|9) printf '%s/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
|
1|2|3|4|5|6|7|8|9) printf '%s/pictures/wallpaper%s.jpg\n' "$ROOT" "$n" ;;
|
||||||
*) return 1 ;;
|
*) return 1 ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user