config.yaml

@@ -155,13 +155,6 @@ dotfiles:
   f_foot.ini:
     src: .config/foot/foot.ini
     dst: ~/.config/foot/foot.ini
-  f_gpg-agent.conf:
-    src: .gnupg/gpg-agent.conf
-    dst: ~/.gnupg/gpg-agent.conf
-    chmod: '600'
-  f_gpg.conf:
-    src: .gnupg/gpg.conf
-    dst: ~/.gnupg/gpg.conf
 profiles:
   base:
     dotfiles:
@@ -232,8 +225,6 @@ profiles:
     - f_user-dirs.dirs
     - f_gitconfig
     - f_foot.ini
-    - f_gpg-agent.conf
-    - f_gpg.conf
   Moria:
     include:
     - terminal
@@ -246,7 +237,6 @@ profiles:
   mko-laptop:
     include:
     - terminal
-    - media
   Edoras:
     include:
     - terminal

dotdrop

@@ -1 +1 @@
-Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb
+Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6

home/.config/alacritty/alacritty.yml

@@ -73,6 +73,8 @@ mouse:
   double_click: { threshold: 300 }
   triple_click: { threshold: 300 }
   hide_when_typing: false
+  url:
+    modifiers: None
 
 selection:
   semantic_escape_chars: ',│`|:"'' ()[]{}<>'

home/.config/mpv/mpv.conf

@@ -9,10 +9,8 @@ hwdec-codecs=all
 
 {%@@ if profile == "Mirkwood" @@%}
 gpu-context=wayland
-{%@@ endif @@%}
+{%@@ elif profile == "Rivendell" @@%}
-
+ao=alsa
-{%@@ if profile == "mko-laptop" @@%}
-script=~/bin/mpris.so
 {%@@ endif @@%}
 
 #############
@@ -106,11 +104,8 @@ ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]"
 [best]
 ytdl-format="bestvideo+bestaudio"
 
-
-{%@@ if profile == "Mirkwood" @@%}
 # Vulkan hwdec profile
 [vulkan]
 gpu-api=vulkan
 gpu-context=waylandvk
 hwdec=vaapi-copy
-{%@@ endif @@%}

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

@@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg }
 xgpgtar() { gpg -d $1 | tar x --zstd }
 
 # colorise output
-alias cvs='grc cvs'
+cvs() { grc cvs $@ }
-alias df='grc df'
+df() { grc df $@ }
-alias digg='grc digg'
+digg() { grc digg $@ }
-alias gcc='grc gcc'
+gcc() { grc gcc $@ }
-alias g++='grc g++'
+g++() { grc g++ $@ }
-alias ifconfig='grc ifconfig'
+ifconfig() { grc ifconfig $@ }
-alias make='grc make'
+make() { grc make $@ }
-alias mount='grc mount'
+mount() { grc mount $@ }
-alias mtr='grc mtr'
+mtr() { grc mtr $@ }
-alias netstat='grc mount'
+netstat() { grc mount $@ }
-alias ping='grc ping'
+ping() { grc ping $@ }
-alias ps='grc ps'
+ps() { grc ps $@ }
-alias tail='grc tail'
+tail() { grc tail $@ }
-alias traceroute='grc traceroute'
+traceroute() { grc traceroute $@ }
-alias wdiff='grc wdiff'
+wdiff() { grc wdiff $@ }
-alias blkid='grc blkid'
+blkid() { grc blkid $@ }
-alias du='grc du'
+du() { grc du $@ }
-alias dnf='grc dnf'
+dnf() { grc dnf $@ }
-alias docker='grc docker'
+docker() { grc docker $@ }
-alias docker-machine='grc docker-machine'
+docker-machine() { grc docker-machine $@ }
-alias env='grc env'
+env() { grc env $@ }
-alias id='grc id'
+id() { grc id $@ }
-alias ip='grc ip'
+ip() { grc ip $@ }
-alias iostat='grc iostat'
+iostat() { grc iostat $@ }
-alias last='grc last'
+last() { grc last $@ }
-alias lsattr='grc lsattr'
+lsattr() { grc lsattr $@ }
-alias lsblk='grc lsblk'
+lsblk() { grc lsblk $@ }
-alias lspci='grc lspci'
+lspci() { grc lspci $@ }
-alias lsmod='grc lsmod'
+lsmod() { grc lsmod $@ }
-alias lsof='grc lsof'
+lsof() { grc lsof $@ }
-alias getfacl='grc getfacl'
+getfacl() { grc getfacl $@ }
-alias getsebool='grc getsebool'
+getsebool() { grc getsebool $@ }
-alias ulimit='grc ulimit'
+ulimit() { grc ulimit $@ }
-alias uptime='grc uptime'
+uptime() { grc uptime $@ }
-alias nmap='grc nmap'
+nmap() { grc nmap $@ }
-alias fdisk='grc fdisk'
+fdisk() { grc fdisk $@ }
-alias findmnt='grc findmnt'
+findmnt() { grc findmnt $@ }
-alias free='grc free'
+free() { grc free $@ }
-alias semanage='grc semanage'
+semanage() { grc semanage $@ }
-alias sar='grc sar'
+sar() { grc sar $@ }
-alias ss='grc ss'
+ss() { grc ss $@ }
-alias sysctl='grc sysctl'
+sysctl() { grc sysctl $@ }
-alias systemctl='grc systemctl'
+systemctl() { grc systemctl $@ }
-alias stat='grc stat'
+stat() { grc stat $@ }
-alias showmount='grc showmount'
+showmount() { grc showmount $@ }
-alias tune2fs='grc tune2fs'
+tune2fs() { grc tune2fs $@ }
-alias tcpdum='grc tcpdum'
+tcpdum() { grc tcpdum $@ }
 
 btw, () {
 	echo "                 I use"

home/.gitconfig

@@ -1,9 +1,5 @@
 [user]
-	{%@@ if profile == "mko-laptop" @@%}
-	email = marko.korhonen@rossum.fi
-	{%@@ else @@%}
 	email = marko@korhonen.cc
-	{%@@ endif @@%}
 	name = Marko Korhonen
 	signingkey = C514037F1EFF4FA6
 
@@ -32,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 
 [pull]
-	rebase = merges
+	rebase = false

home/.gnupg/gpg-agent.conf

@@ -1,5 +0,0 @@
-enable-ssh-support
-pinentry-program /usr/bin/pinentry-gnome3
-default-cache-ttl 60
-max-cache-ttl 120
-extra-socket /run/user/1000/gnupg/S.gpg-agent.extra

home/.gnupg/gpg.conf

@@ -1,2 +1,17 @@
-use-agent
+# File re-created by pEp
-keyserver hkps://keys.openpgp.org
+# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp'
+
+# File re-created by pEp
+# See backup in '/home/reekymarko/.gnupg/gpg.conf.0.pep.bkp'
+
+# GnuPG config file created by KGpg
+
+default-key  A90767494C36DEC2EBBCFB8E83850D9D26A2216C
+keyserver hkp://keys.gnupg.net
+cert-digest-algo SHA256
+no-emit-version 
+no-comments 
+personal-cipher-preferences AES AES256 AES192 CAST5
+personal-digest-preferences SHA256 SHA512 SHA384 SHA224
+ignore-time-conflict 
+allow-freeform-uid 

home/.ssh/config

@@ -1,5 +1,3 @@
-Include ~/.ssh/rossum_hosts
-
 host gitea
 	HostName korhonen.cc
 	user git

root/etc/pacman.conf

@@ -2,7 +2,7 @@
 ILoveCandy
 Color
 CheckSpace
-ParallelDownloads = 5
+TotalDownload
 HoldPkg = pacman glibc
 SigLevel = Required DatabaseOptional
 Architecture = auto