From ea214c16db999ddab9c7d43fa30b645e6d46e616 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:12 +0300 Subject: [PATCH 01/14] Add rebase merges to gitconfig --- home/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.gitconfig b/home/.gitconfig index 9734926e..8be410c2 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -28,4 +28,4 @@ cmd = nvim -d -c 'set nomodifiable' [pull] - rebase = false + rebase = merges From 05cd37b757aeac576e9699af03acf0112820aa46 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:34 +0300 Subject: [PATCH 02/14] Add media profile to mko-laptop --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index c2186244..68335dc7 100644 --- a/config.yaml +++ b/config.yaml @@ -245,6 +245,7 @@ profiles: mko-laptop: include: - terminal + - media Edoras: include: - terminal From 0b0749e5fd04579626be267cdbb175f61a0d6c22 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 10 Jun 2021 10:14:42 +0300 Subject: [PATCH 03/14] Remove deprecated option from pacman.conf --- root/etc/pacman.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 01d8a2a7..aaab5f1c 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,7 +2,6 @@ ILoveCandy Color CheckSpace -TotalDownload HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto From e73596062b912bf571bd4f24a301b7d75f422a6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:53:35 +0300 Subject: [PATCH 04/14] Change grc functions to aliases. Fixes some syntax errors (?) --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 4c0d4215..18d530fd 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/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 -cvs() { grc cvs $@ } -df() { grc df $@ } -digg() { grc digg $@ } -gcc() { grc gcc $@ } -g++() { grc g++ $@ } -ifconfig() { grc ifconfig $@ } -make() { grc make $@ } -mount() { grc mount $@ } -mtr() { grc mtr $@ } -netstat() { grc mount $@ } -ping() { grc ping $@ } -ps() { grc ps $@ } -tail() { grc tail $@ } -traceroute() { grc traceroute $@ } -wdiff() { grc wdiff $@ } -blkid() { grc blkid $@ } -du() { grc du $@ } -dnf() { grc dnf $@ } -docker() { grc docker $@ } -docker-machine() { grc docker-machine $@ } -env() { grc env $@ } -id() { grc id $@ } -ip() { grc ip $@ } -iostat() { grc iostat $@ } -last() { grc last $@ } -lsattr() { grc lsattr $@ } -lsblk() { grc lsblk $@ } -lspci() { grc lspci $@ } -lsmod() { grc lsmod $@ } -lsof() { grc lsof $@ } -getfacl() { grc getfacl $@ } -getsebool() { grc getsebool $@ } -ulimit() { grc ulimit $@ } -uptime() { grc uptime $@ } -nmap() { grc nmap $@ } -fdisk() { grc fdisk $@ } -findmnt() { grc findmnt $@ } -free() { grc free $@ } -semanage() { grc semanage $@ } -sar() { grc sar $@ } -ss() { grc ss $@ } -sysctl() { grc sysctl $@ } -systemctl() { grc systemctl $@ } -stat() { grc stat $@ } -showmount() { grc showmount $@ } -tune2fs() { grc tune2fs $@ } -tcpdum() { grc tcpdum $@ } +alias cvs='grc cvs $@' +alias df='grc df $@' +alias digg='grc digg $@' +alias gcc='grc gcc $@' +alias g++='grc g++ $@' +alias ifconfig='grc ifconfig $@' +alias make='grc make $@' +alias mount='grc mount $@' +alias mtr='grc mtr $@' +alias netstat='grc mount $@' +alias ping='grc ping $@' +alias ps='grc ps $@' +alias tail='grc tail $@' +alias traceroute='grc traceroute $@' +alias wdiff='grc wdiff $@' +alias blkid='grc blkid $@' +alias du='grc du $@' +alias dnf='grc dnf $@' +alias docker='grc docker $@' +alias docker-machine='grc docker-machine $@' +alias env='grc env $@' +alias id='grc id $@' +alias ip='grc ip $@' +alias iostat='grc iostat $@' +alias last='grc last $@' +alias lsattr='grc lsattr $@' +alias lsblk='grc lsblk $@' +alias lspci='grc lspci $@' +alias lsmod='grc lsmod $@' +alias lsof='grc lsof $@' +alias getfacl='grc getfacl $@' +alias getsebool='grc getsebool $@' +alias ulimit='grc ulimit $@' +alias uptime='grc uptime $@' +alias nmap='grc nmap $@' +alias fdisk='grc fdisk $@' +alias findmnt='grc findmnt $@' +alias free='grc free $@' +alias semanage='grc semanage $@' +alias sar='grc sar $@' +alias ss='grc ss $@' +alias sysctl='grc sysctl $@' +alias systemctl='grc systemctl $@' +alias stat='grc stat $@' +alias showmount='grc showmount $@' +alias tune2fs='grc tune2fs $@' +alias tcpdum='grc tcpdum $@' btw, () { echo " I use" From ba6335ce09f04b3778d672f9254a96b73147692d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:55:55 +0300 Subject: [PATCH 05/14] Aliases don't need $@ --- home/.config/zsh/03-aliases.zsh | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 18d530fd..c0811358 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/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 $@' -alias df='grc df $@' -alias digg='grc digg $@' -alias gcc='grc gcc $@' -alias g++='grc g++ $@' -alias ifconfig='grc ifconfig $@' -alias make='grc make $@' -alias mount='grc mount $@' -alias mtr='grc mtr $@' -alias netstat='grc mount $@' -alias ping='grc ping $@' -alias ps='grc ps $@' -alias tail='grc tail $@' -alias traceroute='grc traceroute $@' -alias wdiff='grc wdiff $@' -alias blkid='grc blkid $@' -alias du='grc du $@' -alias dnf='grc dnf $@' -alias docker='grc docker $@' -alias docker-machine='grc docker-machine $@' -alias env='grc env $@' -alias id='grc id $@' -alias ip='grc ip $@' -alias iostat='grc iostat $@' -alias last='grc last $@' -alias lsattr='grc lsattr $@' -alias lsblk='grc lsblk $@' -alias lspci='grc lspci $@' -alias lsmod='grc lsmod $@' -alias lsof='grc lsof $@' -alias getfacl='grc getfacl $@' -alias getsebool='grc getsebool $@' -alias ulimit='grc ulimit $@' -alias uptime='grc uptime $@' -alias nmap='grc nmap $@' -alias fdisk='grc fdisk $@' -alias findmnt='grc findmnt $@' -alias free='grc free $@' -alias semanage='grc semanage $@' -alias sar='grc sar $@' -alias ss='grc ss $@' -alias sysctl='grc sysctl $@' -alias systemctl='grc systemctl $@' -alias stat='grc stat $@' -alias showmount='grc showmount $@' -alias tune2fs='grc tune2fs $@' -alias tcpdum='grc tcpdum $@' +alias cvs='grc cvs' +alias df='grc df' +alias digg='grc digg' +alias gcc='grc gcc' +alias g++='grc g++' +alias ifconfig='grc ifconfig' +alias make='grc make' +alias mount='grc mount' +alias mtr='grc mtr' +alias netstat='grc mount' +alias ping='grc ping' +alias ps='grc ps' +alias tail='grc tail' +alias traceroute='grc traceroute' +alias wdiff='grc wdiff' +alias blkid='grc blkid' +alias du='grc du' +alias dnf='grc dnf' +alias docker='grc docker' +alias docker-machine='grc docker-machine' +alias env='grc env' +alias id='grc id' +alias ip='grc ip' +alias iostat='grc iostat' +alias last='grc last' +alias lsattr='grc lsattr' +alias lsblk='grc lsblk' +alias lspci='grc lspci' +alias lsmod='grc lsmod' +alias lsof='grc lsof' +alias getfacl='grc getfacl' +alias getsebool='grc getsebool' +alias ulimit='grc ulimit' +alias uptime='grc uptime' +alias nmap='grc nmap' +alias fdisk='grc fdisk' +alias findmnt='grc findmnt' +alias free='grc free' +alias semanage='grc semanage' +alias sar='grc sar' +alias ss='grc ss' +alias sysctl='grc sysctl' +alias systemctl='grc systemctl' +alias stat='grc stat' +alias showmount='grc showmount' +alias tune2fs='grc tune2fs' +alias tcpdum='grc tcpdum' btw, () { echo " I use" From 162ff33f899e8d572c5bb2db4cdb155c8d60aad9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:04:58 +0300 Subject: [PATCH 06/14] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5d4b12ea..44791be1 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6 +Subproject commit 44791be1199a5eec56ec219540da8329b225abdf From ba3ee905f0ba0c77ec07a2515566d146e1c0b362 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:05:17 +0300 Subject: [PATCH 07/14] Add gpg conf --- config.yaml | 9 +++++++++ home/.gnupg/gpg-agent.conf | 5 +++++ home/.gnupg/gpg.conf | 19 ++----------------- 3 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 home/.gnupg/gpg-agent.conf diff --git a/config.yaml b/config.yaml index 15de07f4..316f56d2 100644 --- a/config.yaml +++ b/config.yaml @@ -162,6 +162,13 @@ 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: @@ -233,6 +240,8 @@ profiles: - f_user-dirs.dirs - f_gitconfig - f_foot.ini + - f_gpg-agent.conf + - f_gpg.conf Moria: include: - terminal diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf new file mode 100644 index 00000000..a2009825 --- /dev/null +++ b/home/.gnupg/gpg-agent.conf @@ -0,0 +1,5 @@ +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 diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf index 50a0191b..0a9596e7 100644 --- a/home/.gnupg/gpg.conf +++ b/home/.gnupg/gpg.conf @@ -1,17 +1,2 @@ -# File re-created by pEp -# 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 +use-agent +keyserver hkps://keys.openpgp.org From 8b1941beed6f7205b5cd49f04257157077a56d0e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:21 +0300 Subject: [PATCH 08/14] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 44791be1..5c886ba2 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 44791be1199a5eec56ec219540da8329b225abdf +Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f From 75d8bef7aac4e5a570dbab60c2a9181a14a9b1ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:29 +0300 Subject: [PATCH 09/14] Remove deprecated option from alacritty --- home/.config/alacritty/alacritty.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index 5574fc86..8fa9eb14 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -73,8 +73,6 @@ mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } hide_when_typing: false - url: - modifiers: None selection: semantic_escape_chars: ',│`|:"'' ()[]{}<>' From e1f2523e6c6dc94f115cb4a639dc984b4c6772ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:34 +0300 Subject: [PATCH 10/14] Add an include file for Rossum hosts --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index b39bd8de..637e7359 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,3 +1,5 @@ +Include ~/.ssh/rossum_hosts + host gitea HostName korhonen.cc user git From fe0105cd8c61a5e567f5667c835e5bd068ab2403 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:57 +0300 Subject: [PATCH 11/14] Dynamic git config for work laptop --- home/.gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.gitconfig b/home/.gitconfig index 8be410c2..16d6ce2d 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,5 +1,9 @@ [user] + {%@@ if profile == "mko-laptop" @@%} + email = marko.korhonen@rossum.fi + {%@@ else @@%} email = marko@korhonen.cc + {%@@ endif @@%} name = Marko Korhonen signingkey = C514037F1EFF4FA6 From 8eced427bf7c354de68d89272ba05c4aaaf4d96d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:14 +0300 Subject: [PATCH 12/14] Update dotdrop --- dotdrop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop b/dotdrop index 5c886ba2..3f00e21e 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 5c886ba2b0572caae45ca2d72c918cc14ef9ed8f +Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb From fa9dccc7a2f5edde175733eabdc9675cf70b11f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:24 +0300 Subject: [PATCH 13/14] Only add vulkan and wayland stuff for mirkwood mpv --- home/.config/mpv/mpv.conf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index be2d89c7..26d19160 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -9,8 +9,10 @@ hwdec-codecs=all {%@@ if profile == "Mirkwood" @@%} gpu-context=wayland -{%@@ elif profile == "Rivendell" @@%} -ao=alsa +{%@@ endif @@%} + +{%@@ if profile == "mko-laptop" @@%} +script=~/bin/mpris.so {%@@ endif @@%} ############# @@ -104,8 +106,11 @@ 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 @@%} From 3725c791bc5ee0c4864db97c01eb0094a6914d89 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Jul 2021 12:11:27 +0300 Subject: [PATCH 14/14] Enable parallel downloads for pacman --- root/etc/pacman.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index aaab5f1c..97733f89 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -2,6 +2,7 @@ ILoveCandy Color CheckSpace +ParallelDownloads = 5 HoldPkg = pacman glibc SigLevel = Required DatabaseOptional Architecture = auto