From 95676238f8fed9acf83494ddc8baa87222488192 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 30 Jun 2023 10:01:40 +0200 Subject: [PATCH] fix bookmarks, cleanup, minor tweaks --- .config/lf/rifle.conf | 14 +++++++------- .config/lf/shortcutrc | 16 +++------------- .config/nvim | 2 +- .config/zsh/.zprofile | 3 ++- .config/zsh/configs/autogenerated/hashes | 16 +++------------- .config/zsh/configs/autogenerated/shortcuts | 16 +++------------- .local/share/bookmarks/directories | 19 ++++++++++--------- .local/share/bookmarks/files | 19 ++----------------- .local/src/dwm | 2 +- 9 files changed, 32 insertions(+), 75 deletions(-) diff --git a/.config/lf/rifle.conf b/.config/lf/rifle.conf index c5b5247e..af0d0eb1 100644 --- a/.config/lf/rifle.conf +++ b/.config/lf/rifle.conf @@ -67,13 +67,13 @@ ext x?html?, has w3m, terminal = w3m "$@" #-------------------------------------------- # Code #------------------------------------------- -ext py = python -- "$1" -ext pl = perl -- "$1" -ext rb = ruby -- "$1" -ext js = node -- "$1" -ext sh = sh -- "$1" -ext php = php -- "$1" -ext lisp = emacs -- "$1" +# ext py = python -- "$1" +# ext pl = perl -- "$1" +# ext rb = ruby -- "$1" +# ext js = node -- "$1" +# ext sh = sh -- "$1" +# ext php = php -- "$1" +# ext lisp = emacs -- "$1" ext cue , terminal, flag t = delay .3; vim -- "$@" ext cue , terminal = file "$@"|less diff --git a/.config/lf/shortcutrc b/.config/lf/shortcutrc index 7378185d..ab5bfba4 100644 --- a/.config/lf/shortcutrc +++ b/.config/lf/shortcutrc @@ -2,6 +2,7 @@ map gh cd "/home/luca" map gch cd "/home/luca/.cache" map gcf cd "/home/luca/.config" map gdt cd "/home/luca/.local/share" +map gst cd "/home/luca/.local/state" map gsr cd "/home/luca/.local/src" map git cd "/home/luca/.local/src/git" map gsc cd "/home/luca/.local/bin" @@ -13,16 +14,5 @@ map gms cd "/home/luca/Music" map gpc cd "/home/luca/Pictures" map gvd cd "/home/luca/Videos" map gdot cd "/home/luca/.local/share/stow/dots" -map Ebf $$EDITOR "/home/luca/.config/shell/bm-files" -map Ebd $$EDITOR "/home/luca/.config/shell/bm-dirs" -map Ecfx $$EDITOR "/home/luca/.config/x11/xresources" -map EcfX $$EDITOR "/home/luca/.config/x11/xprofile" -map Ecfb $$EDITOR "/home/luca/.local/src/dwmblocks/config.h" -map Ecfk $$EDITOR "/home/luca/.config/kitty/kitty.conf" -map EcfK $$EDITOR "/home/luca/.config/kitty/kittyfullscreen.conf" -map Ecfv $$EDITOR "/home/luca/.config/lvim/config.lua" -map Ecfz $$EDITOR "/home/luca/.config/zsh/.zshrc" -map Ecfa $$EDITOR "/home/luca/.config/shell/aliasrc" -map Ecfp $$EDITOR "/home/luca/.config/shell/profile" -map Ecfl $$EDITOR "/home/luca/.config/lf/lfrc" -map EcfL $$EDITOR "/home/luca/.config/lf/preview" +map Ebf $$EDITOR "/home/luca/.local/share/bookmarks/files" +map Ebd $$EDITOR "/home/luca/.local/share/bookmarks/directories" diff --git a/.config/nvim b/.config/nvim index 62726e01..27aabc45 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 62726e01ced3d191617c0b5f2c03d6ff1b6359a3 +Subproject commit 27aabc459d627847144ea12bf967325cdd886285 diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 11cd05e5..9d4323cf 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -89,8 +89,9 @@ export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" export MOZBUILD_STATE_PATH="$XDG_DATA_HOME/mozbuild" -export W3M_DIR="$XDG_DATA_HOMEA/w3m" +export W3M_DIR="$XDG_DATA_HOME/w3m" export RUSTUP_HOME="$XDG_DATA_HOME/rustup" +export PYTHONSTARTUP="/etc/python/pythonrc" localpath="$(find -L ~/.local/bin -type d -printf %p: | sed 's/.$//')" fpath=($XDG_CONFIG_HOME/zsh/completions $fpath) diff --git a/.config/zsh/configs/autogenerated/hashes b/.config/zsh/configs/autogenerated/hashes index f8dfbf95..31f404b1 100644 --- a/.config/zsh/configs/autogenerated/hashes +++ b/.config/zsh/configs/autogenerated/hashes @@ -2,6 +2,7 @@ hash -d h=/home/luca hash -d ch=/home/luca/.cache hash -d cf=/home/luca/.config hash -d dt=/home/luca/.local/share +hash -d st=/home/luca/.local/state hash -d sr=/home/luca/.local/src hash -d it=/home/luca/.local/src/git hash -d sc=/home/luca/.local/bin @@ -13,16 +14,5 @@ hash -d ms=/home/luca/Music hash -d pc=/home/luca/Pictures hash -d vd=/home/luca/Videos hash -d dot=/home/luca/.local/share/stow/dots -hash -d bf=/home/luca/.config/shell/bm-files -hash -d bd=/home/luca/.config/shell/bm-dirs -hash -d cfx=/home/luca/.config/x11/xresources -hash -d cfX=/home/luca/.config/x11/xprofile -hash -d cfb=/home/luca/.local/src/dwmblocks/config.h -hash -d cfk=/home/luca/.config/kitty/kitty.conf -hash -d cfK=/home/luca/.config/kitty/kittyfullscreen.conf -hash -d cfv=/home/luca/.config/lvim/config.lua -hash -d cfz=/home/luca/.config/zsh/.zshrc -hash -d cfa=/home/luca/.config/shell/aliasrc -hash -d cfp=/home/luca/.config/shell/profile -hash -d cfl=/home/luca/.config/lf/lfrc -hash -d cfL=/home/luca/.config/lf/preview +hash -d bf=/home/luca/.local/share/bookmarks/files +hash -d bd=/home/luca/.local/share/bookmarks/directories diff --git a/.config/zsh/configs/autogenerated/shortcuts b/.config/zsh/configs/autogenerated/shortcuts index 4b5232fd..985f3d45 100644 --- a/.config/zsh/configs/autogenerated/shortcuts +++ b/.config/zsh/configs/autogenerated/shortcuts @@ -3,6 +3,7 @@ alias h="cd /home/luca" \ ch="cd /home/luca/.cache" \ cf="cd /home/luca/.config" \ dt="cd /home/luca/.local/share" \ +st="cd /home/luca/.local/state" \ sr="cd /home/luca/.local/src" \ it="cd /home/luca/.local/src/git" \ sc="cd /home/luca/.local/bin" \ @@ -14,16 +15,5 @@ ms="cd /home/luca/Music" \ pc="cd /home/luca/Pictures" \ vd="cd /home/luca/Videos" \ dot="cd /home/luca/.local/share/stow/dots" \ -bf="$EDITOR /home/luca/.config/shell/bm-files" \ -bd="$EDITOR /home/luca/.config/shell/bm-dirs" \ -cfx="$EDITOR /home/luca/.config/x11/xresources" \ -cfX="$EDITOR /home/luca/.config/x11/xprofile" \ -cfb="$EDITOR /home/luca/.local/src/dwmblocks/config.h" \ -cfk="$EDITOR /home/luca/.config/kitty/kitty.conf" \ -cfK="$EDITOR /home/luca/.config/kitty/kittyfullscreen.conf" \ -cfv="$EDITOR /home/luca/.config/lvim/config.lua" \ -cfz="$EDITOR /home/luca/.config/zsh/.zshrc" \ -cfa="$EDITOR /home/luca/.config/shell/aliasrc" \ -cfp="$EDITOR /home/luca/.config/shell/profile" \ -cfl="$EDITOR /home/luca/.config/lf/lfrc" \ -cfL="$EDITOR /home/luca/.config/lf/preview" \ +bf="$EDITOR /home/luca/.local/share/bookmarks/files" \ +bd="$EDITOR /home/luca/.local/share/bookmarks/directories" \ diff --git a/.local/share/bookmarks/directories b/.local/share/bookmarks/directories index 93c8be40..6e2f9e3f 100644 --- a/.local/share/bookmarks/directories +++ b/.local/share/bookmarks/directories @@ -1,16 +1,17 @@ # You can add comments to these files with # h $HOME -ch ${XDG_CACHE_HOME:-$HOME/.cache} -cf ${XDG_CONFIG_HOME:-$HOME/.config} -dt ${XDG_DATA_HOME:-$HOME/.local/share} +ch $XDG_CACHE_HOME +cf $XDG_CONFIG_HOME +dt $XDG_DATA_HOME +st $XDG_STATE_HOME sr $HOME/.local/src it $HOME/.local/src/git sc $HOME/.local/bin mn /mnt -dl ${XDG_DOWNLOAD_DIR:-$HOME/Downloads} -dm ${XDG_DOCUMENTS_DIR:-$HOME/Documents} -dk ${XDG_DOCUMENTS_DIR:-$HOME/Desktop} -ms ${XDG_MUSIC_DIR:-$HOME/Music} -pc ${XDG_PICTURES_DIR:-$HOME/Pictures} -vd ${XDG_VIDEOS_DIR:-$HOME/Videos} +dl $XDG_DOWNLOAD_DIR +dm $XDG_DOCUMENTS_DIR +dk $XDG_DOCUMENTS_DIR +ms $XDG_MUSIC_DIR +pc $XDG_PICTURES_DIR +vd $XDG_VIDEOS_DIR dot $STOW_DIR/dots diff --git a/.local/share/bookmarks/files b/.local/share/bookmarks/files index 641a129f..e302ee88 100644 --- a/.local/share/bookmarks/files +++ b/.local/share/bookmarks/files @@ -1,18 +1,3 @@ -# These files automatically update when edited/saved in vim: # keys filename -bf ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files -bd ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs -cfx ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources -cfX ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile -cfb ${XDG_HOME:-$HOME}/.local/src/dwmblocks/config.h - -# These do not update automatically, but on the next new instance of a program: -# keys filename -cfk ${XDG_CONFIG_HOME:-$HOME/.config}/kitty/kitty.conf -cfK ${XDG_CONFIG_HOME:-$HOME/.config}/kitty/kittyfullscreen.conf -cfv ${XDG_CONFIG_HOME:-$HOME/.config}/lvim/config.lua -cfz $ZDOTDIR/.zshrc -cfa ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc -cfp ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile -cfl ${XDG_CONFIG_HOME:-$HOME/.config}/lf/lfrc -cfL ${XDG_CONFIG_HOME:-$HOME/.config}/lf/preview +bf $XDG_DATA_HOME/bookmarks/files +bd $XDG_DATA_HOME/bookmarks/directories diff --git a/.local/src/dwm b/.local/src/dwm index 26e5eef6..1f97c457 160000 --- a/.local/src/dwm +++ b/.local/src/dwm @@ -1 +1 @@ -Subproject commit 26e5eef6abf0171c1b6ee1abff83217c28c51073 +Subproject commit 1f97c4575b38d4522ea16ec990e892b7a0782311