diff options
| -rwxr-xr-x | bemenu/install.sh | 22 | ||||
| -rwxr-xr-x | goimapnotify/install.sh | 11 | ||||
| -rwxr-xr-x | install.sh | 4 | ||||
| -rwxr-xr-x | maildir-rank-addr/install.sh | 11 | ||||
| -rw-r--r-- | mbsync/.config/systemd/user/maildir-notify@.service | 3 | ||||
| -rwxr-xr-x | mbsync/install.sh | 13 | ||||
| -rwxr-xr-x | notmuch/install.sh | 8 | ||||
| -rwxr-xr-x | nvim/install.sh | 10 | ||||
| -rwxr-xr-x | sheldon/install.sh | 6 | ||||
| -rwxr-xr-x | spotify/install.sh | 12 | ||||
| -rwxr-xr-x | sway/install.sh | 12 | ||||
| -rw-r--r-- | wayland/.config/systemd/user/physlock.service | 14 | ||||
| -rw-r--r-- | wayland/.config/systemd/user/wl-mpris-idle-inhibit.service | 1 | ||||
| -rwxr-xr-x | wayland/install.sh | 11 | ||||
| -rwxr-xr-x | zsh/install.sh | 6 |
15 files changed, 114 insertions, 30 deletions
diff --git a/bemenu/install.sh b/bemenu/install.sh new file mode 100755 index 0000000..b31dc6a --- /dev/null +++ b/bemenu/install.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +pkgname=bemenu + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" + + for bin in dmenu dmenu_run dmenu-wl dmenu-wl_run; do + if [ -L "$HOME/.local/bin/$bin" ] && [ ! -e "$HOME/.local/bin/$bin" ]; then + rm -v "$HOME/.local/bin/$bin" + fi + done + + exit 0 +fi + +printf "%s: Installing symlinks\n" "$0" + +ln -svf "$(command -v bemenu)" ~/.local/bin/dmenu +ln -svf "$(command -v bemenu)" ~/.local/bin/dmenu-wl +ln -svf "$(command -v bemenu-run)" ~/.local/bin/dmenu_run +ln -svf "$(command -v bemenu-run)" ~/.local/bin/dmenu-wl_run diff --git a/goimapnotify/install.sh b/goimapnotify/install.sh index 312c51b..f324554 100755 --- a/goimapnotify/install.sh +++ b/goimapnotify/install.sh @@ -1,11 +1,14 @@ #!/bin/sh -if ! command -v "goimapnotify" >/dev/null; then - printf "%s: goimapnotify not found, skipping...\n" "$0" +pkgname=goimapnotify + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi printf "%s: Installing services\n" "$0" -systemctl --user enable --now --no-block goimapnotify@gmail.service -systemctl --user enable --now --no-block goimapnotify@porkbun.service +for instance in gmail porkbun; do + systemctl --user enable --now --no-block $pkgname@"$instance".service +done @@ -24,9 +24,9 @@ if [ ! -s .untracked ]; then fi printf "%s: Stowing packages\n" "$0" -stow "$@" */ +stow "$@" ${1:-*}/ printf "%s: Installing packages\n" "$0" -for f in */install.sh; do +for f in ${1:-*}/install.sh; do $f done diff --git a/maildir-rank-addr/install.sh b/maildir-rank-addr/install.sh index 5a449b9..92c3f89 100755 --- a/maildir-rank-addr/install.sh +++ b/maildir-rank-addr/install.sh @@ -1,11 +1,14 @@ #!/bin/sh -if ! command -v "maildir-rank-addr" >/dev/null; then - printf "%s: maildir-rank-addr not found, skipping...\n" "$0" +pkgname=maildir-rank-addr + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi printf "%s: Installing services\n" "$0" -systemctl --user enable --now --no-block maildir-rank-addr@gmail.service -systemctl --user enable --now --no-block maildir-rank-addr@porkbun.service +for instance in gmail porkbun; do + systemctl --user enable --now --no-block $pkgname@"$instance".service +done diff --git a/mbsync/.config/systemd/user/maildir-notify@.service b/mbsync/.config/systemd/user/maildir-notify@.service index 6d2d3e0..3f1ada3 100644 --- a/mbsync/.config/systemd/user/maildir-notify@.service +++ b/mbsync/.config/systemd/user/maildir-notify@.service @@ -1,5 +1,6 @@ [Unit] Description=Notify on new mail in MailDir %i +PartOf=mbsync@%i.service [Service] Type=simple @@ -7,4 +8,4 @@ ExecStart=%h/.local/bin/maildir-notify ${XDG_DATA_HOME}/mail/%i/INBOX RestartSec=10 [Install] -WantedBy=default.target +WantedBy=mbsync@%i.service diff --git a/mbsync/install.sh b/mbsync/install.sh index de06c1a..957765e 100755 --- a/mbsync/install.sh +++ b/mbsync/install.sh @@ -1,13 +1,14 @@ #!/bin/sh -if ! command -v "mbsync" >/dev/null; then - printf "%s: mbsync not found, skipping...\n" "$0" +pkgname=mbsync + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi printf "%s: Installing services\n" "$0" -systemctl --user enable --now --no-block mbsync@gmail.service -systemctl --user enable --now --no-block mbsync@porkbun.service -systemctl --user enable --now --no-block maildir-notify@gmail.service -systemctl --user enable --now --no-block maildir-notify@porkbun.service +for instance in gmail porkbun; do + systemctl --user enable --now --no-block $pkgname@"$instance".service +done diff --git a/notmuch/install.sh b/notmuch/install.sh index 12196c8..058baa6 100755 --- a/notmuch/install.sh +++ b/notmuch/install.sh @@ -1,10 +1,12 @@ #!/bin/sh -if ! command -v "notmuch" >/dev/null; then - printf "%s: notmuch not found, skipping...\n" "$0" +pkgname=notmuch + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi printf "%s: Installing service\n" "$0" -systemctl --user enable --now --no-block notmuch.service +systemctl --user enable --now --no-block $pkgname.service diff --git a/nvim/install.sh b/nvim/install.sh index 43595bd..60e2659 100755 --- a/nvim/install.sh +++ b/nvim/install.sh @@ -1,7 +1,9 @@ #!/bin/sh -if ! command -v "nvim" >/dev/null; then - printf "%s: nvim not found, skipping...\n" "$0" +pkgname=nvim + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi @@ -12,6 +14,4 @@ nvim --headless -c 'Lazy! clean' -c qa printf "%s: Installing treesitter parsers\n" "$0" -nvim --headless -c 'TSUpdateSync' -c qa - -printf "\n" +nvim --headless -c 'TSUpdateSync' -c qa | sed 's/$/\n/' diff --git a/sheldon/install.sh b/sheldon/install.sh index 06f7b5e..d1aafe1 100755 --- a/sheldon/install.sh +++ b/sheldon/install.sh @@ -1,7 +1,9 @@ #!/bin/sh -if ! command -v "sheldon" >/dev/null; then - printf "%s: sheldon not found, skipping...\n" "$0" +pkgname=sheldon + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi diff --git a/spotify/install.sh b/spotify/install.sh new file mode 100755 index 0000000..6143d7e --- /dev/null +++ b/spotify/install.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +pkgname=spotifyd + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" + exit 0 +fi + +printf "%s: Installing services\n" "$0" + +systemctl --user enable --now --no-block $pkgname.service diff --git a/sway/install.sh b/sway/install.sh new file mode 100755 index 0000000..a209985 --- /dev/null +++ b/sway/install.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +pkgname=sway + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" + exit 0 +fi + +printf "%s: Installing service\n" "$0" + +systemctl --user enable --now --no-block swayidle.service diff --git a/wayland/.config/systemd/user/physlock.service b/wayland/.config/systemd/user/physlock.service new file mode 100644 index 0000000..0a8fed6 --- /dev/null +++ b/wayland/.config/systemd/user/physlock.service @@ -0,0 +1,14 @@ +[Unit] +Description=Lightweight linux console locking tool +OnSuccess=unlock.target +PartOf=lock.target +After=lock.target + +[Service] +Type=forking +ExecStart=/usr/bin/physlock -dsm +Restart=on-failure +RestartSec=0 + +[Install] +WantedBy=lock.target diff --git a/wayland/.config/systemd/user/wl-mpris-idle-inhibit.service b/wayland/.config/systemd/user/wl-mpris-idle-inhibit.service index be67705..0e50c6e 100644 --- a/wayland/.config/systemd/user/wl-mpris-idle-inhibit.service +++ b/wayland/.config/systemd/user/wl-mpris-idle-inhibit.service @@ -2,7 +2,6 @@ Description=Idle management daemon for Wayland PartOf=wayland-session.target After=wayland-session.target -ConditionFileIsExecutable=/usr/bin/wl-mpris-idle-inhibit [Service] Type=simple diff --git a/wayland/install.sh b/wayland/install.sh new file mode 100755 index 0000000..00e86c9 --- /dev/null +++ b/wayland/install.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +printf "%s: Installing services\n" "$0" + +for pkgname in physlock wl-mpris-idle-inhibit; do + if command -v "$pkgname" >/dev/null; then + systemctl --user enable --now --no-block $pkgname.service + else + printf "%s: $pkgname not found, skipping...\n" "$0" + fi +done diff --git a/zsh/install.sh b/zsh/install.sh index 2c6b871..23da883 100755 --- a/zsh/install.sh +++ b/zsh/install.sh @@ -1,7 +1,9 @@ #!/bin/sh -if ! command -v "zsh" >/dev/null; then - printf "%s: zsh not found, skipping...\n" "$0" +pkgname=zsh + +if ! command -v "$pkgname" >/dev/null; then + printf "%s: $pkgname not found, skipping...\n" "$0" exit 0 fi |