diff --git a/.Xdefaults b/.Xdefaults index b0a6212..deb0db1 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -5,7 +5,7 @@ Xft.hintstyle: hintfull XTerm.termName: xterm-256color XTerm*loginShell:true -XTerm*font: xft:Inconsolata:size=12 +XTerm*font: xft:GohuFont:size=9 XTerm*scrollBar:false XTerm*utf8:true XTerm*eightBitInput: true @@ -15,39 +15,32 @@ XTerm.vt100.translations: #override \n\ Ctrl Shift C: copy-selection(CLIPBOARD) \n\ Ctrl Shift V: insert-selection(CLIPBOARD) -! special -*.foreground: #d3c6aa -*.background: #272e33 -*.cursorColor: #d3c6aa +Nsxiv.bar.font: GohuFont:size=9 -! black -*.color0: #272e33 -*.color8: #374145 +*.foreground: #e8e8d4 +*.background: #141414 +*.cursorColor: #ffa560 -! red -*.color1: #f85552 -*.color9: #e67e80 +*.color0: #3b3b3b +*.color8: #929292 -! green -*.color2: #8da101 -*.color10: #a7c080 +*.color1: #cf6a4c +*.color9: #e27373 -! yellow -*.color3: #dfa000 -*.color11: #dbbc7f +*.color2: #99ad6a +*.color10: #aecc66 -! blue -*.color4: #3a94c5 -*.color12: #7fbbb3 +*.color3: #d8ad4c +*.color11: #ffba7b -! magenta -*.color5: #df69ba -*.color13: #d699b6 +*.color4: #597bc5 +*.color12: #729af2 -! cyan -*.color6: #35a77c -*.color14: #83c092 +*.color5: #a037b0 +*.color13: #c051d1 -! white -*.color7: #bec5b2 -*.color15: #edeada +*.color6: #71b9f8 +*.color14: #99cefc + +*.color7: #c9c9bd +*.color15: #e8e8d4 diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf deleted file mode 100644 index 9ef6c2c..0000000 --- a/.config/mpv/mpv.conf +++ /dev/null @@ -1 +0,0 @@ -audio-pitch-correction=no diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 3264fa5..d6b19ea 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -3,8 +3,10 @@ set message_cachedir = ~/.config/mutt/cache/bodies set certificate_file = ~/.config/mutt/certificates set move = no set imap_keepalive = 900 - set status_format="" -color status white default + +color normal default default +color status default black +color signature red default source "~/.config/mutt/acct.main" diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index dfd8f55..656fa68 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,20 +1,20 @@ -set font "Anonymous Pro normal 12" -set default-bg "#272e33" -set default-fg "#d3c6aa" -set index-bg "#272e33" -set index-fg "#d3c6aa" -set index-active-bg "#272e33" -set index-active-fg "#d3c6aa" -set inputbar-bg "#272e33" -set inputbar-fg "#d3c6aa" -set statusbar-bg "#272e33" -set statusbar-fg "#d3c6aa" -set highlight-color "#272e33" -set highlight-active-color "#d3c6aa" -set recolor-lightcolor "#272e33" -set recolor-darkcolor "#d3c6aa" +set font "GohuFont normal 9" +set default-bg "#141414" +set default-fg "#e8e8d4" +set index-bg "#141414" +set index-fg "#e8e8d4" +set index-active-bg "#141414" +set index-active-fg "#e8e8d4" +set inputbar-bg "#141414" +set inputbar-fg "#e8e8d4" +set statusbar-bg "#141414" +set statusbar-fg "#e8e8d4" +set highlight-color "#141414" +set highlight-active-color "#e8e8d4" +set recolor-lightcolor "#141414" +set recolor-darkcolor "#e8e8d4" -set adjust-open "best-fit" +set adjust-open "width" set pages-per-row 1 set scroll-page-aware "true" set scroll-full-overlap 0.01 diff --git a/.local/bin/bar b/.local/bin/bar index aab927f..601b3ae 100755 --- a/.local/bin/bar +++ b/.local/bin/bar @@ -1,24 +1,23 @@ -inet_int=iwm0 +#!/usr/bin/env sh -fg=#fff -bg=#000 -red=#f92672 -green=#a6e22e -blue=#66d9ef -yellow=#f4bf75 +fg=#141414 +red=#cf6a4c +green=#99ad6a +yellow=#d8ad4c +sleep=1 batt() { num=$(apm -l) bstat=$(apm -b) case "$bstat" in - 0|4|255) c=$fg; ;; - 1) c=$yellow; ;; - 2) c=$red; ;; - 3) c=$green; ;; + 0|4|255) c=""; ;; + 1) c="-"; ;; + 2) c="--"; ;; + 3) c="++"; ;; esac - echo "%{F$c}$num%%{F$fg}" + echo "$c$num%" } used() { @@ -30,16 +29,16 @@ used() { 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=$(used) - batt=$(batt) - wttr=$(cat "$HOME/share/misc/wttr") - win=$( (xdotool getactivewindow getwindowname 2>/dev/null) || echo "Idle") +chkinet() { + out=$(ifconfig $(ifconfig | grep -E "UP,BROADCAST,RUNNING" | cut -f1 -d ":") | grep "status" | cut -f2 -d ":" | tr -d " ") - echo " $date $wttr | $win%{r}$me $version $chkinet $used $batt " - sleep 0.25 + case "$out" in + "active") echo "Up"; ;; + "nonetwork") echo "Down"; ;; + esac +} + +while true; do + echo "%{r}$USER@$(hostname) - $(date "+%Y-%m-%d - %H:%M") - $(chkinet) - $(used) - $(batt) " + sleep $sleep done diff --git a/.local/bin/uc b/.local/bin/uc deleted file mode 100755 index b28385d..0000000 --- a/.local/bin/uc +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env sh - -ungoogled-chromium \ - --force-dark-mode --enable-features=WebUIDarkMode $@ - -# --js-flags=--jitless \ -# --disable-features=WebAssembly,AsmJsToWebAssembly,WebAssemblyStreaming \ -# --js-flags=--noexpose-wasm diff --git a/.profile b/.profile index f2a8a09..d514846 100644 --- a/.profile +++ b/.profile @@ -6,13 +6,11 @@ LANG="en_US.UTF-8" PATH=$HOME/.local/bin:$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin HISTFILE="$HOME/.history" HISTSIZE=2048 -export PS1 LANG PATH HISTFILE HISTSIZE HOME TERM +EDITOR="vi" -export GOT_AUTHOR="Agnosto Dvonik " +export LANG PATH HISTFILE HISTSIZE EDITOR HOME TERM set -o vi +alias mkdir="mkdir -p" -#/usr/games/fortune -myfortune - -calendar -A0 -B0 +/usr/games/fortune diff --git a/.xsession b/.xsession index d952461..1dead79 100644 --- a/.xsession +++ b/.xsession @@ -1,19 +1,26 @@ +#!/usr/bin/env sh + export LANG="en_US.UTF-8" export DBUS_SESSION_BUS_ADDRESS="no" export GTK_THEME="Adwaita:dark" +# export XMODIFIERS=@im=ibus +# export GTK_IM_MODULE=ibus +# export QT_IM_MODULE=ibus walldir="$HOME/Pictures/Wallpapers" -xset b off -xrandr --dpi 96 xrdb -merge "$HOME/.Xdefaults" -sct 5600 -xwallpaper --zoom "$walldir/tobias-tullius-PXXtq6bp6cs-unsplash.jpg" -xidle -program "/usr/sbin/zzz" -timeout 600 & +sct 5500 -picom --backend glx --glx-no-rebind-pixmap --glx-no-stencil --xrender-sync-fence --vsync \ - -fI0.075 -O0.075 --corner-radius 10 -co50 -r5 -o0.45 -l6 -t6& -"$HOME/.local/bin/bar" | lemonbar-xft -F "#d3c6aa" -f "Inconsolata:size=12" -g 1920x30+0+1050 & +# pick one +feh --no-fehbg --bg-fill "$walldir/catswall.png" & +# xsetroot -solid "#e8e8d4" & -"$HOME/.local/bin/wttr" & +xidle -program "/usr/sbin/zzz" -timeout 590 & + +"$HOME/.local/bin/bar" |\ +lemonbar-xft -f "GohuFont:size=9" -B "#e8e8d4" -F "#141414" & + +# in the case japanese is required +# ibus-daemon -x & cwm diff --git a/Pictures/Wallpapers/catswall.png b/Pictures/Wallpapers/catswall.png new file mode 100644 index 0000000..6a8f57f Binary files /dev/null and b/Pictures/Wallpapers/catswall.png differ diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources index 77a4e32..b97d470 100644 --- a/fsroot/etc/X11/xenodm/Xresources +++ b/fsroot/etc/X11/xenodm/Xresources @@ -1,25 +1,24 @@ ! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $ -! zakaria.org's fail message is the best, and i cannot possibly replace it -xlogin.Login.fail: ya dun goofed -xlogin.Login.greeting: - -xlogin*borderWidth: 0 -xlogin.Login.height: 200 -xlogin.Login.width: 400 -xlogin.Login.y: 320 -xlogin.Login.frameWidth: 10 -xlogin.Login.innerFramesWidth: 0 +xlogin*borderWidth: 0 +xlogin.Login.height: 140 +xlogin.Login.width: 200 +xlogin.Login.y: 60 +xlogin.Login.x: 60 +xlogin.Login.frameWidth: 4 +xlogin.Login.innerFramesWidth: 0 xlogin.Login.sepWidthz: 0 - -xlogin.Login.background: #272e33 -xlogin.Login.foreground: #d3c6aa -xlogin.Login.failColor: #f85552 -xlogin.Login.inpColor: #272e33 -xlogin.Login.promptColor: #d3c6aa -xlogin.Login.hiColor: #272e33 -xlogin.Login.shdColor: #272e33 - -xlogin.Login.face: Inconsolata-12 -xlogin.Login.failFace: Inconsolata-12 -xlogin.Login.promptFace: Inconsolata-12 +xlogin.Login.greeting: CLIENTHOST +xlogin.Login.fail: ya dun goofed +xlogin.Login.background: #141414 +xlogin.Login.foreground: #e8e8d4 +xlogin.Login.greetColor: #e8e8d4 +xlogin.Login.failColor: #cf6a4c +xlogin.Login.inpColor: #141414 +xlogin.Login.promptColor: #e8e8d4 +xlogin.Login.hiColor: #cf6a4c +xlogin.Login.shdColor: #cf6a4c +xlogin.Login.greetFace: GohuFont-10 +xlogin.Login.face: GohuFont-9 +xlogin.Login.failFace: GohuFont-9 +xlogin.Login.promptFace: GohuFont-9 diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0 index 2db664e..08da77e 100755 --- a/fsroot/etc/X11/xenodm/Xsetup_0 +++ b/fsroot/etc/X11/xenodm/Xsetup_0 @@ -1,10 +1,14 @@ #!/bin/sh # $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $ -/usr/X11R6/bin/xsetroot -solid \#272e33 -/usr/X11R6/bin/xrandr --dpi 96 +/usr/X11R6/bin/setxkbmap jp OADG109A -model thinkpad60 +/usr/X11R6/bin/xset b off /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.1 +/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Inertia" 10 +/usr/X11R6/bin/xinput set-prop "/dev/wsmouse" "Device Accel Constant Deceleration" 0.5 +/usr/X11R6/bin/xrandr --dpi 96 +/usr/X11R6/bin/xsetroot -solid \#e8e8d4 +/usr/local/bin/feh -B \#e8e8d4 -g 213x64+1130+680 -. \ + -Z /etc/X11/xenodm/pixmaps/digital.png & diff --git a/fsroot/etc/rc.conf.local b/fsroot/etc/rc.conf.local index 4ac869d..ada696d 100644 --- a/fsroot/etc/rc.conf.local +++ b/fsroot/etc/rc.conf.local @@ -1,7 +1,6 @@ -apmd_flags=-H -obsdfreqd_flags=-T45 -m90 +apmd_flags=-L +obsdfreqd_flags=-m85 -T45 pkg_scripts=obsdfreqd smtpd_flags=NO sshd_flags=NO -unwind_flags= xenodm_flags=