Merge branch 'master' of localgit:dotconfig

9 files changed, 44 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index 7df0a8b..de1cbcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 
 nvim/.netrwhist
 nvim/plugged
+zsh/.zcompdump
diff --git a/launch/config b/launch/config
index 21446b6..e1ee120 100644
--- a/launch/config
+++ b/launch/config
@@ -2,19 +2,19 @@
 +host fedora
 +host T495
 +host voidx250
-+host librex60
++host libreX60
 
 #OPTS
 firefox|brave
 	firefox -P default-esr
 	firefox
 	firefox -P default-default
-	iceweasel -P default-release
+	2
 ff-school|chromium|chrome
 	firefox -P School
 	firefox
 	1
-	iceweasel -P School
+	^
 halt|off|poweroff|shutdown
 	doas poweroff
 	^
diff --git a/nvim/init.vim b/nvim/init.vim
index 699fcb4..9e89eb6 100755
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -42,6 +42,7 @@ set smartcase                  " ...Unless the search term is capital
 set splitbelow splitright	   " Open splits on bottom/right instead of top/left
 set termguicolors              " Enable GUI colors for the terminal to get truecolor
 set wildmode=longest,list,full " Enable file auto-complete
+set wrap!                      " Disable word wrapping
 syntax on                      " Enable syntax highlighting
 
 " Get rid of the pointless .viminfo files that clutter the home directory
@@ -52,7 +53,7 @@ set viminfo=""
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 
 " Tabbing
-let tabwidth = 4
+"let tabwidth = 4
 set tabstop=4                  " Set width of tabs to 4 instead of default 8
 set shiftwidth=4               " Tab key will only insert 1 tab
 " Use tabs instead of spaces
diff --git a/zsh/profiles/zprofile.libreX60 b/zsh/profiles/zprofile.libreX60
new file mode 100755
index 0000000..d4f4e9c
--- /dev/null
+++ b/zsh/profiles/zprofile.libreX60
@@ -0,0 +1,4 @@
+#!/usr/bin/env zsh
+
+export WM="awesome"
+export TERMINAL="st"
diff --git a/zsh/profiles/zprofile.librex60 b/zsh/profiles/zprofile.librex60
deleted file mode 100755
index 530563f..0000000
--- a/zsh/profiles/zprofile.librex60
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env zsh
-
-export PATH="/usr/local/texlive/2021/bin/x86_64-linux:$PATH"
diff --git a/zsh/zprofile b/zsh/zprofile
index 79e87c5..fc9911e 100755
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -2,12 +2,12 @@
 
 # Default programs
 export EDITOR='nvim'
-export TERMINAL='st'
+export TERMINAL='alacritty'
 export BROWSER='launch firefox'
 export SUDO='doas'
 
 # Use sudo=${SUDO-sudo}
-[ $EUID = 0 ] && export SUDO='' # When running as root, don't use sudo
+[ $EUID = 0 ] && export SUDO=''  # When running as root, don't use sudo
 
 # Make programs follow the XDG base directory specification
 export XDG_CACHE_HOME="$HOME/.cache"
@@ -22,7 +22,7 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
 export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-export X11CONFIG="$XDG_CONFIG_HOME/x11" # Used for X11 scripts
+export X11CONFIG="$XDG_CONFIG_HOME/x11"  # Used for X11 scripts
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
 export XDG_DATA_HOME="$HOME/.local/share"
@@ -34,11 +34,12 @@ export PYTHONUSERBASE="$XDG_DATA_HOME/python"
 export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_DATA_HOME/java"
 
 export XDG_STATE_HOME="$HOME/.local/state"
-export LESSHISTFILE='-' # Disable this, but it would be considered a state file
-export ZHISTFILE="$XDG_STATE_HOME/zsh/zhistory" # Used to set HISTFILE in zshrc without exporting since HISTFILE is generic to most shells, and desired behavior is for zsh to have its own history file
+export LESSHISTFILE='-'  # Disable this, but it would be considered a state file
+export ZHISTFILE="$XDG_STATE_HOME/zsh/zhistory"  # Used to set HISTFILE in zshrc without exporting since HISTFILE is generic to most shells, and desired behavior is for zsh to have its own history file
 
 # Path
-for lbin in "$HOME/.local/bin"{/,/*/}; do export PATH="${lbin%/}:$PATH"; done 2>/dev/null # Add ~/.local/bin and all sub dirs
+setopt nullglob  # Set in case .local/bin doesn't exist
+for lbin in "$HOME/.local/bin"{/,/*/}; do export PATH="${lbin%/}:$PATH"; done 2>/dev/null  # Add ~/.local/bin and all sub dirs
 export PATH="$HOME/.local/opt:$PATH"
 export PATH="$CARGO_HOME/bin:$PATH"
 export PATH="$PYTHONUSERBASE/bin:$PATH"
@@ -48,7 +49,7 @@ export QT_QPA_PLATFORMTHEME='qt5ct'
 
 # Misc Zsh setup
 mkdir -p "$(dirname "$ZHISTFILE")"
-source "$ZDOTDIR/profiles/zprofile.$HOST" 2>/dev/null # Source additional host-specific profiles
+source "$ZDOTDIR/profiles/zprofile.$HOST" 2>/dev/null  # Source additional host-specific profiles
 
 # Autostart X after login
 [ -z $DISPLAY ] && [[ $UID != 0 ]] && [[ $TTY =~ /dev/tty(1|C0) ]] && startx "$X11CONFIG/xinitrc"
diff --git a/zsh/zscripts/hosts/aliasrc.libreX60.zsh b/zsh/zscripts/hosts/aliasrc.libreX60.zsh
new file mode 100755
index 0000000..1180171
--- /dev/null
+++ b/zsh/zscripts/hosts/aliasrc.libreX60.zsh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Package Management
+alias \
+	apt="sudo apt" \
+
+# Shorten program names
+alias \
+	systemctl="sudo systemctl" \
+	sd="systemctl" \
+
diff --git a/zsh/zscripts/hosts/aliasrc.librex60.zsh b/zsh/zscripts/hosts/aliasrc.librex60.zsh
deleted file mode 100755
index 87f7e08..0000000
--- a/zsh/zscripts/hosts/aliasrc.librex60.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Package Management
-alias \
-	p="sudo pacman" \
-	pq="sudo pacman -Ss" \
-
diff --git a/zsh/zshrc b/zsh/zshrc
index 8bef6af..532c795 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,8 +1,8 @@
 #!/usr/bin/env zsh
 
-setopt +o NOMATCH		# Non-existant wildcard matches won't produce an error
+setopt +o NOMATCH  # Non-existant wildcard matches won't produce an error
 
-# Zsh scripts (load general scripts, then host specific scripts, then scripts prepended with !)
+# Zsh scripts (load general scripts, then host specific scripts, then scripts with ! prefix) (loaded later = higher priority)
 for zscript in "$XDG_CONFIG_HOME/zsh/zscripts"{/[^\!]*.zsh,/hosts/*.$HOST.zsh,/!*.zsh}; do source "$zscript"; done 2>/dev/null
 
 # Colors! + Prompt
@@ -10,24 +10,23 @@ autoload -U colors && colors
 [ -z "$PS1OVERRIDE" ] && PS1="%B%F{${colbr:-red}}[%F{${colname:-yellow}}%n%F{${colat:-green}}@%F{${colhost:-blue}}%m %F{${coldir:-magenta}}%U%~%u%F{${colbr:-red}}]%f%b%(!.#.$) "
 
 # Cd settings
-setopt AUTO_CD			# `cd` is implied
-#setopt CDABLE_VARS		# '~/' is implied for `cd` (doesn't work?)
+setopt AUTO_CD  # `cd` is implied when path is entered
 
 # History settings
 HISTFILE="${ZHISTFILE:-$HOME/.zhistory}"
-HISTSIZE=500			# Max lines of history loaded into memory for each zsh session
-SAVEHIST=10000000		# Max lines of history saved to HISTFILE before overwriting
-setopt EXTENDED_HISTORY		# Save superfluous info with command to reduce disk writes when using INC_APPEND_HISTORY or SHARE_HISTORY
-setopt HIST_IGNORE_DUPS		# Successive duplicate entries ignored
-setopt HIST_IGNORE_SPACE	# Entries with leading space ignored
-setopt HIST_REDUCE_BLANKS	# Remove superfluous blank characters before saving
-setopt INC_APPEND_HISTORY	# Create entries after each command, not after zsh exits
-setopt SHARE_HISTORY		# Share history between zsh sessions
+HISTSIZE=500               # Max lines of history loaded into memory for each zsh session
+SAVEHIST=10000000          # Max lines of history saved to HISTFILE before overwriting
+setopt EXTENDED_HISTORY    # Save superfluous info with command to reduce disk writes when using INC_APPEND_HISTORY or SHARE_HISTORY
+setopt HIST_IGNORE_DUPS    # Successive duplicate entries ignored
+setopt HIST_IGNORE_SPACE   # Entries with leading space aren't stored in histfile
+setopt HIST_REDUCE_BLANKS  # Remove superfluous blank characters before saving
+setopt INC_APPEND_HISTORY  # Create entries after each command, not after zsh exits
+setopt SHARE_HISTORY       # Share history between zsh sessions
 
 # Input/output settings
-setopt INTERACTIVE_COMMENTS	# Comments won't be interpreted in an interactive zsh session
+setopt INTERACTIVE_COMMENTS  # Comments won't be interpreted in an interactive shell
 
-# tmp thing
-[ $TTY = /dev/tty2 ] && "/home/timmy/.local/opt/shell-color-scripts/colorscripts/$(ls /home/timmy/.local/opt/shell-color-scripts/colorscripts 2>/dev/null | shuf -n1)" 2>/dev/null
+# Disable bell
+unsetopt BEEP
 
-zplugInitialize # Load zsh plugins using zplug; should be last
+zplugInitialize  # Load zsh plugins using zplug; goes last