Compare commits
16 commits
7b74157256
...
0c80d9bc34
Author | SHA1 | Date | |
---|---|---|---|
0c80d9bc34 | |||
|
3725c791bc | ||
|
fa9dccc7a2 | ||
|
8eced427bf | ||
|
fe0105cd8c | ||
|
e1f2523e6c | ||
75d8bef7aa | |||
8b1941beed | |||
ba3ee905f0 | |||
162ff33f89 | |||
ba6335ce09 | |||
e73596062b | |||
0b0749e5fd | |||
|
cc1fbb151b | ||
|
05cd37b757 | ||
|
ea214c16db |
10 changed files with 80 additions and 71 deletions
10
config.yaml
10
config.yaml
|
@ -155,6 +155,13 @@ dotfiles:
|
||||||
f_foot.ini:
|
f_foot.ini:
|
||||||
src: .config/foot/foot.ini
|
src: .config/foot/foot.ini
|
||||||
dst: ~/.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:
|
profiles:
|
||||||
base:
|
base:
|
||||||
dotfiles:
|
dotfiles:
|
||||||
|
@ -225,6 +232,8 @@ profiles:
|
||||||
- f_user-dirs.dirs
|
- f_user-dirs.dirs
|
||||||
- f_gitconfig
|
- f_gitconfig
|
||||||
- f_foot.ini
|
- f_foot.ini
|
||||||
|
- f_gpg-agent.conf
|
||||||
|
- f_gpg.conf
|
||||||
Moria:
|
Moria:
|
||||||
include:
|
include:
|
||||||
- terminal
|
- terminal
|
||||||
|
@ -237,6 +246,7 @@ profiles:
|
||||||
mko-laptop:
|
mko-laptop:
|
||||||
include:
|
include:
|
||||||
- terminal
|
- terminal
|
||||||
|
- media
|
||||||
Edoras:
|
Edoras:
|
||||||
include:
|
include:
|
||||||
- terminal
|
- terminal
|
||||||
|
|
2
dotdrop
2
dotdrop
|
@ -1 +1 @@
|
||||||
Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6
|
Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb
|
|
@ -73,8 +73,6 @@ mouse:
|
||||||
double_click: { threshold: 300 }
|
double_click: { threshold: 300 }
|
||||||
triple_click: { threshold: 300 }
|
triple_click: { threshold: 300 }
|
||||||
hide_when_typing: false
|
hide_when_typing: false
|
||||||
url:
|
|
||||||
modifiers: None
|
|
||||||
|
|
||||||
selection:
|
selection:
|
||||||
semantic_escape_chars: ',│`|:"'' ()[]{}<>'
|
semantic_escape_chars: ',│`|:"'' ()[]{}<>'
|
||||||
|
|
|
@ -9,8 +9,10 @@ hwdec-codecs=all
|
||||||
|
|
||||||
{%@@ if profile == "Mirkwood" @@%}
|
{%@@ if profile == "Mirkwood" @@%}
|
||||||
gpu-context=wayland
|
gpu-context=wayland
|
||||||
{%@@ elif profile == "Rivendell" @@%}
|
{%@@ endif @@%}
|
||||||
ao=alsa
|
|
||||||
|
{%@@ if profile == "mko-laptop" @@%}
|
||||||
|
script=~/bin/mpris.so
|
||||||
{%@@ endif @@%}
|
{%@@ endif @@%}
|
||||||
|
|
||||||
#############
|
#############
|
||||||
|
@ -104,8 +106,11 @@ ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]"
|
||||||
[best]
|
[best]
|
||||||
ytdl-format="bestvideo+bestaudio"
|
ytdl-format="bestvideo+bestaudio"
|
||||||
|
|
||||||
|
|
||||||
|
{%@@ if profile == "Mirkwood" @@%}
|
||||||
# Vulkan hwdec profile
|
# Vulkan hwdec profile
|
||||||
[vulkan]
|
[vulkan]
|
||||||
gpu-api=vulkan
|
gpu-api=vulkan
|
||||||
gpu-context=waylandvk
|
gpu-context=waylandvk
|
||||||
hwdec=vaapi-copy
|
hwdec=vaapi-copy
|
||||||
|
{%@@ endif @@%}
|
||||||
|
|
|
@ -216,53 +216,53 @@ cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg }
|
||||||
xgpgtar() { gpg -d $1 | tar x --zstd }
|
xgpgtar() { gpg -d $1 | tar x --zstd }
|
||||||
|
|
||||||
# colorise output
|
# colorise output
|
||||||
cvs() { grc cvs $@ }
|
alias cvs='grc cvs'
|
||||||
df() { grc df $@ }
|
alias df='grc df'
|
||||||
digg() { grc digg $@ }
|
alias digg='grc digg'
|
||||||
gcc() { grc gcc $@ }
|
alias gcc='grc gcc'
|
||||||
g++() { grc g++ $@ }
|
alias g++='grc g++'
|
||||||
ifconfig() { grc ifconfig $@ }
|
alias ifconfig='grc ifconfig'
|
||||||
make() { grc make $@ }
|
alias make='grc make'
|
||||||
mount() { grc mount $@ }
|
alias mount='grc mount'
|
||||||
mtr() { grc mtr $@ }
|
alias mtr='grc mtr'
|
||||||
netstat() { grc mount $@ }
|
alias netstat='grc mount'
|
||||||
ping() { grc ping $@ }
|
alias ping='grc ping'
|
||||||
ps() { grc ps $@ }
|
alias ps='grc ps'
|
||||||
tail() { grc tail $@ }
|
alias tail='grc tail'
|
||||||
traceroute() { grc traceroute $@ }
|
alias traceroute='grc traceroute'
|
||||||
wdiff() { grc wdiff $@ }
|
alias wdiff='grc wdiff'
|
||||||
blkid() { grc blkid $@ }
|
alias blkid='grc blkid'
|
||||||
du() { grc du $@ }
|
alias du='grc du'
|
||||||
dnf() { grc dnf $@ }
|
alias dnf='grc dnf'
|
||||||
docker() { grc docker $@ }
|
alias docker='grc docker'
|
||||||
docker-machine() { grc docker-machine $@ }
|
alias docker-machine='grc docker-machine'
|
||||||
env() { grc env $@ }
|
alias env='grc env'
|
||||||
id() { grc id $@ }
|
alias id='grc id'
|
||||||
ip() { grc ip $@ }
|
alias ip='grc ip'
|
||||||
iostat() { grc iostat $@ }
|
alias iostat='grc iostat'
|
||||||
last() { grc last $@ }
|
alias last='grc last'
|
||||||
lsattr() { grc lsattr $@ }
|
alias lsattr='grc lsattr'
|
||||||
lsblk() { grc lsblk $@ }
|
alias lsblk='grc lsblk'
|
||||||
lspci() { grc lspci $@ }
|
alias lspci='grc lspci'
|
||||||
lsmod() { grc lsmod $@ }
|
alias lsmod='grc lsmod'
|
||||||
lsof() { grc lsof $@ }
|
alias lsof='grc lsof'
|
||||||
getfacl() { grc getfacl $@ }
|
alias getfacl='grc getfacl'
|
||||||
getsebool() { grc getsebool $@ }
|
alias getsebool='grc getsebool'
|
||||||
ulimit() { grc ulimit $@ }
|
alias ulimit='grc ulimit'
|
||||||
uptime() { grc uptime $@ }
|
alias uptime='grc uptime'
|
||||||
nmap() { grc nmap $@ }
|
alias nmap='grc nmap'
|
||||||
fdisk() { grc fdisk $@ }
|
alias fdisk='grc fdisk'
|
||||||
findmnt() { grc findmnt $@ }
|
alias findmnt='grc findmnt'
|
||||||
free() { grc free $@ }
|
alias free='grc free'
|
||||||
semanage() { grc semanage $@ }
|
alias semanage='grc semanage'
|
||||||
sar() { grc sar $@ }
|
alias sar='grc sar'
|
||||||
ss() { grc ss $@ }
|
alias ss='grc ss'
|
||||||
sysctl() { grc sysctl $@ }
|
alias sysctl='grc sysctl'
|
||||||
systemctl() { grc systemctl $@ }
|
alias systemctl='grc systemctl'
|
||||||
stat() { grc stat $@ }
|
alias stat='grc stat'
|
||||||
showmount() { grc showmount $@ }
|
alias showmount='grc showmount'
|
||||||
tune2fs() { grc tune2fs $@ }
|
alias tune2fs='grc tune2fs'
|
||||||
tcpdum() { grc tcpdum $@ }
|
alias tcpdum='grc tcpdum'
|
||||||
|
|
||||||
btw, () {
|
btw, () {
|
||||||
echo " I use"
|
echo " I use"
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
[user]
|
[user]
|
||||||
|
{%@@ if profile == "mko-laptop" @@%}
|
||||||
|
email = marko.korhonen@rossum.fi
|
||||||
|
{%@@ else @@%}
|
||||||
email = marko@korhonen.cc
|
email = marko@korhonen.cc
|
||||||
|
{%@@ endif @@%}
|
||||||
name = Marko Korhonen
|
name = Marko Korhonen
|
||||||
signingkey = C514037F1EFF4FA6
|
signingkey = C514037F1EFF4FA6
|
||||||
|
|
||||||
|
@ -28,4 +32,4 @@
|
||||||
cmd = nvim -d -c 'set nomodifiable'
|
cmd = nvim -d -c 'set nomodifiable'
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = merges
|
||||||
|
|
5
home/.gnupg/gpg-agent.conf
Normal file
5
home/.gnupg/gpg-agent.conf
Normal file
|
@ -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
|
|
@ -1,17 +1,2 @@
|
||||||
# File re-created by pEp
|
use-agent
|
||||||
# See backup in '/home/reekymarko/.gnupg/gpg.conf.1.pep.bkp'
|
keyserver hkps://keys.openpgp.org
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
Include ~/.ssh/rossum_hosts
|
||||||
|
|
||||||
host gitea
|
host gitea
|
||||||
HostName korhonen.cc
|
HostName korhonen.cc
|
||||||
user git
|
user git
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
ILoveCandy
|
ILoveCandy
|
||||||
Color
|
Color
|
||||||
CheckSpace
|
CheckSpace
|
||||||
TotalDownload
|
ParallelDownloads = 5
|
||||||
HoldPkg = pacman glibc
|
HoldPkg = pacman glibc
|
||||||
SigLevel = Required DatabaseOptional
|
SigLevel = Required DatabaseOptional
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
|
Loading…
Reference in a new issue