diff --git a/.gitignore b/.gitignore index 1f33cf48..e16391b3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ mail/mbsyncrc mail/msmtp/config misc/spotifyd.conf misc/wakatime.cfg +misc/nextcloud diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index 8900a118..b244cb73 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -3,3 +3,4 @@ mail/mbsyncrc:65eec91b162f829575c2cc4b2428faa90eb71f3f79ba779bcfe70712f161cabe mail/msmtp/config:529c5ae169a81f528ece6356c2bfb23f20af93619386aa018f28fab9505271ec misc/spotifyd.conf:dd73afe8809498ba3b00ba9aa99e78fb3606867dc4871231880d2ebfd55196a9 misc/wakatime.cfg:e306146d45036c38f15aa9a817fc172bdca3c4c9d9ed3c4f6fe1d8d93d783d78 +misc/nextcloud:936fb8a7f1f7a624c12e370edb0d19e219f9a8bb7210728449d6fff1b9d060a9 diff --git a/arch-setup/chroot.sh b/arch-setup/chroot.sh index 5b258aa0..cbaa2231 100755 --- a/arch-setup/chroot.sh +++ b/arch-setup/chroot.sh @@ -130,5 +130,4 @@ echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers.d/wheel echo "SETUP COMPLETE" - -exit +bash diff --git a/install.sh b/install.sh index 430b0573..e121659c 100755 --- a/install.sh +++ b/install.sh @@ -103,6 +103,7 @@ ln -s ~/.dotfiles/misc/keyboard ~/.keyboard ln -s ~/.dotfiles/misc/mimeapps.list ~/.config/mimeapps.list ln -s ~/.dotfiles/misc/wakatime.cfg ~/.wakatime.cfg ln -s ~/.dotfiles/misc/BetterDiscord ~/.config/BetterDiscord +ln -s ~/.dotfiles/misc/nextcloud ~/.nextcloud mkdir -p ~/.config/spotifyd ln -s ~/.dotfiles/misc/spotifyd.conf ~/.config/spotifyd/spotifyd.conf ln -s ~/.dotfiles/fonts ~/.fonts @@ -149,6 +150,7 @@ if [ ! -f "/var/spool/cron$username" ]; then sudo chmod 755 "/var/spool/cron/$username" fi echo "*/8 * * * * /home/$username/.scripts/mailsync" >> /var/spool/cron/yigit +echo "*/15 * * * * /home/$username/.scripts/nextcloud-sync" >> /var/spool/cron/yigit # Root sudo cp ~/.dotfiles/root/dwm.desktop /usr/share/xsessions diff --git a/mail/mbsyncrc.secret b/mail/mbsyncrc.secret index 2a06b02a..665f6b6e 100644 Binary files a/mail/mbsyncrc.secret and b/mail/mbsyncrc.secret differ diff --git a/mail/msmtp/config.secret b/mail/msmtp/config.secret index 1a9bd468..66fa2418 100644 Binary files a/mail/msmtp/config.secret and b/mail/msmtp/config.secret differ diff --git a/misc/.fzf.zsh b/misc/.fzf.zsh deleted file mode 100644 index f0fac174..00000000 --- a/misc/.fzf.zsh +++ /dev/null @@ -1,13 +0,0 @@ -# Setup fzf -# --------- -if [[ ! "$PATH" == */home/yigit/.fzf/bin* ]]; then - export PATH="${PATH:+${PATH}:}/home/yigit/.fzf/bin" -fi - -# Auto-completion -# --------------- -[[ $- == *i* ]] && source "/home/yigit/.fzf/shell/completion.zsh" 2> /dev/null - -# Key bindings -# ------------ -source "/home/yigit/.fzf/shell/key-bindings.zsh" diff --git a/misc/nextcloud.secret b/misc/nextcloud.secret new file mode 100644 index 00000000..0fba7013 Binary files /dev/null and b/misc/nextcloud.secret differ diff --git a/misc/spotifyd.conf.secret b/misc/spotifyd.conf.secret index a2332b3c..51c6bd81 100644 Binary files a/misc/spotifyd.conf.secret and b/misc/spotifyd.conf.secret differ diff --git a/misc/wakatime.cfg.secret b/misc/wakatime.cfg.secret index d8d3b9e6..bb483d22 100644 Binary files a/misc/wakatime.cfg.secret and b/misc/wakatime.cfg.secret differ diff --git a/scripts/nextcloud-sync b/scripts/nextcloud-sync new file mode 100755 index 00000000..d7666ca3 --- /dev/null +++ b/scripts/nextcloud-sync @@ -0,0 +1,17 @@ +#!/bin/bash + +source $HOME/.nextcloud + +rm -rf /tmp/nextcloud.out +rm -rf /tmp/nextcloud.err + +for i in "${!mappings[@]}"; do + echo "Syncing: $i" + nextcloudcmd -h -u "$NEXTCLOUD_USERNAME" -p "$NEXTCLOUD_PASSWORD" \ + "${mappings[$i]}" "$i" >> /tmp/nextcloud.out 2>> /tmp/nextcloud.err +done + +echo $(date '+%R') >> $HOME/.cache/nextcloud-track +kill -59 $(pidof dwmblocks) + + diff --git a/suckless/dwmblocks/config.h b/suckless/dwmblocks/config.h index 7316b999..fc7b9f48 100644 --- a/suckless/dwmblocks/config.h +++ b/suckless/dwmblocks/config.h @@ -7,6 +7,7 @@ static Block blocks[] = { { "", PATH("mail"), 120, 23}, { "", PATH("keyboard"), 120, 24}, { "", PATH("mconnect"), 120, 20}, + { "", PATH("nextcloud"), 600, 25}, { "", PATH("cpu-temp"), 30, 17}, { "", PATH("memory"), 120, 21}, { "", PATH("weather"), 60, 16}, diff --git a/zsh/secret.secret b/zsh/secret.secret index 83a29dde..aeb128c1 100644 Binary files a/zsh/secret.secret and b/zsh/secret.secret differ