diff --git a/.gitattributes b/.gitattributes index 774abfe..c7a8e2b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,4 +9,3 @@ global/.zshrc-secrets filter=git-crypt diff=git-crypt global/.borgmatic/sensitive.yaml filter=git-crypt diff=git-crypt global/.borgmatic/pass.gpg filter=git-crypt diff=git-crypt global/.newsboat/miniflux filter=git-crypt diff=git-crypt -global/.linkding_env filter=git-crypt diff=git-crypt diff --git a/global/.tmux.conf b/global/.tmux.conf index 4fc1958..e6c1800 100755 --- a/global/.tmux.conf +++ b/global/.tmux.conf @@ -56,14 +56,13 @@ set -g status on # plugins set -g @plugin 'tmux-plugins/tpm' -# set -g @plugin 'tmux-plugins/tmux-battery' +set -g @plugin 'tmux-plugins/tmux-battery' set -g @plugin 'tmux-plugins/tmux-sensible' # set -g @plugin 'tmux-plugins/tmux-resurrect' # set -g @plugin 'tmux-plugins/tmux-continuum' -# set -g @plugin 'MunifTanjim/tmux-mode-indicator' +set -g @plugin 'MunifTanjim/tmux-mode-indicator' set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'schasse/tmux-jump' -set -g @plugin 'https://git.fz0x1.wtf/fz0x1/aw-watcher-tmux.git' run '~/.tmux/plugins/tpm/tpm' diff --git a/global/.zshrc b/global/.zshrc index d055402..a7494b9 100644 --- a/global/.zshrc +++ b/global/.zshrc @@ -23,30 +23,30 @@ source $ZSH/oh-my-zsh.sh # functions ### ARCHIVE EXTRACTION # usage: ex -# ex () -# { -# if [ -f "$1" ] ; then -# case $1 in -# *.tar.bz2) tar xjf $1 ;; -# *.tar.gz) tar xzf $1 ;; -# *.bz2) bunzip2 $1 ;; -# *.rar) unrar x $1 ;; -# *.gz) gunzip $1 ;; -# *.tar) tar xf $1 ;; -# *.tbz2) tar xjf $1 ;; -# *.tgz) tar xzf $1 ;; -# *.zip) unzip $1 ;; -# *.Z) uncompress $1;; -# *.7z) 7z x $1 ;; -# *.deb) ar x $1 ;; -# *.tar.xz) tar xf $1 ;; -# *.tar.zst) unzstd $1 ;; -# *) echo "'$1' cannot be extracted via ex()" ;; -# esac -# else -# echo "'$1' is not a valid file" -# fi -# } +ex () +{ + if [ -f "$1" ] ; then + case $1 in + *.tar.bz2) tar xjf $1 ;; + *.tar.gz) tar xzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xf $1 ;; + *.tbz2) tar xjf $1 ;; + *.tgz) tar xzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1;; + *.7z) 7z x $1 ;; + *.deb) ar x $1 ;; + *.tar.xz) tar xf $1 ;; + *.tar.zst) unzstd $1 ;; + *) echo "'$1' cannot be extracted via ex()" ;; + esac + else + echo "'$1' is not a valid file" + fi +} DIARY="default" diff --git a/global/.zshrc-secrets b/global/.zshrc-secrets index 78cf39c..50d3989 100644 Binary files a/global/.zshrc-secrets and b/global/.zshrc-secrets differ diff --git a/global/moonlander_moonlander-default-layout_xbJpL_aByb5.bin b/global/moonlander_moonlander-default-layout_xbJpL_aByb5.bin new file mode 100644 index 0000000..1cc391d Binary files /dev/null and b/global/moonlander_moonlander-default-layout_xbJpL_aByb5.bin differ diff --git a/linux/.config/i3/autostart.sh b/linux/.config/i3/autostart.sh index 20fc7bc..90a6d89 100755 --- a/linux/.config/i3/autostart.sh +++ b/linux/.config/i3/autostart.sh @@ -16,11 +16,9 @@ xrdb -merge ~/.Xresources & # xrandr settings ~/scripts/bin/setup_displays -# PolicyKit Authentication Agent - KDE -# /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & -/usr/lib/polkit-kde-authentication-agent-1 & -# /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets & -/sbin/kwalletd6 & +# PolicyKit Authentication Agent - Gnome +/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & +/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets & sleep 2 @@ -33,7 +31,7 @@ i3-msg restart dunst & # vpn -# mullvad-vpn & +mullvad-vpn & # caffeine caffeine start & diff --git a/linux/.config/systemd/user/promnesia_index.service b/linux/.config/systemd/user/promnesia_index.service index c2a2c2e..d3d1501 100644 --- a/linux/.config/systemd/user/promnesia_index.service +++ b/linux/.config/systemd/user/promnesia_index.service @@ -2,13 +2,10 @@ Description=index promnesia [Service] -ExecStart=/home/fz0x1/.local/share/pipx/venvs/promnesia/bin/promnesia index -Environment=HOME=/home/fz0x1 -Environment=PATH=/home/fz0x1/.local/bin:/usr/local/bin:/usr/bin -; ExecStart=/bin/zsh -c '. /home/fz0x1/.zshrc && /home/fz0x1/.local/share/pipx/venvs/promnesia/bin/promnesia index' +; ExecStart=/home/fz0x1/.local/share/pipx/venvs/promnesia/bin/promnesia index +ExecStart=/bin/zsh -c '. /home/fz0x1/.zshrc && /home/fz0x1/.local/share/pipx/venvs/promnesia/bin/promnesia index' StandardOutput=append:/tmp/promnesia-index.log StandardError=append:/tmp/promnesia-index.err -EnvironmentFile=/home/fz0x1/.linkding_env Restart=on-failure RestartSec=10