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:
|
||||
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:
|
||||
|
@ -225,6 +232,8 @@ profiles:
|
|||
- f_user-dirs.dirs
|
||||
- f_gitconfig
|
||||
- f_foot.ini
|
||||
- f_gpg-agent.conf
|
||||
- f_gpg.conf
|
||||
Moria:
|
||||
include:
|
||||
- terminal
|
||||
|
@ -237,6 +246,7 @@ profiles:
|
|||
mko-laptop:
|
||||
include:
|
||||
- terminal
|
||||
- media
|
||||
Edoras:
|
||||
include:
|
||||
- terminal
|
||||
|
|
2
dotdrop
2
dotdrop
|
@ -1 +1 @@
|
|||
Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6
|
||||
Subproject commit 3f00e21ee4ce8a235782a714a99f7578db5d0adb
|
|
@ -73,8 +73,6 @@ mouse:
|
|||
double_click: { threshold: 300 }
|
||||
triple_click: { threshold: 300 }
|
||||
hide_when_typing: false
|
||||
url:
|
||||
modifiers: None
|
||||
|
||||
selection:
|
||||
semantic_escape_chars: ',│`|:"'' ()[]{}<>'
|
||||
|
|
|
@ -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 @@%}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
@ -28,4 +32,4 @@
|
|||
cmd = nvim -d -c 'set nomodifiable'
|
||||
|
||||
[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
|
||||
# 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
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Include ~/.ssh/rossum_hosts
|
||||
|
||||
host gitea
|
||||
HostName korhonen.cc
|
||||
user git
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
ILoveCandy
|
||||
Color
|
||||
CheckSpace
|
||||
TotalDownload
|
||||
ParallelDownloads = 5
|
||||
HoldPkg = pacman glibc
|
||||
SigLevel = Required DatabaseOptional
|
||||
Architecture = auto
|
||||
|
|
Loading…
Reference in a new issue