fix: Remove auto workspace placements

This breaks on multiple monitors

.config/.gitignore

@@ -28,8 +28,6 @@ clipse/tmp_files/
 !hyprpanel/**
 !WallRizz
 !WallRizz/**
-!btop
-!btop/**
 btop/themes/WallRizz.theme
 btop/btop.log
 !kitty

.config/btop/btop.conf

@@ -1,257 +0,0 @@
-#? Config file for btop v. 1.4.5
-
-#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
-#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "catppuccin_macciato"
-
-#* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = False
-
-#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
-
-#* Set to true to force tty mode regardless if a real tty has been detected or not.
-#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
-
-#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
-#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
-#* Use whitespace " " as separator between different presets.
-#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
-presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
-
-#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
-#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = False
-
-#* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
-
-#* Default symbols to use for graph creation, "braille", "block" or "tty".
-#* "braille" offers the highest resolution but might not be included in all fonts.
-#* "block" has half the resolution of braille but uses more common characters.
-#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY.
-#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view.
-graph_symbol = "braille"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_cpu = "default"
-
-# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
-graph_symbol_gpu = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_mem = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_net = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_proc = "default"
-
-#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
-shown_boxes = "cpu mem net proc"
-
-#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
-update_ms = 2000
-
-#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
-#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "cpu direct"
-
-#* Reverse sorting order, True or False.
-proc_reversed = False
-
-#* Show processes as a tree.
-proc_tree = False
-
-#* Use the cpu graph colors in the process list.
-proc_colors = True
-
-#* Use a darkening gradient in the process list.
-proc_gradient = True
-
-#* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
-
-#* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
-
-#* Show cpu graph for each process.
-proc_cpu_graphs = True
-
-#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
-
-#* Show proc box on left side of screen instead of right.
-proc_left = False
-
-#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
-
-#* In tree-view, always accumulate child process resources in the parent process.
-proc_aggregate = False
-
-#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
-#* Select from a list of detected attributes from the options menu.
-cpu_graph_upper = "total"
-
-#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available.
-#* Select from a list of detected attributes from the options menu.
-cpu_graph_lower = "total"
-
-#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
-show_gpu_info = "Auto"
-
-#* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
-
-#* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
-
-#* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
-
-#* Shows the system uptime in the CPU box.
-show_uptime = True
-
-#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
-show_cpu_watts = True
-
-#* Show cpu temperature.
-check_temp = True
-
-#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
-cpu_sensor = "Auto"
-
-#* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
-
-#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
-#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
-#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries.
-#* Example: "4:0 5:1 6:3"
-cpu_core_map = ""
-
-#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine".
-temp_scale = "celsius"
-
-#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = True
-
-#* Show CPU frequency.
-show_cpu_freq = True
-
-#* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
-#* Special formatting: /host = hostname | /user = username | /uptime = system uptime
-clock_format = "%X"
-
-#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
-
-#* Custom cpu model name, empty string to disable.
-custom_cpu_name = ""
-
-#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user"
-disks_filter = ""
-
-#* Show graphs instead of meters for memory values.
-mem_graphs = True
-
-#* Show mem box below net box instead of above.
-mem_below_net = False
-
-#* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
-
-#* If swap memory should be shown in memory box.
-show_swap = True
-
-#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
-
-#* If mem box should be split to also show disks info.
-show_disks = True
-
-#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
-
-#* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
-
-#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
-
-#* Set to true to show available disk space for privileged users.
-disk_free_priv = False
-
-#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
-
-#* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
-
-#* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
-
-#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
-#* Example: "/mnt/media:100 /:20 /boot:1".
-io_graph_speeds = ""
-
-#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
-net_download = 100
-
-net_upload = 100
-
-#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
-
-#* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
-
-#* Starts with the Network Interface specified here.
-net_iface = ""
-
-#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
-base_10_bitrate = "Auto"
-
-#* Show battery stats in top right if battery is present.
-show_battery = False
-
-#* Which battery to use if multiple are present. "Auto" for auto detection.
-selected_battery = "Auto"
-
-#* Show power stats of battery next to charge indicator.
-show_battery_watts = True
-
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
-#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
-
-#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
-nvml_measure_pcie_speeds = True
-
-#* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
-rsmi_measure_pcie_speeds = True
-
-#* Horizontally mirror the GPU graph.
-gpu_mirror_graph = True
-
-#* Custom gpu0 model name, empty string to disable.
-custom_gpu_name0 = ""
-
-#* Custom gpu1 model name, empty string to disable.
-custom_gpu_name1 = ""
-
-#* Custom gpu2 model name, empty string to disable.
-custom_gpu_name2 = ""
-
-#* Custom gpu3 model name, empty string to disable.
-custom_gpu_name3 = ""
-
-#* Custom gpu4 model name, empty string to disable.
-custom_gpu_name4 = ""
-
-#* Custom gpu5 model name, empty string to disable.
-custom_gpu_name5 = ""

.config/hypr/keybinds.conf

@@ -1,7 +1,8 @@
 # Set programs that you use
 $terminal = alacritty
 $fileManager = dolphin
-$menu = pgrep -x tofi-drun && pkill -x tofi-drun || tofi-drun --drun-launch=true > ~/.logs/tofi-drun.log 2>&1 &
+# $menu = pgrep -x tofi-drun && pkill -x tofi-drun || tofi-drun --drun-launch=true > ~/.logs/tofi-drun.log 2>&1 &
+$menu = vicinae toggle
 $clipboard = /home/nathan/.local/bin/clipse
 $StartWallpaperTimer = systemctl --user start wallpaper.timer && WallRizz -r -n -d ~/.config/backgrounds
 $mainMod = SUPER
@@ -82,8 +83,8 @@ bindm = $mainMod, mouse:273, resizewindow
 bind = , mouse_left, exec, ydotool key 56:1 105:1 105:0 56:0
 bind = , mouse_right, exec, ydotool key 56:1 106:1 106:0 56:0
 
-# Gromit for drawing
-bind = SUPER CTRL, P, exec, ~/.config/hypr/scripts/gromit.py
+# Onscreen drawing
+bind = $mainMod, D, exec, wayscriber --active
 
 # Emoji
 bind = $mainMod, PERIOD, exec, bemoji
@@ -100,6 +101,7 @@ bind = $mainMod CTRL, W, exec, $StartWallpaperTimer
 $caps = VoidSymbol
 bind = , $caps, submap, capsmode
 submap = capsmode
+
 # Bindings for submap
 
 bind = , 1, exec, hyprctl notify 5 2000 0 "Opening Brave Browser"

.config/hypr/plugins/split-monitor-workspaces.conf

@@ -26,6 +26,6 @@ bind = $mainMod SHIFT, 0, split-movetoworkspace, 10
 bind = ALT, TAB, lastdesk
 
 # Window rules for sticky apps
-windowrule = workspace 5, class:vesktop
-windowrule = workspace 5, class:org.telegram.desktop
-windowrule = workspace 5, class:Slack
+#windowrule = workspace 5, class:vesktop
+#windowrule = workspace 5, class:org.telegram.desktop
+#windowrule = workspace 5, class:Slack

.config/hypr/start-exec.conf

@@ -2,6 +2,7 @@ exec-once = hyprpm reload -n
 exec-once = hyprpanel > ~/.logs/hyprpanel.log
 # exec-once = hyprpaper > ~/.logs/hyprpaper.log # Using swww now
 exec-once = hypridle
+exec-once = vicinae server
 
 exec-once = /usr/bin/kdeconnectd
 exec-once = systemctl --user start hyprpolkitagent

.config/hypr/windowrules.conf

@@ -1,107 +1,237 @@
 
 
 # Default floating rules to stop windows being too large or small
-windowrulev2 = size <80% <80%,floating:1
-windowrulev2 = size >50% >75%, class:(^org.kde.kdenlive$)
-windowrule = float, class:(^xdg-desktop-portal-gtk$)
-windowrule = size <80% <80%, class:(^xdg-desktop-portal-gtk$)
-# windowrulev2 = size >50% >50%,floating:1
+windowrule {
+  name = default-floating-size-limit
+  max_size = (monitor_w*0.8) (monitor_h*0.8)
+  match:float = 1
+}
+
+windowrule {
+  name = kdenlive-floating-size
+  min_size = (monitor_w*0.5) (monitor_h*0.75)
+  match:class = (^org.kde.kdenlive$)
+}
+
+windowrule {
+  name = xdg-desktop-portal-gtk-floating
+  float = on
+  max_size = (monitor_w*0.8) (monitor_h*0.8)
+  opacity = 1 override 1 override
+  stay_focused = on
+  match:class = (^xdg-desktop-portal-gtk$)
+}
+
+windowrule {
+  name = floating-windowrule-1
+  float = on
+  max_size = (monitor_w*0.8) (monitor_h*0.8)
+  center = on
+  match:class = (float)
+}
+
+windowrule {
+  name = floating-windowrule-2
+  float = on
+  size = (monitor_w*0.8) (monitor_h*0.8)
+  center = on
+  match:class = (float-80)
+}
 
 
-# windowrulev2 = float,class:(clipse)
-# windowrulev2 = size 622 652,class:(clipse)
-# windowrulev2 = opacity 1 override 1 override,class:(clipse)
+windowrule {
+  name = swayimg-floating
+  float = on
+  size = (monitor_w*0.8)
+  match:class = (swayimg)
+}
 
-windowrulev2 = float,class:(float)
-windowrule = size <80% <80%,class:(float)
-windowrulev2 = float,class:(float-80)
-windowrule = size 80% 80%,class:(float-80)
+windowrule {
+  name = null-class-windowrule
+  no_blur = 1 noanim 1 noshadow 1
+  match:class = (^$)
+}
 
-windowrulev2 = float,class:(swayimg)
-windowrulev2 = size 80%,class:(swayimg)
-windowrule = noblur 1 noanim 1 noshadow 1, class:(^$)
-windowrule = noblur 1 noanim 0 noshadow 1, title:(^$)
-windowrule = nofocus 1, title:(^$)
-windowrulev2 = float,class:(mpv)
-windowrulev2 = float,class:^(brave-)(.*)(-.*)$
-windowrulev2 = move onscreen cursor,class:^(brave-)(.*)(-.*)$
+windowrule {
+  name = null-title-windowrule
+  no_blur = 1 noanim 0 noshadow 1
+  no_focus = 1
+  match:title = (^$)
+}
 
-windowrulev2 = move onscreen cursor -50% 0,class:^(com.nextcloud.desktopclient.nextcloud)$
-windowrulev2 = float,class:^(com.nextcloud.desktopclient.nextcloud)$
-windowrule = size 800 500,class:^(com.nextcloud.desktopclient.nextcloud)$
+windowrule {
+  name = mpv-floating
+  float = on
+  match:class = (mpv)
+}
 
-workspace = special:gromit, gapsin:0, gapsout:0, shadow:0, on-created-empty: gromit-mpx -a
-windowrule = noblur, class:^(Gromit-mpx)$
-windowrule = opacity 1 override 1 override, class:^(Gromit-mpx)$
-windowrule = noshadow, class:^(Gromit-mpx)$
-windowrule = size 100% 100%, class:^(Gromit-mpx)$
+windowrule {
+  name = brave-floating
+  float = on
+  move = 
+  match:class = ^(brave-)(.*)(-.*)$
+}
 
 
-# Floating broken windows
-windowrule = opacity 1 override 1 override, class:^(xdg-desktop-portal-gtk)$
-windowrule = stayfocused, class:^(xdg-desktop-portal-gtk)$
-windowrule = stayfocused, class:^(soffice)$
-windowrule = stayfocused, class:^(virt-manager)$, title:^$
-#windowrule = float 1, class:^(xdg-desktop-portal-gtk)$
-
-windowrulev2 = stayfocused,        class:^(Sparrow)$, title:^$, xwayland:1
-windowrulev2 = focusonactivate 1,  class:^(Sparrow)$, title:^$, xwayland:1
-windowrulev2 = allowsinput 1,      class:^(Sparrow)$, title:^$, xwayland:1
-windowrulev2 = stayfocused,        class:^(Sparrow)$, title:^$, xwayland:1
+windowrule {
+  name = nextcloud-floating
+  move = (monitor_w-window_w) 45
+  float = on
+  size = 800 800
+  match:class = ^(com.nextcloud.desktopclient.nextcloud)$
+}
 
 
+windowrule {
+  name = soffice-focused
+  stay_focused = on
+  match:class = ^(soffice)$
+}
 
+windowrule {
+  name = virt-manager-focused
+  stay_focused = on
+  match:class = ^(virt-manager)$
+  match:title = ^$
+}
+
+windowrule {
+  name = sparrow-wallet-focused
+  opacity = 1 override 1 override
+  stay_focused = on
+  match:class = ^(Sparrow)$
+  match:title = ^$
+}
 
 # No Opacity windowrules
-windowrule = opacity 1 override 1 override, class:^(brave-browser)$
-windowrule = opacity 1 override 1 override, class:^(mpv)$
-windowrule = opacity 1 override 1 override, class:^(virt-manager)$
-windowrule = opacity 1 override 1 override, class:^(Bootstrap Studio)$
-windowrule = opacity 1 override 1 override, class:^(Minecraft)(.*)$
-windowrule = opacity 1 override 1 override, class:^(gimp)$
-windowrule = opacity 1 override 1 override, class:^(com.obsproject.Studio)$
-windowrule = opacity 1 override 1 override, class:^$
+windowrule {
+  name = brave-browser-opacity
+  opacity = 1 override 1 override
+  match:class = ^(brave-browser)$
+}
 
+windowrule {
+  name = mpv-opacity
+  opacity = 1 override 1 override
+  match:class = ^(mpv)$
+}
+
+windowrule {
+  name = virt-manager-opacity
+  opacity = 1 override 1 override
+  match:class = ^(virt-manager)$
+}
+
+windowrule {
+  name = bootstrap-studio-opacity
+  opacity = 1 override 1 override
+  match:class = ^(Bootstrap Studio)$
+}
+
+windowrule {
+  name = minecraft-opacity
+  opacity = 1 override 1 override
+  match:class = ^(Minecraft)(.*)$
+}
+
+windowrule {
+  name = gimp-opacity
+  opacity = 1 override 1 override
+  match:class = ^(gimp)$
+}
+
+windowrule {
+  name = com-obsproject-Studio-opacity
+  opacity = 1 override 1 override
+  match:class = ^(com.obsproject.Studio)$
+}
+
+windowrule {
+  name = empty-class-opacity
+  opacity = 1 override 1 override
+  match:class = ^$
+}
 
 # Disable opacity for Alacritty (as it already has a transparent background)
-windowrule = opacity 1 override 0.75 override, class:^(Alacritty)$
+windowrule {
+  name = alacritty-opacity
+  opacity = 1 override 0.75 override
+  match:class = ^(Alacritty)$
+}
+
 
 workspace = special:terminal, on-created-empty: alacritty
 
 # Tags for opacity
-windowrule = opacity 0.1 override 0.1 override, tag:opacity:0.1
-windowrule = opacity 0.2 override 0.2 override, tag:opacity:0.2
-windowrule = opacity 0.3 override 0.3 override, tag:opacity:0.3
-windowrule = opacity 0.4 override 0.4 override, tag:opacity:0.4
-windowrule = opacity 0.5 override 0.5 override, tag:opacity:0.5
-windowrule = opacity 0.6 override 0.6 override, tag:opacity:0.6
-windowrule = opacity 0.7 override 0.7 override, tag:opacity:0.7
-windowrule = opacity 0.8 override 0.8 override, tag:opacity:0.8
-windowrule = opacity 0.9 override 0.9 override, tag:opacity:0.9
-windowrule = opacity 1 override 1 override, tag:opacity:1
+windowrule {
+  name = tag-opacity-0.1
+  opacity = 0.1 override 0.1 override
+  match:tag = opacity:0.1
+}
 
+windowrule {
+  name = tag-opacity-0.2
+  opacity = 0.2 override 0.2 override
+  match:tag = opacity:0.2
+}
 
-# freeRDP - Remote Desktop Protocol Client
-windowrule = float, class:^(xfreerdp)$
-# match by X11 WM_CLASS you set in xfreerdp
-windowrule = float, class:^(Autodesk Fusion)$
-windowrule = center, class:^(Autodesk Fusion)$
-# prevent tiling / auto-fullscreen for these windows
-#windowrulev2 = disableautotile, xclass:Autodesk Fusion
-windowrule = float, class:^(Autodesk Fusion)$
-# optionally force borderless (if you prefer)
-windowrule = noborder, class:^(Autodesk Fusion)$
+windowrule {
+  name = tag-opacity-0.3
+  opacity = 0.3 override 0.3 override
+  match:tag = opacity:0.3
+}
 
+windowrule {
+  name = tag-opacity-0.4
+  opacity = 0.4 override 0.4 override
+  match:tag = opacity:0.4
+}
 
+windowrule {
+  name = tag-opacity-0.5
+  opacity = 0.5 override 0.5 override
+  match:tag = opacity:0.5
+}
 
+windowrule {
+  name = tag-opacity-0.6
+  opacity = 0.6 override 0.6 override
+  match:tag = opacity:0.6
+}
 
-#! (Still doesn't work) Add org.kde.kdeconnect.daemon for KDE connect pointer
-windowrule = noblur, class:^(org.kde.kdeconnect.daemon)$ #As it is transparent it will prevent it blurring so you can see what you are ponting at
-windowrule = nofocus,class:^(org.kde.kdeconnect.daemon)$ # Disables focus so if you have the option to dim on focus it will not dim the window behind it
-windowrule = nodim,class:^(org.kde.kdeconnect.daemon)$ # As it is out of focus it will prevent it from diming, so its brighter if you have window dimming on
-windowrule = noshadow,class:^(org.kde.kdeconnect.daemon)$ # Preents it having a shadow if you have window shadows on 
-windowrule = idleinhibit,class:^(org.kde.kdeconnect.daemon)$ # Will prevent your computer from idling if this is in use 
-windowrule = float,class:^(org.kde.kdeconnect.daemon)$
-# windowrule = maximize,class:^(org.kde.kdeconnect.daemon)$
-# windowrule = move 0 0,class:^(org.kde.kdeconnect.daemon)$
+windowrule {
+  name = tag-opacity-0.7
+  opacity = 0.7 override 0.7 override
+  match:tag = opacity:0.7
+}
 
+windowrule {
+  name = tag-opacity-0.8
+  opacity = 0.8 override 0.8 override
+  match:tag = opacity:0.8
+}
+
+windowrule {
+  name = tag-opacity-0.9
+  opacity = 0.9 override 0.9 override
+  match:tag = opacity:0.9
+}
+
+windowrule {
+  name = tag-opacity-1
+  opacity = 1 override 1 override
+  match:tag = opacity:1
+}
+
+windowrule {
+  name = xfreerdp-floating
+  float = on
+  match:class = ^(xfreerdp)$
+}
+windowrule {
+  name = autodesk-fusion-floating
+  float = on
+  center = on
+  border_size = 0
+  match:class = ^(Autodesk Fusion)$
+}

.config/hyprpanel/config.json

@@ -15,14 +15,14 @@
   "bar.layouts": {
     "0": {
       "left": [
-        "dashboard",
         "media"
       ],
-      "middle": [],
+      "middle": [
+        "workspaces"
+      ],
       "right": [
         "volume",
         "bluetooth",
-        "network",
         "battery",
         "systray",
         "clock",
@@ -31,14 +31,14 @@
     },
     "1": {
       "left": [
-        "dashboard",
         "media"
       ],
-      "middle": [],
+      "middle": [
+        "workspaces"
+      ],
       "right": [
         "volume",
         "bluetooth",
-        "network",
         "battery",
         "systray",
         "clock",
@@ -47,10 +47,11 @@
     },
     "2": {
       "left": [
-        "dashboard",
         "media"
       ],
-      "middle": [],
+      "middle": [
+        "workspaces"
+      ],
       "right": [
         "volume",
         "network",
@@ -495,5 +496,15 @@
   "menus.power.showLabel": true,
   "bar.customModules.storage.paths": [
     "/"
-  ]
+  ],
+  "theme.bar.buttons.workspaces.enableBorder": false,
+  "bar.workspaces.showWsIcons": false,
+  "bar.workspaces.showApplicationIcons": false,
+  "bar.workspaces.showAllActive": true,
+  "bar.workspaces.numbered_active_indicator": "highlight",
+  "bar.workspaces.applicationIconFallback": "",
+  "bar.workspaces.ignored": "-\\d",
+  "bar.workspaces.applicationIconEmptyWorkspace": "",
+  "bar.workspaces.applicationIconOncePerWorkspace": true,
+  "theme.bar.buttons.workspaces.pill.active_width": "8em"
 }

.zshenv

@@ -1,8 +1,3 @@
-. "$HOME/.cargo/env"
-
-export PATH="$PATH:/home/nathan/.cyfrin/bin"
-
-export PATH="$PATH:/home/nathan/.foundry/bin"
 export HSD_URL=hsd01.dev.woodburn.au
 export HSD_HTTP_HOST=hsd01.dev.woodburn.au
 export HSD_API_KEY=y5cSK42tgVCdt4E58jkHjI3nQ9GU32bC

.zshrc

@@ -15,6 +15,15 @@ fi
 # TMP profiler
 # zmodload zsh/zprof
 
+# Path Prepending
+function path_prepend() {
+  case ":$PATH:" in
+    *":$1:"*) ;;
+    *) PATH="$1:$PATH" ;;
+  esac
+}
+
+
 ### 📦 Plugin & Framework Setup
 export ZSH="$HOME/.oh-my-zsh"
 ZSH_THEME="robbyrussell"
@@ -33,19 +42,23 @@ export ANDROID_HOME="$HOME/Android/Sdk"
 export LIBVIRT_DEFAULT_URI="qemu:///system"
 
 # Set path at the start to ensure all commands can find their binaries
-export PATH="/usr/bin:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
-export PATH="$ANDROID_HOME/platform-tools:$PATH"
-export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$PATH"
-export PATH="$HOME/.pub-cache/bin:$PATH"
-export PATH="/opt/flutter/flutter/bin:$PATH"
-export PATH="$HOME/go/bin:$PATH"
-export PATH="$HOME/Downloads/go/bin:$PATH"
-export PATH="$HOME/Downloads/idea-IU-232.10072.27/bin:$PATH"
-export PATH="$HOME/exe/zig-linux-x86_64-0.13.0:$PATH"
-export PATH="$HOME/Downloads/javacc-javacc-7.0.13/javacc-javacc-7.0.13/scripts:$PATH"
-export PATH="$HOME/.atuin/bin:$PATH"
+path_prepend "$HOME/.local/bin"
+path_prepend "$HOME/.local/share/solana/install/active_release/bin"
+path_prepend "$ANDROID_HOME/platform-tools"
+path_prepend "$ANDROID_HOME/cmdline-tools/latest/bin"
+path_prepend "$HOME/.pub-cache/bin"
+path_prepend "/opt/flutter/flutter/bin"
+path_prepend "$HOME/go/bin"
+path_prepend "$HOME/Downloads/go/bin"
+path_prepend "$HOME/Downloads/idea-IU-232.10072.27/bin"
+path_prepend "$HOME/exe/zig-linux-x86_64-0.13.0"
+path_prepend "$HOME/Downloads/javacc-javacc-7.0.13/javacc-javacc-7.0.13/scripts"
+path_prepend "$HOME/.atuin/bin"
+path_prepend "$HOME/.cyfrin/bin"
+path_prepend "$HOME/.foundry/bin"
+path_prepend "$HOME/.atuin/bin"
+path_prepend "$HOME/.cargo/bin"
+
 
 ### ⚙️ Tools Init
 eval "$(zoxide init --cmd cd zsh)"
@@ -53,14 +66,13 @@ eval "$(oh-my-posh init zsh --config ~/theme.omp.json)"
 eval "$(atuin init zsh --disable-up-arrow)"
 bindkey '^[[1;5A' atuin-up-search
 
-. "$HOME/.atuin/bin/env"
-
 export PYENV_ROOT="$HOME/.pyenv"
 [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init - zsh)"
 
 # Zellij auto-start
 ZELLIJ_AUTO_EXIT=true
+ZELLIJ_AUTO_ATTACH=true
 eval "$(zellij setup --generate-auto-start zsh)"
 
 ### 🐚 Shell Options
@@ -107,3 +119,8 @@ export FZF_DEFAULT_OPTS='--preview "bat --color=always {}"'
 fpath+=(${ZDOTDIR:-~}/.zsh_functions)
 FPATH+="$HOME/Git/eza/completions/zsh"
 export FPATH
+
+# pnpm
+export PNPM_HOME="$HOME/.local/share/pnpm"
+path_prepend "$PNPM_HOME"
+# pnpm end