logo

dotfiles

My dotfiles, one branch per machine
commit: ae2bac5adaab8db4c1343132f22567087262b34d
parent: 5cfac95c722993204cb80e9204018a14852d9b29
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Wed, 26 Jun 2019 05:59:39 +0200

stash

Diffstat:

M.clang-format8++++++--
M.config/gtkrc-2.03+--
M.gitconfig2+-
M.gnupg/gpg.conf13++++---------
M.tmux.conf2++
M.weechat/irc.conf3+++
M.weechat/weechat.conf1+
M.xbindkeysrc9+++++++++
M.xinitrc20+++++++++++++-------
M.xmodmaprc12++----------
10 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/.clang-format b/.clang-format @@ -2,9 +2,10 @@ AlignAfterOpenBracket: true AlignConsecutiveAssignments: true AlignOperands: true AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true +AllowShortCaseLabelsOnASingleLine: true AllowShortFunctionsOnASingleLine: true AllowShortIfStatementsOnASingleLine: true +AlwaysBreakAfterReturnType: AllDefinitions BinPackArguments: false BinPackParameters: false BreakBeforeBraces: Allman @@ -13,5 +14,8 @@ IncludeBlocks: Regroup ReflowComments: false SortIncludes: true UseTab: ForIndentation -TabWidth: 2 +IndentWidth: 4 +TabWidth: 4 ColumnLimit: 100 + +NamespaceIndentation: All diff --git a/.config/gtkrc-2.0 b/.config/gtkrc-2.0 @@ -1,4 +1,3 @@ -gtk-theme-name = "Breeze-Dark" -gtk-icon-theme-name = "Breeze" +gtk-theme-name = "Adwaita-dark" gtk-font-name = "sans-serif 10" gtk-recent-files-max-age = 0 diff --git a/.gitconfig b/.gitconfig @@ -5,7 +5,7 @@ [push] default = matching [commit] - gpgsign = true + gpgSign = true [url "git://anongit.kde.org/"] insteadOf = kde: [url "ssh://git@git.kde.org/"] diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf @@ -1,25 +1,20 @@ # curl https://sks-keyservers.net/sks-keyservers.netCA.pem > /home/haelwenn/.gnupg/sks-keyservers.netCA.pem -#cert-digest-algo SHA512 -#keyserver-options http-proxy=socks5h://127.0.0.1:9050 +cert-digest-algo SHA512 charset utf-8 -# default-key 8E4BAA5EE6FBD5A8D04F3BE5C87384794BBEBBAD default-key DDC9237C14CF6F4DD847F6B390D93ACCFEFF61AE -default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed default-recipient-self keyid-format 0xlong keyserver hkps://hkps.pool.sks-keyservers.net keyserver-options no-honor-keyserver-url -list-options show-photos +#list-options show-photos list-options show-uid-validity lock-once no-greeting require-secmem -personal-cipher-preferences AES256 AES192 AES CAMELLIA256 CAMELLIA192 CAMELLIA128 -personal-digest-preferences SHA512 SHA384 SHA256 SHA224 RIPEMD160 -photo-viewer "xdg-open %i" +photo-viewer "feh %i" use-agent verify-options show-uid-validity with-fingerprint -disable-cipher-algo 3DES +disable-cipher-algo 3DES IDEA #disable-digest-algo SHA1 #blacklist-cipher-algo 3DES IDEA diff --git a/.tmux.conf b/.tmux.conf @@ -21,6 +21,8 @@ bind-key -n M-j select-pane -D bind-key -n M-k select-pane -U bind-key -n M-l select-pane -R +set-option escape-time 2 + #### COLOUR (Solarized dark) # default statusbar colors diff --git a/.weechat/irc.conf b/.weechat/irc.conf @@ -107,6 +107,9 @@ whois_double_nick = off [ctcp] [ignore] +ignore = *;*;^notifico@.*$ +ignore = *;*;^.*@unaffiliated/soniex2$ +ignore = *;*;^wm\|afk$ [server_default] addresses = "" diff --git a/.weechat/weechat.conf b/.weechat/weechat.conf @@ -370,6 +370,7 @@ default.current = on [filter] irc_smart = on;*;irc_smart_filter;* +Mikaela__r = on;irc.freenode.##abgilpqt+;*;(?-i)^__r [key] ctrl-? = "/input delete_previous_char" diff --git a/.xbindkeysrc b/.xbindkeysrc @@ -36,3 +36,12 @@ "killall -HUP xbindkeys" XF86HomePage + +"setxkbmap ru -variant phonetic" + Alt+Shift+Right + +"setxkbmap us && xmodmap ~/.xmodmaprc" + Alt+Shift+Left + +"passmenu" + Mod4+p diff --git a/.xinitrc b/.xinitrc @@ -1,18 +1,24 @@ +#setxkbmap \ +# -layout us,ru \ +# -variant lanodan,phonetic \ +# -option terminate:ctrl_alt_bksp,ctrl:nocaps setxkbmap \ -layout "${XKB_DEFAULT_LAYOUT}" \ -variant "${XKB_DEFAULT_VARIANT}" \ -option "${XKB_DEFAULT_OPTIONS}" # -rules "${XKB_DEFAULT_RULES}" \ # -model "${XKB_DEFAULT_MODEL}" \ -xset +dpms dpms 40 60 200 s 40 s expose s on & -xautolock -time 0 -locker slock -secure -detectsleep & -~/.screenlayout/default.sh & -g810-led -pp < /home/haelwenn/.config/g810-led-profile & -xmodmap ~/.xmodmaprc & +st & +xset +dpms dpms 40 60 200 s 40 s expose s on +xautolock -time 0 -locker locker -secure -detectsleep & +~/.screenlayout/default.sh +~/.fehbg +g810-led -pp < /home/haelwenn/.config/g810-led-profile +#setxkbmap us -option terminate:ctrl_alt_bksp +#xmodmap ~/.xmodmaprc +#xkbcomp -w0 -I$HOME/.xkb -R$HOME/.xkb keymap/custom $DISPLAY redshift & xbindkeys & xmobar & uim-xim & -st & -~/.fehbg & xmonad diff --git a/.xmodmaprc b/.xmodmaprc @@ -11,8 +11,8 @@ clear Mod3 clear Mod5 clear control -keycode 50 = Shift_L Caps_Lock -keycode 62 = Shift_R Caps_Lock +keycode 50 = Shift_L Shift_L +keycode 62 = Shift_R Shift_R keycode 66 = Control_L Control_L add control = Control_L Control_R @@ -36,15 +36,7 @@ keycode 46 = l L Right End keycode 48 = apostrophe quotedbl U2018 U201C keycode 51 = backslash bar U2019 U201D -keycode 53 = x X -keycode 54 = c C -keycode 55 = v V keycode 59 = comma less U00AB keycode 60 = period greater U00BB keycode 61 = slash question UFFFD keycode 65 = space space nobreakspace - -keycode 112 = Prior Prior -keycode 117 = Next Next - -keycode 135 = Multi_key Multi_key