diff --git a/.Xdefaults b/.Xdefaults index f4d0f38..d7a786d 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -5,7 +5,7 @@ Xft.hintstyle: hintfull XTerm.termName: xterm-256color XTerm*loginShell:true -XTerm*font: xft:Iosevka Term:size=12 +XTerm*font: xft:Source Code Pro:size=11.5 XTerm*scrollBar:false XTerm*utf8:true XTerm*eightBitInput: true @@ -16,37 +16,41 @@ XTerm.vt100.translations: #override \n\ Ctrl Shift C: copy-selection(CLIPBOARD) \n\ Ctrl Shift V: insert-selection(CLIPBOARD) -*background: #24273A -*foreground: #CAD3F5 +nsxiv.window.background: #000 +nsxiv.window.foreground: #fff +nsxiv.bar.font: xft:Source Code Pro:size=11.5 + +*background: #000 +*foreground: #fff ! black -*color0: #494D64 -*color8: #5B6078 +*color0: #000 +*color8: #353535 ! red -*color1: #ED8796 -*color9: #ED8796 +*color1: #f92672 +*color9: #f92672 ! green -*color2: #A6DA95 -*color10: #A6DA95 +*color2: #a6e22e +*color10: #a6e22e ! yellow -*color3: #EED49F -*color11: #EED49F +*color3: #f4bf75 +*color11: #f4bf75 ! blue -*color4: #8AADF4 -*color12: #8AADF4 +*color4: #66d9ef +*color12: #66d9ef ! magenta -*color5: #F5BDE6 -*color13: #F5BDE6 +*color5: #ae81ff +*color13: #ae81ff ! cyan -*color6: #8BD5CA -*color14: #8BD5CA +*color6: #a1efe4 +*color14: #a1efe4 ! white -*color7: #B8C0E0 -*color15: #A5ADCB +*color7: #fff +*color15: #ff diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 507aea7..54fc439 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,22 +1,22 @@ -set default-bg "#24273A" -set default-fg "#CAD3F5" -set index-bg "#24273A" -set index-fg "#CAD3F5" -set index-active-bg "#24273A" -set index-active-fg "#CAD3F5" -set inputbar-bg "#24273A" -set inputbar-fg "#CAD3F5" -set statusbar-bg "#24273A" -set statusbar-fg "#CAD3F5" -set highlight-color "#24273A" -set highlight-active-color "#CAD3F5" -set recolor-lightcolor "#24273A" -set recolor-darkcolor "#CAD3F5" +set default-bg "#000" +set default-fg "#fff" +set index-bg "#000" +set index-fg "#fff" +set index-active-bg "#000" +set index-active-fg "#fff" +set inputbar-bg "#000" +set inputbar-fg "#fff" +set statusbar-bg "#000" +set statusbar-fg "#fff" +set highlight-color "#000" +set highlight-active-color "#fff" +set recolor-lightcolor "#000" +set recolor-darkcolor "#fff" set adjust-open "best-fit" set pages-per-row 1 -set font "Iosevka 12" +set font "Source Code Pro 11.5" set recolor true set guioptions none set page-padding 1 diff --git a/.profile b/.profile index cbad78a..103b52a 100644 --- a/.profile +++ b/.profile @@ -17,5 +17,6 @@ export PATH HOME LANG EDITOR HISTFILE HISTSIZE alias vi="nvi" -fortune +# fortune +myfortune calendar -A0 -B0 diff --git a/.xsession b/.xsession index 221fc75..f6509e7 100644 --- a/.xsession +++ b/.xsession @@ -7,18 +7,13 @@ export GTK_THEME=Adwaita:dark export LANG="en_US.UTF-8" export DBUS_SESSION_BUS_ADDRESS="no" -# export MOZ_WEBRENDER=1 -# export MOZ_ACCELERATION=1 -xwallpaper --zoom "$HOME/share/pic/wall/m904ak26fcy91.jpg" +xrdb -merge "$HOME/.Xdefaults" +hsetroot -fill "$HOME/share/pic/wall/bence-balla-schottner-5DgfYlL_r54-unsplash.jpg" +picom -fI0.075 -O0.075 \ +--backend glx --glx-no-stencil --glx-no-rebind-pixmap \ +--vsync --xrender-sync-fence -b xidle -program "/usr/sbin/zzz" -timeout 900 & -picom --vsync -fcI0.075 -O0.075 -o0.60 -r0 -l10 -t10 --xrender-sync-fence --xrender-sync & -# xcompmgr -cfI 0.2 -O 0.2 & -# sct 4250 & curl -SsLo $HOME/share/misc/wttr "https://wttr.in/?m&format=%t%20%C" & -"$HOME/bin/bar" | lemonbar-xft -g 1890x30+10+1030 -B "#24273A" -F "#CAD3F5" -f "Iosevka:size=12" & - -# eyecandy -# xeyes -outline "#24273a" -fg "#8aadf4" -center "#cad3f5" -geometry 150x100+10+960 & - +"$HOME/bin/bar" | lemonbar-xft -B "#000" -F "#fff" -f "Source Code Pro:size=11.5" & exec cwm diff --git a/README b/README index 1ee6b3b..231c3a4 100644 --- a/README +++ b/README @@ -2,6 +2,7 @@ dotfiles -------- * apm * cwm +* hsetroot * init * ksh * lemonbar @@ -11,5 +12,4 @@ dotfiles * ufetch * xenodm * xterm -* xwallpaper * zathura diff --git a/bin/bar b/bin/bar index e9162d6..5472333 100755 --- a/bin/bar +++ b/bin/bar @@ -1,14 +1,44 @@ inet_int=iwm0 +fg=#fff +bg=#000 +red=#f92672 +green=#a6e22e +blue=#66d9ef +yellow=#f4bf75 + +batt() { + num=$(apm -l) + bstat=$(apm -b) + + case "$bstat" in + 0|4|255) c=$fg; ;; + 1) c=$yellow; ;; + 2) c=$red; ;; + 3) c=$green; ;; + esac + + echo "%{F$c}$num%%{F$fg}" +} + +used() { + used=$(vmstat | awk 'END {printf $3}' | tr -d "M") + full=$(expr $(sysctl -n hw.usermem) / 1048576) + tp=$(expr $full / 2) + [ $used -ge $tp ] && c=$red || c=$fg + + echo "%{F$c}$used/$full%{F$fg}" +} + while true; do me=$(echo "$USER@$(hostname)") version=$(uname -rv) date=$(date "+%Y-%m-%d %H:%M") chkinet=$(ifconfig $inet_int | grep status | cut -d " " -f2-) - used=$(vmstat | awk 'END {printf $3}' | tr -d "M") - batt=$(apm -l) + used=$(used) + batt=$(batt) wttr=$(cat "$HOME/share/misc/wttr") - echo " $date $wttr%{r}$me $version $chkinet $used $batt% " - sleep 1 + echo " $date $wttr%{r}$me $version $chkinet $used $batt " + sleep 0.5 done diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources index f0385e2..ebab0ba 100644 --- a/fsroot/etc/X11/xenodm/Xresources +++ b/fsroot/etc/X11/xenodm/Xresources @@ -17,14 +17,14 @@ xlogin.Login.frameWidth: 10 xlogin.Login.innerFramesWidth: 0 xlogin.Login.sepWidthz: 0 -xlogin.Login.background: #24273A -xlogin.Login.foreground: #CAB3F5 -xlogin.Login.failColor: #ED8796 -xlogin.Login.inpColor: #24273A -xlogin.Login.promptColor: #CAB3F5 -xlogin.Login.hiColor: #24273A -xlogin.Login.shdColor: #24273A +xlogin.Login.background: #000 +xlogin.Login.foreground: #fff +xlogin.Login.failColor: #f92672 +xlogin.Login.inpColor: #000 +xlogin.Login.promptColor: #fff +xlogin.Login.hiColor: #000 +xlogin.Login.shdColor: #000 -xlogin.Login.face: Iosevka-12 -xlogin.Login.failFace: Iosevka-12 -xlogin.Login.promptFace: Iosevka-12 +xlogin.Login.face: Source Code Pro-12 +xlogin.Login.failFace: Source Code Pro-12 +xlogin.Login.promptFace: Source Code Pro-12 diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0 index c9dfc4d..475cfde 100755 --- a/fsroot/etc/X11/xenodm/Xsetup_0 +++ b/fsroot/etc/X11/xenodm/Xsetup_0 @@ -1,9 +1,10 @@ #!/bin/sh # $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $ -/usr/X11R6/bin/xsetroot -solid \#24273A +/usr/X11R6/bin/xsetroot -solid \#000 /usr/X11R6/bin/xrandr --dpi 96 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5 +/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Inertia" 1 /usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "Device Accel Constant Deceleration" 0.3 diff --git a/fsroot/etc/X11/xorg.conf b/fsroot/etc/X11/xorg.conf index fdd56ff..c723c3a 100644 --- a/fsroot/etc/X11/xorg.conf +++ b/fsroot/etc/X11/xorg.conf @@ -1,4 +1,9 @@ -Section "ServerFlags" - Option "DontVTSwitch" "True" - Option "DontZap" "True" +Section "Device" + Identifier "Intel Graphics" + Driver "intel" +EndSection + +Section "ServerFlags" + Option "DontVTSwitch" "True" + Option "DontZap" "True" EndSection