8 files changed, 26 insertions, 29 deletions
diff --git a/alacritty/.config/alacritty.yml b/alacritty/.config/alacritty.yml
index fe044c7..d2889fd 100644
--- a/alacritty/.config/alacritty.yml
+++ b/alacritty/.config/alacritty.yml
@@ -1,6 +1,6 @@
 # Configuration for Alacritty, the GPU enhanced terminal emulator.
 import:
- - /home/ross/.config/alacritty/nord.yml
+ - ~/.config/alacritty/nord.yml
 
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
diff --git a/lvim/.config/lvim/config.lua b/lvim/.config/lvim/config.lua
index f738d0d..b4089e3 100644
--- a/lvim/.config/lvim/config.lua
+++ b/lvim/.config/lvim/config.lua
@@ -145,19 +145,19 @@ lvim.builtin.treesitter.highlight.enabled = true
 
 -- Additional Plugins
 lvim.plugins = {
-  {"shaunsingh/nord.nvim"}
---     {"folke/tokyonight.nvim"},
---     {
---       "folke/trouble.nvim",
---       cmd = "TroubleToggle",
---     },
+  { "shaunsingh/nord.nvim" }
+  --     {"folke/tokyonight.nvim"},
+  --     {
+  --       "folke/trouble.nvim",
+  --       cmd = "TroubleToggle",
+  --     },
 }
 
-vim.g.nord_disable_background=true
-vim.g.nord_borders=true
-vim.g.nord_contrast=true
-vim.g.nord_cursorline_transparent=true
-vim.g.nord_enable_sidebar_background=true
+vim.g.nord_disable_background = true
+vim.g.nord_borders = true
+vim.g.nord_contrast = true
+vim.g.nord_cursorline_transparent = true
+vim.g.nord_enable_sidebar_background = true
 
 -- Autocommands (https://neovim.io/doc/user/autocmd.html)
 -- lvim.autocommands.custom_groups = {
diff --git a/sh/.config/shell/aliasrc b/sh/.config/shell/aliasrc
index c959afa..514eb8b 100644
--- a/sh/.config/shell/aliasrc
+++ b/sh/.config/shell/aliasrc
@@ -27,7 +27,7 @@ alias \
 	du="dust -r" \
 	free="free -m" \
   gdb="gdb -q -nh -x "$XDG_CONFIG_HOME"/gdb/init" \
-  paru="yay" \
+  # paru="yay" \
   yarn='yarn --use-yarnrc "$XDG_CONFIG_HOME/yarn/config"' \
 # Colorize commands when possible.
 alias \
diff --git a/sh/.config/shell/profile b/sh/.config/shell/profile
index 86ac8f7..50ff763 100644
--- a/sh/.config/shell/profile
+++ b/sh/.config/shell/profile
@@ -1,5 +1,4 @@
 #!/bin/zsh
-
 # profile file. Runs on login. Environmental variables are set here.
 
 # If you don't plan on reverting to bash, you can remove the link in ~/.profile
@@ -7,12 +6,12 @@
 
 # Adds `~/.local/bin` to $PATH
 export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}"
+export FPATH="$FPATH:${XDG_DATA_HOME:-$HOME/.local/share/zsh/site-functions}"
 
 unsetopt PROMPT_SP
 
 # Default programs:
 export EDITOR="lvim"
-#export TERMINAL="xterm-256color"
 export BROWSER="chromium"
 
 # ~/ Clean-up:
@@ -42,7 +41,8 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
-export MANPAGER="nvimpager"
+export VOLTA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/volta"
+export PATH="$VOLTA_HOME/bin:$PATH"
 export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
 export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison"
 export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history"
@@ -50,11 +50,11 @@ export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat"
 export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
 export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
 export OCTAVE_SITE_INITFILE="$XDG_CONFIG_HOME/octave/octaverc"
-export OCTAVE_HISTFILE="/home/ross/.cache/octave/octave_hist"
-export ICEAUTHORITY="$XDG_CACHE_HOME"/ICEauthority
-#export TERM="xterm-256color"                      # getting proper colors
+export OCTAVE_HISTFILE="$XDG_CACHE_HOME/octave/octave_hist"
+export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
 export HISTORY_IGNORE="(ls|cd|pwd|exit|sudo reboot|history|cd -|cd ..|clear|fg)"
 export GDBHISTFILE="$XDG_DATA_HOME"/gdb/history
+export PAGER=nvimpager
 
 # Other program settings:
 export DICS="/usr/share/stardict/dic/"
diff --git a/sh/.zprofile b/sh/.zprofile
new file mode 120000
index 0000000..8486fca
--- /dev/null
+++ b/sh/.zprofile
@@ -0,0 +1 @@
+.config/shell/profile
+\ No newline at end of file
diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
deleted file mode 120000
index 555eb07..0000000
--- a/zsh/.config/zsh/.zprofile
+++ /dev/null
@@ -1 +0,0 @@
-/home/ross/.config/shell/profile
-\ No newline at end of file
diff --git a/zsh/.config/zsh/.zshopts b/zsh/.config/zsh/.zshopts
index 810e2d1..f9df3e3 100644..100755
--- a/zsh/.config/zsh/.zshopts
+++ b/zsh/.config/zsh/.zshopts
@@ -1,15 +1,15 @@
+#! /usr/bin/env zsh
 # History settings
 HISTSIZE=50000
 SAVEHIST=10000
-HISTFILE=$HOME/.zsh_history
 
 setopt append_history           # append the history
 setopt inc_append_history       # append to history in the current
                                 # session and not just when the session ends
 setopt share_history            # share history between sessions
-#setopt extended_history         # include statistics of when/how long/etc a
+setopt extended_history         # include statistics of when/how long/etc a
                                 # command has run
-#setopt hist_ignore_dups         # do not store dupes executed after eachother
+setopt hist_ignore_dups         # do not store dupes executed after eachother
 setopt hist_ignore_all_dups     # removes copies of the same line
 setopt hist_expire_dups_first   # removes copies when the histfile fills up
 setopt hist_save_no_dups        # don't save dupes from the same session
@@ -20,9 +20,9 @@ setopt hist_reduce_blanks       # remove blank lines from the command which
 
 # Disable this on boxes that are affected by bug
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=924736
-is-at-least 5.5   &&  unsetopt hist_reduce_blanks
+# is-at-least 5.5   &&  unsetopt hist_reduce_blanks
 # bugfix is incoming, lets see what it does
-is-at-least 5.7.2 &&  setopt hist_reduce_blanks
+# is-at-least 5.7.2 &&  setopt hist_reduce_blanks
 
 setopt hist_ignore_space        # lines starting with space don't go into the
                                 # history
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 7bb97bf..f437896 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -28,8 +28,7 @@ HISTFILE=~/.cache/zsh/history
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc"
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc"
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshopts" ] && source 
-"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshopts"
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshopts" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshopts"
 
 
 
@@ -39,10 +38,8 @@ autoload -U compinit
 zstyle ':completion:*' menu select
 zmodload zsh/complist
 compinit
-#compdef cat='bat'
 _comp_options+=(globdots)		# Include hidden files.
 
-PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source "/home/ross/.config/tea/autocomplete.zsh"
 # To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
 [[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh
 [[ ! -f ~/.config/zsh/keybindings.zsh ]] || source ~/.config/zsh/keybindings.zsh