diff --git a/.bin/_config b/.bin/_config index 2945b12..c5b2bfa 100644 --- a/.bin/_config +++ b/.bin/_config @@ -10,13 +10,26 @@ PIMDIR="${HOME}/Documents" # COLORS # -#COLOR_NB="#121212" # notion -#COLOR_NF="#707070" # notion -COLOR_NB="#181818" # spectrwm -COLOR_NF="#FF6A00" # spectrwm +COLOR_NB="#121212" +COLOR_NF="#707070" COLOR_SB="#222222" COLOR_SF="#CCCCCC" +# SEL_ACTIVE +# selected frame +# border +# active tab fg +# active tab bg +# inactive tab fg +# inactive tab bg + +# inactive frame +# border +# active tab fg +# active tab bg +# inactive tab fg +# inactive tab bg + # # TERMINALS # @@ -61,10 +74,10 @@ needs() { # CONNECT TO GPG-AGENT # -eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval id_rsa) +#eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval id_rsa) -# export GPG_TTY=$(tty) -# export GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:0:1" -# export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -# export SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra -# gpg-connect-agent /bye +export GPG_TTY=$(tty) +export GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:0:1" +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +export SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra +gpg-connect-agent /bye diff --git a/.bin/cbar b/.bin/cbar index 7d96f1f..46706ab 100755 Binary files a/.bin/cbar and b/.bin/cbar differ diff --git a/.bin/pmake b/.bin/pmake index 4b5b488..19bc5c1 100755 --- a/.bin/pmake +++ b/.bin/pmake @@ -83,6 +83,7 @@ case $1 in install) _install; ;; reinstall) _reinstall; ;; clean) _clean; ;; + realclean) _realclean; ;; makesum) _makesum; ;; remakesum) _remakesum; ;; update-go) _update-go; ;; diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index 13c2708..b07cdb0 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -1,5 +1,7 @@ #!/usr/local/bin/bash +. ~/.bin/_config + ####################################################################### # STARTUP COMMANDS ####################################################################### @@ -93,10 +95,9 @@ hc keybind $Mod-minus spawn scratchpad.sh hc mouseunbind --all # mouse -hc mousebind $Mod-Button1 drag '' move +hc mousebind $Mod-Button1 move hc mousebind $Mod-Button3 resize - # XXX TODO BASHISM # tags tag_names=( {1..9} ) @@ -128,57 +129,102 @@ hc rule fixedsize floating=on hc set tree_style '╾│ ├└╼─┐' -# theme -hc attr theme.tiling.reset 1 -hc attr theme.floating.reset 1 -hc set frame_border_active_color '#222222cc' -hc set frame_border_normal_color '#101010cc' -hc set frame_bg_normal_color '#565656aa' -hc set frame_bg_active_color '#345F0Caa' -hc set frame_border_width 1 -hc set show_frame_decorations 'focused_if_multiple' -hc set frame_bg_transparent on -hc set frame_transparent_width 5 -hc set frame_gap 4 +# reset theme +hc attr theme.reset 1 -hc attr settings.frame_transparent_width 1 +# spacing +hc set frame_gap 14 +hc attr theme.title_align center +hc set frame_padding 0 +hc set smart_window_surroundings off +hc set smart_frame_surroundings off -hc attr theme.title_height 15 -hc attr theme.title_when always -hc attr theme.title_font 'CozetteVector:pixelsize=13' # example using Xft -# hc attr theme.title_font '-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' -hc attr theme.title_depth 3 # space below the title's baseline -hc attr theme.active.color '#345F0Cef' -hc attr theme.title_color '#ffffff' -hc attr theme.normal.color '#323232dd' -hc attr theme.urgent.color '#7811A1dd' -hc attr theme.tab_color '#1F1F1Fdd' -hc attr theme.active.tab_color '#2B4F0Add' -hc attr theme.active.tab_outer_color '#6C8257dd' -hc attr theme.active.tab_title_color '#ababab' -hc attr theme.normal.title_color '#898989' -hc attr theme.inner_width 1 -hc attr theme.inner_color black -hc attr theme.border_width 1 +# TABS +hc attr theme.title_height 12 +hc attr theme.title_when multiple_tabs +hc attr theme.title_font 'Terminus:pixelsize=13' +hc attr theme.title_depth 5 + +# BORDER WIDTH +hc attr theme.inner_width 0 +hc attr theme.outer_width 0 +hc attr theme.border_width 0 +hc set frame_border_width 1 +hc set window_border_width 0 + +# FLOATING WINDOW hc attr theme.floating.border_width 1 -hc attr theme.floating.outer_width 1 -hc attr theme.floating.outer_color black -hc attr theme.active.inner_color '#789161' -hc attr theme.urgent.inner_color '#9A65B0' -hc attr theme.normal.inner_color '#606060' -# copy inner color to outer_color -for state in active urgent normal ; do - hc substitute C theme.${state}.inner_color \ - attr theme.${state}.outer_color C -done -hc attr theme.tiling.outer_width 1 -hc attr theme.background_color '#141414' +hc attr theme.floating.title_when always + +# NORMAL BORDER COLOR +hc attr theme.normal.inner_color $COLOR_NB +hc attr theme.normal.outer_color $COLOR_NB +hc attr theme.normal.border_color $COLOR_NB +hc set frame_border_normal_color $COLOR_NB +hc set window_border_normal_color $COLOR_NB + +# ACTIVE BORDER COLOR +hc attr theme.active.inner_color $COLOR_SB +hc attr theme.active.outer_color $COLOR_SB +hc attr theme.active.border_color $COLOR_SB +hc set frame_border_active_color $COLOR_SB +hc set window_border_active_color $COLOR_SB + +# TAB BG COLOR +hc attr theme.active.color $COLOR_SB +hc attr theme.normal.color $COLOR_NB + +# INACTIVE TAB TAB TEXT COLOR +hc attr theme.active.tab_title_color $COLOR_SF +hc attr theme.normal.tab_title_color $COLOR_NF + +# ACTIVE TAB TEXT COLOR +hc attr theme.active.title_color $COLOR_SF +hc attr theme.normal.title_color $COLOR_NF + +# tab color +# hc attr theme.tab_title_color $COLOR_NB +# +# # tab color +# hc attr theme.active.tab_color $COLOR_SB # inactive tab, active frame, bg color +# hc attr theme.active.tab_title_color $COLOR_SF # inactive tab, active frame, fg color +# +# hc attr theme.normal.tab_color $COLOR_NB # inactive tab, inactive frame, bg color +# hc attr theme.normal.tab_title_color $COLOR_NF # inactive tab, inactive frame, fg color +# +# # hc attr theme.active.color $COLOR_SB # active tab, active frame, fg color +# # hc attr theme.normal.color $COLOR_NB # active tab, inactive frame, fg color +# hc attr theme.active.title_color $COLOR_SF # active tab, active frame, fg color +# hc attr theme.normal.title_color $COLOR_NF # active tab, inactive frame, fg color + +# hc attr theme.active.tab_outer_color $COLOR_NB + +# hc set frame_border_active_color $COLOR_NB +# hc set frame_border_normal_color $COLOR_NB +# hc set frame_bg_normal_color $COLOR_NB +# hc set frame_bg_active_color $COLOR_NF +# hc set show_frame_decorations 'focused_if_multiple' +# hc set frame_bg_transparent on +# hc set frame_transparent_width 5 +# +# hc attr settings.frame_transparent_width 1 +# +# hc attr theme.active.color $COLOR_NB +# hc attr theme.title_color $COLOR_SF +# hc attr theme.normal.color $COLOR_NB +# #hc attr theme.urgent.color '#7811A1dd' +# hc attr theme.inner_width 0 +# hc attr theme.inner_color $COLOR_NB +# hc attr theme.border_width 0 +# hc attr theme.floating.border_width 1 +# hc attr theme.floating.outer_width 1 +# hc attr theme.floating.normal.outer_color $COLOR_NB +# hc attr theme.floating.active.outer_color $COLOR_SB +# hc attr theme.active.inner_color $COLOR_NB +# hc attr theme.urgent.inner_color '#9A65B0' +# hc attr theme.normal.inner_color $COLOR_NB # hc set window_gap 0 -# hc set frame_padding 0 -# hc set smart_window_surroundings off -# hc set smart_frame_surroundings on -# hc set mouse_recenter_gap 0 # rules hc unrule -F @@ -207,5 +253,5 @@ hc unlock # "$panel" "$monitor" & # done -# pkill -lf "^polybar$" -# polybar & +pkill -lf "^polybar$" +polybar & diff --git a/.kshrc b/.kshrc index 7d917c6..da941ef 100644 --- a/.kshrc +++ b/.kshrc @@ -239,8 +239,6 @@ alias events="vim ~/Documents/events.txt" alias caly="ncal -Cy" alias calm="ncal -3C" -mansearch() { man -k any=$1; } - # music alias music_psychedelik="mpg123 -b 1024 http://62.210.114.63:8000" alias music_progressive="mpg123 -b 1024 http://62.210.114.63:8010" @@ -463,14 +461,10 @@ alias port-modgo-update='make MODGO_VERSION=latest modgo-gen-modules > modules.i proot-rebuild() { doas proot -c /etc/proot.conf - doas chroot /home/dpb pkg_add -Dsnap ccache cmake gmake go rust lua--%5.1 gtk+3-- - doas chroot /home/dpb pkg_add -Dsnap gtk+4-- harfbuzz-- webkitgtk40-- webkitgtk41-- - doas chroot /home/dpb pkg_add -Dsnap webkitgtk60-- qt6-qtbase-- qtbase-- qtwebengine-- - doas chroot /home/dpb pkg_add -Dsnap qtwebkit-- python--%3.10 + doas chroot /home/dpb pkg_add -Dsnap ccache } alias proot-do="doas chroot /home/dpb/" -alias dmake="doas /usr/ports/infrastructure/bin/dpb -B /home/dpb -c -I " alias dpb-control="ssh openbsd.codevoid.de \"doas nc -U /usr/ports/logs/amd64/control-openbsd-*\"" dpb-log() { ssh openbsd.codevoid.de "tail -n 500 /usr/ports/logs/amd64/paths/$1.log" @@ -695,13 +689,13 @@ alias xrandr_mirror_hdmi="xrandr --output HDMI-A-0 --same-as eDP --mode 1920x108 # GNUPG AGENT ######################################################################## -eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval id_rsa) +#eval $(keychain -Q -q --noask --agents ssh,gpg --noask --eval --eval id_rsa id_dsa id_ed25519) -# if [ -f $HOME/.enable_gpg ] -# then -# GPG_TTY=$(tty) -# SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -# SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra -# export GPG_TTY SSH_AUTH_SOCK SSH_AUTH_SOCK_EXTRA -# pgrep -qu sdk gpg-agent || gpg-connect-agent -q /bye -# fi +if [ -f $HOME/.enable_gpg ] +then + GPG_TTY=$(tty) + SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + SSH_AUTH_SOCK_EXTRA=${SSH_AUTH_SOCK%%.ssh}.extra + export GPG_TTY SSH_AUTH_SOCK SSH_AUTH_SOCK_EXTRA + pgrep -qu sdk gpg-agent || gpg-connect-agent -q /bye +fi