Merge branch 'master' into nvim-lua

home/.config/ncmpcpp/config

@@ -9,10 +9,9 @@ mpd_music_dir = ~/Music
 mpd_crossfade_time = 2
 
 ##### visualizer #####
-visualizer_fifo_path = /tmp/mpd.fifo
+visualizer_data_source = /tmp/mpd.fifo
 visualizer_output_name = Visualizer
 visualizer_in_stereo = yes
-visualizer_sync_interval = 30
 # spectrum,wave,wave_filled,ellipse.
 visualizer_type = wave_filled
 visualizer_look = ●▮

home/.config/zsh/01-env.zsh

@@ -33,11 +33,16 @@ export DOTREPO="$HOME/git/dotfiles"
 # nvim ftw!
 export EDITOR=nvim
 export PAGER="nvimpager -p"
+export AUR_PAGER=$PAGER
 
-# use gpg for ssh
+# Use GPG for SSH authentication
 export GPG_TTY="$(tty)"
-export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-gpg-connect-agent updatestartuptty /bye > /dev/null
+
+# set SSH_AUTH_SOCK if not logging in over SSH
+if [ "$SSH_CONNECTION" != "" ]; then
+	export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+	gpgconf --launch gpg-agent
+fi
 
 # tehfuk
 eval $(thefuck --alias)

home/.config/zsh/03-aliases.zsh

@@ -128,23 +128,24 @@ passync() { pass git pull && pass git push && updatesecrets }
 
 update() {
 	all() {
+		paru
 		plugins
 		{%@@ if profile == "Moria" @@%}
-		base --devel
+		repo
 		docker-update
 		docker system prune --volumes
-		{%@@ elif profile == "Mirkwood" @@%}
-		base --devel firefox-nightly
-		{%@@ else @@%}
-		base --devel
 		{%@@ endif @@%}
-		flatpak update
+		sudo flatpak update
 		sudo awman-update
 	}
 
-	base() {
-		paru -Pw
-		paru -Syu $@
+	repo() {
+		aur sync -Su --margs --noconfirm
+		firefox
+	}
+
+	firefox() {
+		aur sync -S --rebuild firefox-nightly --margs --noconfirm 
 	}
 
 	plugins() {
@@ -171,17 +172,20 @@ update() {
 		all)
 			all
 			;;
-		base)
-			base
-			;;
 		plugins)
 			plugins
 			;;
 		docker)
 			docker-update
 			;;
+		repo)
+			repo
+			;;
+		firefox)
+			firefox
+			;;
 		*)
-			base $@
+			paru
 			;;
 	esac
 }
@@ -204,6 +208,8 @@ alias notify-send='notify-send --icon=alarm'
 # download archiso
 alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"'
 
+# Update repository
+
 
 # encrypted tar's with zstd compression
 cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg }
@@ -280,4 +286,3 @@ btw, () {
   ▟███▀▘                       ▝▀███▙
  ▟▛▀                               ▀▜▙"
 }
-

home/.ssh/config

@@ -23,18 +23,18 @@ host moria
 	port 221
 	User balrog
 	ForwardAgent yes
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
 
 host gondor
 	hostname gondor.korhonen.cc
 	port 22
 	User reekymarko
-	ForwardAgent yes
+	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
 
 host anitta
 	HostName 10.200.200.4
 	port 22
 	user reekymarko
-	ForwardAgent yes
 
 host takamaki
 	HostName 10.200.200.5