From e0b2cc16fb9179cc4c62c94a807a07ddc4d4fa53 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 22 Oct 2022 00:58:24 +0200
Subject: [PATCH] Improve configs
---
.bin/.e | 2 +-
.bin/autoinstall | 5 +++
.config/aliasrc | 2 +
.config/git/config | 67 +++++++++++++++---------------
.config/gtk-3.0/settings.ini | 16 +++++++
.config/sxhkd/sxhkdrc | 4 +-
.config/wakatime/.wakatime.cfg.tpl | 2 +
7 files changed, 63 insertions(+), 35 deletions(-)
create mode 100644 .config/gtk-3.0/settings.ini
diff --git a/.bin/.e b/.bin/.e
index fffd747..f9c6fd5 100755
--- a/.bin/.e
+++ b/.bin/.e
@@ -14,7 +14,7 @@ declare -A mapper=(
["starship"]="$HOME/.config/starship.toml"
["sxhkd"]="$HOME/.config/sxhkd/sxhkdrc"
["vim"]="$HOME/.config/vim/vimrc"
- ["wakatime"]="$HOME/.config/wakatime/.wakatime.cfg"
+ ["wakatime"]="$HOME/.config/wakatime/.wakatime.cfg.tpl"
["xprofile"]="$HOME/.xprofile"
["zsh"]="$HOME/.config/zsh/.zshrc"
)
diff --git a/.bin/autoinstall b/.bin/autoinstall
index c6b1d1a..e0522b9 100755
--- a/.bin/autoinstall
+++ b/.bin/autoinstall
@@ -28,6 +28,8 @@ _autoinstall_all () {
envsubst < "$wakatime_tpl" > "$wakatime_cfg"
fi
+ cp -n "$HOME/.ssh/authorized_keys.default" "$HOME/.ssh/authorized_keys"
+
_autoinstall_file \
"https://raw.githubusercontent.com/qw3rtman/git-fire/master/git-fire" \
"$HOME/.local/bin/git-fire"
@@ -44,6 +46,9 @@ _autoinstall_all () {
"https://github.com/dracula/qutebrowser.git" \
"$HOME/.config/qutebrowser/dracula"
+ _autoinstall_git \
+ "https://github.com/dracula/gtk.git" \
+ "$HOME/.themes/Dracula"
}
_autoinstall_git () {
diff --git a/.config/aliasrc b/.config/aliasrc
index baeb2e1..0242682 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -1,6 +1,8 @@
#!/bin/sh
alias .f='git --git-dir="$HOME/.dotfiles"'
+alias :q='exit'
+alias :wq='exit'
alias aliases='$EDITOR ~/.config/aliasrc && . ~/.config/aliasrc'
alias aliases.local='$EDITOR ~/.config/aliasrc.local && . ~/.config/aliasrc'
diff --git a/.config/git/config b/.config/git/config
index 3ab7fad..42f12c1 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,54 +1,55 @@
[user]
- email = tobias@msrg.cc
- name = Tobias Reisinger
- signingkey = 723B78C0BF8D8C721D2C4EEF41E544A54E2533B2
+ email = tobias@msrg.cc
+ name = Tobias Reisinger
+ signingkey = 723B78C0BF8D8C721D2C4EEF41E544A54E2533B2
[core]
- excludesfile = ~/.config/git/ignore
- editor = vim
- pager = less
- autocrlf = input
+ excludesfile = ~/.config/git/ignore
+ editor = vim
+ pager = less
+ autocrlf = input
[help]
- autocorrect = 20
+ autocorrect = 20
[diff]
- tool = vimdiff
+ tool = vimdiff
[difftool]
- prompt = false
+ prompt = false
trustExitCode = true
[alias]
- b = branch -vv
- ci = commit
- cia = commit --amend
- d = diff
- dc = diff --cached
- ds = diff --stat
- dt = difftool
- dtc = difftool --cached
- l = log --graph
+ b = branch -vv
+ ci = commit
+ cia = commit -C HEAD --amend
+ d = diff
+ dc = diff --cached
+ ds = diff --stat
+ dw = diff --word-diff=color
+ dt = difftool
+ dtc = difftool --cached
+ l = log --graph
lo = log --graph --decorate --oneline --all
s = status
[merge]
- tool = vim_mergetool
- conflictstyle = diff3
+ tool = vim_mergetool
+ conflictstyle = diff3
[mergetool "vim_mergetool"]
- cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
- trustExitCode = true
+ cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+ trustExitCode = true
[credential]
- helper = /usr/bin/pass-git-helper
+ helper = /usr/bin/pass-git-helper
[sendemail]
- smtpserver = mail.serguzim.me
- smtpuser = tobias@msrg.cc
- smtpencryption = tls
- smtpserverport = 587
- annotate = yes
+ smtpserver = mail.serguzim.me
+ smtpuser = tobias@msrg.cc
+ smtpencryption = tls
+ smtpserverport = 587
+ annotate = yes
[advice]
- addIgnoredFile = false
+ addIgnoredFile = false
[pull]
- ff = only
+ ff = only
[push]
- followTags = true
+ followTags = true
[format]
- signOff = yes
+ signOff = yes
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
new file mode 100644
index 0000000..998107d
--- /dev/null
+++ b/.config/gtk-3.0/settings.ini
@@ -0,0 +1,16 @@
+[Settings]
+gtk-theme-name=Dracula
+gtk-icon-theme-name=Dracula
+gtk-font-name=Sans 11
+gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_TEXT
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull
+gtk-application-prefer-dark-theme=1
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 2a6aa7c..fc42ddd 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -54,7 +54,7 @@ XF86MonBrightnessDown
backlight -dec 5
super + v
- freetube "$(xclip -o -selection clipboard)"
+ flatpak run io.freetubeapp.FreeTube "$(xclip -o -selection clipboard)"
super + shift + v
mpv $(xclip -o -selection clipboard); notify-send "mpv media playback finished"
@@ -133,6 +133,8 @@ super + {_,shift + }{1-9,0}
bspc {desktop -f,node -d} '^{1-9,10}'
super + {_,shift + } dead_circumflex
bspc {desktop -f,node -d} 'focus'
+super + ctrl + dead_circumflex
+ bspc desktop -f 'side-view'
super + shift + p
bspc desktop 'presenter1' --swap 'presenter2'
diff --git a/.config/wakatime/.wakatime.cfg.tpl b/.config/wakatime/.wakatime.cfg.tpl
index 2c03234..45277e9 100644
--- a/.config/wakatime/.wakatime.cfg.tpl
+++ b/.config/wakatime/.wakatime.cfg.tpl
@@ -10,3 +10,5 @@ ignore=
TAG_EDITMSG$
exclude_unknown_project=true
api_key=${WAKATIME_API_KEY}
+[projectmap]
+projects/emgauwa/core=emgauwa-core