updates

executable_dot_zshrc

@@ -1,16 +1,12 @@
 #!/bin/zsh
 # Runs for interactive shells
 
-export START="${START:=$(date '+%s.%N')}"
-
 checkCommand(){
   type "$1" >/dev/null 2>&1
 }
-# If you have zellij installed, this will auto start it
-#if [ -z "$ZELLIJ" ] && checkCommand zellij; then
-#    #export ZELLIJ_AUTO_ATTACH=true
-#    exec zellij
-#fi
+
+# Set aliases
+[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc" # >/dev/null 2>&1 &;
 
 # Speed up shell load on WSL
 OLDPATH=$PATH
@@ -24,7 +20,8 @@ PATH=$(echo "$PATH" | sed -e 's/\/mnt\/.*\?://g')
 HISTFILE="$XDG_STATE_HOME/zsh/history"
 [ ! -e $HISTFILE ] && mkdir -p "$XDG_STATE_HOME/zsh" && touch $HISTFILE
 HISTSIZE=10000
-SAVEHIST=10000
+SAVEHIST=$HISTSIZE
+HISTDUP=erase
 
 # disable system beep on error
 setopt BEEP
@@ -35,14 +32,14 @@ setopt nomatch
 # report status of bg jobs immediately
 setopt notify 
 #dedupe history, and append to histfile after every command
-setopt histfindnodups histsavenodups incappendhistory 
-# correct all arguments in a line
-setopt correctall
+setopt hist_find_no_dups hist_save_no_dups hist_ignore_dups appendhistory sharehistory 
 # vim style line editing
 bindkey -v
 # make file name completion case-insensitive
-zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
 zstyle ':completion:*' cache-path $XDG_CACHE_HOME/zsh/zcompcache
+zstyle 'fzf-tab:complete:cd:*' fzf-preview `ls $realpath`
+zstyle 'fzf-tab:complete:__zoxide_z:*' fzf-preview `ls $realpath`
 
 # Move completions to XDG Dir
 autoload -Uz compinit
@@ -53,9 +50,6 @@ compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 HYPHEN_INSENSITIVE="true"
 
-# Enable command auto-correction.
-ENABLE_CORRECTION="true"
-
 # Display red dots whilst waiting for completion.
 COMPLETION_WAITING_DOTS="true"
 
@@ -103,50 +97,18 @@ if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
   add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
   add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
 fi
-#bindkey "${terminfo[khome]}" beginning-of-line
-#bindkey "${terminfo[kend]}" end-of-line
-#bindkey "${terminfo[kdch1]}" delete-char
-
-#if ! checkCommand gum && checkCommand go; then
-#	# TODO
-#fi
-
 
 #Allows fuzzy-finding
 if checkCommand fzf; then
   export FZF_BASE=$(which fzf)
-else
-  git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf;
-  ~/.fzf/install --bin;
-  mkdir -p ~/.local/bin;
-  mv ~/.fzf/bin/* ~/.local/bin/;
-  rm -rf ~/.fzf;
 fi
 
 #todo: install if not found
 # Load plugins
-mkdir -p ~/.config/sheldon
-touch ~/.config/sheldon/plugins.toml
 if checkCommand sheldon; then
+  mkdir -p ~/.config/sheldon
+  touch ~/.config/sheldon/plugins.toml
   eval "$(sheldon -q source)";
-elif checkCommand brew; then
-  brew install sheldon;
-elif checkCommand cargo; then
-  cargo install sheldon
-else
-  curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh \
-    | bash -s -- --repo rossmacarthur/sheldon --to ~/.local/bin
-fi
-
-#zplug "plugins/git", from:oh-my-zsh, lazy:on 
-#zplug "plugins/vi-mode", from:oh-my-zsh
-#zplug "plugins/adb", from:oh-my-zsh, lazy:on
-#zplug "plugins/pip", from:oh-my-zsh, lazy:on
-
-
-# set colors if pywal is installed
-if checkCommand wal  && [ -z "$SSH_TTY" ]; then
-  eval 'cat ~/.cache/wal/sequences &'
 fi
 
 # if ssh-agent isn't running, run it
@@ -165,7 +127,6 @@ if [ ! -f "$SSH_AUTH_SOCK" ] && [ -f ~/.ssh-agent.env ]; then
   source "$HOME/.ssh-agent.env" >/dev/null
 fi
 
-[[ -f ~/.zsh_history ]] && touch ~/.zsh_history
 
 # Set up mcfly if installed (lets you search through history easily with ctrl+r)
 if checkCommand mcfly; then
@@ -178,33 +139,18 @@ fi
 if checkCommand zoxide; then
   eval "$(zoxide init zsh)"
 fi
-if checkCommand direnv; then
-  eval "$(direnv hook zsh)"
-fi
-#if "$(checkCommand notify-send)"; then
-#    notify-send() { wsl-notify-send.exe --category $WSL_DISTRO_NAME "${@}"; }
-#fi
-
-
-# Set up broot if installed (a nicer tree, probably has other cool stuff I haven't looked at yet)
-# [ -e "$HOME"/.config/broot/launcher/bash/br ] && zsh-defer -t 5 eval "$(broot --print-shell-function zsh)" 
-# Set aliases
-[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc" # >/dev/null 2>&1 &;
+# if checkCommand direnv; then
+#   eval "$(direnv hook zsh)"
+# fi
 
 if checkCommand mirafetch; then
   RUST_BACKTRACE=1 mirafetch
 fi
-END="$(date '+%s.%N')"
 PATH=$OLDPATH
-printf "Startup Time: %.2fms\n" $((1000 * (END - START)))
-# todo: install if not found
-checkCommand starship && eval "$(starship init zsh)"
 unset OLDPATH
-unset START
-unset END
-
-
+checkCommand starship && eval "$(starship init zsh)"
 
+# TODO: move these
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 

private_dot_config/external_nvim

@@ -1 +1 @@
-Subproject commit 12ba675a2c1565339bda1422a76fd4c0ad1b3ef4
+Subproject commit e3a99eb8f20c358f8376579594c0ebbf62c1db55

private_dot_config/git/executable_config.tmpl

@@ -4,14 +4,16 @@ name = {{ .name | quote }}
 
 [core]
 editor = nvim
-pager = delta
-difftool = true
+# pager = delta
 # Remove Carriage Returns
 autocrlf = input
 eol = lf
 
+[pager]
+difftool = true
+
 [interactive]
-diffFilter = delta --color-only
+# diffFilter = delta --color-only
 
 [delta]
 navigate = true # use n and N to move between diff sections
@@ -20,9 +22,12 @@ light = false   # set to true if you're in a terminal w/ a light background colo
 [diff]
 tool = difftastic
 
-[difftool "difftastic"]
+[difftool]
 prompt = false
 
+[difftool "difftastic"]
+cmd = difft "$LOCAL" "$REMOTE"
+
 [merge]
 # TODO: set this to meld or nvimdiff
 conflictstyle = zdiff3

private_dot_config/sheldon/plugins.toml

@@ -49,9 +49,9 @@ apply = ["defer"]
 github = 'click-contrib/click-completion'
 apply = ["defer"]
 
-#[plugins.zsh-direnv]
-#github = 'ptavares/zsh-direnv'
-#apply = ["defer"]
+[plugins.zsh-direnv]
+github = 'ptavares/zsh-direnv'
+apply = ["defer"]
 
 [plugins.undollar]
 github = 'zpm-zsh/undollar'

private_dot_config/sway/config

@@ -42,14 +42,13 @@ include "keybinds"
 default_border normal 1 
 
 gaps inner 10
-
 # polkit
+exec_always --no-startup-id /usr/bin/lxpolkit
 exec_always --no-startup-id /usr/bin/lxqt-policykit-agent
 #notif daemon
-exec_always swhks & 
-exec_always pkexec swhkd
-exec_always dunst &
-
+exec dunst
 exec nm-tray
-exec_always fcitx5
+# exec_always fcitx5
 exec_always wl-paste --watch cliphist store 
+exec_always gnome-keyring-daemon -r
+exec ~/.config/swhkd/hotkeys.sh

private_dot_config/swhkd/executable_hotkeys.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
 killall swhks
+source ~/.env
 SWHKDRC="${XDG_CONFIG_HOME:-$HOME/.config}/swhkd/swhkdrc"
 swhks & pkexec swhkd -d -c $SWHKDRC

private_dot_config/swhkd/swhkdrc

@@ -41,14 +41,14 @@ super + tab
   rofi -show window -show-icons -theme lunar-witch
 
 print
-  flameshot full -c -r -p "$HOME/Pictures/screenshots/" 
+  grim - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy 
 
 shift + print
-  flameshot gui -c -s -r -p "$HOME/Pictures/screenshots/" 
+  grim -g "$(slurp)" - | tee "$XDG_PICTURES_DIR/screenshots/$(date -Is).png" | wl-copy 
 
 
 ctrl + print
-  flameshot gui -c -r -p "$HOME/Pictures/screenshots/" 
+  TEMP=$(mktemp); grim -g "$(slurp)" $TEMP && notify-send "$TEMP" && flatpak run org.gimp.GIMP -- $TEMP
 
 
 #super + shift + v

private_dot_config/systemd/user/hotkeys.service

@@ -4,7 +4,7 @@ BindsTo=default.target
 
 [Service]
 Type=simple
-ExecStart=/home/mira/.config/swhkd/hotkeys.sh
+ExecStart=bash -l $HOME/.config/swhkd/hotkeys.sh
 [Install]
 WantedBy=default.target