From e14b06fb2b71741763a5fda6c530bd5a909087c6 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 19 May 2025 16:03:55 -0700 Subject: [PATCH] Buncha other fixes --- .Xdefaults | 10 ---------- .config/alacritty.toml | 6 +----- .config/nvim/init.vim | 6 +++++- .config/picom/picom.conf | 4 ++-- .gnupg/gpg-agent.conf | 1 + .ideavimrc | 3 ++- .tmux.conf | 1 + .xmonad/xmonad.hs | 6 ++++-- .xsession | 25 ++----------------------- local/bin/battery.sh | 4 ++-- 10 files changed, 20 insertions(+), 46 deletions(-) mode change 100644 => 100755 .xsession diff --git a/.Xdefaults b/.Xdefaults index 9553f21..a0cd969 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -90,16 +90,6 @@ XTerm*vt100.metaSendsEscape:true !http://www.linuxpowertop.org/known.php !UXTerm*sessionMgt:False -!Emacs*background:black -!Emacs*foreground:white -!Emacs*font: -*-bitstream vera sans mono-*-*-*-*-*-*-*-*-*-*-*-* -!Emacs*font: -bitstream-bitstream vera sans mono-medium-r-normal-*-12-120-75-75-m-0-iso8859-1:antialias=True -!Emacs*font: Bitstream Vera Sans Mono:antialias=True:pixelsize=11 -Emacs*font: Bitstream Vera Sans Mono-8:antialias=True -Emacs*menuBar: off -Emacs*toolBar: off -Emacs*verticalScrollBars: off - XClock*Foreground: #007998 XClock*Background: #222222 XClock*chime: True diff --git a/.config/alacritty.toml b/.config/alacritty.toml index e0f7fff..e84395c 100644 --- a/.config/alacritty.toml +++ b/.config/alacritty.toml @@ -37,10 +37,6 @@ background = "#2e3440" dim_foreground = "#a5abb6" foreground = "#d8dee9" -[colors.search.footer_bar] -background = "#434c5e" -foreground = "#d8dee9" - [colors.search.matches] background = "#88c0d0" foreground = "CellBackground" @@ -60,4 +56,4 @@ size = 9.0 y = -2 [font.normal] -family = "Liberation Mono" +family = "LiterationMono Nerd Font" diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7dc4ccf..b1b16b1 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -534,8 +534,12 @@ nmap gy (coc-type-definition) nmap gi (coc-implementation) nmap gr (coc-references) +" Use ,b to jump with ace jump + " beancount macros -au BufReadPost,BufNewFile *.beancount +"au BufRead,BufNewFile *.beancount,*.bean python3 import sys; sys.path.append('/lib/python3.12/site-packages'); import beancount; sys.path.pop() +au BufReadPost,BufNewFile *.beancount,*.bean + \ setlocal omnifunc=beancount#complete | \ let @f = 'joExpenses:Megs:Foodjj0zz' | \ let @o = 'joExpenses:Megs:Otherjj0zz' | \ let @p = 'joExpenses:Needs:Petroljj0zz' | diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 7f93711..275e7a9 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -118,11 +118,11 @@ fade-out-step = 0.03; # Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) # inactive-opacity = 1 -inactive-opacity = 0.8; +inactive-opacity = 1.0; # Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) # frame-opacity = 1.0 -frame-opacity = 0.7; +frame-opacity = 1.0; # Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) # menu-opacity = 1.0 diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index 0c72a0b..c99b782 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -7,4 +7,5 @@ enable-ssh-support #pinentry-program /opt/homebrew/bin/pinentry-mac #pinentry-program /usr/bin/pinentry-curses #pinentry-program /Users/haugenh1/.gnupg/pinentry-ide.sh +pinentry-program /etc/profiles/per-user/hunner/bin/pinentry-gtk-2 #extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra diff --git a/.ideavimrc b/.ideavimrc index 0728de2..613f9f6 100644 --- a/.ideavimrc +++ b/.ideavimrc @@ -1,6 +1,6 @@ noremap : inoremap -inoremap +"inoremap let mapleader = "," " Use :actionlist [pattern] to find more actions noremap v :action SearchEverywhere @@ -17,6 +17,7 @@ noremap _ :action GotoPreviousError noremap gq :action com.andrewbrookins.idea.wrap.WrapParagraphAction noremap pry odebugger; nnoremap :noh +noremap :action ActivateProjectToolWindow set ignorecase set smartcase set showmatch diff --git a/.tmux.conf b/.tmux.conf index e22cd83..85acfb0 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -153,6 +153,7 @@ set -g @prefix_highlight_show_copy_mode 'on' #set -g status-right "#[fg=green]][ #[fg=blue]%Y-%m-%d #[fg=white]%H:%M#[default]" # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +# first time initialize with prefix+I run -b '~/.tmux/plugins/tpm/tpm' # vim:ft=tmux diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index f5be909..e966732 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -18,6 +18,7 @@ import XMonad.Actions.CopyWindow(copy, copyToAll, killAllOtherCopies) import XMonad.Actions.GridSelect import XMonad.Actions.NoBorders import XMonad.Actions.SpawnOn +import XMonad.Actions.UpdatePointer import XMonad.Actions.Warp(warpToScreen) import XMonad.Actions.WindowBringer import XMonad.Prompt @@ -81,8 +82,8 @@ mKeys = [ ("M-S-n" , sendMessage MirrorShrink ) -- Expand current window , ("M-S-g", spawn "rofi -show window") -- Multimedia - , ("" , spawn "xbacklight -inc 10" ) -- Brightness up - , ("" , spawn "xbacklight -dec 10" ) -- Brightness down + , ("" , spawn "brillo -A 10" ) -- Brightness up + , ("" , spawn "brillo -U 10" ) -- Brightness down , ("" , spawn "mpc toggle" ) -- play/pause mpd , ("" , spawn "mpc stop" ) -- stop mpd , ("" , spawn "mpc prev" ) -- prev song @@ -273,6 +274,7 @@ mConfig = ewmh def , normalBorderColor = mNormalBorderColor , focusedBorderColor = mFocusedBorderColor , layoutHook = mLayout + , logHook = updatePointer (0.5, 0.5) (0, 0) --, manageHook = manageSpawn sp <+> mManageHook , manageHook = mManageHook , handleEventHook = handleEventHook def <+> pickyFocusEventHook diff --git a/.xsession b/.xsession old mode 100644 new mode 100755 index d0b7680..db9d9df --- a/.xsession +++ b/.xsession @@ -1,32 +1,12 @@ +#!/bin/sh + export PATH=/home/hunner/local/bin:$PATH -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?* ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -xrandr --setprovideroutputsource modesetting NVIDIA-0 -xrandr --auto - -#export GDK_DPI_SCALE=0.5 -systemctl --user import-environment DISPLAY -#setxkbmap us dvorak ctrl:nocaps -# remap powerkey to insert -#xmodmap -e "keycode 124 = NoSymbol Insert" -#xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock" -#xmodmap -e "keycode 37 = Control_R Control_R" -xinput set-prop 'Apple Inc. Magic Trackpad 2' 'libinput Tapping Enabled' 1 xsetroot -cursor_name right_ptr redshift & CM_DIR=~/.config/clipmenu clipmenud & -#picom -b hsetroot -solid '#000000' -#xrdb -merge ~/.Xresources -#feh --bg-fill ~/Dropbox/Photos/Adventurous\ Kate.jpg eval `ssh-agent -s` -xrandr --dpi 100 battery.sh & xset r rate 200 30 @@ -37,5 +17,4 @@ xset s 1200 #xss-lock -- xlock -echokeys -usefirst & #xscreensaver & - exec xmonad diff --git a/local/bin/battery.sh b/local/bin/battery.sh index 59f0aaa..f07bfdf 100755 --- a/local/bin/battery.sh +++ b/local/bin/battery.sh @@ -23,8 +23,8 @@ fi Y=2 # y position FN='xft:Liberation Mono:size=8' # font -STATEFILE='/sys/class/power_supply/BAT0/status' # battery's state file -CAPFILE='/sys/class/power_supply/BAT0/capacity' # battery's capacity file +STATEFILE='/sys/class/power_supply/BAT1/status' # battery's state file +CAPFILE='/sys/class/power_supply/BAT1/capacity' # battery's capacity file CHRGCOL='#99ff00' # color when battery is charging LOWBAT=15 # percentage of battery life marked as low