diff options
Diffstat (limited to '')
| -rw-r--r-- | .bashrc | 4 | ||||
| -rw-r--r-- | .config/foot/foot.ini | 2 | ||||
| -rw-r--r-- | .config/git/config | 10 | ||||
| -rw-r--r-- | .config/isync/mbsyncrc | 4 | ||||
| -rw-r--r-- | .config/mpv/mpv.conf | 2 | ||||
| -rw-r--r-- | .config/sway/config | 6 | ||||
| -rw-r--r-- | .emacs.d/eshell/alias | 4 | ||||
| -rw-r--r-- | .emacs.d/init.el | 22 | ||||
| -rwxr-xr-x | .local/bin/b-bar | 25 | ||||
| -rwxr-xr-x | .local/bin/b-pavols | 2 |
10 files changed, 50 insertions, 31 deletions
@@ -78,6 +78,7 @@ HISTFILESIZE= HISTCONTROL=ignoreboth # ignore a few very common commands and don't add them to history #HISTIGNORE='ls:l:ll:s:g:[bf]g:history:da:li' +HISTIGNORE='sr' HISTTIMEFORMAT='%F %T ' stty stop "" @@ -125,7 +126,7 @@ alias vdir='vdir --color=auto' alias grep='grep --color=auto' alias egrep='grep -E --color=auto' alias fgrep='grep -F --color=auto' -alias mpv="mpv --ytdl-format=mp4" +# alias mpv="mpv --ytdl-format=mp4" alias mv="mv -iv" alias cp="cp -iv" alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc' @@ -141,6 +142,7 @@ alias alert='notify-send --urgency=low \ alias da='change-theme dark' alias li='change-theme light' +alias sr='sway-run' bash_completions_dir=/usr/share/bash-completion/completions/ diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index ff0740c..b9c9c83 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -74,7 +74,7 @@ lines=100000 # hide-when-typing=no # alternate-scroll-mode=yes -[touch] +#[touch] # long-press-delay=400 [colors] diff --git a/.config/git/config b/.config/git/config index e9f8388..2d3bfd8 100644 --- a/.config/git/config +++ b/.config/git/config @@ -87,15 +87,15 @@ name = debian/changelog merge driver driver = dpkg-mergechangelogs -m %O %A %B %A -[includeIf "gitdir:~/src/gnu/"] +[includeIf "gitdir:src/gnu/"] path = ~/.config/git/config.gnu -[includeIf "gitdir:~/src/debian/"] +[includeIf "gitdir:src/debian/"] path = ~/.config/git/config.debian -[includeIf "gitdir:~/src/canonical/"] +[includeIf "gitdir:src/canonical/"] path = ~/.config/git/config.canonical -[includeIf "gitdir:~/src/sfl/"] +[includeIf "gitdir:src/sfl/"] path = ~/.config/git/config.sfl [cinnabar] - version-check = 1709664726 + version-check = 1718710536 [help] autoCorrect = prompt diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc index ec6d804..b0151fd 100644 --- a/.config/isync/mbsyncrc +++ b/.config/isync/mbsyncrc @@ -9,7 +9,7 @@ Host mail.kelar.org User bandali@kelar.org PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/kelar.gpg" SSLType IMAPS -Timeout 240 +Timeout 300 IMAPStore kelar-remote Account kelar @@ -60,7 +60,7 @@ Host mail.shemshak.org User gnu@bndl.org PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub.gpg" SSLType IMAPS -Timeout 360 +Timeout 420 IMAPStore gnub-remote Account gnub diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index dd3b3b4..2b0d324 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -27,5 +27,5 @@ sub-border-size=0 sub-border-color=0/1 sub-shadow-color=0/1 sub-shadow-offset=1.2 -sub-ass-style-overrides=Kerning=yes +sub-ass-force-style=Kerning=yes sub-ass-line-spacing=0 diff --git a/.config/sway/config b/.config/sway/config index c251a25..684218e 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -26,6 +26,7 @@ input * { repeat_delay 200 repeat_rate 45 xkb_layout us,ir + # xkb_layout us(colemak_dh),ir } floating_modifier $mod normal @@ -164,7 +165,7 @@ bar { } } -seat seat0 hide_cursor 5000 +seat seat0 hide_cursor 10000 seat seat0 xcursor_theme DMZ-White default_border pixel 4 @@ -172,8 +173,7 @@ hide_edge_borders smart for_window [window_role="pop-up"] floating enable -for_window [app_id="mpv"] floating enable -for_window [app_id="mumble"] floating enable, inhibit_idle +for_window [app_id="mumble"] floating enable, inhibit_idle open for_window [app_id="nm-connection-editor"] floating enable for_window [app_id="virt-manager"] floating enable for_window [class="Vncviewer"] floating enable diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 113ef31..597d9f4 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -17,5 +17,5 @@ alias vi find-file $1 alias vim find-file $1 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $* alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $* -alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; mbsync sfl; mbsync sflro; getmail -alias mc mbsync canonical; mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; mbsync sfl; mbsync sflro; getmail +alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail +alias mc mbsync canonical; mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 29a4c4b..975d314 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -631,7 +631,7 @@ for all frames." (setopt gnus-select-method '(nnnil "") gnus-secondary-select-methods - `(,@(when (member (system-name) '("darya" "nostalgia")) + `(,@(when (member (system-name) '("darya" "nostalgia" "selene")) '((nnimap "canonical" (nnimap-stream plain) @@ -741,13 +741,14 @@ for all frames." ("X-Spam-Flag" "YES" "Junk") ;; catch-all "INBOX"))) - (nnimap - "sfl" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "amin.bandali@savoirfairelinux.local"))) + ;; (nnimap + ;; "sfl" + ;; (nnimap-stream plain) + ;; (nnimap-address "127.0.0.1") + ;; (nnimap-server-port 143) + ;; (nnimap-authenticator plain) + ;; (nnimap-user "amin.bandali@savoirfairelinux.local")) + ) gnus-message-archive-group "nnimap+kelar:INBOX" gnus-parameters '(("l\\.fencepost-users" @@ -951,7 +952,7 @@ for all frames." (setq gnus-topic-topology `(("Gnus" visible nil nil) (("misc" visible nil nil)) - ,@(when (member (system-name) '("darya" "nostalgia")) + ,@(when (member (system-name) '("darya" "nostalgia" "selene")) '((("canonical" visible nil nil)))) (("csc" visible nil nil)) (("kelar" visible nil nil)) @@ -959,7 +960,8 @@ for all frames." (("debian" visible nil nil)) (("gnu" visible nil nil)) ;; (("old-gnu" visible nil nil)) - (("sfl" visible nil nil))))) + ;; (("sfl" visible nil nil)) + ))) (with-eval-after-load 'gnus-win (setopt gnus-use-full-window nil)) diff --git a/.local/bin/b-bar b/.local/bin/b-bar index e326673..cfcd4cc 100755 --- a/.local/bin/b-bar +++ b/.local/bin/b-bar @@ -1,13 +1,28 @@ #!/bin/sh while true do - b0="/sys/class/power_supply/BAT0" - bat="$(cat $b0/capacity)" - # batl="$(cat $b0/capacity_level)" + h="$(hostname)" vols="$(b-pavols)" load="$(cat /proc/loadavg | cut -d' ' -f1)" time="$(date +'%a, %d %b %Y %R %z')" - printf "%s%% | %s | %s | %s\n" \ - "$bat" "$vols" "$load" "$time" + + case $h in + selene) + sens="$(sensors -j w83795g-i2c-*-*)" + nrbr="$(echo $sens | jq -r '.[].temp1.temp1_input')" + cpu1="$(echo $sens | jq -r '.[].temp7.temp7_input')" + cpu2="$(echo $sens | jq -r '.[].temp8.temp8_input')" + printf "%s %s %s | %s | %s | %s\n" \ + "$nrbr" "$cpu1" "$cpu2" "$vols" "$load" "$time" + ;; + *) + b0="/sys/class/power_supply/BAT0" + bat="$(cat $b0/capacity)" + # batl="$(cat $b0/capacity_level)" + printf "%s%% | %s | %s | %s\n" \ + "$bat" "$vols" "$load" "$time" + ;; + esac + sleep 5 done diff --git a/.local/bin/b-pavols b/.local/bin/b-pavols index 76606e2..051776e 100755 --- a/.local/bin/b-pavols +++ b/.local/bin/b-pavols @@ -19,5 +19,5 @@ else source_mute='-' fi -printf "%s%s,%s%s\n" \ +printf "%s%s %s%s\n" \ "$sink_volume" "$sink_mute" "$source_volume" "$source_mute" |