From 180f47818d9d739d277618ef9ecd718cda2f35a4 Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Sat, 10 Aug 2024 14:14:02 -0500 Subject: commits --- Xresources | 4 ++-- config/aerc/aerc.conf | 6 +++--- cwmrc | 6 +++--- gnupg/gpg-agent.conf | 2 +- local/bin/pfetch | 2 +- profile | 10 +++------- shrc | 16 +++++++++++----- tmux.conf | 2 +- vimrc | 17 +++++++++++------ 9 files changed, 36 insertions(+), 29 deletions(-) diff --git a/Xresources b/Xresources index a7ca01d..eb2d4c3 100644 --- a/Xresources +++ b/Xresources @@ -6,8 +6,8 @@ XTerm*faceName: GoMono:style=regular:antialias=true:hinting=false xterm*scrollBar: false xterm*rightScrollbar: false XTerm.termName: xterm-256color -XTerm*Background: #FEFFFA +XTerm*Background: #F6FFFA XTerm*Foreground: #000000 -XTerm*HiBackColor: #FEFFFA +XTerm*HiBackColor: #F6FFFA XTerm*scaleHeight: 1.2 diff --git a/config/aerc/aerc.conf b/config/aerc/aerc.conf index a594cf6..439bb4a 100644 --- a/config/aerc/aerc.conf +++ b/config/aerc/aerc.conf @@ -445,7 +445,7 @@ parse-http-links=true # # Example (obviously, this requires that you write your main text/plain body # using the markdown syntax): -text/html=pandoc -f markdown -t html --standalone +#text/html=pandoc -f markdown -t html --standalone [filters] # @@ -479,8 +479,8 @@ text/plain=less -r text/calendar=calendar message/delivery-status=colorize message/rfc822=colorize -#text/html=pandoc -f html -t plain -#text/html=w3m +text/html=pandoc -f html -t plain +#text/html=lowdown -t term #application/octet-stream=zathura #text/*=bat -fP --file-name="$AERC_FILENAME" #application/x-sh=bat -fP -l sh diff --git a/cwmrc b/cwmrc index 86560d6..f67b9db 100644 --- a/cwmrc +++ b/cwmrc @@ -1,6 +1,6 @@ sticky yes fontname "Liberation Serif:pixelsize=22:Normal" -borderwidth 5 +borderwidth 3 autogroup 0 xclock,XClock autogroup 0 xarclock, XClock autogroup 0 clock, clock @@ -13,8 +13,8 @@ color menufg "#FFFFFF" #black color font "#000000" #black color menubg "#DDDDDD" "#000000" color selfont #white #white -color activeborder "#58a9ad" -color inactiveborder "#999999" +color activeborder "#AAAAAA" +color inactiveborder "#111111" bind-key 0-XF86MonBrightnessUp "backlight incr 10" bind-key 0-XF86MonBrightnessDown "backlight decr 10" diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index 231e0ac..e8991b9 100755 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -1,4 +1,4 @@ default-cache-ttl 999999999 max-cache-ttl 999999999 allow-preset-passphrase -pinentry-program /usr/pkg/bin/pinentry +pinentry-program /usr/local/bin/pinentry-curses diff --git a/local/bin/pfetch b/local/bin/pfetch index bfc58b6..0c2cb53 100755 --- a/local/bin/pfetch +++ b/local/bin/pfetch @@ -1051,7 +1051,7 @@ get_wm() { ;; esac - log wm "cwm" >&6 + log wm "hikari" >&6 } diff --git a/profile b/profile index 0f3b6fc..17f8691 100644 --- a/profile +++ b/profile @@ -1,11 +1,7 @@ -# Let sh(1) know it's at home, despite /home being a symlink. -if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi - -# Query terminal size; useful for serial lines. -if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi - PATH=${PATH}:/home/mccd/go/bin:/home/mccd/.local/bin:/home/mccd/.cargo/bin +export MOZ_ENABLE_WAYLAND=1 +#export LIBSEAT_BACKEND="seatd" export EDITOR="vim" export GDK_DPI_SCALE="1.5" export GDK_SCALE="1.5" @@ -18,7 +14,7 @@ export PF_COLOR="0" export MOZ_ACCELERATED=1 #test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -export XDG_DATA_DIRS=${XDG_DATA_DIRS}:~/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/pkg/share:/usr/local/share +#export XDG_DATA_DIRS=${XDG_DATA_DIRS}:~/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/pkg/share:/usr/local/share export ENV=$HOME/.shrc export HISTSIZE=65535 export HISTFILE=$HOME/.history diff --git a/shrc b/shrc index af7ee47..bf6ca78 100644 --- a/shrc +++ b/shrc @@ -1,7 +1,8 @@ # # be paranoid # alias cp='cp -ip' # alias mv='mv -i' - alias rm='rm -i' +alias rm='rm -i' +alias restart-wifi="doas service netif restart" # # csh like history on arrow up and down bind ^[[A ed-search-prev-history @@ -21,9 +22,14 @@ alias e="$EDITOR" alias g="git" alias grep="ugrep" alias tldr="NO_COLOR=1 tldr" -alias fd="find . -name $1" -alias f-commit="fossil commit && fossil git export" -alias jrnl='stitch -t :journal:' +alias fd="find . -name $1*" +alias dedoc="dedoc --color off" +alias doc="dedoc --color off search" + + +notes() { + grep -i "$1" --format='%f%~' ~/notes/ | xargs -I {} cat {} +} eval "$(opam env)" @@ -33,6 +39,6 @@ set -o vi eval "$(zoxide init posix --hook prompt)" -PS1='\W \$ ' +export PS1='\W \$ ' diff --git a/tmux.conf b/tmux.conf index bd80dbd..014cfa9 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,3 +1,3 @@ set -g mouse on -set -g status off +set -g status-style bg=#F6FFFA set -s escape-time 0 diff --git a/vimrc b/vimrc index ae859e6..bcbd257 100644 --- a/vimrc +++ b/vimrc @@ -3,7 +3,8 @@ packadd snippets " General set ignorecase set backspace=indent,eol,start - +set nocompatible +filetype plugin on " Indentation set tabstop=8 @@ -25,13 +26,14 @@ set termguicolors colorscheme quiet set t_Co=256 set tgc -hi Normal guifg=black guibg=#FEFFFA +hi Normal guifg=black guibg=#FFFFFF "hi String guifg=blue hi Comment guifg=blue cterm=italic -hi SpellBad term=reverse term=underline guibg=#FEFFFA -hi SpellCap term=reverse term=underline guibg=#FEFFFA -hi SpellRare term=reverse term=underline guibg=#FEFFFA -hi SpellLocal term=reverse term=underline guibg=#FEFFFA +hi Directory cterm=bold +hi SpellBad term=reverse term=underline guibg=#FFFFFF +hi SpellCap term=reverse term=underline guibg=#FFFFFF +hi SpellRare term=reverse term=underline guibg=#FFFFFF +hi SpellLocal term=reverse term=underline guibg=#FFFFFF "" Cursor - switch between line and full when going to insert mode let &t_SI = "\[6 q" @@ -135,6 +137,9 @@ autocmd Filetype go nnoremap t :!go test %:h/*.go au BufRead,BufNewFile *.tmpl set filetype=gohtml autocmd Filetype gohtml setlocal tabstop=2 +" dot +autocmd Filetype dot set makeprg=dot\ -Tjpg\ system-setup.dot\ >\ /tmp/dotout.jpg\ &&\ imv\ /tmp/dotout.jpg + " Nix if exists('g:loaded_lsp') -- cgit v1.2.3