Fix path to battery script

Shows entire previous command, followed by '- Alacritty ($host)'

alacritty/alacritty.toml

@@ -161,6 +161,7 @@ blinking = "On"
 shape = "Block"
 
 [env]
+TERM_TITLE = "Alacritty"
 TERM = "alacritty"
 
 [font]
@@ -209,4 +210,4 @@ title = "Alacritty - Invalid invalid-terminal"
 
 [window.class]
 general = "Alacritty"
-instance = "Alacritty-default"
+instance = "Alacritty-invalid"

alacritty/archlinux-ephemeral.toml

@@ -1,5 +1,8 @@
 import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/archlinux.toml"]
 
+[env]
+TERM_TITLE = "Alacritty (Archlinux Ephemeral)"
+
 [shell]
 args = ["ephemeral", "-i", "archlinux"]
 program = "/usr/bin/distrobox"
@@ -8,4 +11,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Archlinux (Ephemeral)"
 
 [window.class]
+general = "Alacritty-archlinux-ephemeral"
 instance = "Alacritty-archlinux-ephemeral"

alacritty/archlinux.toml

@@ -24,6 +24,9 @@ yellow = "#D19317"
 background = "#171421"
 foreground = "#D0CFCC"
 
+[env]
+TERM_TITLE = "Alacritty (Archlinux)"
+
 [font]
 size = 10.0
 
@@ -51,4 +54,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Archlinux (Distrobox)"
 
 [window.class]
+general = "Alacritty-archlinux"
 instance = "Alacritty-archlinux"

alacritty/debian-ephemeral.toml

@@ -1,5 +1,8 @@
 import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/debian.toml"]
 
+[env]
+TERM_TITLE = "Alacritty (Debian Ephemeral)"
+
 [shell]
 args = ["ephemeral", "-i", "debian:bookworm"]
 program = "/usr/bin/distrobox"
@@ -8,4 +11,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Debian (Ephemeral)"
 
 [window.class]
+general = "Alacritty-debian-ephemeral"
 instance = "Alacritty-debian-ephemeral"

alacritty/debian.toml

@@ -24,6 +24,9 @@ yellow = "#D78E0A"
 background = "#450325"
 foreground = "#FBE6EE"
 
+[env]
+TERM_TITLE = "Alacritty (Debian)"
+
 [font]
 size = 10.0
 
@@ -51,4 +54,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Debian (Distrobox)"
 
 [window.class]
+general = "Alacritty-debian"
 instance = "Alacritty-debian"

alacritty/grave.toml

@@ -24,6 +24,9 @@ yellow = "#D79921"
 background = "#282828"
 foreground = "#EBDBB2"
 
+[env]
+TERM_TITLE = "Alacritty (Debian)"
+
 [font]
 size = 11.0
 
@@ -50,4 +53,5 @@ program = "/bin/bash"
 title = "Alacritty - Grave (Host)"
 
 [window.class]
+general = "Alacritty-grave"
 instance = "Alacritty-grave"

alacritty/host.toml

@@ -4,6 +4,9 @@ import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml"]
 background = "#010101"
 foreground = "#FEFEFE"
 
+[env]
+TERM_TITLE = "Alacritty (Host)"
+
 [font]
 size = 10.0
 
@@ -30,4 +33,5 @@ program = "/bin/bash"
 title = "Alacritty - Fedora (Host)"
 
 [window.class]
+general = "Alacritty-toolbox"
 instance = "Alacritty-toolbox"

alacritty/toolbox-ephemeral.toml

@@ -1,5 +1,8 @@
 import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/toolbox.toml"]
 
+[env]
+TERM_TITLE = "Alacritty (Fedora Ephemeral)"
+
 [shell]
 args = ["ephemeral", "-i", "fedora:37"]
 program = "/usr/bin/distrobox"
@@ -8,4 +11,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Fedora (Ephemeral)"
 
 [window.class]
+general = "Alacritty-toolbox-ephemeral"
 instance = "Alacritty-toolbox-ephemeral"

alacritty/toolbox.toml

@@ -24,6 +24,9 @@ yellow = "#D79921"
 background = "#282828"
 foreground = "#EBDBB2"
 
+[env]
+TERM_TITLE = "Alacritty (Fedora)"
+
 [font]
 size = 11.0
 
@@ -51,4 +54,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Fedora (Distrobox)"
 
 [window.class]
+general = "Alacritty-toolbox"
 instance = "Alacritty-toolbox"

alacritty/ubuntu-ephemeral.toml

@@ -1,5 +1,8 @@
 import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/ubuntu.toml"]
 
+[env]
+TERM_TITLE = "Alacritty (Ubuntu Ephemeral)"
+
 [shell]
 args = ["ephemeral", "-i", "ubuntu:22.04"]
 program = "/usr/bin/distrobox"
@@ -8,4 +11,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Ubuntu (Ephemeral)"
 
 [window.class]
+general = "Alacritty-ubuntu-ephemeral"
 instance = "Alacritty-ubuntu-ephemeral"

alacritty/ubuntu.toml

@@ -24,6 +24,9 @@ yellow = "#c9A000"
 background = "#300A24"
 foreground = "#FEFEFE"
 
+[env]
+TERM_TITLE = "Alacritty (Ubuntu)"
+
 [font]
 size = 12.0
 
@@ -51,4 +54,5 @@ program = "/usr/bin/distrobox"
 title = "Alacritty - Ubuntu (Distrobox)"
 
 [window.class]
+general = "Alacritty-ubuntu"
 instance = "Alacritty-ubuntu"

bash/bashrc

@@ -11,7 +11,7 @@ export GDK_BACKEND="wayland"
 export DCONF=".config/dconf/user"
 
 # Setup editor
-export EDITOR="${HOME}/.dotfiles/nix/bin/nvim"
+export EDITOR="nvim"
 
 # If not running interactively, don't do anything
 case $- in
@@ -52,10 +52,18 @@ if ! shopt -oq posix; then
     fi
 fi
 
+if [[ -z $TERM_TITLE ]]; then
+    TERM_TITLE="$TERM";
+fi
+
 # Set window title to last command
-PROMPT_COMMAND='echo -e -n "\033]2;$_\007"'
-# Reconfigure prompt after each return
-PROMPT_COMMAND="$PROMPT_COMMAND; source ${HOME}/.dotfiles/bash/prompt.sh"
+function last_command {
+    local h="$(history 1)";
+    echo "${h##*([[:space:])+([[:digit:]])+([[:space:]])}"
+}
+PS0='\[\e]0;$(last_command) - $TERM_TITLE\a\]'
+# Update prompt
+PROMPT_COMMAND="source ${HOME}/.dotfiles/bash/prompt.sh"
 # Bell when prompt is returned to mark as urgent
 PROMPT_COMMAND="$PROMPT_COMMAND;printf \"\a\"; history -a"
 

nvim/stylua.toml

@@ -1,3 +1,3 @@
 indent_type = "Spaces"
-indent_width = 2
-column_width = 120
+indent_width = 4
+column_width = 100

sway/config

@@ -19,7 +19,8 @@ font pango:Anonymous Pro 12
 
 # Start Waybar with IPC functionality (requires waybar>=0.9.9, wlroots>=0.15)
 bar bar-1 {
-    swaybar_command $HOME/.dotfiles/nix/bin/waybar -c $HOME/.config/waybar/config
+    swaybar_command waybar -c $HOME/.config/waybar/config
+    icon_theme Gruvbox
     mode hide
     hidden_state hide
     position bottom

waybar/config.template

@@ -118,7 +118,7 @@
         "return-type": "json",
         "exec": "${HOME}/scripts/waybar/waybar-battery.sh bar",
         "interval": 10,
-        "on-click": "${HOME}/scripts/scripts/waybar/waybar-battery.sh notify"
+        "on-click": "${HOME}/scripts/waybar/waybar-battery.sh notify"
     },
     "pulseaudio": {
         //"scroll-step": 1,