diff --git a/.Xdefaults b/.Xdefaults index b9bc3b6..74b4b06 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -2,55 +2,19 @@ Xft.hinting: true Xft.hintstyle: hintfull -Xft.dpi: 123 +Xft.dpi: 120 -XTerm.termName: xterm-256color +XTerm*termName: xterm-256color XTerm*loginShell:true -XTerm*font: xft:Tamsyn:size=8 -XTerm*scaleHeight: 1.05 -XTerm*scrollBar:false -XTerm*utf8:true -XTerm*eightBitInput: true -XTerm*internalBorder: 12 - -XTerm.vt100.translations: #override \n\ - Ctrl Shift C: copy-selection(CLIPBOARD) \n\ - Ctrl Shift V: insert-selection(CLIPBOARD) - -*foreground: #ffffff -*background: #000000 -*fading: 0 -*cursorColor: #ee271d - -! black -*.color0: #000000 -*.color8: #090909 - -! red -*.color1: #111111 -*.color9: #181818 - -! green -*.color2: #222222 -*.color10: #272727 - -! yellow -*.color3: #333333 -*.color11: #393939 - -! blue -*.color4: #444444 -*.color12: #484848 - -! magenta -*.color5: #555555 -*.color13: #595959 - -! cyan -*.color6: #666666 -*.color14: #707070 - -! white -*.color7: #777777 -*.color15: #818181 +XTerm*faceName: Tamsyn:size=12 +XTerm*scrollBar: false +XTerm*eightBitInput: false +XTerm*locale: true +XTerm*pointerMode: 2 +XTerm*internalBorder: 8 +XTerm.vt100.translations: #override \ + Ctrl Shift V: insert-selection(CLIPBOARD) \n\ + Ctrl Shift C: copy-selection(CLIPBOARD) +*.foreground: #fff +*.background: #000 diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc deleted file mode 100644 index d719bb4..0000000 --- a/.config/mutt/muttrc +++ /dev/null @@ -1,43 +0,0 @@ -set header_cache = ~/.config/mutt/cache/headers -set message_cachedir = ~/.config/mutt/cache/bodies -set certificate_file = ~/.config/mutt/certificates -set move = no -set imap_keepalive = 900 -set status_format="" - -source "~/.config/mutt/acct.main" - -color normal default default # Text is "Text" -color index color2 default ~N # New Messages are Green -color index color1 default ~F # Flagged messages are Red -color index color13 default ~T # Tagged Messages are Red -color index color1 default ~D # Messages to delete are Red -color attachment color5 default # Attachments are Pink -color signature color8 default # Signatures are Surface 2 -color search color4 default # Highlighted results are Blue - -color indicator default color8 # currently highlighted message Surface 2=Background Text=Foreground -color error color1 default # error messages are Red -color status color15 default # status line "Subtext 0" -color tree color15 default # thread tree arrows Subtext 0 -color tilde color15 default # blank line padding Subtext 0 - -color hdrdefault color13 default # default headers Pink -color header color13 default "^From:" -color header color13 default "^Subject:" - -color quoted color15 default # Subtext 0 -color quoted1 color7 default # Subtext 1 -color quoted2 color8 default # Surface 2 -color quoted3 color0 default # Surface 1 -color quoted4 color0 default -color quoted5 color0 default - -color body color2 default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+ # email addresses Green -color body color2 default (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+ # URLs Green -color body color4 default (^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text Blue -color body color4 default (^|[[:space:]])_[^[:space:]]+_([[:space:]]|$) # _underlined_ text Blue -color body color4 default (^|[[:space:]])/[^[:space:]]+/([[:space:]]|$) # /italic/ text Blue - -color sidebar_flagged color1 default # Mailboxes with flagged mails are Red -color sidebar_new color10 default # Mailboxes with new mail are Green diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index 6b9841d..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,11 +0,0 @@ -filetype plugin on -syntax on -set termguicolors -set ai -set nu -set ic -set hlsearch -set noshowmode -set laststatus=0 -set cursorline -colo catppuccin-mocha diff --git a/.config/picom.conf b/.config/picom.conf index d2bf3fb..e76dfe7 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -1,15 +1,3 @@ -# backend = "glx"; vsync = true; -# shadow = true; -# shadow-radius = 1; -# shadow-opacity = 0.45; -# shadow-offset-x = 6; -# shadow-offset-y = 6; -# shadow-exclude = [ -# "class_g = 'Bar'", -# ]; -fading = true; -fade-delta = 3; +xrender-sync = true; xrender-sync-fence = true; -# glx-no-rebind-pixmap = true; -# glx-no-stencil = true; diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 3329909..e1846ac 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,20 +1,20 @@ -set font "Tamsyn normal 8" -set default-bg "#1e1e2d" -set default-fg "#cdd6f4" -set index-bg "#1e1e2d" -set index-fg "#cdd6f4" -set index-active-bg "#1e1e2d" -set index-active-fg "#cdd6f4" -set inputbar-bg "#1e1e2d" -set inputbar-fg "#cdd6f4" -set statusbar-bg "#1e1e2d" -set statusbar-fg "#cdd6f4" -set highlight-color "#1e1e2d" -set highlight-active-color "#cdd6f4" -set recolor-lightcolor "#1e1e2d" -set recolor-darkcolor "#cdd6f4" +set font "Tamsyn normal 12" +set default-bg "#000000" +set default-fg "#ffffff" +set index-bg "#000000" +set index-fg "#ffffff" +set index-active-bg "#000000" +set index-active-fg "#ffffff" +set inputbar-bg "#000000" +set inputbar-fg "#ffffff" +set statusbar-bg "#000000" +set statusbar-fg "#ffffff" +set highlight-color "#000000" +set highlight-active-color "#ffffff" +set recolor-lightcolor "#000000" +set recolor-darkcolor "#ffffff" -#set adjust-open "width" +set adjust-open "best-fit" set pages-per-row 1 set scroll-page-aware "true" set scroll-full-overlap 0.01 diff --git a/.cwmrc b/.cwmrc index 3af9d0c..71f337e 100644 --- a/.cwmrc +++ b/.cwmrc @@ -1,61 +1,46 @@ -fontname "Tamsyn:size=8" - -gap 30 0 0 0 - ignore bar autogroup 0 bar sticky yes +gap 26 0 0 0 +snapdist 10 borderwidth 6 - -color selfont "#000000" -color font "#ffffff" -color menubg "#000000" -color menufg "#ffffff" -color activeborder "#ffffff" -color inactiveborder "#666666" +fontname "Tamsyn:size=12" +color font "#fff" +color selfont "#000" +color menufg "#fff" +color menubg "#000" +color activeborder "#bbb" +color inactivebborder "#222" unbind-key all -unbind-key M-h -unbind-key M-j -unbind-key M-k -unbind-key M-l - -command terminal xterm -command browse "firefox -P main" -command school "firefox -P school" -command tor tor-browser -command confuse slock -command suspend zzz - -bind-key 4S-Return terminal -bind-key 4S-b "firefox -P main" -bind-key 4S-s "firefox -P school" +bind-key 4S-Return xterm +bind-key 4S-b ungoogled-chromium bind-key 4S-t tor-browser -bind-key 4S-Tab slock -bind-key MS-r restart bind-key MS-q quit -bind-key MS-s zzz +bind-key MS-r restart +bind-key MS-x menu-exec +bind-key MS-m menu-window -bind-key CM-h window-hide -bind-key CM-k window-cycle -bind-key CM-j window-rcycle bind-key CM-w window-close bind-key CM-m window-maximize bind-key CM-f window-fullscreen +bind-key CM-t window-vtile +bind-key CM-j window-rcycle +bind-key CM-k window-cycle bind-key M-1 group-only-1 bind-key M-2 group-only-2 bind-key M-3 group-only-3 bind-key M-4 group-only-4 +bind-key MS-1 window-movetogroup-1 +bind-key MS-2 window-movetogroup-2 +bind-key MS-3 window-movetogroup-3 +bind-key MS-4 window-movetogroup-4 -bind-key SM-1 window-movetogroup-1 -bind-key SM-2 window-movetogroup-2 -bind-key SM-3 window-movetogroup-3 -bind-key SM-4 window-movetogroup-4 +unbind-mouse all bind-mouse 4-1 window-move -bind-mouse 4-2 window-lower bind-mouse 4-3 window-resize diff --git a/.gitconfig b/.gitconfig index b561d09..bcf3f26 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,5 +1,7 @@ +[commit] + gpgsign = true +[init] + defaultBranch = trunk [user] name = Agnosto Dvonik email = dvonik@rslp.org -[init] - defaultBranch = trunk diff --git a/.local/bin/bar b/.local/bin/bar index 54ebd4d..a7f6ebc 100755 --- a/.local/bin/bar +++ b/.local/bin/bar @@ -15,8 +15,8 @@ chkinet() { out=$(ifconfig "$int" | grep "status" | cut -f2 -d ":" | tr -d " ") case "$out" in - "active") echo "Up"; ;; - "nonetwork") echo "Down"; ;; + "active") echo "up"; ;; + "nonetwork") echo "down"; ;; esac } diff --git a/.local/bin/ufetch b/.local/bin/ufetch deleted file mode 100755 index f3aca51..0000000 --- a/.local/bin/ufetch +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# ufetch-openbsd - tiny system info for openbsd - -## INFO - -# user is already defined -host="$(hostname)" -os="$(uname -sr)" -kernel="$(uname -v)" -uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')" -packages="$(ls -d /var/db/pkg/* | wc -l | sed -e 's/^[ \t]*//')" -shell="$(basename "${SHELL}")" - -## UI DETECTION - -parse_rcs() { - for f in "${@}"; do - wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)" - [ -n "${wm}" ] && echo "${wm}" && return - done -} - -rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")" - -ui='unknown' -uitype='UI' -if [ -n "${DE}" ]; then - ui="${DE}" - uitype='de' -elif [ -n "${WM}" ]; then - ui="${WM}" - uitype='wm' -elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then - ui="${XDG_CURRENT_DESKTOP}" - uitype='de' -elif [ -n "${DESKTOP_SESSION}" ]; then - ui="${DESKTOP_SESSION}" - uitype='de' -elif [ -n "${rcwm}" ]; then - ui="${rcwm}" - uitype='wm' -elif [ -n "${XDG_SESSION_TYPE}" ]; then - ui="${XDG_SESSION_TYPE}" -fi - -ui="$(basename "${ui}")" - -## DEFINE COLORS - -# probably don't change these -if [ -x "$(command -v tput)" ]; then - bold="$(tput bold)" - black="$(tput setaf 0 0 0 2>/dev/null)" - red="$(tput setaf 1 0 0 2>/dev/null)" - green="$(tput setaf 2 0 0 2>/dev/null)" - yellow="$(tput setaf 3 0 0 2>/dev/null)" - blue="$(tput setaf 4 0 0 2>/dev/null)" - magenta="$(tput setaf 5 0 0 2>/dev/null)" - cyan="$(tput setaf 6 0 0 2>/dev/null)" - white="$(tput setaf 7 0 0 2>/dev/null)" - reset="$(tput sgr0)" -fi - -# you can change these -c1="${reset}${bold}${white}" # second color - -## OUTPUT - -cat < - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/.local/bin/watts b/.local/bin/watts new file mode 100755 index 0000000..a5a998a --- /dev/null +++ b/.local/bin/watts @@ -0,0 +1,7 @@ +#!/usr/bin/env sh + +current=$(sysctl -n hw.sensors.acpibat0.current0|cut -f1 -d' ') +voltage=$(sysctl -n hw.sensors.acpibat0.volt1|cut -f1 -d' ') +watts=$(bc -e "scale=2;$current*$voltage" -e "quit") + +echo "${watts}W" diff --git a/README b/README index fbbd5b3..4be8629 100644 --- a/README +++ b/README @@ -1,3 +1,11 @@ dotfiles +-------- -idk wat +- vi(1) +- zathura(1) +- cwm(1) +- git(1) +- xenodm(1) +- lemonbar(1) + +and others idk diff --git a/fsroot/etc/X11/xenodm/Xresources b/fsroot/etc/X11/xenodm/Xresources index c02997b..7277c3a 100644 --- a/fsroot/etc/X11/xenodm/Xresources +++ b/fsroot/etc/X11/xenodm/Xresources @@ -1,26 +1,26 @@ ! $OpenBSD: Xresources.in,v 1.4 2022/11/07 17:12:06 matthieu Exp $ -Xft.dpi: 123 +Xft.dpi: 120 xlogin*borderWidth: 0 -xlogin.Login.height: 160 -xlogin.Login.width: 200 +xlogin.Login.height: 220 +xlogin.Login.width: 240 xlogin.Login.y: 60 xlogin.Login.x: 60 xlogin.Login.frameWidth: 6 xlogin.Login.innerFramesWidth: 0 xlogin.Login.sepWidthz: 0 xlogin.Login.greeting: CLIENTHOST -xlogin.Login.fail: ya dun goofed -xlogin.Login.background: #1e1e2e -xlogin.Login.foreground: #cdd6f4 -xlogin.Login.greetColor: #cdd6f4 -xlogin.Login.failColor: #f38ba8 -xlogin.Login.inpColor: #1e1e2e -xlogin.Login.promptColor: #cdd6f4 -xlogin.Login.hiColor: #a6adc8 -xlogin.Login.shdColor: #a6adc8 -xlogin.Login.greetFace: Tamsyn-8 -xlogin.Login.face: Tamsyn-8 -xlogin.Login.failFace: Tamsyn-8 -xlogin.Login.promptFace: Tamsyn-8 +xlogin.Login.fail: wrong +xlogin.Login.background: #000000 +xlogin.Login.foreground: #ffffff +xlogin.Login.greetColor: #ffffff +xlogin.Login.failColor: #ffffff +xlogin.Login.inpColor: #000000 +xlogin.Login.promptColor: #ffffff +xlogin.Login.hiColor: #bbbbbb +xlogin.Login.shdColor: #bbbbbb +xlogin.Login.greetFace: Tamsyn-12 +xlogin.Login.face: Tamsyn-12 +xlogin.Login.failFace: Tamsyn-12 +xlogin.Login.promptFace: Tamsyn-12 diff --git a/fsroot/etc/X11/xenodm/Xsession b/fsroot/etc/X11/xenodm/Xsession deleted file mode 100755 index 626dd25..0000000 --- a/fsroot/etc/X11/xenodm/Xsession +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: Xsession.in,v 1.2 2022/07/01 20:42:06 naddy Exp $ -prefix="/usr/X11R6" -exec_prefix="${prefix}" - -# redirect errors to a file in user's home directory if we can - -errfile="$HOME/.xsession-errors" -if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null ) -then - exec > "$errfile" 2>&1 -else - for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" - do - if ef="$( umask 077 && mktemp "$errfile.XXXXXX" 2> /dev/null)" - then - exec > "$ef" 2>&1 - mv "$ef" "$errfile" 2> /dev/null - break - fi - done -fi - -# if we have private ssh key(s), start ssh-agent and add the key(s) -id1=$HOME/.ssh/identity -id2=$HOME/.ssh/id_dsa -id3=$HOME/.ssh/id_rsa -id4=$HOME/.ssh/id_ecdsa -id5=$HOME/.ssh/id_ed25519 - -# if [ -z "$SSH_AGENT_PID" ]; -# then -# if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ]; -# then -# eval `ssh-agent -s` -# ssh-add < /dev/null -# fi -# fi -# -# do_exit() { -# if [ "$SSH_AGENT_PID" ]; then -# ssh-add -D < /dev/null -# eval `ssh-agent -s -k` -# fi -# exit -# } - -case $# in -1) - case $1 in - failsafe) - ${exec_prefix}/bin/xterm -geometry 80x24-0-0 - do_exit - ;; - esac -esac - -# The startup script is not intended to have arguments. - -startup=$HOME/.xsession -resources=$HOME/.Xresources - -if [ -s "$startup" ]; then - if [ -x "$startup" ]; then - "$startup" - else - /bin/sh "$startup" - fi -else - if [ -f "$resources" ]; then - /usr/X11R6/bin/xrdb -load "$resources" - fi - ${exec_prefix}/bin/xterm & - ${exec_prefix}/bin/fvwm -fi -do_exit diff --git a/fsroot/etc/X11/xenodm/Xsetup_0 b/fsroot/etc/X11/xenodm/Xsetup_0 index 5330947..c15fe61 100755 --- a/fsroot/etc/X11/xenodm/Xsetup_0 +++ b/fsroot/etc/X11/xenodm/Xsetup_0 @@ -1,7 +1,20 @@ #!/bin/sh # $OpenBSD: Xsetup_0.in,v 1.1 2021/08/30 15:38:27 matthieu Exp $ -/usr/X11R6/bin/xset b off -/usr/X11R6/bin/xinput set-prop "/dev/wsmouse0" "Device Accel Constant Deceleration" 0.4 -/usr/X11R6/bin/xrandr --dpi 96 -/usr/X11R6/bin/xsetroot -solid \#11111d +prefix="/usr/X11R6" +exec_prefix="${prefix}" + +# ${exec_prefix}/bin/xsetroot -fg \#6f6f6f -bg \#bfbfbf -bitmap ${prefix}/include/X11/bitmaps/root_weave +${exec_prefix}/bin/xsetroot -solid \#000000 + +# ${exec_prefix}/bin/xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail + +# install package openbsd-backgrounds +# then uncomment: +# +# if test -x /usr/local/bin/openbsd-wallpaper +# then +# /usr/local/bin/openbsd-wallpaper +# fi + +# sxpm OpenBSD.xpm & diff --git a/fsroot/etc/rc.conf.local b/fsroot/etc/rc.conf.local index d98dee7..108e266 100644 --- a/fsroot/etc/rc.conf.local +++ b/fsroot/etc/rc.conf.local @@ -1,6 +1,5 @@ -#obsdfreqd_flags=-r6 -m75 -T40 -apmd_flags=-L -obsdfreqd_flags=-T40 +apmd_flags=-LZ5 +obsdfreqd_flags=-T50 -m70 pkg_scripts=obsdfreqd smtpd_flags=NO sshd_flags=NO diff --git a/fsroot/etc/sysctl.conf b/fsroot/etc/sysctl.conf deleted file mode 100644 index f788aa1..0000000 --- a/fsroot/etc/sysctl.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Enable hyperthreading -# hw.smt=1 - -# default: 1310 -kern.maxproc=8192 -# default: 7030 -kern.maxfiles=32768 -# default: 1950 -kern.maxthread=16384 -# shared memory settings -kern.shminfo.shmall=536870912 # default: 8192 -kern.shminfo.shmmax=2147483647 # default: 33554432 -kern.shminfo.shmmni=4096 # default: 1024