sync

17 files changed, 1257 insertions, 281 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 1b5feff..eb1783b 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -22,3 +22,5 @@ font:
     # style: Italic
 window:
     opacity: 0.75
+key_bindings:
+  - { key: Return,   mods: Alt|Shift, action: SpawnNewInstance }
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index f030df5..a24173f 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -5,6 +5,8 @@ vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
 vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
+vim.lsp.set_log_level("debug")
+
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
 local on_attach = function(client, bufnr)
@@ -63,6 +65,11 @@ lspconfig.zls.setup({
   capabilities = capabilities,
 })
 
+lspconfig.bashls.setup({
+  on_attach = on_attach,
+  capabilities = capabilities,
+})
+
 -- https://github.com/nikeee/dot-language-server
 -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#dotls
 lspconfig['dotls'].setup({
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 33d87db..0374e22 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -8,6 +8,8 @@ return require('packer').startup(function()
   use 'edkolev/tmuxline.vim'
   use 'romainl/vim-cool'
 
+  use 'lambdalisue/suda.vim'
+
   -- common
   use 'tpope/vim-fugitive' -- Git commands
   use {
diff --git a/.config/sway/config b/.config/sway/config
index 1684ad4..bed8d92 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -10,6 +10,8 @@
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 # Read `man 5 sway` for a complete reference.
 
+include /etc/sway/config.d/*
+
 set $mod Mod1
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -196,6 +198,9 @@ exec ~/bin/idlechecker
 
 exec nm-applet --indicator
 exec blueman-applet
+# for flatpaks (like obs) https://github.com/emersion/xdg-desktop-portal-wlr#running
+exec_always systemctl --user import-environment XDG_DISPLAY XDG_CURRENT_DESKTOP
+exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 #############################
 ### settings for i3-gaps: ###
@@ -212,11 +217,21 @@ bar {
 }
 
 # Set inner/outer gaps
-default_border none
-default_floating_border none
 gaps inner 10
 gaps outer 0
-titlebar_border_thickness 0
+
+for_window {
+  [class="firefox"] border none
+  [window_role="pop-up"] floating enable
+  [window_role="bubble"] floating enable
+  [window_role="dialog"] floating enable
+  [window_type="dialog"] floating enable
+}
+
+#client.<class> <border> <background> <text> <indicator> <child_border>
+client.focused "#d0f0c0" "#d0f0c0" "#2b2b2b" "#888888" "#000000"
+client.focused_inactive "#23242a" "#2b2b2b" "#888888" "#000000" "#000000"
+client.unfocused "#2c2c2c" "#2b2b2b" "#888888" "#000000" "#000000"
 
 # A lock command used in several places
 # set $lock_script ~/bin/pretty-lock
@@ -237,25 +252,25 @@ bindswitch --reload --locked lid:on exec '[ $(swaymsg -t get_outputs | grep name
 exec_always ~/bin/clamshell-toggle
 
 bindswitch --reload --locked lid:off output $laptop_screen enable
-workspace 1 output DP-4 DP-3 eDP-1
-workspace 2 output eDP-1 DP-3 DP-4
+workspace 1 output 'LG Electronics LG ULTRAGEAR 107NTDVCR242' eDP-1
+workspace 2 output 'Dell Inc. DELL P2723QE 3940MP3' eDP-1
 
 bindsym --release Print exec grim -g "$(slurp)" -t png - | wl-copy -t image/png
 
-# Sway display things 
+# Sway display things
 output 'LG Electronics LG ULTRAGEAR 107NTDVCR242' {
-	position 0,0
+	position 2560,0
 	scale 1.0
 }
- 
+
 output 'Dell Inc. DELL P2723QE 3940MP3' {
-	position 2560,0
+	position 0,0
 	scale 1.5
 }
 
 output eDP-1 {
 	position 0,0
- 	scale 1.25 
+ 	scale 1.25
 }
 
 input type:touchpad {
diff --git a/.config/waybar/config b/.config/waybar/config
index 3d2dce5..eed1e84 100644..120000
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,87 +1 @@
-{
-    "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-center": ["sway/window", "cpu", "temperature", "memory","tray"],
-    "modules-right": ["pulseaudio",  "backlight", "battery", "clock"],
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "position": "top", // Waybar position (top|bottom|left|right)
-    "network": {
-        "format-wifi": "({signalStrength}%) ",
-        "format-ethernet": "{ifname} ",
-        "format-disconnected": "", 
-        "max-length": 50,
-        "on-click": "'"
-    },
-    "tray": {
-        "icon-size": 15,
-        "spacing": 10
-    },
-    "clock": {
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        // "format-alt": "{:%Y-%m-%d}"
-		"on-click": "gnome-calendar"
-    },
-    "pulseaudio": {
-        "format": "{volume}% {icon} ",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "0% {icon} ",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": true
-    },
-    "memory": {
-        "format": "{}% 🐏"
-    },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
-    },
-    "sway/window": {
-        "format": "{}",
-        "min-length": 25,
-        "max-length": 25,
-        "rewrite": {
-          "": "Out of Focus"
-        }
-    },
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{percent}% {icon}",
-        "format-icons": [""],
-        "on-scroll-up": "brightnessctl set +5%",
-        "on-scroll-down": "~/nushell/decrement-brightness.nu"
-    }
-}
+yoink/config
\ No newline at end of file
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 6f10f4a..40b1c0d 100644..120000
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,180 +1 @@
-/*
- * Tea green 
- * https://en.wikipedia.org/wiki/Shades_of_green#Tea_green
- */
-@define-color highlight rgba(208, 240, 192, 0.4);
-@define-color hover rgba(208, 240, 192, 0.6);
-
-* {
-    border: none;
-    font-family: JetBrainsMono Nerd Font, Font Awesome, Roboto, Arial, sans-serif;
-    font-size: 13px;
-    border-radius: 5px;
-}
-
-window#waybar {
-    background-color: rgba(0,0,0, 0.0);
-    color: #ffffff;
-}
-
-/*-----module groups----*/
-.modules-right {
-	background-color: rgba(0,43,51,0.3);
-    margin: 2px 10px 0 0;
-}
-.modules-center {
-	background-color: rgba(0,43,51,0.3);
-    margin: 2px 5px 0 0;
-    padding-left: 10px;
-}
-.modules-left {
-    margin: 2px 0 0 5px;
-	background-color: rgba(0,43,51,0.3);
-}
-/*-----modules indv----*/
-#workspaces button {
-    padding: 1px 5px;
-    background-color: transparent;
-    border-radius: 5px
-}
-/*
- * only curve first and last workspaces butons
-#workspaces button:first-child {
-    border-bottom-left-radius: 5px;
-    border-top-left-radius: 5px;
-}
-#workspaces button:last-child {
-    border-bottom-right-radius: 5px;
-    border-top-right-radius: 5px;
-}
-#workspaces button:only-child {
-    border-radius: 5px;
-}
-*/
-
-
-#workspaces button:hover {
-    box-shadow: inherit;
-	background-color: rgba(0,153,153,0.2);
-}
-
-#workspaces button.focused {
-	background-color: @highlight;
-}
-
-
-#workspaces button.urgent {
-    background-color: #eb4d4b;
-}
-
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#custom-media,
-#tray,
-#mode,
-#window
-#custom-power,
-#custom-menu,
-#idle_inhibitor {
-    padding: 0 10px;
-    color: #ffffff;
-}
-#mode {
-    color: #cc3436;
-    font-weight: bold;
-}
-#custom-power {
-    margin: 5px 5px;
-    padding: 1px 1px 1px 6px;
-}
-/*-----Indicators----*/
-#idle_inhibitor.activated {
-    color: #2dcc36;
-}
-#pulseaudio.muted {
-    color: #cc3436;
-}
-
-#battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
-}
-
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
-}
-
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    animation-name: blink;
-    animation-duration: 1s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-#temperature.critical {
-    color: #cc3436;
-}
-
-#tray {
-  background-color: @highlight
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-}
-
-#battery {
-  padding-right: 20px;
-}
-
-#clock {
-  background-color: @highlight;
-}
-
-
-button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
-    /* Avoid rounded borders under each button name */
-    border: none;
-    border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #ffffff;
-}
-
-#workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: #ffffff;
-}
-
-
-/*-----Colors----*/
-/*
- *rgba(0,85,102,1),#005566 --> Indigo(dye)
- *rgba(0,43,51,1),#002B33 --> Dark Green 
- *rgba(0,153,153,1),#009999 --> Persian Green 
- *
- */
+yoink/style.css
\ No newline at end of file
diff --git a/.config/waybar/waybar/config b/.config/waybar/waybar/config
new file mode 100644
index 0000000..3d2dce5
--- /dev/null
+++ b/.config/waybar/waybar/config
@@ -0,0 +1,87 @@
+{
+    "modules-left": ["sway/workspaces", "sway/mode"],
+    "modules-center": ["sway/window", "cpu", "temperature", "memory","tray"],
+    "modules-right": ["pulseaudio",  "backlight", "battery", "clock"],
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "position": "top", // Waybar position (top|bottom|left|right)
+    "network": {
+        "format-wifi": "({signalStrength}%) ",
+        "format-ethernet": "{ifname} ",
+        "format-disconnected": "", 
+        "max-length": 50,
+        "on-click": "'"
+    },
+    "tray": {
+        "icon-size": 15,
+        "spacing": 10
+    },
+    "clock": {
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        // "format-alt": "{:%Y-%m-%d}"
+		"on-click": "gnome-calendar"
+    },
+    "pulseaudio": {
+        "format": "{volume}% {icon} ",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": "0% {icon} ",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": true
+    },
+    "memory": {
+        "format": "{}% 🐏"
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "sway/window": {
+        "format": "{}",
+        "min-length": 25,
+        "max-length": 25,
+        "rewrite": {
+          "": "Out of Focus"
+        }
+    },
+    "backlight": {
+        "device": "intel_backlight",
+        "format": "{percent}% {icon}",
+        "format-icons": [""],
+        "on-scroll-up": "brightnessctl set +5%",
+        "on-scroll-down": "~/nushell/decrement-brightness.nu"
+    }
+}
diff --git a/.config/waybar/waybar/default/config b/.config/waybar/waybar/default/config
new file mode 100644
index 0000000..ad76e93
--- /dev/null
+++ b/.config/waybar/waybar/default/config
@@ -0,0 +1,166 @@
+{
+    // "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 30, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    "spacing": 4, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
+    "modules-center": ["sway/window"],
+    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2", "clock", "tray"],
+    // Modules configuration
+    // "sway/workspaces": {
+    //     "disable-scroll": true,
+    //     "all-outputs": true,
+    //     "format": "{name}: {icon}",
+    //     "format-icons": {
+    //         "1": "",
+    //         "2": "",
+    //         "3": "",
+    //         "4": "",
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
+    //     }
+    // },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
+    },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
+}
+
diff --git a/.config/waybar/waybar/default/style.css b/.config/waybar/waybar/default/style.css
new file mode 100644
index 0000000..86e8338
--- /dev/null
+++ b/.config/waybar/waybar/default/style.css
@@ -0,0 +1,280 @@
+* {
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+}
+
+window#waybar {
+    background-color: rgba(43, 48, 59, 0.0);
+    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+}
+
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#workspaces button.focused {
+    background-color: #64727D;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#mpd {
+    padding: 0 10px;
+    color: #ffffff;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#clock {
+    background-color: #64727D;
+}
+
+#battery {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#disk {
+    background-color: #964B00;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#wireplumber {
+    background-color: #fff0f5;
+    color: #000000;
+}
+
+#wireplumber.muted {
+    background-color: #f53c3c;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    padding: 0 5px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    padding: 0 0px;
+    margin: 0 5px;
+    min-width: 16px;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
diff --git a/.config/waybar/waybar/style.css b/.config/waybar/waybar/style.css
new file mode 100644
index 0000000..6f10f4a
--- /dev/null
+++ b/.config/waybar/waybar/style.css
@@ -0,0 +1,180 @@
+/*
+ * Tea green 
+ * https://en.wikipedia.org/wiki/Shades_of_green#Tea_green
+ */
+@define-color highlight rgba(208, 240, 192, 0.4);
+@define-color hover rgba(208, 240, 192, 0.6);
+
+* {
+    border: none;
+    font-family: JetBrainsMono Nerd Font, Font Awesome, Roboto, Arial, sans-serif;
+    font-size: 13px;
+    border-radius: 5px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0, 0.0);
+    color: #ffffff;
+}
+
+/*-----module groups----*/
+.modules-right {
+	background-color: rgba(0,43,51,0.3);
+    margin: 2px 10px 0 0;
+}
+.modules-center {
+	background-color: rgba(0,43,51,0.3);
+    margin: 2px 5px 0 0;
+    padding-left: 10px;
+}
+.modules-left {
+    margin: 2px 0 0 5px;
+	background-color: rgba(0,43,51,0.3);
+}
+/*-----modules indv----*/
+#workspaces button {
+    padding: 1px 5px;
+    background-color: transparent;
+    border-radius: 5px
+}
+/*
+ * only curve first and last workspaces butons
+#workspaces button:first-child {
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+#workspaces button:last-child {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+}
+#workspaces button:only-child {
+    border-radius: 5px;
+}
+*/
+
+
+#workspaces button:hover {
+    box-shadow: inherit;
+	background-color: rgba(0,153,153,0.2);
+}
+
+#workspaces button.focused {
+	background-color: @highlight;
+}
+
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#window
+#custom-power,
+#custom-menu,
+#idle_inhibitor {
+    padding: 0 10px;
+    color: #ffffff;
+}
+#mode {
+    color: #cc3436;
+    font-weight: bold;
+}
+#custom-power {
+    margin: 5px 5px;
+    padding: 1px 1px 1px 6px;
+}
+/*-----Indicators----*/
+#idle_inhibitor.activated {
+    color: #2dcc36;
+}
+#pulseaudio.muted {
+    color: #cc3436;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 1s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#temperature.critical {
+    color: #cc3436;
+}
+
+#tray {
+  background-color: @highlight
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#battery {
+  padding-right: 20px;
+}
+
+#clock {
+  background-color: @highlight;
+}
+
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+}
+
+
+/*-----Colors----*/
+/*
+ *rgba(0,85,102,1),#005566 --> Indigo(dye)
+ *rgba(0,43,51,1),#002B33 --> Dark Green 
+ *rgba(0,153,153,1),#009999 --> Persian Green 
+ *
+ */
diff --git a/.config/waybar/waybar/yoink/config b/.config/waybar/waybar/yoink/config
new file mode 100644
index 0000000..3d2dce5
--- /dev/null
+++ b/.config/waybar/waybar/yoink/config
@@ -0,0 +1,87 @@
+{
+    "modules-left": ["sway/workspaces", "sway/mode"],
+    "modules-center": ["sway/window", "cpu", "temperature", "memory","tray"],
+    "modules-right": ["pulseaudio",  "backlight", "battery", "clock"],
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "position": "top", // Waybar position (top|bottom|left|right)
+    "network": {
+        "format-wifi": "({signalStrength}%) ",
+        "format-ethernet": "{ifname} ",
+        "format-disconnected": "", 
+        "max-length": 50,
+        "on-click": "'"
+    },
+    "tray": {
+        "icon-size": 15,
+        "spacing": 10
+    },
+    "clock": {
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        // "format-alt": "{:%Y-%m-%d}"
+		"on-click": "gnome-calendar"
+    },
+    "pulseaudio": {
+        "format": "{volume}% {icon} ",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": "0% {icon} ",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": true
+    },
+    "memory": {
+        "format": "{}% 🐏"
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "sway/window": {
+        "format": "{}",
+        "min-length": 25,
+        "max-length": 25,
+        "rewrite": {
+          "": "Out of Focus"
+        }
+    },
+    "backlight": {
+        "device": "intel_backlight",
+        "format": "{percent}% {icon}",
+        "format-icons": [""],
+        "on-scroll-up": "brightnessctl set +5%",
+        "on-scroll-down": "~/nushell/decrement-brightness.nu"
+    }
+}
diff --git a/.config/waybar/waybar/yoink/style.css b/.config/waybar/waybar/yoink/style.css
new file mode 100644
index 0000000..6f10f4a
--- /dev/null
+++ b/.config/waybar/waybar/yoink/style.css
@@ -0,0 +1,180 @@
+/*
+ * Tea green 
+ * https://en.wikipedia.org/wiki/Shades_of_green#Tea_green
+ */
+@define-color highlight rgba(208, 240, 192, 0.4);
+@define-color hover rgba(208, 240, 192, 0.6);
+
+* {
+    border: none;
+    font-family: JetBrainsMono Nerd Font, Font Awesome, Roboto, Arial, sans-serif;
+    font-size: 13px;
+    border-radius: 5px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0, 0.0);
+    color: #ffffff;
+}
+
+/*-----module groups----*/
+.modules-right {
+	background-color: rgba(0,43,51,0.3);
+    margin: 2px 10px 0 0;
+}
+.modules-center {
+	background-color: rgba(0,43,51,0.3);
+    margin: 2px 5px 0 0;
+    padding-left: 10px;
+}
+.modules-left {
+    margin: 2px 0 0 5px;
+	background-color: rgba(0,43,51,0.3);
+}
+/*-----modules indv----*/
+#workspaces button {
+    padding: 1px 5px;
+    background-color: transparent;
+    border-radius: 5px
+}
+/*
+ * only curve first and last workspaces butons
+#workspaces button:first-child {
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+#workspaces button:last-child {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+}
+#workspaces button:only-child {
+    border-radius: 5px;
+}
+*/
+
+
+#workspaces button:hover {
+    box-shadow: inherit;
+	background-color: rgba(0,153,153,0.2);
+}
+
+#workspaces button.focused {
+	background-color: @highlight;
+}
+
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#window
+#custom-power,
+#custom-menu,
+#idle_inhibitor {
+    padding: 0 10px;
+    color: #ffffff;
+}
+#mode {
+    color: #cc3436;
+    font-weight: bold;
+}
+#custom-power {
+    margin: 5px 5px;
+    padding: 1px 1px 1px 6px;
+}
+/*-----Indicators----*/
+#idle_inhibitor.activated {
+    color: #2dcc36;
+}
+#pulseaudio.muted {
+    color: #cc3436;
+}
+
+#battery.charging, #battery.plugged {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 1s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#temperature.critical {
+    color: #cc3436;
+}
+
+#tray {
+  background-color: @highlight
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#battery {
+  padding-right: 20px;
+}
+
+#clock {
+  background-color: @highlight;
+}
+
+
+button {
+    /* Use box-shadow instead of border so the text isn't offset */
+    box-shadow: inset 0 -3px transparent;
+    /* Avoid rounded borders under each button name */
+    border: none;
+    border-radius: 0;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+button:hover {
+    background: inherit;
+    box-shadow: inset 0 -3px #ffffff;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+}
+
+
+/*-----Colors----*/
+/*
+ *rgba(0,85,102,1),#005566 --> Indigo(dye)
+ *rgba(0,43,51,1),#002B33 --> Dark Green 
+ *rgba(0,153,153,1),#009999 --> Persian Green 
+ *
+ */
diff --git a/.config/waybar/yoink/style.css b/.config/waybar/yoink/style.css
index 6f10f4a..865f27d 100644
--- a/.config/waybar/yoink/style.css
+++ b/.config/waybar/yoink/style.css
@@ -1,5 +1,5 @@
 /*
- * Tea green 
+ * Tea green
  * https://en.wikipedia.org/wiki/Shades_of_green#Tea_green
  */
 @define-color highlight rgba(208, 240, 192, 0.4);
@@ -142,6 +142,7 @@ window#waybar {
 }
 
 #battery {
+  /*background-color: #FF8000;*/
   padding-right: 20px;
 }
 
@@ -174,7 +175,7 @@ button:hover {
 /*-----Colors----*/
 /*
  *rgba(0,85,102,1),#005566 --> Indigo(dye)
- *rgba(0,43,51,1),#002B33 --> Dark Green 
- *rgba(0,153,153,1),#009999 --> Persian Green 
+ *rgba(0,43,51,1),#002B33 --> Dark Green
+ *rgba(0,153,153,1),#009999 --> Persian Green
  *
  */
diff --git a/.zshrc b/.zshrc
index cfc5c67..066724a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -131,4 +131,10 @@ unset key
 
 alias cat=bat
 alias find=fd
-export PATH=~/.zig/bin:$PATH
+export PATH=~/bin:$PATH
+export PATH=~/.local/bin:$PATH
+
+if [[ -f "$HOME/.zig/env" ]]; then
+  source ~/.zig/env
+fi
+
diff --git a/bin/xrenderdoc b/bin/xrenderdoc
new file mode 100755
index 0000000..7a97e5f
--- /dev/null
+++ b/bin/xrenderdoc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+env -u WAYLAND_DISPLAY qrenderdoc & disown
diff --git a/bin/zigup b/bin/zigup
new file mode 100755
index 0000000..eb7bb1a
--- /dev/null
+++ b/bin/zigup
@@ -0,0 +1,183 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+if [[ "${TRACE-0}" == "1" ]]; then
+    set -o xtrace
+fi
+
+zig_root="$HOME/.zig"
+
+prompt_confirm() {
+  while true; do
+    read -r -n 1 -p "${1:-Continue?} [y/n]: " REPLY
+    case $REPLY in
+      [yY]) echo ; return 0 ;;
+      [nN]) echo ; return 1 ;;
+      *) printf " \033[31m %s \n\033[0m" "invalid input"
+    esac
+  done
+}
+
+
+help() {
+    echo "Usage: $0
+
+    Install/update zig and zls under ~/.zig
+
+"
+    exit
+}
+
+install_zig() {
+    arch="x86_64-linux"
+    zig_master_arch_json="$(jq -r ".\"$arch\"" <<< "$zig_master_json")"
+    zig_master_tarball="$(jq -r '.tarball' <<< "$zig_master_arch_json")"
+    zig_master_shasum="$(jq -r '.shasum' <<< "$zig_master_arch_json")"
+    zig_master_size="$(jq -r '.size' <<< "$zig_master_arch_json")"
+
+    echo "$zig_master_tarball"
+    echo "$zig_master_shasum"
+    echo "$zig_master_size"
+
+    if [ ! -d "$zig_root/tmp" ]; then
+      mkdir "$zig_root/tmp"
+    fi
+
+    echo "fetching tarball"
+    zig_tarball_path="$zig_root/tmp/zig.tar"
+    wget -O "$zig_root/tmp/zig.tar" "$zig_master_tarball"
+
+    if ! echo "$zig_master_shasum $zig_tarball_path" | sha256sum --check; then
+      echo "invalid tarball; bailing"
+      exit 1
+    fi
+
+    echo "extracting tarball"
+
+    if [ ! -d "$zig_root/zig" ]; then
+      mkdir "$zig_root/zig"
+    fi
+
+   if ! tar -xf "$zig_tarball_path" -C "$zig_root/zig" --strip-components=1 ; then
+     echo "extraction failed; bailing"
+     exit 1
+   fi
+
+   echo "zig installed"
+    zig version
+}
+
+install_zls() {
+   zls_path="$zig_root/zls"
+   if [ ! -d "$zls_path" ]; then
+     echo "cloning zls"
+     git clone https://github.com/zigtools/zls.git "$zls_path"
+   fi
+   cd "$zls_path"
+   echo "pulling zls"
+   git pull
+   echo "building zls"
+   zig build -Doptimize=ReleaseSafe
+
+    if [ ! -d "$zig_root/bin" ]; then
+      mkdir "$zig_root/bin"
+    fi
+
+    cp "$zls_path/zig-out/bin/zls" "$zig_root/bin"
+    echo "zls installed"
+    zls --version
+}
+
+if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
+    help
+fi
+
+cd "$(dirname "$0")"
+
+main() {
+    force=0
+    while getopts "f" o; do
+      case "${o}" in
+        f)
+          force=1
+          ;;
+        *)
+          echo "invalid flag"
+          help
+          ;;
+      esac
+    done
+
+    if [ ! -d "$zig_root" ]; then
+      echo "initalizing zig directory"
+      mkdir "$zig_root"
+      # shellcheck disable=SC2016
+      echo '#!/bin/sh
+# zigup shell setup
+# affix colons on either side of $PATH to simplify matching
+case ":${PATH}:" in
+    *:"$HOME/.zig/bin":*)
+        ;;
+    *)
+        # Prepending path in case a system-installed rustc needs to be overridden
+        export PATH='"$zig_root/"'bin:"$PATH"
+        ;;
+esac
+case ":${PATH}:" in
+    *:"$HOME/.zig/zig":*)
+        ;;
+    *)
+        # Prepending path in case a system-installed rustc needs to be overridden
+        export PATH='"$zig_root/"'zig:"$PATH"
+        ;;
+esac
+' > "$zig_root/env"
+      echo "add \`source $zig_root/env\` to your shell config"
+    fi
+    # shellcheck source=/dev/null
+    source "$zig_root/env"
+
+    zig_json_path="$zig_root/index.json"
+    if [ ! -f "$zig_json_path" ]; then
+      echo "initalizing index.json"
+      curl -s https://ziglang.org/download/index.json > "$zig_json_path"
+    fi
+    json_ttl="600"
+    seconds_since_fetch=$(($(date +%s) - $(date -r "$zig_json_path" +%s)))
+    if [ "$json_ttl" -lt "$seconds_since_fetch" ]; then
+      echo "fetching fresh index.json"
+      curl -s https://ziglang.org/download/index.json >| "$zig_json_path"
+    else
+      echo "using cached index.json"
+    fi
+
+    zig_master_json="$(jq '.master' "$zig_json_path")"
+    zig_master_version="$(jq -r '.version' <<< "$zig_master_json")"
+
+    if command -v zig &> /dev/null; then
+      installed_zig_version="$(zig version)"
+    else
+      installed_zig_version="no zig installed"
+    fi
+
+    echo $force
+    if [[ ! $force && "$installed_zig_version" == "$zig_master_version" ]]; then
+      echo "zig up to date,"
+      exit 0
+    else
+      echo "zig upgrade avaliable: $installed_zig_version -> $zig_master_version"
+      if prompt_confirm "Proceed?"; then
+        install_zig
+      fi
+    fi
+
+   if prompt_confirm "build ZLS?"; then
+     install_zls
+   fi
+
+}
+
+main "$@"
+
diff --git a/script_template.sh b/script_template.sh
new file mode 100755
index 0000000..854ddfa
--- /dev/null
+++ b/script_template.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+if [[ "${TRACE-0}" == "1" ]]; then
+    set -o xtrace
+fi
+
+prompt_confirm() {
+  while true; do
+    read -r -n 1 -p "${1:-Continue?} [y/n]: " REPLY
+    case $REPLY in
+      [yY]) echo ; return 0 ;;
+      [nN]) echo ; return 1 ;;
+      *) printf " \033[31m %s \n\033[0m" "invalid input"
+    esac
+  done
+}
+
+
+help() {
+    echo 'Usage: ./script.sh arg-one arg-two
+
+This is an awesome bash script to make your life better.
+
+'
+    exit
+}
+
+if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
+    help
+fi
+
+cd "$(dirname "$0")"
+
+main() {
+  prompt_confirm "print help?" || exit 0
+  help
+}
+
+main "$@"