various config updates

.config/alacritty/alacritty.yml

@@ -77,7 +77,7 @@ font:
   # OS X only: use thin stroke font rendering. Thin strokes are suitable
   # for retina displays, but for non-retina you probably want this set to
   # false.
-  use_thin_strokes: true
+  #use_thin_strokes: true
 
 # Should display the render timer
 render_timer: true

.config/emptty-custom-sessions/sway.desktop

@@ -3,3 +3,4 @@ Name=Sway
 Comment=An i3-compatible Wayland compositor
 Exec=sway
 Type=Application
+Environment=wayland

.config/neofetch/config.conf

@@ -27,7 +27,7 @@ print_info() {
     info "Public IP" public_ip
 
     # info "CPU Usage" cpu_usage
-    # info "Battery" battery
+    info "Battery" battery
     # info "Font" font
     # info "Song" song
     # [[ "$player" ]] && prin "Music Player" "$player"
@@ -116,7 +116,7 @@ uptime_shorthand="on"
 # Example:
 # on:   '1801MiB / 7881MiB (22%)'
 # off:  '1801MiB / 7881MiB'
-memory_percent="off"
+memory_percent="on"
 
 # Change memory output unit.
 #
@@ -128,7 +128,7 @@ memory_percent="off"
 # kib  '1020928KiB / 7117824KiB'
 # mib  '1042MiB / 6951MiB'
 # gib: ' 0.98GiB / 6.79GiB'
-memory_unit="mib"
+memory_unit="gib"
 
 
 # Packages

plugins/extras/defaults.d/000-base.sh

@@ -18,7 +18,7 @@ esac
 # History
 # https://www.digitalocean.com/community/tutorials/how-to-use-bash-history-commands-and-expansions-on-a-linux-vps
 shopt -s histappend;                       # Append to the history file, not overwrite
-export HISTCONTRO=Lignoreboth:erasedups;                    # No duplicate commands in history
+export HISTCONTROL="ignoreboth:erasedups";                    # No duplicate commands in history
 export HISTSIZE=25000;
 export HISTFILESIZE=10000;
 export HISTIGNORE="[   ]*:&:bg:fg:exit:clear";   # Don't save these commands in the history

plugins/starship/starship.sh

@@ -9,15 +9,16 @@ if ! [[ -f "$(which starship 2>&1)" ]] && [[ -d "${HOME}/.asdf" ]]; then
 fi
 
 if [[ -f "$(which starship 2>&1)" ]]; then
-	export STARSHIP_CONFIG_DIR="${FILES_USER_CONFIG}";
+	export STARSHIP_CONFIG_DIR="${FILES_USER_CONFIG}/starship";
 	export STARSHIP_CACHE="${STARSHIP_CONFIG_DIR}/cache";
 
 	files_debug_log "[starship] installing default config";
-    [[ -f "${FILES_USER_CONFIG}/starship.toml" ]] || ln -sf  "${FILES_PLUGIN_ROOT}/defaults.d/starship.toml" ${FILES_USER_CONFIG};
+    [[ -f "${STARSHIP_CONFIG_DIR}/starship.toml" ]] || ln -sf  "${FILES_PLUGIN_ROOT}/defaults.d/starship.toml" ${STARSHIP_CONFIG_DIR};
 
 	starship_run() {
 		local shell=${1:-bash};
-		eval "$(starship init ${1})";
+		eval "$(starship init ${1} --print-full-init)";
+		export PROMPT_COMMAND='PS1=$(starship prompt)';
 	}
 
 	starship_install() {

plugins/wezterm/defaults.d/wezterm.lua

@@ -1,20 +1,93 @@
-local wez = require 'wezterm';
+local wezterm = require 'wezterm';
 
-return {
-    font = wez.font('Fira Code'),
-    default_prog = {"/bin/bash", "--login"},
-    keys = {
-        -- This will create a new split and run your default program inside it
-        { 
-            key="s", 
-            mods="CTRL|SHIFT|ALT", 
-            action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}
-        },
-        { 
-            key="i", 
-            mods="CTRL|SHIFT|ALT", 
-            action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}
-        },
+local config = {};
+
+-- In newer versions of wezterm, use the config_builder which will
+-- help provide clearer error messages
+if wezterm.config_builder then
+  config = wezterm.config_builder();
+end
+
+config.default_prog = {"/bin/bash", "--login"};
+config.default_cwd = "~/projects";
+
+config.font = wezterm.font('Pragmata Pro Mono Liga');
+
+config.color_scheme = 'Aura (Gogh)';
+--config.color_scheme = 'Batman';
+
+config.window_padding = {
+  left = 10,
+  right = 10,
+  top = 10,
+  bottom = 10,
+};
+
+config.inactive_pane_hsb = {
+  saturation = 0.9,
+  brightness = 0.8,
+};
+
+config.window_background_opacity = 0.5;
+
+config.keys = {
+    -- This will create a new split and run your default program inside it
+    {
+        key="s",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}
+    },
+    {
+        key="i",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}
+    },
+    {
+        key="j",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{AdjustPaneSize={"Down", 2}}
+    },
+    {
+        key="k",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{AdjustPaneSize={"Up", 2}}
+    },
+    {
+        key="h",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{AdjustPaneSize={"Left", 2}}
+    },
+    {
+        key="l",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{AdjustPaneSize={"Right", 2}}
+    },
+    {
+        key="h",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{ActivatePaneDirection="Left"}
+    },
+    {
+        key="l",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{ActivatePaneDirection="Right"}
+    },
+    {
+        key="j",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{ActivatePaneDirection="Down"}
+    },
+    {
+        key="k",
+        mods="CTRL|SHIFT",
+        action=wezterm.action{ActivatePaneDirection="Up"}
+    },
+    {
+        key="w",
+        mods="CTRL",
+        action=wezterm.action{CloseCurrentTab={confirm=false}}
     }
+};
+
+return config;
 
-}

plugins/wezterm/wezterm.sh

@@ -9,6 +9,6 @@ if [[ -f "$(which wezterm 2>&1)" ]]; then
 
     if ! [[ -f "${WEZTERM_CONFIG_FILE}" ]]; then
         files_debug_log "linking"
-        files_linkdir "${FILES_PLUGIN_ROOT}/defaults.d/" "${FILES_USER_CONFIG}/wezterm";
+        files_linkdir "${FILES_PLUGIN_ROOT}/defaults.d/" "${FILES_USER_CONFIG}/wezterm/";
     fi
 fi