From 641b513334577b407bb9b2042b70b7e195039c6e Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 10:58:04 -0600 Subject: change dmenu font to 18 (from 12) --- X11/Xresources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/X11/Xresources b/X11/Xresources index 367f4d4..874b459 100644 --- a/X11/Xresources +++ b/X11/Xresources @@ -1,6 +1,6 @@ !! dmenu -dmenu.font: mononoki Nerd Font Mono:size=12 +dmenu.font: mononoki Nerd Font Mono:size=18 !! dwm -- cgit v1.2.3 From 1fa2e34ab545e677f12ce126774dcdfdf87a7e05 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 10:58:28 -0600 Subject: set default alacritty fontsize --- alacritty/alacritty.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 01e8d54..2c247d5 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -154,7 +154,7 @@ font: style: Bold Italic # Point size - size: 11.0 + size: 10.0 # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter -- cgit v1.2.3 From d2f04e6c96701097e86143944db4143dc3b579f4 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 10:59:15 -0600 Subject: autostart: comment out snd.sh (might not need), add picom --- autostart.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autostart.sh b/autostart.sh index d892e27..b8d1aa5 100755 --- a/autostart.sh +++ b/autostart.sh @@ -14,7 +14,8 @@ if type mpd >/dev/null; then elif type musicpd >/dev/null; then runifnot musicpd fi -pkill pipewire ; pkill pipewire-pulse ; pkill wireplumber ; snd.sh & +#pkill pipewire ; pkill pipewire-pulse ; pkill wireplumber ; snd.sh & +runifnot picom runifnot mpd-mpris -network unix runifnot mpd-notification runifnot transmission-daemon -- cgit v1.2.3 From a748b66a5a8ca3e42eca2e577dd4cff80510167a Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 11:00:01 -0600 Subject: add updated lfimg previews to lf --- lf/preview | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lf/preview b/lf/preview index 4b70b2e..e24c381 100755 --- a/lf/preview +++ b/lf/preview @@ -20,6 +20,17 @@ batorcat() { fi } +glowormdcat() { + file="$1" + shift + if command -v glow > /dev/null 2>&1 + then + glow "$file" + else + mdcat "$file" + fi +} + CACHE="$HOME/.cache/lf/thumbnail.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}'))" case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in @@ -29,7 +40,8 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in *.tar) tar tf "$1" ;; *.zip|*.jar|*.war|*.ear|*.oxt) unzip -l "$1" ;; *.rar) unrar l "$1" ;; - *.md) glow -s dark "$1" ;; + *.md) + glowormdcat "$1";; *.7z) 7z l "$1" ;; *.[1-8]) man "$1" | col -b ;; *.o) nm "$1";; @@ -37,7 +49,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in *.iso) iso-info --no-header -l "$1" ;; *.odt|*.ods|*.odp|*.sxw) odt2txt "$1" ;; *.doc) catdoc "$1" ;; - *.docx) docx2txt "$1" - ;; + *.docx) docx2txt "$1" ;; *.xml|*.html) w3m -dump "$1";; *.xls|*.xlsx) ssconvert --export-type=Gnumeric_stf:stf_csv "$1" "fd://1" | batorcat --language=csv @@ -65,7 +77,7 @@ case "$(printf "%s\n" "$(readlink -f "$1")" | awk '{print tolower($0)}')" in ffmpegthumbnailer -i "$1" -o "${CACHE}.jpg" -s 0 -q 5 image "${CACHE}.jpg" "$2" "$3" "$4" "$5" ;; - *.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.gif|*.jfif) + *.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.tiff|*.gif|*.jfif|*.ico) image "$1" "$2" "$3" "$4" "$5" ;; *.svg) -- cgit v1.2.3 From c2fb36df2c383078b67462b2b93d3f77c376a2e2 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:45:29 -0600 Subject: update nvim config; update 'xx to be closer to :q --- nvim/init.vim | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index b5831c2..2ebefca 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -76,7 +76,7 @@ set conceallevel=2 let mapleader="'" " emmet {{{ -let g:user_emmet_leader_key=';' +let g:user_emmet_leader_key='+' " }}} " zig config {{{ @@ -246,10 +246,14 @@ vnoremap h vnoremap j vnoremap k vnoremap l +" these may go away soon noremap xx :q noremap x! :q! -noremap xw :wq -noremap w :w +" these are the new standard +noremap qq :q +noremap q! :q! +noremap wq :wq +noremap ww :w " escape for term windows tnoremap -- cgit v1.2.3 From 944bcb63f0b56cb1b2ac5ace64743a66a9f3b650 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:49:32 -0600 Subject: fix e alias in *ksh and zsh --- kshrc | 2 ++ mksh/mkshrc | 5 ++++- sh/aliases | 4 ---- zsh/.zshrc | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kshrc b/kshrc index cd372c4..82c58fb 100644 --- a/kshrc +++ b/kshrc @@ -5,6 +5,8 @@ [ -f $HOME/.config/sh/aliases ] && . $HOME/.config/sh/aliases [ -f $HOME/.config/sh/functions ] && . $HOME/.config/sh/functions +alias e='. $ENV' + RED="\033[1;31m" GRE="\033[1;32m" YEL="\033[1;33m" diff --git a/mksh/mkshrc b/mksh/mkshrc index 5b61ae3..8d17b8e 100644 --- a/mksh/mkshrc +++ b/mksh/mkshrc @@ -26,9 +26,12 @@ # catch non-mksh, non-lksh, trying to run this file case ${KSH_VERSION:-} in *LEGACY\ KSH*|*MIRBSD\ KSH*) ;; -*) \return 0 ;; +*) . $CONFIG/kshrc && exit ;; esac +[ -f "$HOME/.config/sh/aliases" ] && . "$HOME/.config/sh/aliases" +[ -f "$HOME/.config/sh/functions" ] && . "$HOME/.config/sh/functions" + # give MidnightBSD's laffer1 a bit of csh feeling function setenv { if (( $# )); then diff --git a/sh/aliases b/sh/aliases index 974a1d7..6face5a 100644 --- a/sh/aliases +++ b/sh/aliases @@ -45,10 +45,6 @@ alias gd='git diff' ## Single Chars alias r='cd ~ && clear && exec $SHELL' -case "$(echo $0 | sed 's/^-*//' | xargs basename)" in - "zsh") alias e='. $ZDOTDIR/.zshrc' ;; - "ksh"|"oksh") alias e='. ~/.config/kshrc' ;; -esac alias q='exit' alias c='clear' alias m='make' diff --git a/zsh/.zshrc b/zsh/.zshrc index 1c13e80..5442bc9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -9,6 +9,8 @@ setopt HIST_IGNORE_DUPS setopt INC_APPEND_HISTORY setopt HIST_REDUCE_BLANKS +_SH="zsh" + if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then source "$XDG_CONFIG_HOME"/sh/aliases fi -- cgit v1.2.3 From 98b7d29dbaeb1a15d8074db3c88cef531e1fe0db Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:56:55 -0600 Subject: add many new gitignores (thanks pop os) --- .gitignore | 15 +++++++++++++++ gtk-3.0/settings.ini | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 gtk-3.0/settings.ini diff --git a/.gitignore b/.gitignore index bbc3215..25c91d7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,11 @@ vlc/vlc-qt-interface.conf vdirsyncer/ unity3d/ ubports-installer/ +tremc/ transmission-daemon/ transmission/* !transmission/settings.json +touchegg/ torbrowser/ tmux/plugins syncthing/ @@ -32,7 +34,9 @@ rtorrent/ rncbc.org/ retroarch/ rclone/ +raveloxmidi/ qutebrowser/jmatrix-rules +gtk-3.0/ qtile/__pycache__/ !qt6ct/qt6ct.conf qt6ct/* @@ -44,6 +48,8 @@ protonmail/ protonfixes/ profanity/profrc print-manager/ +pop-system-updater/ +pop-shell/ polychromatic/ poezio/ pmbootstrap.cfg @@ -98,6 +104,7 @@ ksh/history kritarc kritadisplayrc kicad/ +khal/ keepassxc/ kdenlive-layoutsrc kdenlive-appimagerc @@ -114,16 +121,22 @@ isync/ irssi/ inkscape/ icedtea-web/ +ibus/ htop/htoprc guitarix/ gtk-3.0/bookmarks gtk-2.0/gtkfilechooser.ini gomuks/ +goa-1.0/ +gnome-session/ +gnome-initial-setup-done +gnome-control-center/ glib-2.0/ ghb/ gaiasky/ fontconfig/ falkTX/ +evolution/ enchant/ emacs/ dolphin-emu/ @@ -139,6 +152,8 @@ chromium/ cef_user_data calibre/conversion calibre/ +calcurse/* +!calcurse/keys blender/ autostart/ ardour6/ diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini deleted file mode 100644 index 7c143cc..0000000 --- a/gtk-3.0/settings.ini +++ /dev/null @@ -1,15 +0,0 @@ -[Settings] -gtk-theme-name=Sweet-mars-v40 -gtk-icon-theme-name=Adwaita -gtk-font-name=Cantarell 11 -gtk-cursor-theme-name=Adwaita -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=0 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintmedium -- cgit v1.2.3 From 2b0ac3a1fe83f405bc161a680c160d73f0f9b921 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:57:14 -0600 Subject: add calcurse keybindings (may change soon) --- calcurse/keys | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 calcurse/keys diff --git a/calcurse/keys b/calcurse/keys new file mode 100644 index 0000000..28ff9e4 --- /dev/null +++ b/calcurse/keys @@ -0,0 +1,55 @@ +# +# Calcurse keys configuration file +# +# In this file the keybindings used by Calcurse are defined. +# It is generated automatically by Calcurse and is maintained +# via the key configuration menu of the interactive user +# interface. It should not be edited directly. + +generic-cancel ESC +generic-select SPC +generic-credits @ +generic-help ? +generic-quit q Q +generic-save s S ^S +generic-reload R +generic-copy c +generic-paste p ^V +generic-change-view TAB +generic-import i I +generic-export x X +generic-goto g G +generic-other-cmd o O +generic-config-menu C +generic-redraw ^R +generic-add-appt ^A +generic-add-todo ^T +generic-prev-day T ^H +generic-next-day t ^L +generic-prev-week W ^K +generic-next-week w +generic-prev-month M +generic-next-month m +generic-prev-year Y +generic-next-year y +generic-scroll-down ^N +generic-scroll-up ^P +generic-goto-today ^G +generic-command : +move-right l L RGT +move-left h H LFT +move-down j J DWN +move-up k K UP +start-of-week 0 +end-of-week $ +add-item a A +del-item d D +edit-item e E +view-item v V RET +pipe-item | +flag-item ! +repeat r +edit-note n N +view-note > +raise-priority + +lower-priority - -- cgit v1.2.3 From 549acbb2bf8e30315d0eb3e87c44f4793c22337f Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:58:06 -0600 Subject: add bl generic backlight to sxhkd --- sxhkd/sxhkdrc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 222425e..2c8f824 100755 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -145,13 +145,11 @@ XF86Audio{Prev,Next,Play,Stop} # turn the brightness up XF86MonBrightnessUp - xbacklight -inc 1 - # light -A 1 + bl -i 1 # turn the brightness down XF86MonBrightnessDown - xbacklight -dec 1 - # light -U 1 + bl -d 1 # raise the volume XF86AudioRaiseVolume -- cgit v1.2.3 From dac383aa608ef1e96c87cfefd9e438a9ce1228d4 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 15:58:40 -0600 Subject: update PATH and set ENV to mksh by default (from there redirects to kshrc if necessary) --- zsh/.zshenv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/.zshenv b/zsh/.zshenv index baa373d..cedb08b 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -71,6 +71,6 @@ export OPENER="xdg-open" export PAGER="less" # KSH -export ENV="$XDG_CONFIG_HOME/kshrc" +export ENV="$XDG_CONFIG_HOME/mksh/mkshrc" -export PATH="$HOME/.local/bin/generics:$HOME/.local/volsv:$HOME/.local/bin/shortcmds:$HOME/.local/bin/scripts:$HOME/.local/bin/blocks:$HOME/.local/bin:$HOME/.local/bin/ignore:$HOME/.local/bin/testing:$CARGO_HOME/bin:$GOPATH/bin:/opt/REAPER:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +export PATH="$HOME/.local/bin/generics:$HOME/.local/volsv:$HOME/.local/bin/shortcmds:$HOME/.local/bin/flatpak-sc:$HOME/.local/bin/scripts:$HOME/.local/bin/blocks:$HOME/.local/bin:$HOME/.local/share/flatpak/exports/bin/:$HOME/.local/bin/ignore:$HOME/.local/bin/testing:$CARGO_HOME/bin:$GOPATH/bin:/opt/REAPER:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" -- cgit v1.2.3 From 3b31fa05d95454ea83cf074775f506c19f34ab6d Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 16:05:29 -0600 Subject: update awesome config --- awesome | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awesome b/awesome index 98e36e5..3b147eb 160000 --- a/awesome +++ b/awesome @@ -1 +1 @@ -Subproject commit 98e36e5087a8855bf758c95d9e90d6feae15a619 +Subproject commit 3b147eb8d6c02511cbc93ee1304a953c78054e59 -- cgit v1.2.3 From 63b2322d99e818b73199f8be74389088cb982040 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 16:09:46 -0600 Subject: use my git server for my awesome-config --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4528b81..5e925b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/sayanarijit/dragon.xplr [submodule "awesome"] path = awesome - url = https://gitlab.com/zachir/awesome-config + url = https://git.zachir.xyz/awesome-config.git [submodule "qutebrowser/jmatrix"] path = qutebrowser/jmatrix url = https://gitlab.com/jgkamat/jmatrix.git -- cgit v1.2.3 From 9c096aa3d0e26537228489f3c522070454d96436 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 9 Feb 2023 16:12:21 -0600 Subject: update doas.conf --- doas.conf | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/doas.conf b/doas.conf index b4065ab..ab9b891 100644 --- a/doas.conf +++ b/doas.conf @@ -1,19 +1,12 @@ -permit persist zachir -permit nopass zachir cmd make args install -permit nopass zachir cmd rsm args start libvirtd virtlockd virtlogd -permit nopass zachir cmd rsm args stop libvirtd virtlockd virtlogd -permit nopass zachir cmd pacman -permit nopass zachir cmd iptables -permit nopass zachir cmd ip6tables -permit nopass zachir cmd mount -permit nopass zachir cmd mount.exfat -permit nopass zachir cmd umount -permit nopass zachir cmd modprobe -permit nopass zachir cmd zzz -permit nopass zachir cmd sv -permit nopass zachir cmd swhkd args -permit nopass zachir cmd pkill args -HUP swhkd -permit nopass zachir cmd killall args swhkd +permit persist setenv { XAUTHORITY LANG LC_ALL } zachir +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd make args install +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd iptables +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd ip6tables +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd mount +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd mount.exfat +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd umount +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd modprobe +permit nopass setenv { XAUTHORITY LANG LC_ALL } zachir cmd zzz permit nopass keepenv zachir as zachir permit nopass keepenv root -- cgit v1.2.3