From eaa8c9448cf363cc15bc7a01e8b4116fef0004dd Mon Sep 17 00:00:00 2001 From: ulve Date: Sat, 13 Jun 2026 11:23:36 +0200 Subject: [PATCH] move wallpaper.sh to ~/.local/bin to avoid nix store conflict --- config/sway/config | 6 +++--- home.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/config/sway/config b/config/sway/config index 8cbcb52..99ae644 100644 --- a/config/sway/config +++ b/config/sway/config @@ -18,7 +18,7 @@ exec lxqt-policykit-agent exec mako exec swww-daemon -exec sh -c 'sleep 1 && ~/.config/sway/wallpaper.sh' +exec sh -c 'sleep 1 && ~/.local/bin/wallpaper.sh' input type:keyboard { xkb_layout "se" @@ -101,7 +101,7 @@ bindsym $mod+Shift+s exec 'grim -l 0 -g "$(slurp)" - | wl-copy' bindsym $mod+Alt+s exec 'mkdir -p ~/Pictures/Screenshots && grim -l 0 -g "$(slurp)" - | satty --filename - --output-filename ~/Pictures/Screenshots/$(date +"%Y-%m-%d_%H-%M-%S").png' exec swayidle -w \ - timeout 300 'swaylock -f -c 0a0a0a && ~/.config/sway/wallpaper.sh' \ + timeout 300 'swaylock -f -c 0a0a0a && ~/.local/bin/wallpaper.sh' \ timeout 600 'swaymsg "output * dpms off"; wpctl set-mute @DEFAULT_AUDIO_SINK@ 1' \ resume 'swaymsg "output * dpms on"; wpctl set-mute @DEFAULT_AUDIO_SINK@ 0' \ - before-sleep 'swaylock -f -c 0a0a0a && ~/.config/sway/wallpaper.sh' + before-sleep 'swaylock -f -c 0a0a0a && ~/.local/bin/wallpaper.sh' diff --git a/home.nix b/home.nix index 06574c9..32d53d2 100644 --- a/home.nix +++ b/home.nix @@ -49,10 +49,6 @@ bindkey "^[OA" up-line-or-beginning-search bindkey "^[OB" down-line-or-beginning-search - function cap() { - git add -A && git commit -m "$*" && git push - } - function gc() { sudo nix-collect-garbage --delete-older-than "''${1:-14}d" } @@ -243,7 +239,7 @@ source = config.lib.file.mkOutOfStoreSymlink "/home/ulve/nixos-dotfiles/config/nvim"; }; xdg.configFile."sway".source = ./config/sway; - home.file.".config/sway/wallpaper.sh" = { + home.file.".local/bin/wallpaper.sh" = { source = ./config/sway/wallpaper.sh; executable = true; };