312 changed files with 866 additions and 31608 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -1,186 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Common Commands
-
-### Building and Rebuilding Systems
-```bash
-# Rebuild NixOS configuration for current system
-sudo nixos-rebuild switch --flake .
-
-# Build for specific system
-sudo nixos-rebuild switch --flake .#nate-work
-sudo nixos-rebuild switch --flake .#nate
-sudo nixos-rebuild switch --flake .#luci
-sudo nixos-rebuild switch --flake .#jaci
-sudo nixos-rebuild switch --flake .#scrappy
-sudo nixos-rebuild switch --flake .#frame12
-
-# Test configuration without switching
-sudo nixos-rebuild test --flake .
-
-# Check configuration without building
-nix flake check
-
-# Dry-run build specific host configuration (check for errors/warnings without building)
-nix build .#nixosConfigurations.frame12.config.system.build.toplevel --dry-run
-nix build .#nixosConfigurations.nate-work.config.system.build.toplevel --dry-run
-nix build .#nixosConfigurations.nate.config.system.build.toplevel --dry-run
-```
-
-### Package Management
-```bash
-# Update flake inputs
-nix flake update
-
-# Run garbage collection
-nix-collect-garbage -d
-
-# Check system generations
-nixos-rebuild list-generations
-
-# Rollback to previous generation
-sudo nixos-rebuild switch --rollback
-```
-
-### Home Manager
-```bash
-# Apply home manager configuration
-home-manager switch --flake .
-
-# For specific user configurations
-home-manager switch --flake .#nate-work
-```
-
-### Window Manager Configuration Validation
-```bash
-# Validate niri configuration
-niri validate
-
-# Validate sway configuration (if using sway)
-sway --validate
-
-# Validate hyprland configuration (if using hyprland) 
-hyprctl reload  # This reloads and validates the config
-
-# Check wayland compositor logs for errors
-journalctl --user -u niri -f          # For niri
-journalctl --user -u sway -f          # For sway  
-journalctl --user -u hyprland -f      # For hyprland
-```
-
-## Architecture Overview
-
-This is a multi-user NixOS configuration repository using Nix flakes. The repository manages configurations for multiple machines and users across different environments.
-
-### Repository Structure
-
- **flake.nix**: Main flake configuration defining all system configurations
- **{user}/**: Individual user configuration directories (nate, nate-work, luci, jaci, scrappy)
- **shared/**: Shared modules and configurations across systems
- **{user}/default.nix**: System-level configuration for each user/machine
- **{user}/desktop-configuration.nix**: Desktop environment configuration
- **{user}/modules/**: User-specific modules and configurations
- **{user}/dotfiles/**: User dotfiles and application configurations
-
-### Key Components
-
-#### System Configurations
-Each system configuration follows this pattern:
- `default.nix`: Main system configuration with user settings, hostname, desktop environment
- `desktop-configuration.nix`: Desktop environment setup (Sway/Hyprland)
- `modules/home-manager/home.nix`: Home Manager configuration
- `nixos/hardware-configuration.nix`: Hardware-specific settings
-
-#### Supported Desktop Environments
- **Sway**: Wayland compositor (default)
- **Hyprland**: Modern Wayland compositor
- Desktop choice configured via `deskCfg.de` option
-
-#### User Management
- Custom `main_user` module handles user creation
- Desktop users get additional groups (video, audio, adbusers)
- Server users get minimal groups (wheel, networkmanager)
-
-#### Package Management
- Stable packages from nixpkgs 25.05
- Unstable packages available via `nixpkgs-unstable`
- Catppuccin theme integration via catppuccin.nix
- NUR (Nix User Repository) overlay enabled
-
-### Configuration Patterns
-
-#### User-Specific Settings
-Each user configuration defines:
-```nix
-{
-  userName = "username";
-  fullName = "Full Name";
-  email = "email@domain.com";
-  hostName = "hostname";
-  desktop = "sway" or "hyprland";
-  gaming = true/false;
-}
-```
-
-#### Module System
- Custom modules in `modules/` directories
- Shared modules in `shared/modules/`
- Options defined with `lib.mkOption`
- Conditional configuration with `lib.mkIf`
-
-#### Home Manager Integration
- Home Manager configurations in `modules/home-manager/home.nix`
- Dotfiles linked from `dotfiles/` directories
- User packages defined in `homePackages`
-
-### Development Environment
-
-#### Installed Development Tools
- **Editors**: Helix (default), Emacs
- **Languages**: Go, Python, Clojure, Nix
- **LSPs**: gopls, nil, bash-language-server, python-lsp-server
- **Tools**: Docker, distrobox, jq, make, cmake
- **Version Control**: Git with delta, direnv
-
-#### Shell Configuration
- **Default Shell**: Zsh with Oh My Zsh
- **Theme**: half-life
- **Plugins**: git, ssh-agent
- **Aliases**: Modern Unix tools (lsd, bat, ripgrep, fd, fzf)
-
-### Security and Maintenance
-
-#### Automatic Updates
- `auto-update.nix` module for automatic system updates
- Garbage collection configured weekly
- Boot loader limited to 5 generations
- Store optimization enabled
-
-#### Security Features
- ClamAV antivirus on work systems
- Gnome Keyring for SSH secrets
- Firewall configuration for servers
- Initial password set to "password" (should be changed)
-
-### Server Configuration
-
-For server deployments, use `shared/server-configuration.nix` which provides:
- SSH server option
- NFS server with configurable exports
- Syncthing for file synchronization
- Radicale CalDAV server
- Printer sharing via CUPS/Avahi
-
-### Special Features
-
-#### Claude Code Integration
- Work profile: `claudew` command (uses AWS Bedrock)
- Personal profile: `claudep` command (uses standard API)
- Configuration directories: `/home/nate/.claude-work` and `/home/nate/.claude-personal`
-
-#### Catppuccin Theme
- Consistent theming across applications
- Macchiato variant with lavender accent
- GTK, Qt, and terminal theme integration
--- a/jaci/dotfiles/foot/foot.ini
+++ b/jaci/dotfiles/foot/foot.ini
--- a/dotfiles/helix/config.toml
+++ b/dotfiles/helix/config.toml
@ -0,0 +1,86 @@
+# Theme
+theme = "catppuccin_frappe"
+
+[keys.normal]
+
+# Navigation
+n = "move_char_left" # Maps the 'a' key to the move_char_left command
+i = "move_visual_line_down"
+e = "move_visual_line_up"
+o = "move_char_right"
+
+C-i = "half_page_down"
+C-e = "half_page_up"
+
+# Modes
+h = "insert_mode"
+l = "open_below"
+L = "open_above"
+
+# Search
+k = "search_next"
+K = "search_prev"
+
+
+C-s = ":w" # Maps Ctrl-s to the typable command :w which is an alias for :write (save file)
+C-o = ":open ~/.config/helix/config.toml" # Maps Ctrl-o to opening of the helix config file
+C-l = ":open ~/.config/helix/languages.toml"
+
+[keys.normal.g]
+P = "goto_previous_buffer"
+N = "goto_next_buffer"
+n = "goto_line_start"
+o = "goto_line_end"
+
+[keys.select]
+n = "move_char_left"
+i = "move_visual_line_down"
+e = "move_visual_line_up"
+o = "move_char_right"
+
+[editor]
+bufferline = "multiple"
+auto-save = true
+line-number = "relative"
+cursorline = true
+color-modes = true
+text-width = 120
+auto-format = true
+
+[editor.statusline]
+left = ["mode", "spinner", "version-control", "file-name"]
+mode.normal = "Normal"
+mode.insert = "Insert"
+mode.select = "Select"
+
+[editor.indent-guides]
+render = true
+
+[editor.lsp]
+display-messages = true
+
+[editor.cursor-shape]
+insert = "bar"
+normal = "block"
+select = "underline"
+
+[editor.file-picker]
+hidden = false
+
+[editor.whitespace.render]
+space = "all"
+tab = "all"
+tabpad = "all"
+newline = "none"
+nbsp = "none"
+
+[editor.whitespace.characters]
+space = "·"
+tab = "⇀"
+tabpad = " "
+
+
+#w = "move_line_up" # Maps the 'w' key move_line_up
+#"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
+#g = { a = "code_action" } # Maps `ga` to show possible code actions
+#"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode
--- a/luci/dotfiles/helix/languages.toml
+++ b/luci/dotfiles/helix/languages.toml
--- a/nate-work/dotfiles/keepassxc/keepassxc.ini
+++ b/nate-work/dotfiles/keepassxc/keepassxc.ini
@ -17,5 +17,5 @@ QuietSuccess=true
 [PasswordGenerator]
 AdditionalChars=
 ExcludedChars=
-Length=25
+Length=20
 SpecialChars=false
--- a/nate-work/dotfiles/kitty/kitty.conf
+++ b/nate-work/dotfiles/kitty/kitty.conf
--- a/nate-work/dotfiles/sway/background.pid
+++ b/nate-work/dotfiles/sway/background.pid
--- a/nate-work/dotfiles/sway/cheatsheet
+++ b/nate-work/dotfiles/sway/cheatsheet
--- a/nate-work/dotfiles/sway/config
+++ b/nate-work/dotfiles/sway/config
--- a/nate-work/dotfiles/sway/config.d/application_defaults
+++ b/nate-work/dotfiles/sway/config.d/application_defaults
@ -14,14 +14,13 @@ for_window [class="Telegram"] focus

 for_window [app_id="xed"] focus

-# default keepass main window to scratch
-for_window [app_id="org.keepassxc.KeePassXC"] $floating_window
-for_window [app_id="org.keepassxc.KeePassXC" title="KeePassXC"] move to scratchpad #, scratchpad show # default to show

 # set floating (nontiling)for apps needing it:
 for_window [class="Yad" instance="yad"] floating enable
 for_window [app_id="yad"] floating enable
 for_window [app_id="blueman-manager"] floating enable,  resize set width 40 ppt height 30 ppt
+for_window [app_id="mobile"] floating enable, resize set width 200 ppt height 400 ppt
+

 # set floating (nontiling) for special apps:
 for_window [class="Xsane" instance="xsane"] floating enable
@ -30,7 +29,6 @@ for_window [class="qt5ct" instance="qt5ct"] floating enable, resize set width 60
 for_window [class="Bluetooth-sendto" instance="bluetooth-sendto"] floating enable
 for_window [app_id="pamac-manager"] floating enable, resize set width 80 ppt height 70 ppt
 for_window [class="Lxappearance"] floating enable, resize set width 60 ppt height 50 ppt
-for_window [class="steam" title="^((?!Steam$).)*"] floating enable

 # set floating for window roles
 for_window [window_role="pop-up"] floating enable
--- a/nate-work/dotfiles/sway/config.d/autostart_applications
+++ b/nate-work/dotfiles/sway/config.d/autostart_applications
@ -1,5 +1,5 @@
 # Auth with polkit-gnome:
-exec lxqt-policykit-agent
+exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1

 # Desktop notifications
 exec mako
--- a/nate-work/dotfiles/sway/config.d/clamshell
+++ b/nate-work/dotfiles/sway/config.d/clamshell
--- a/nate-work/dotfiles/sway/config.d/default
+++ b/nate-work/dotfiles/sway/config.d/default
@ -145,8 +145,8 @@ exec swayidle -w\
    # Move focus to the parent container
    bindsym $mod+a focus parent

-    # bindsym $mod+g exec ~/.config/sway/scripts/scale.sh inc
-    # bindsym $mod+m exec ~/.config/sway/scripts/scale.sh dec
+    bindsym $mod+g exec ~/.config/sway/scripts/scale.sh inc
+    bindsym $mod+m exec ~/.config/sway/scripts/scale.sh dec

 #
 # Scratchpad:
@ -225,7 +225,7 @@ bindsym $mod+r mode "resize"
 #
 # Screenshots
 #
-    bindsym $mod+Shift+p exec ~/.config/sway/scripts/screenshot.sh clipboard
+    bindsym $mod+Shift+p exec /usr/share/sway/scripts/grimshot --notify save output
    bindsym $mod+p exec ~/.config/sway/scripts/screenshot.sh
 #
 # Keybindings List
--- a/nate-work/dotfiles/sway/config.d/input
+++ b/nate-work/dotfiles/sway/config.d/input
--- a/nate-work/dotfiles/sway/config.d/output
+++ b/nate-work/dotfiles/sway/config.d/output
@ -9,5 +9,4 @@
 # Wacom Tablet - Example
 #   input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1
 #   input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1
-output DP-3 resolution 3840x2160@240.084Hz position 0,0
-output * adaptive_sync off
+output * adaptive_sync on
--- a/nate-work/dotfiles/sway/config.d/theme
+++ b/nate-work/dotfiles/sway/config.d/theme
@ -41,8 +41,8 @@ font pango:Overpass Nerd Font 12
 smart_borders on

 # Set wallpaper:
-exec_always swaybg -i /home/nate/.config/sway/wallpapers/nix-black-4k.png
-# exec_always /home/nate/.config/sway/scripts/background.sh
+#exec_always swaybg -i /home/nate/.config/sway/wallpapers/ign-0000.png
+exec_always /home/nate/.config/sway/scripts/background.sh

 # Title format for windows
 for_window [shell="xdg_shell"] title_format "%title (%app_id)"
@ -71,28 +71,31 @@ bar {
    swaybar_command waybar
 }

-set $opacity 0.8
+set $opacity 0.88
 set $floating_window floating enable, resize set width 1030 height 710, opacity 1.0

 for_window {
-    [class=".*"] opacity 1.0
-    [app_id=".*"] opacity 1.0
-    [app_id="foot"] opacity $opacity
-    [app_id="thunar"] opacity $opacity
+    [class=".*"] opacity $opacity
+    [app_id=".*"] opacity $opacity
+    [app_id="firefox"] opacity 1.0
+    [app_id="corectrl"] opacity 1.0
+    [app_id="org.keepassxc.KeePassXC"] $floating_window, move to scratchpad, sratchpad show, opacity 1.0
+    [app_id="pavucontrol"] opacity 1.0
+    [app_id="oversteer"] opacity 1.0

-    # Steam
    [class="steam_app.*"] inhibit_idle fullscreen; floating enable; border none opacity 1.0
    [class="steam"] opacity 1.0
+    [class="leagueclientux.exe"] opacity 1.0
+    [class="obsidian"] opacity 1.0

+    [title="(?:Open|Save|Save New|Open a) (?:File|Folder|As|Scene As)"] $floating_window
    # Godot windows
+    [title="(?:Godot)"] opacity 1.0
    [title="(?:Create New|Select Frames|project.godot|node)"] $floating_window
    [title="(?:Create Folder|Node Configuration|Warning|Please Confirm)"] $floating_window, resize set height 200
-
    # Aseprite
    [title="(?:Aseprite)"] opacity 1.0

-    # Floating windows
-    [title="(?:Open|Save|Save New|Open a) (?:File|Folder|As|Scene As)"] $floating_window
    [window_role="pop-up"] $floating_window
    [window_role="bubble"] $floating_window
    [window_role="task_dialog"] $floating_window
--- a/nate-work/dotfiles/sway/keyboard.conf
+++ b/nate-work/dotfiles/sway/keyboard.conf
--- a/nate-work/dotfiles/sway/scripts/background.pid
+++ b/nate-work/dotfiles/sway/scripts/background.pid
--- a/nate/dotfiles/sway/scripts/background.sh
+++ b/nate/dotfiles/sway/scripts/background.sh
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 PID_FILE="background.pid"
 WP_LOC="/home/nate/.config/sway/wallpapers"
 PREV_WP=""
--- a/nate-work/dotfiles/sway/scripts/clamshell.sh
+++ b/nate-work/dotfiles/sway/scripts/clamshell.sh
--- a/nate-work/dotfiles/sway/scripts/import-gsettings
+++ b/nate-work/dotfiles/sway/scripts/import-gsettings
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

 # usage: import-gsettings
 config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini"
--- a/nate-work/dotfiles/sway/scripts/lockman.sh
+++ b/nate-work/dotfiles/sway/scripts/lockman.sh
--- a/nate/dotfiles/sway/scripts/scale.sh
+++ b/nate/dotfiles/sway/scripts/scale.sh
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 SCALE_FILE="scale.txt"
 DIRNAME="/tmp/$(ls /tmp | grep scale.sh | head -n 1)"
--- a/dotfiles/sway/scripts/screenshot.sh
+++ b/dotfiles/sway/scripts/screenshot.sh
@ -0,0 +1,18 @@
+#!/bin/bash
+ 
+entries="Active Screen Output Area Window"
+ 
+selected=$(printf '%s\n' $entries | wofi --style=$HOME/.config/wofi/style.widgets.css --conf=$HOME/.config/wofi/config.screenshot | awk '{print tolower($1)}')
+ 
+case $selected in
+  active)
+    /usr/share/sway/scripts/grimshot --notify save active;;
+  screen)
+    /usr/share/sway/scripts/grimshot --notify save screen;;
+  output)
+    /usr/share/sway/scripts/grimshot --notify save output;;
+  area)
+    /usr/share/sway/scripts/grimshot --notify save area;;
+  window)
+    /usr/share/sway/scripts/grimshot --notify save window;;
+esac
--- a/nate-work/dotfiles/sway/scripts/swayfader.py
+++ b/nate-work/dotfiles/sway/scripts/swayfader.py
--- a/dotfiles/sway/scripts/weather.sh
+++ b/dotfiles/sway/scripts/weather.sh
@ -0,0 +1,15 @@
+#!/bin/bash
+
+LOC="$1"
+# HTML encode string as %20
+LOCATION=$(sed -e "s/ /%20/g" <<<"$LOC")
+content=$(curl -sS "https://thisdavej.azurewebsites.net/api/weather/current?loc=NewYork&deg=C")
+ICON=$(curl -s 'https://wttr.in/?format=1' | sed 's/[+0-9a-cA-Z°-]//g' )
+# echo $ICON
+TEMP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)"' | sed 's/"//g')
+TOOLTIP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)\n\(.skytext)"' | sed 's/"//g')
+CLASS=$(echo $content | jq .skytext)
+echo '{"text": "'$TEMP'", "tooltip": "'$ICON $TOOLTIP $LOC'", "class": '$CLASS' }'
+
+
+
--- a/nate-work/dotfiles/sway/swaylock.png
+++ b/nate-work/dotfiles/sway/swaylock.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-archlinux.png.png
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-archlinux.png.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign-0000.png.png
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign-0000.png.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png
--- a/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg
+++ b/nate-work/dotfiles/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg
--- a/nate/dotfiles/waybar/config
+++ b/nate/dotfiles/waybar/config
@ -2,13 +2,13 @@
 {
    "layer": "top",
    "position": "top",
-    "margin-top": 3,
+    "margin-top": 8,
    "margin-left": 10,
    "margin-right": 10,
-    "margin-bottom": 3,
+    "margin-bottom": 8,

    // If height property would be not present, it'd be calculated dynamically
-    "height": 60,
+    "height": 30,

    "modules-left": [
        "custom/launcher",
@ -17,13 +17,6 @@
    ],
 
    "modules-center": [
-        "custom/signal",
-        "custom/steam",
-        "custom/spotify",
-        "custom/firefox",
-        "custom/slack",
-        "custom/files",
-        "custom/pomo",
    ],

    "modules-right": [
@ -32,11 +25,12 @@
        "memory",
        "cpu",
        "pulseaudio",
+        "custom/spotify",
        "custom/keyboard-layout",
        "battery",
        //"custom/PBPbattery",
-        // "backlight#icon",
-        // "backlight#value",
+        "backlight#icon",
+        "backlight#value",
        "clock",
        "tray",
        //"custom/weather",
@ -86,7 +80,7 @@
            "warning": 70,
            "critical": 90,
        },
-        "on-click": "foot -e 'htop'",
+        "on-click": "xfce4-terminal -e 'htop'",
    },

    "custom/keyboard-layout": {
@ -103,7 +97,7 @@
    "memory": {
        "interval": 5,
        "format": " {}%", // Icon: memory
-        "on-click": "foot -e 'htop'", 
+        "on-click": "xfce4-terminal -e 'htop'", 
        "states": {
            "warning": 70,
            "critical": 90
@ -116,7 +110,7 @@
        "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
        "format-disconnected": "⚠  Disconnected",
        "tooltip-format": "{ifname}: {ipaddr}",
-        "on-click": "foot -e 'nmtui'",
+        "on-click": "xfce4-terminal -e 'nmtui'",
    },
    "network#vpn": {
        "interface": "tun0",
@ -153,18 +147,18 @@
        "scroll-step": 1, // %, can be a float
        "format": "{volume}% {icon}",
        "format-bluetooth": "{volume}% {icon}  {format_source}",
-        "format-bluetooth-muted": " {icon}  {format_source}",
-        "format-muted": " {format_source}",
+        "format-bluetooth-muted": " {icon}  {format_source}",
+        "format-muted": "婢 {format_source}",
        "format-source": "{volume}% ",
        "format-source-muted": "",
        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
+            "headphone": "",
+            "hands-free": "וֹ",
+            "headset": "  ",
            "phone": "",
            "portable": "",
            "car": "",
-            "default": [""]
+            "default": [""]
        },
        "on-click": "pavucontrol",
        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
@ -179,12 +173,6 @@
        "interval": 600,
    },

-    // "custom/temp": {
-    //     "exec": "notify-send \"temp thing\"",
-    //     "interval": "once",
-    //     "signal": 8,
-    // },
-
    "tray": {
        "icon-size": 18,
        "spacing":10,
@ -203,54 +191,28 @@
         "on-scroll-up": "brightnessctl -c backlight set +1%"
    },

-   "custom/signal": {
-        "format": "  ",
-        "on-click": "exec signal",
-        "tooltip": false,
-    },
-
-    "custom/steam": {
-        "format": "  ",
-        "on-click": "exec steam",
-        "tooltip": false,
+    "custom/firefox": {
+        "format": " ",
+        "on-click": "exec firefox",
+        "tooltip": false
    },

    "custom/spotify": {
        "format": " ",
-        "on-click": "foot -e 'ncspot'",
-        "tooltip": false,
+        "on-click": "xfce4-terminal -e 'ncspot'",
+        "tooltip": false
    },

-    "custom/firefox": {
-        "format": "  ",
-        "on-click": "exec firefox",
-        "tooltip": false,
+    "custom/terminal": {
+        "format": " ",
+        "on-click": "exec xfce4-terminal",
+        "tooltip": false
    },

-
-    "custom/slack": {
-        "format": "  ",
-        "on-click": "slack",
-        "tooltip": false,
-        "exec if": "pgrep slack"
-    },
-
-
    "custom/files": {
-        "format": " 󰉋 ",
-        "on-click": "exec nautilus",
-        "tooltip": false,
-    },
-
-
-    "custom/pomo": {
-        "format": " {} ",
-        "exec": "/home/nate/source/pomozoro/zig-out/bin/pomozoro",
-        "return-type": "json",
-        "on-click": "echo 's' > ~/.local/share/pomozoro/pomopipe",
-        "on-click-right": "echo 'p' > ~/.local/share/pomozoro/pomopipe",
-        "on-click-middle": "echo 'r' > ~/.local/share/pomozoro/pomopipe",
-        // "signal": 8,
+        "format": " ",
+        "on-click": "exec thunar",
+        "tooltip": false
    },

    "custom/launcher": {
--- a/dotfiles/waybar/scripts/PBPbattery.sh
+++ b/dotfiles/waybar/scripts/PBPbattery.sh
@ -0,0 +1,21 @@
+
+#!/bin/bash
+#simple Shellscript for waybar/i3blocks/polybar on Pinebook pro
+#05012020 geri123@gmx.net Gerhard S.
+
+PERCENT=$(cat /sys/class/power_supply/cw2015-battery/capacity)
+STATUS=$(cat /sys/class/power_supply/cw2015-battery/status)
+case $((
+ $PERCENT >= 0 && $PERCENT <= 20 ? 1 :
+ $PERCENT > 20 && $PERCENT <= 40 ? 2 :
+ $PERCENT > 40 && $PERCENT <= 60 ? 3 :
+ $PERCENT > 60 && $PERCENT <= 80 ? 4 : 5)) in
+#
+       (1) echo $STATUS:"":$PERCENT%;;
+       (2) echo $STATUS:"":$PERCENT%;;
+       (3) echo $STATUS:"":$PERCENT%;;
+       (4) echo $STATUS:"":$PERCENT%;;
+       (5) echo $STATUS:"":$PERCENT%;;
+esac
+
+
--- a/frame12/linked-dotfiles/waybar/scripts/keyboard_layout.sh
+++ b/frame12/linked-dotfiles/waybar/scripts/keyboard_layout.sh
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 entries="Default Colemak"

--- a/dotfiles/waybar/scripts/keyhint.sh
+++ b/dotfiles/waybar/scripts/keyhint.sh
@ -0,0 +1,2 @@
+#!/bin/sh
+yad --title="EndeavourOS Sway-WM keybindings:" --no-buttons --geometry=400x345-15-400 --list --column=key: --column=description: --column=command: "ESC" "close this app" "" "=" "modkey" "(set mod Mod4)" "+enter" "Terminal" "(xfce4-terminal)" "+d" "Application Menu" "(wofi)" "+p" "Activities" "(wofi)" "+o" "" "Open Broswer" "+n" "" "Open Files" "+q" "close focused app" "(kill)" "[Shift]+Print-key" "screenshot" "(grim)" "+Shift+e" "power-menu" "(wofi)" "+t" "open keybinding helper" "full list"
--- a/nate/dotfiles/waybar/scripts/power-menu.sh
+++ b/nate/dotfiles/waybar/scripts/power-menu.sh
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 entries="Logout Suspend Reboot Shutdown"

--- a/dotfiles/waybar/scripts/weather.sh
+++ b/dotfiles/waybar/scripts/weather.sh
@ -0,0 +1,13 @@
+#!/bin/bash
+
+LOC="$1"
+# HTML encode string as %20
+LOCATION=$(sed -e "s/ /%20/g" <<<"$LOC")
+content=$(curl -sS "https://thisdavej.azurewebsites.net/api/weather/current?loc=$LOCATION&deg=C")
+ICON=$(curl -s 'https://wttr.in/?format=1' | sed 's/[+0-9a-cA-Z°-]//g' )
+# echo $ICON
+TEMP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)"' | sed 's/"//g')
+TOOLTIP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)\n\(.skytext)"' | sed 's/"//g')
+CLASS=$(echo $content | jq .skytext)
+echo '{"text": "'$TEMP'", "tooltip": "'$ICON $TOOLTIP $LOC'", "class": '$CLASS' }'
+
--- a/dotfiles/waybar/style.css
+++ b/dotfiles/waybar/style.css
@ -0,0 +1,219 @@
+/* =============================================================================
+ *
+ * Waybar configuration
+ *
+ * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
+ *
+ * =========================================================================== */
+
+/* -----------------------------------------------------------------------------
+ * Keyframes
+ * -------------------------------------------------------------------------- */
+
+/*
+Nordic Color Scheme
+*/
+@define-color nord2         #434c5e;
+@define-color nord3         #4c566a;
+@define-color nord4         #d8dee9;
+@define-color nord8         #88c0d0;
+@define-color nord9         #81a1c1;
+@define-color nord_cyan     #8fbcbb;
+@define-color nord_orange   #d08770;
+@define-color nord_red      #bf616a;
+@define-color nord_green    #a3be8c;
+@define-color nord_yellow   #ebcb8b;
+
+@keyframes blink-warning {
+    70% {
+        color: white;
+    }
+
+    to {
+        color: white;
+        background-color: @nord_orange;
+    }
+}
+
+@keyframes blink-critical {
+    70% {
+      color: white;
+    }
+
+    to {
+        color: white;
+        background-color: @nord_red;
+    }
+}
+
+/* -----------------------------------------------------------------------------
+ * Base styles
+ * -------------------------------------------------------------------------- */
+
+/* Reset all styles */
+* {
+    border: none;
+    border-radius: 0;
+    min-height: 0;
+    margin: 1px;
+    padding: 0;
+}
+
+/* The whole bar */
+#waybar {
+    background: transparent;
+    color: @nord4;
+    background-color: @nord3;
+    font-family: Overpass Nerd Font;
+    font-size: 16px;
+    border-radius: 15px;
+}
+
+/* Every modules */
+#battery,
+#clock,
+#backlight,
+#cpu,
+#custom-keyboard-layout,
+#memory,
+#mode,
+#custom-weather,
+#network,
+#pulseaudio,
+#temperature,
+#tray,
+#idle_inhibitor,
+#custom-PBPbattery {
+    padding:0.5rem 0.6rem;
+    margin: 1px 0px;
+}
+
+/* -----------------------------------------------------------------------------
+ * Modules styles
+ * -------------------------------------------------------------------------- */
+
+#battery {
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#battery.warning {
+    color: @nord_orange;
+}
+
+#battery.critical {
+    color: @nord_red;
+}
+
+#battery.warning.discharging {
+    animation-name: blink-warning;
+    animation-duration: 3s;
+}
+
+#battery.critical.discharging {
+    animation-name: blink-critical;
+    animation-duration: 2s;
+}
+
+#cpu.warning {
+    color: @nord_orange;
+}
+
+#cpu.critical {
+    color: @nord_red;
+}
+
+#memory {
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#memory.warning {
+    color: @nord_orange;
+ }
+
+#memory.critical {
+    color: @nord_red;
+    animation-name: blink-critical;
+    animation-duration: 2s;
+    padding-left:5px;
+    padding-right:5px;
+}
+
+#mode {
+    background: @nord8;
+    border-bottom: 3px transparent;
+    color:white;
+    margin-left: 5px;
+    padding: 7px;
+}
+
+#network.disconnected {
+    color: @nord_orange;
+}
+
+#pulseaudio {
+    padding-top:6px;
+}
+
+#pulseaudio.muted {
+
+    color: @nord_cyan;
+}
+
+#temperature.critical {
+    color: @nord_red;
+}
+
+#window {
+    font-weight: bold;
+}
+
+#workspaces {
+    font-size:13px;
+}
+
+#workspaces button {
+    border-bottom: 3px solid transparent;
+    margin-bottom: 0px;
+    padding:0px;
+}
+
+#custom-launcher {
+    color: @nord9;
+}
+
+#custom-spotify {
+    color: @nord_green;
+}
+
+#workspaces button.focused {
+    border-bottom: 3px solid  @nord_green;
+    margin-bottom: 1px;
+    padding-left:0;
+}
+
+#workspaces button.urgent {
+    border-color: @nord2;
+    color: @nord_yellow;
+}
+
+#custom-power {
+    margin-left:15px;
+    margin-right:15px;
+    font-size:15px;
+    color: @nord_orange;
+}
+
+#custom-launcher {
+    font-size:15px;
+    margin-left:15px;
+    margin-right:10px;
+}
+
+#backlight.icon {
+    padding-right:1px;
+    font-size: 13px;
+}
--- a/nate-work/dotfiles/wofi/config
+++ b/nate-work/dotfiles/wofi/config
--- a/nate-work/dotfiles/wofi/config.power
+++ b/nate-work/dotfiles/wofi/config.power
--- a/scrappy/dotfiles/wofi/config.screenshot
+++ b/scrappy/dotfiles/wofi/config.screenshot
--- a/nate-work/dotfiles/wofi/style.css
+++ b/nate-work/dotfiles/wofi/style.css
--- a/nate-work/dotfiles/wofi/style.widgets.css
+++ b/nate-work/dotfiles/wofi/style.widgets.css
--- a/nate-work/dotfiles/wofi/windows.py
+++ b/nate-work/dotfiles/wofi/windows.py
--- a/flake.lock
+++ b/flake.lock
@ -1,61 +1,40 @@
 {
  "nodes": {
-    "auto-cpufreq": {
+    "firefox-addons": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1752998173,
-        "narHash": "sha256-ZlYpBp2WOe03UrpjJGz5KTOL/pp7A452hJO/Vc8C4/0=",
-        "owner": "AdnanHodzic",
-        "repo": "auto-cpufreq",
-        "rev": "562278377ffa96f3c1af49c7b499df028ce8d8bd",
-        "type": "github"
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1702612985,
+        "narHash": "sha256-dnlw/lHJO2Fk/jUHzkz4dYKHF4nQxmHps9Jx8zldoo4=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "ae18cb76153e8dda888a313daac932ba358002ae",
+        "type": "gitlab"
      },
      "original": {
-        "owner": "AdnanHodzic",
-        "repo": "auto-cpufreq",
-        "type": "github"
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
      }
    },
-    "catppuccin": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
+    "flake-utils": {
      "locked": {
-        "lastModified": 1749223974,
-        "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4",
+        "lastModified": 1629284811,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
        "type": "github"
      },
      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "numtide",
+        "repo": "flake-utils",
        "type": "github"
      }
    },
@ -66,43 +45,26 @@
        ]
      },
      "locked": {
-        "lastModified": 1749154018,
-        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
+        "lastModified": 1702538064,
+        "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
+        "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1759831965,
-        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "lastModified": 1702312524,
+        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
+        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
        "type": "github"
      },
      "original": {
@ -112,87 +74,28 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1759735786,
-        "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
+        "lastModified": 1702346276,
+        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
+        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-23.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1749285348,
-        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1749411920,
-        "narHash": "sha256-b8gH96+gNoLMudWbM5B3AuAnr1uvOmAIrCuq08BfDGI=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "73d91ecf207a0796b50f5a60c824073363dc52ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
-        "auto-cpufreq": "auto-cpufreq",
-        "catppuccin": "catppuccin",
+        "firefox-addons": "firefox-addons",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "nur": "nur"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@ -2,151 +2,61 @@
  description = "NixOS system flake.";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+
    home-manager = {
-        url = "github:nix-community/home-manager/release-25.05";
+        url = "github:nix-community/home-manager";
        inputs.nixpkgs.follows = "nixpkgs";
    };
-    # bonus inputs
-    catppuccin.url = "github:catppuccin/nix";
-    nur.url = "github:nix-community/NUR";
-    auto-cpufreq = {
-      url = "github:AdnanHodzic/auto-cpufreq";
+
+    firefox-addons = {
+        url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
        inputs.nixpkgs.follows = "nixpkgs";
    };
  };

-  outputs = { self, nixpkgs, nixpkgs-unstable, catppuccin, nur, home-manager, auto-cpufreq, ... } @ inputs:
+  outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... } @ inputs:
  let
    inherit (self) outputs;
    system = "x86_64-linux";
+    userName = "nate";
+    fullName = "Nate Anderson";
+    email = "n8r@tuta.io";
+    hostName = "winmax";
+    desktop = "sway";
+    gaming = true;
    timeZone = "America/Denver";
    pkgs = nixpkgs.legacyPackages.${system};
-    unstablePkgs = import nixpkgs-unstable { system = system; config = { allowUnfree = true; }; };
-    
-    # pkgs23 = import nixpkgs-23 { system = system; config = { allowUnfree = true; }; }; 
+    stablePkgs = nixpkgs-stable.legacyPackages.${system};
  in
  {
+
      nixosConfigurations = {
-      luci = nixpkgs.lib.nixosSystem {
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
+      nixServer = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs; };
        modules = [
-          inputs.home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users.luci = import ./luci/modules/home-manager/home.nix;
-              home-manager.extraSpecialArgs = {
-                  inherit inputs outputs;
-              };
-          }
-          ./luci/default.nix
+          ./nixos/server_configuration.nix
+          inputs.home-manager.nixosModules.default
        ];
      };
-      nate = nixpkgs.lib.nixosSystem {
+      nixDesktop = nixpkgs.lib.nixosSystem {
        # Pass args to desktop configuration
        specialArgs = {
-            inherit inputs outputs timeZone system;
+            inherit inputs outputs userName hostName desktop timeZone gaming;
        };
        modules = [
-            catppuccin.nixosModules.catppuccin
+          ./nixos/desktop_configuration.nix
          # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager {
              home-manager.useGlobalPkgs = true;
              home-manager.useUserPackages = true;
-                home-manager.users.nate = import ./nate/modules/home-manager/home.nix;
+              home-manager.users.${userName} = import ./modules/home-manager/home.nix;
              home-manager.extraSpecialArgs = {
-                    inherit inputs outputs unstablePkgs;
+                  inherit inputs outputs userName fullName email hostName desktop gaming;
              };
          }
-            ./nate/default.nix
-        ];
-      };
-      nate-work = nixpkgs.lib.nixosSystem {
-        # Pass args to desktop configuration
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
-        modules = [
-            catppuccin.nixosModules.catppuccin
-            auto-cpufreq.nixosModules.default
-            # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.nate = {
-                    imports = [
-                        ./nate-work/modules/home-manager/home.nix
-                        catppuccin.homeModules.catppuccin
-                    ];
-                };
-                home-manager.extraSpecialArgs = {
-                    inherit inputs outputs unstablePkgs;
-                };
-            }
-            ./nate-work/default.nix
-        ];
-      };
-      jaci = nixpkgs.lib.nixosSystem {
-        # Pass args to desktop configuration
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
-        modules = [
-            # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.jaci = import ./jaci/modules/home-manager/home.nix;
-                home-manager.extraSpecialArgs = {
-                    inherit inputs outputs;
-                };
-            }
-            ./jaci/default.nix
-        ];
-      };
-      scrappy = nixpkgs.lib.nixosSystem {
-        # Pass args to desktop configuration
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
-        modules = [
-            # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.scrappy = import ./scrappy/modules/home-manager/home.nix;
-                home-manager.extraSpecialArgs = {
-                    inherit inputs outputs unstablePkgs;
-                };
-            }
-            ./scrappy/default.nix
-        ];
-      };
-      frame12 = nixpkgs.lib.nixosSystem {
-        # Pass args to desktop configuration
-        specialArgs = {
-            inherit inputs outputs timeZone system;
-        };
-        modules = [
-            catppuccin.nixosModules.catppuccin
-            # Setup home manager
-            inputs.home-manager.nixosModules.home-manager {
-                home-manager.useGlobalPkgs = true;
-                home-manager.useUserPackages = true;
-                home-manager.users.nate = {
-                    imports = [
-                        ./frame12/modules/home-manager/home.nix
-                        catppuccin.homeModules.catppuccin
-                    ];
-                };
-                home-manager.extraSpecialArgs = {
-                    inherit inputs outputs unstablePkgs;
-                };
-            }
-            ./frame12/default.nix
        ];
      };
    };
--- a/frame12/default.nix
+++ b/frame12/default.nix
@ -1,39 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, system, timeZone, ... }:
-  let
-    userName = "nate";
-    fullName = "Nate Anderson";
-    email = "n8r@tuta.io";
-    hostName = "frame12";
-    desktop = "niri";
-    gaming = true;
-  in
-{
-  imports = [
-      ./desktop-configuration.nix
-      ./nixos/hardware-configuration.nix
-  ];
-
-  deskCfg = {
-      userName = userName;
-      hostName = hostName;
-      de = desktop;
-      installGaming = gaming;
-  };
-
-  # Limit the number of generations to keep
-  boot.loader.systemd-boot.configurationLimit = 5;
-
-  # Perform garbage collection weekly to maintain low disk usage
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 14d";
-  };
-
-  # Optimize storage
-  # You can also manually optimize the store via:
-  #    nix-store --optimise
-  # Refer to the following link for more details:
-  # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store
-  nix.settings.auto-optimise-store = true;
-}
--- a/frame12/desktop-configuration.nix
+++ b/frame12/desktop-configuration.nix
@ -1,138 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, timeZone, system, ... }:
-let
-  supportedDesktops = [ "niri" ];
-  supportedDesktopsStr = lib.strings.concatStringsSep ", " supportedDesktops;
-  deskCfg = config.deskCfg;
-in
-{
-  options.deskCfg = {
-      de = lib.mkOption {
-          default = "";
-          type = lib.types.str;
-          description = "Desktop Environment";
-      };
-      userName = lib.mkOption {
-          type = lib.types.str;
-          description = "Main username for system";
-      };
-      hostName = lib.mkOption {
-          type = lib.types.str;
-          description = "Hostname for system";
-      };
-      installGaming = lib.mkOption {
-          type = lib.types.bool;
-          default = true;
-          description = "Whether to install gaming software or not";
-      };
-  };
-
-    imports = [
-      modules/user/main_user.nix
-      modules/niri/niri_conf.nix
-      ../shared/modules/system/power_manager.nix
-    ];
-
-   config = {
-    assertions = [
-      {
-        assertion = builtins.elem deskCfg.de supportedDesktops;
-        message = "Unsupported desktop environment: ${deskCfg.de}\nSupported DE's: ${supportedDesktopsStr}";
-      }
-    ];
-  
-    nixpkgs.overlays = [
-      inputs.nur.overlays.default
-    ];
-  
- 
-    # Enable flakes feature
-    nix.settings.experimental-features = [
-      "nix-command" "flakes"
-    ];
-    nixpkgs.config.allowUnfree = true;
-  
-    boot = {
-      plymouth = {
-        enable = true;
-        theme = "circuit";
-        themePackages = with pkgs; [
-          # By default we would install all themes
-          (adi1090x-plymouth-themes.override {
-            selected_themes = [ "circuit" "circle_flow" ];
-          })
-        ];
-      };
-
-      # Enable "Silent Boot"
-      consoleLogLevel = 0;
-      initrd.verbose = false;
-      kernelParams = [
-        "quiet"
-        "splash"
-        "boot.shell_on_fail"
-        "loglevel=3"
-        "rd.systemd.show_status=false"
-        "rd.udev.log_level=3"
-        "udev.log_priority=3"
-      ];
-      # Hide the OS choice for bootloaders.
-      # It's still possible to open the bootloader list by pressing any key
-      # It will just not appear on screen unless a key is pressed
-      loader.timeout = 0;
-      # Use the systemd-boot EFI boot loader.
-      loader.systemd-boot.enable = true;
-      loader.efi.canTouchEfiVariables = true;
-      # Use latest kernel packages
-      kernelPackages = pkgs.linuxPackages_latest;
-    };
-    networking.hostName = deskCfg.hostName; # Define your hostname.
-    networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-    networking.wireless.iwd.enable = true;  
-
-    time.timeZone = timeZone;
-   
-    main_user = {
-      enable = true;
-      userName = deskCfg.userName;
-      isDesktopUser = true;
-    };
-    
-    power_manager = {
-      enable = true;
-    };
-
-    niriwm = {
-      enable = true;
-      useNonFree = true;
-      user = deskCfg.userName;
-      systemPackages = with pkgs; [
-        libreoffice
-        rpi-imager
-      ];
-    };
-
-    environment.systemPackages = with pkgs; [
-      cryptsetup
-      cage
-    ];
-
-    programs.niri.enable = true;
-    # For electron apps in wayland
-    environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-    services.greetd = {
-      enable = true;
-      settings = rec {
-        initial_session = {
-          command = "${pkgs.niri}/bin/niri-session";
-          user = "nate";
-        };
-        default_session = initial_session;
-      };
-    };
-    
-    # For yubioath desktop
-    services.pcscd.enable = true;
-    system.stateVersion = "25.05"; # Did you read the comment?
-  };
-}
--- a/frame12/linked-dotfiles/niri/bg.png
+++ b/frame12/linked-dotfiles/niri/bg.png
--- a/frame12/linked-dotfiles/niri/config.kdl
+++ b/frame12/linked-dotfiles/niri/config.kdl
@ -1,297 +0,0 @@
-// Example config for Niri.
-//
-// See `man 5 niri` for the complete list of options.
-
-output "eDP-1"{
-    scale 1.0
-    variable-refresh-rate
-    // transform "90"
-}
-
-input {
-    keyboard {
-        xkb {
-            layout "us"
-        }
-        repeat-delay 175
-        repeat-rate 50
-    }
-    
-    touchpad {
-        tap
-        dwt
-        dwtp
-        natural-scroll
-        accel-speed 0.2
-        accel-profile "adaptive"
-    }
-    
-    mouse {
-        accel-speed 0.2
-        accel-profile "adaptive"
-    }
-    
-    trackpoint {
-        accel-speed 0.2
-        accel-profile "adaptive"
-    }
-    
-    tablet {
-        map-to-output "eDP-1"
-    }
-    
-    touch {
-        map-to-output "eDP-1"
-    }
-    
-    disable-power-key-handling
-}
-
-output "eDP-1" {
-    scale 1.0
-    transform "normal"
-    position x=0 y=0
-}
-
-layout {
-    gaps 16
-    
-    center-focused-column "never"
-
-    always-center-single-column
-    default-column-display "tabbed"
-
-    tab-indicator {
-        hide-when-single-tab
-    }
-
-    preset-column-widths {
-        proportion 0.33333
-        proportion 0.5
-        proportion 0.66667
-    }
-    
-    default-column-width {
-        proportion 0.5;
-    }
-    
-    focus-ring {
-        width 4
-        active-color "#8aadf4"
-        inactive-color "#494d64"
-    }
-    
-    border {
-        width 2
-        active-color "#8aadf4"
-        inactive-color "#494d64"
-    }
-
-    shadow {
-        softness 30
-        spread 5
-        offset x=0 y=5
-        draw-behind-window true
-        color "#00000070"
-    }
-    
-    struts {
-        left 64
-        right 64
-        top 64
-        bottom 64
-    }
-}
-
-prefer-no-csd
-
-screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
-
-hotkey-overlay {
-    skip-at-startup
-}
-
-environment {
-    QT_QPA_PLATFORM "wayland"
-    DISPLAY ":0"
-}
-
-window-rule {
-    match app-id="com.mitchellh.ghostty"
-    default-column-width { proportion 0.5; }
-}
-
-window-rule {
-    match app-id="firefox"
-    default-column-width { proportion 0.75; }
-}
-
-window-rule {
-    match at-startup=true app-id="org.keepassxc.KeePassXC"
-    open-on-workspace "9"
-}
-
-spawn-at-startup "waybar"
-spawn-at-startup "swaybg" "-i" "/home/nate/.config/niri/bg.png"
-spawn-at-startup "nm-applet" "--indicator"
-spawn-at-startup "swaync"
-spawn-at-startup "keepassxc"
-spawn-at-startup "sh" "-c" "sleep 5 && syncthingtray --wait"
-spawn-at-startup "flatpak" "run" "org.signal.Signal"
-
-binds {
-    Mod+Shift+Slash { show-hotkey-overlay; }
-    
-    // Terminal - consistent with sway/hyprland
-    Mod+Return { spawn "ghostty"; }
-    
-    // Application launcher - consistent with sway/hyprland  
-    Mod+D { spawn "wofi" "--show" "drun"; }
-    
-    // File manager - consistent with sway/hyprland
-    Mod+T { spawn "nautilus"; }
-    
-    // Browser - consistent with sway/hyprland
-    Mod+W { spawn "firefox"; }
-    
-    // Close window - consistent with sway/hyprland
-    Mod+Q { close-window; }
-    
-    // Arrow keys for focus movement
-    Mod+Left  { focus-column-left; }
-    Mod+Down  { focus-window-down; }
-    Mod+Up    { focus-window-up; }
-    Mod+Right { focus-column-right; }
-    
-    // Colemak-DH keys - consistent with sway/hyprland (n=left, i=down, e=up, o=right)
-    Mod+N     { focus-column-left; }
-    Mod+I     { focus-window-down; }
-    Mod+E     { focus-window-up; }
-    Mod+O     { focus-column-right; }
-    
-    // Arrow keys for window movement - consistent with sway/hyprland
-    Mod+Shift+Left  { move-column-left; }
-    Mod+Shift+Down  { move-window-down; }
-    Mod+Shift+Up    { move-window-up; }
-    Mod+Shift+Right { move-column-right; }
-    
-    // Colemak-DH keys for window movement - consistent with sway/hyprland
-    Mod+Shift+N     { move-column-left; }
-    Mod+Shift+I     { move-window-down; }
-    Mod+Shift+E     { move-window-up; }
-    Mod+Shift+O     { move-column-right; }
-    
-    Mod+Home { focus-column-first; }
-    Mod+End  { focus-column-last; }
-    Mod+Ctrl+Home { move-column-to-first; }
-    Mod+Ctrl+End  { move-column-to-last; }
-    
-    // Monitor focus (keeping existing Shift pattern since this conflicts with window movement)
-    Mod+Ctrl+Left  { focus-monitor-left; }
-    Mod+Ctrl+Down  { focus-monitor-down; }
-    Mod+Ctrl+Up    { focus-monitor-up; }
-    Mod+Ctrl+Right { focus-monitor-right; }
-    
-    // Colemak-DH keys for monitor focus
-    Mod+Ctrl+N     { focus-monitor-left; }
-    Mod+Ctrl+I     { focus-monitor-down; }
-    Mod+Ctrl+E     { focus-monitor-up; }
-    Mod+Ctrl+O     { focus-monitor-right; }
-    
-    // Move column to monitor
-    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
-    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
-    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
-    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
-    
-    // Colemak-DH keys for moving column to monitor
-    Mod+Shift+Ctrl+N     { move-column-to-monitor-left; }
-    Mod+Shift+Ctrl+I     { move-column-to-monitor-down; }
-    Mod+Shift+Ctrl+E     { move-column-to-monitor-up; }
-    Mod+Shift+Ctrl+O     { move-column-to-monitor-right; }
-    
-    // Workspace navigation (using Page keys to avoid conflicts with Colemak-DH movement)
-    Mod+Page_Down      { focus-workspace-down; }
-    Mod+Page_Up        { focus-workspace-up; }
-    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
-    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
-    
-    Mod+Shift+Page_Down { move-workspace-down; }
-    Mod+Shift+Page_Up   { move-workspace-up; }
-    
-    Mod+1 { focus-workspace 1; }
-    Mod+2 { focus-workspace 2; }
-    Mod+3 { focus-workspace 3; }
-    Mod+4 { focus-workspace 4; }
-    Mod+5 { focus-workspace 5; }
-    Mod+6 { focus-workspace 6; }
-    Mod+7 { focus-workspace 7; }
-    Mod+8 { focus-workspace 8; }
-    Mod+9 { focus-workspace 9; }
-    Mod+Minus { focus-workspace "scratch"; }
-    Mod+Shift+1 { move-column-to-workspace 1; }
-    Mod+Shift+2 { move-column-to-workspace 2; }
-    Mod+Shift+3 { move-column-to-workspace 3; }
-    Mod+Shift+4 { move-column-to-workspace 4; }
-    Mod+Shift+5 { move-column-to-workspace 5; }
-    Mod+Shift+6 { move-column-to-workspace 6; }
-    Mod+Shift+7 { move-column-to-workspace 7; }
-    Mod+Shift+8 { move-column-to-workspace 8; }
-    Mod+Shift+9 { move-column-to-workspace 9; }
-    
-    Mod+Comma  { consume-window-into-column; }
-    Mod+Period { expel-window-from-column; }
-    
-    Mod+R { switch-preset-column-width; }
-    Mod+Shift+R { reset-window-height; }
-    // Fullscreen - consistent with sway/hyprland
-    Mod+F { fullscreen-window; }
-    Mod+Shift+F { maximize-column; }
-    
-    // Floating toggle - consistent with sway/hyprland (niri doesn't have floating, using maximize instead)
-    Mod+Space { maximize-column; }
-    
-    Mod+C { center-column; }
-    
-    Mod+bracketleft { set-column-width "-10%"; }
-    Mod+bracketright { set-column-width "+10%"; }
-    
-    Mod+Shift+bracketleft { set-window-height "-10%"; }
-    Mod+Shift+bracketright { set-window-height "+10%"; }
-    
-    // Screenshots - consistent with sway/hyprland  
-    Mod+P { screenshot; }
-    Mod+Shift+P { screenshot-screen; }
-    
-    // Traditional screenshot keys
-    Print { screenshot; }
-    Ctrl+Print { screenshot-screen; }
-    Alt+Print { screenshot-window; }
-    
-    // Volume control
-    XF86AudioRaiseVolume { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "+5%"; }
-    XF86AudioLowerVolume { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "-5%"; }
-    XF86AudioMute { spawn "pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle"; }
-    XF86AudioMicMute { spawn "pactl" "set-source-mute" "@DEFAULT_SOURCE@" "toggle"; }
-    
-    // Media control
-    XF86AudioPlay { spawn "playerctl" "play-pause"; }
-    XF86AudioPause { spawn "playerctl" "pause"; }
-    XF86AudioNext { spawn "playerctl" "next"; }
-    XF86AudioPrev { spawn "playerctl" "previous"; }
-    XF86AudioStop { spawn "playerctl" "stop"; }
-    
-    // Brightness control
-    XF86MonBrightnessUp { spawn "brightnessctl" "set" "+5%"; }
-    XF86MonBrightnessDown { spawn "brightnessctl" "set" "5%-"; }
-    
-    Mod+Shift+Q { quit; }
-    Mod+Shift+Ctrl+P { power-off-monitors; }
-    
-    Mod+Shift+Ctrl+T { toggle-debug-tint; }
-}
-
-switch-events {
-    lid-close { spawn "systemctl" "suspend"; }
-    lid-open { spawn "notify-send" "The laptop lid is open!"; }
-}
--- a/frame12/linked-dotfiles/waybar/config
+++ b/frame12/linked-dotfiles/waybar/config
@ -1,312 +0,0 @@
-// Global 
-{
-    "layer": "bottom",
-    "position": "top",
-    "margin-top": 3,
-    "margin-left": 3,
-    "margin-right": 3,
-    "margin-bottom": 3,
-
-    // If height property would be not present, it'd be calculated dynamically
-    // "height": 60,
-
-    "modules-left": [
-        "custom/launcher",
-        "niri/workspaces",
-        "niri/window",
-    ],
- 
-    "modules-right": [
-        "clock",
-        // "network",  // using network applet in tray
-        // "idle_inhibitor",
-        "custom/storage",
-        "memory",
-        "cpu",
-        "pulseaudio",
-        "custom/keyboard-layout",
-        "battery",
-        "backlight",
-        "custom/wlsunset",
-        "tray",
-        //"custom/weather",
-        "custom/power",
-    ],
-
-    // Modules
-
-    "idle_inhibitor": {
-        "format": "{icon} ",
-        "format-icons":{
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{icon}  {capacity}%",
-        "format-charging": "{capacity}% 󰂄",
-        "format-plugged": "{capacity}% ",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-
-    "clock": {
-        "interval": 1,
-        // "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
-        "format": "{:%I:%M.%S %p}",
-        "tooltip-format": "{:%e %B %Y}"
-    },
-
-    "cpu": {
-        "interval": 5,
-        "format": "  {usage}%", // Icon: microchip
-        "states": {
-            "warning": 70,
-            "critical": 90,
-        },
-        "on-click": "ghostty -e 'htop'",
-    },
-
-    "memory": {
-        "interval": 5,
-        "format": "  {}%", // Icon: memory
-        "on-click": "ghostty -e 'htop'",
-        "states": {
-            "warning": 70,
-            "critical": 90
-        }
-    },
-
-    "network": {
-        "interval": 5,
-        "format-wifi": "", // Icon: wifi
-        "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{essid} - {ifname}:{ipaddr}  {bandwidthUpBytes} {bandwidthDownBytes}",
-        "on-click": "ghostty -e 'nmtui'",
-    },
-    "network#vpn": {
-        "interface": "tun0",
-        "format": "  {signalStrength}%",
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{essid} - {ifname}:{ipaddr}  {bandwidthUpBytes} {bandwidthDownBytes}",
-    },
-
-    "niri/window": {
-        "format": "{title}",
-        "icon": true,
-        "icon-size": 24,
-        "rewrite": {
-            // Firefox
-            "(.*) — Mozilla Firefox": " $1",
-            "(.*) - Mozilla Firefox": " $1",
-            "Mozilla Firefox": " Firefox",
-
-            // Chrome/Chromium
-            "(.*) - Google Chrome": " $1",
-            "(.*) - Chromium": " $1",
-            "Google Chrome": " Chrome",
-            "Chromium": " Chromium",
-
-            // Terminal applications
-            "(.*) - zsh": " $1",
-            "(.*) - bash": " $1",
-            "(.*) - fish": " $1",
-            "ghostty": " Terminal",
-            "kitty": " Terminal",
-            "alacritty": " Terminal",
-            "ghostty": " Terminal",
-
-            // Text editors and IDEs
-            "(.*) - Visual Studio Code": " $1",
-            "(.*) - Code": " $1",
-            "(.*) - Vim": " $1",
-            "(.*) - Neovim": " $1",
-            "(.*) - Emacs": " $1",
-            "Visual Studio Code": " VS Code",
-
-            // File managers
-            "(.*)Nautilus": " Files: $1",
-            "Files": " Files",
-            "Thunar": " Files",
-            "Dolphin": " Files",
-
-            // Communication apps
-            "Slack (.*)": " $1",
-            "Slack": " Slack",  
-            "Signal": " Signal",
-            "Discord": " Discord",
-            "Telegram": " Telegram",
-
-            // Media and entertainment
-            "Spotify": " Spotify",
-            "Steam": " Steam",
-            "(.*) - YouTube": "󰗃 $1",
-            "VLC media player": "󰕼 VLC",
-
-            // Development tools
-            "(.*) - GitHub": " $1",
-            "GitKraken": " GitKraken",
-            "Postman": " Postman",
-
-            // System applications
-            "System Monitor": " System Monitor",
-            "Task Manager": " Task Manager",
-            "Settings": " Settings",
-            "Control Panel": " Settings",
-
-            // Office applications
-            "(.*) - LibreOffice Writer": " $1",
-            "(.*) - LibreOffice Calc": " $1",
-            "(.*) - LibreOffice Impress": " $1",
-
-            // Remove common suffixes that don't add value
-            "^(.*) - .*$": "$1",
-            "^(.*) | .*$": "$1",
-
-            // Fallback for empty/unnamed windows
-            "^$": "Desktop"
-        }
-    },
-
-    "niri/workspaces": {
-        "disable-click": false,
-        "disable-markup": false,
-        "all-outputs": true,
-        "format": "  {icon}  ",
-        "format-icons": {
-            "1": "",
-            "2": "",
-            "3": "󰭻",
-            "4": "",
-            "5": " 5",
-            "6": " 6",
-            "7": " 7",
-            "8": " 8",
-            "9": " 9",
-            "music": "",
-            "scratch": "",
-        }
-    },
-
-    "pulseaudio": {
-        "scroll-step": 1, // %, can be a float
-        "format": "{icon}  {volume}%",
-        "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",
-        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
-        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
-    },
-
-    // "custom/temp": {
-    //     "exec": "notify-send \"temp thing\"",
-    //     "interval": "once",
-    //     "signal": 8,
-    // },
-
-    "tray": {
-        "icon-size": 20,
-        "spacing":10,
-     },
-
-    "backlight": {
-        "format": "{icon}  {percent}%",
-        "format-icons": ["󰹐", "󱩏", "󱩑", "󱩓", "󱩕", "󰛨"],
-        "on-scroll-down": "brightnessctl -c backlight set 1%-",
-        "on-scroll-up": "brightnessctl -c backlight set +1%",
-        "min-brightness": 1
-    },
-
-    "custom/storage": {
-        "format": "{icon}  {percentage}%",
-        "format-icons": {
-          "default": "",
-          "warning": "",
-          "critical": "",
-        },
-        "exec": "usage=$(df / --output=pcent | tail -n1 | tr -d ' %'); if [ $usage -ge 90 ]; then class=\"critical\"; elif [ $usage -ge 75 ]; then class=\"warning\"; else class=\"default\"; fi; echo \"{\\\"percentage\\\":$usage,\\\"class\\\":\\\"$class\\\"}\"",
-        "return-type": "json",
-        "interval": 30,
-        "tooltip-format": "Root filesystem: {percentage}% used",
-    },
-
-    "custom/signal": {
-        "format": "  ",
-        "on-click": "exec signal",
-        "tooltip": false,
-    },
-
-    "custom/steam": {
-        "format": "  ",
-        "on-click": "exec steam",
-        "tooltip": false,
-    },
-
-    "custom/spotify": {
-        "format": "  ",
-        "on-click": "exec flatpak run com.spotify.Client",
-        "tooltip": false,
-    },
-
-    "custom/firefox": {
-        "format": "  ",
-        "on-click": "exec firefox",
-        "tooltip": false,
-    },
-
-
-    "custom/slack": {
-        "format": "  ",
-        "on-click": "slack",
-        "tooltip": false,
-        "exec if": "pgrep slack"
-    },
-
-
-   "custom/files": {
-        "format": " 󰉋 ",
-        "on-click": "exec nautilus",
-        "tooltip": false,
-    },
-
-    "custom/launcher": {
-        "format":" ",
-        "on-click": "exec wofi -c ~/.config/wofi/config --show=drun",
-        "tooltip": false,
-    },
-
-    "custom/wlsunset": {
-        "format": "{}",
-        "exec": "~/.config/waybar/scripts/wlsunset-status.sh",
-        "on-click": "~/.config/waybar/scripts/wlsunset-toggle.sh",
-        "interval": "once",
-        "signal": 8,
-        "tooltip": false,
-    },
-
-    "custom/power": {
-        "format":"⏻",
-        "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
-        "tooltip": false,
-    },
-}
--- a/frame12/linked-dotfiles/waybar/scripts/power-menu.sh
+++ b/frame12/linked-dotfiles/waybar/scripts/power-menu.sh
@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-entries="Logout Suspend Reboot Shutdown"
-
-selected=$(printf '%s\n' $entries | wofi --show=dmenu --conf=$HOME/.config/wofi/config.power --style=$HOME/.config/wofi/style.widgets.css | awk '{print tolower($1)}')
-
-case $selected in
-  logout)
-    swaymsg exit;;
-  suspend)
-    exec systemctl suspend;;
-  reboot)
-    exec systemctl reboot;;
-  shutdown)
-    exec systemctl poweroff -i;;
-esac
--- a/frame12/linked-dotfiles/waybar/scripts/wlsunset-status.sh
+++ b/frame12/linked-dotfiles/waybar/scripts/wlsunset-status.sh
@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Check if wlsunset service is active and return appropriate icon
-if systemctl --user is-active --quiet wlsunset; then
-    echo "󰖜"  # Moon/sunset icon (night mode active)
-else
-    echo "󰖚"  # Sun icon (day mode)
-fi
--- a/frame12/linked-dotfiles/waybar/scripts/wlsunset-toggle.sh
+++ b/frame12/linked-dotfiles/waybar/scripts/wlsunset-toggle.sh
@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Check if wlsunset service is active
-if systemctl --user is-active --quiet wlsunset; then
-    # Service is running, stop it
-    systemctl --user stop wlsunset
-else
-    # Service is not running, start it
-    systemctl --user start wlsunset
-fi
-
-# Send signal to waybar to update the display
-pkill -SIGRTMIN+8 waybar
--- a/frame12/linked-dotfiles/waybar/style.css
+++ b/frame12/linked-dotfiles/waybar/style.css
@ -1,340 +0,0 @@
-/* =============================================================================
- *
- * Waybar configuration
- *
- * Configuration reference: https://github.com/Alexays/Waybar/wiki/Configuration
- *
- * =========================================================================== */
-
-@define-color rosewater #f4dbd6;
-@define-color flamingo #f0c6c6;
-@define-color pink #f5bde6;
-@define-color mauve #c6a0f6;
-@define-color red #ed8796;
-@define-color maroon #ee99a0;
-@define-color peach #f5a97f;
-@define-color yellow #eed49f;
-@define-color green #a6da95;
-@define-color teal #8bd5ca;
-@define-color sky #91d7e3;
-@define-color sapphire #7dc4e4;
-@define-color blue #8aadf4;
-@define-color lavender #b7bdf8;
-@define-color text #cad3f5;
-@define-color subtext1 #b8c0e0;
-@define-color subtext0 #a5adcb;
-@define-color overlay2 #939ab7;
-@define-color overlay1 #8087a2;
-@define-color overlay0 #6e738d;
-@define-color surface2 #5b6078;
-@define-color surface1 #494d64;
-@define-color surface0 #363a4f;
-@define-color base #24273a;
-@define-color mantle #1e2030;
-@define-color crust #181926;
-
-
-/* -----------------------------------------------------------------------------
- * Keyframes
- * -------------------------------------------------------------------------- */
-@keyframes blink-warning {
-  70% {
-    color: @overlay0;
-  }
-
-  to {
-    color: @overlay0;
-    background-color: @crust;
-  }
-}
-
-@keyframes blink-critical {
-  70% {
-    color: @overlay2;
-  }
-
-  to {
-    color: @overlay2;
-    background-color: @base;
-  }
-}
-
-
-/* -----------------------------------------------------------------------------
- * Base styles
- * -------------------------------------------------------------------------- */
-/* Reset all styles */
-* {
-  border: none;
-  border-radius: 0;
-  min-height: 40px;
-  margin: 0px;
-  padding: 0px;
-}
-
-/* The whole bar */
-#waybar {
-  background: transparent;
-  background-color: transparent;
-  font-family: Overpass Nerd Font;
-  font-size: 22px;
-  color: @text;
-}
-
-#taskbar {
-  background: transparent;
-}
-
-#taskbar button {
-  padding-left: 3px;
-  padding-right: 3px;
-  margin-left: 3px;
-  margin-right: 3px;
-  /* color: transparent; */
-  border-bottom: 2px solid;
-}
-
-#taskbar button.active {
-  color: @green;
-}
-
-.modules-left,
-.modules-right,
-.modules-center {
-  /* margin: 8px 8px 1px 8px; */
-  background: transparent;
-  /* color: @; */
-  background-color: @base;
-  border-radius: 25px;
-  padding: 0px 10px 0px 10px;
-  border-style: solid;
-  border-width: 3px;
-  border-color: @surface0;
-}
-
-/* Add gaps for middle module so they space out and dont touch */
-.modules-center {
-  margin: 0px 100px;
-}
-
-/* Every modules */
-#backlight,
-#battery,
-#clock,
-#cpu,
-#custom-storage,
-#custom-keyboard-layout,
-#custom-PBPbattery,
-#custom-weather,
-#idle_inhibitor,
-#memory,
-#mode,
-#network,
-#pulseaudio,
-#temperature,
-#tray {
-  padding: 0.5rem 0.6rem;
-  margin: 1px 0px;
-}
-
-#clock {
-  margin-left: 5px;
-  margin-right: 5px;
-  min-width: 140px;
-}
-
-#backlight,
-#battery,
-#cpu,
-#custom-storage,
-#memory,
-#network,
-#pulseaudio,
-#temperature {
-  min-width: 90px;
-}
-
-
-/* -----------------------------------------------------------------------------
- * Modules styles
- * -------------------------------------------------------------------------- */
-
-#battery {
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
-
-#battery.warning,
-#custom-storage.warning {
-  color: @flamingo;
-}
-
-#battery.critical,
-#custom-storage.critical {
-  color: @red;
-}
-
-#battery.warning.discharging {
-  animation-name: blink-warning;
-  animation-duration: 3s;
-}
-
-#battery.critical.discharging {
-  animation-name: blink-critical;
-  animation-duration: 2s;
-}
-
-#cpu.warning {
-  color: @flamingo;
-}
-
-#cpu.critical {
-  color: @red;
-}
-
-#memory {
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-}
-
-#memory.warning {
-  color: @flamingo;
-}
-
-#memory.critical {
-  color: @red;
-  animation-name: blink-critical;
-  animation-duration: 2s;
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-#mode {
-  background: @overlay0;
-  border-bottom: 3px transparent;
-  color: @text;
-  margin-left: 5px;
-  margin-right: 5px;
-  border-radius: 20px;
-}
-
-#network.disconnected {
-  color: @flamingo;
-}
-
-#pulseaudio {
-  padding-top: 6px;
-}
-
-#pulseaudio.muted {
-  color: @sky;
-}
-
-#temperature.critical {
-  color: @red;
-}
-
-#window {
-  font-weight: bold;
-  margin-left: 20px;
-  margin-right: 10px;
-}
-
-#workspaces {
-  font-size: 24px;
-}
-
-#workspaces button {
-  /* border-bottom: 3px solid transparent; */
-  margin-bottom: 0px;
-  padding: 0px;
-}
-
-#custom-launcher {
-  color: @lavenderblush;
-}
-
-/* @define-color rosewater #f4dbd6; */
-/* @define-color flamingo #f0c6c6; */
-/* @define-color pink #f5bde6; */
-/* @define-color mauve #c6a0f6; */
-/* @define-color red #ed8796; */
-/* @define-color maroon #ee99a0; */
-/* @define-color peach #f5a97f; */
-/* @define-color yellow #eed49f; */
-/* @define-color green #a6da95; */
-/* @define-color teal #8bd5ca; */
-/* @define-color sky #91d7e3; */
-/* @define-color sapphire #7dc4e4; */
-/* @define-color blue #8aadf4; */
-/* @define-color lavender #b7bdf8; */
-
-
-#custom-signal {
-  color: @lavender;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-steam {
-  color: @teal;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-spotify {
-  color: @green;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-firefox {
-  color: @yellow;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-slack {
-  color: @peach;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-files {
-  color: @pink;
-  padding: 0px 5px 0px 5px;
-}
-
-#custom-pomo {
-  color: @red;
-  padding: 0px 5px 0px 5px;
-}
-
-#wiggle {
-  animation-name: blink-warning;
-}
-
-#workspaces button.active {
-  border-bottom: 3px solid @lavender;
-  color: @green;
-}
-
-#workspaces button.urgent {
-  border-color: @lavender;
-  color: @yellow;
-}
-
-#custom-power {
-  margin-left: 15px;
-  margin-right: 15px;
-  font-size: 20px;
-  color: @flamingo;
-}
-
-#custom-launcher {
-  font-size: 24px;
-  margin-left: 15px;
-  margin-right: 10px;
-}
-
-#backlight.icon {
-  padding-right: 1px;
-  font-size: 20px;
-}
--- a/frame12/modules/home-manager/home.nix
+++ b/frame12/modules/home-manager/home.nix
@ -1,285 +0,0 @@
-{ inputs, config, pkgs, lib, ... }:
-  let
-    userName = "nate";
-    fullName = "Nate Anderson";
-    email = "n8r@tuta.io";
-    unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
-  in
-{
-  imports = [
-      ../../../shared/modules/apps/firefox/firefox.nix
-  ];
-  
-  home.username = userName;
-  home.homeDirectory = "/home/${userName}";
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "25.05"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  firefoxApp.enable = true;
-  
-  fonts.fontconfig.enable = true;
-
-  # Niri configuration will go in dotfiles
-  # Optional, hint Electron apps to use Wayland:
-  home.packages = with pkgs; [
-    ### ---
-    ### niri packages
-    swaybg
-    swaylock-effects
-    wofi
-    wl-clipboard # System clipboard
-    waybar
-    networkmanagerapplet
-    libnotify
-    swaynotificationcenter
-    syncthingtray
-    lynx
-    qutebrowser
-    brightnessctl
-    ### ---
-
-    chromium
-    #
-    # Dev Tools
-    #
-    helix
-    ghostty
-    docker
-    docker-compose
-    jq
-    python310
-    unstable.claude-code
-   ### LSP's
-    nil # Nix LSP
-    nodePackages_latest.bash-language-server
-    openscad-lsp
-    vscode-langservers-extracted # provides eslint, markdown, json, css, and html lsp
-    # python311Packages.python-lsp-server
-    ### Misc
-    usbutils
-    openscad
-
-    #
-    # Gaming
-    #
-    webcord
-
-    #
-    # Better Unix
-    #
-    bat
-    duf
-    du-dust
-    fd
-    fzf
-    lsd
-    ripgrep
-    tre-command
-    gtop
-    htop
-    neofetch
-    # Normies
-    unzip
-    llpp
-    nmap
-
-    #
-    # Photo / Video
-    #
-    imv
-    mpv
-    gimp
-    ffmpeg
-    tenacity
-    yt-dlp
-
-    #
-    # Communication
-    #
-    mumble
-    slack
-    unstable.signal-desktop
-
-    #
-    # Other
-    #
-    keepassxc
-    yubioath-flutter
-
-    #
-    # Style
-    #
-    catppuccin-kvantum
-    libsForQt5.qtstyleplugin-kvantum
-    libsForQt5.qt5ct
-    # Install fonts
-    lato
-    unstable.nerd-fonts.hurmit
-    unstable.nerd-fonts.overpass
-    unstable.nerd-fonts.monaspace
-    monaspace
-    recursive
-  ];
-
-  #
-  # Dotfiles
-  # 
-
-  # Static symlinks
-  home.file = lib.mkMerge [
-    # Shared dotfiles
-    (let
-      sharedDotfilesPath = ../../../shared/dotfiles;
-    in
-      if builtins.pathExists sharedDotfilesPath then
-        builtins.listToAttrs (map (name: {
-          name = "${config.xdg.configHome}/${name}";
-          value = { source = sharedDotfilesPath + "/${name}"; };
-        }) (builtins.attrNames (builtins.readDir sharedDotfilesPath)))
-      else {})
-    # Add local dotfiles, overriding from local over shared
-    (let
-      localDotfilesPath = ../../dotfiles;
-    in
-      if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != {} then
-        builtins.listToAttrs (map (name: {
-          name = "${config.xdg.configHome}/${name}";
-          value = { source = localDotfilesPath + "/${name}"; };
-        }) (builtins.attrNames (builtins.readDir localDotfilesPath)))
-      else {})
-    {
-      ".icons/default/index.theme".text = ''
-        [icon theme]
-        Inherits=Catppuccin-Macchiato-Lavender-Cursors
-      '';
-    }
-  ];
-
-  # Active symlinks
-  xdg.configFile = {
-    "niri".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/linked-dotfiles/niri";
-    "waybar".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/linked-dotfiles/waybar";
-    "helix".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/shared/linked-dotfiles/helix";
-    
-    # Theme configuration
-    "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
-    "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
-    "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
-    "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
-      General.theme = "catppuccin-macchiato-lavender";
-     };
-  };
-
-  home.sessionVariables = {
-    BAT_THEME="Catppuccin Macchiato";
-    EDITOR = "hx";
-    # For electron apps
-    NIXOS_OZONE_WL = "1";
-  };
-
-  # Git setup
-  programs.git = {
-    enable = true;
-    userEmail = email;
-    userName = fullName;
-    extraConfig = {
-      include = { path = "${config.xdg.configHome}/macchiato.gitconfig"; };
-      init = { defaultBranch = "main"; };
-      pull = { ff = "only"; };
-      merge = { conflictStyle="zdiff3"; };
-      push = { autoSetupRemote="true"; };
-      delta = { features = "Catppuccin Macchiato"; };
-    };
-    delta.enable = true;
-  };
-
-  programs = {
-    direnv = {
-      enable = true;
-      enableZshIntegration = true; # see note on other shells below
-      nix-direnv.enable = true;
-    };
-
-    bash.enable = true; # see note on other shells below
-  };
-
-  # enable saving ssh secrets (needed for go mod installing private packages)
-  services.gnome-keyring.enable = true;
-  services.gnome-keyring.components = [ "ssh" "secrets" ];
-
-  # Zsh setup
-  programs.zsh = {
-      enable = true;
-      oh-my-zsh = {
-          enable = true;
-          plugins = [ "git" "ssh-agent" ];
-          theme = "half-life";
-      };
-      initContent = ''
-          eval "$(direnv hook zsh)"
-
-          yt-audio() {
-            nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3"
-          }
-
-          # Better Unix Aliases
-          alias ls="lsd"
-          alias l="lsd --almost-all --long"
-          alias llm="lsd --timesort --long"
-          alias lS="lsd --oneline --classic"
-          alias lt="lsd --tree --depth=2"
-          alias grep="rg"
-          alias cat="bat --paging=never"
-          alias rm="rm -i"
-      '';
-      profileExtra = ''
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share
-      '';
-  };
-
-  qt = {
-    enable = true;
-    platformTheme.name = "qtct";
-    style.name = "kvantum";
-  };
-
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      package = pkgs.catppuccin-cursors.macchiatoLavender;
-      name = "Catppuccin-Macchiato-Lavender-Cursors";
-    };
-    iconTheme = {
-      package = pkgs.catppuccin-papirus-folders;
-      name = "Papirus-Dark";
-    };
-    theme = {
-      name = "catppuccin-macchiato-lavender-compact+rimless";
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "lavender" ];
-        size = "compact";
-        tweaks = [ "rimless" ];
-        variant = "macchiato";
-      };
-    };
-  };
-
-  services.wlsunset = {
-    enable = true;
-    sunrise = "07:00";
-    sunset = "17:00";
-    temperature.night = 3500;
-  };
-
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-
-  # Enable bluetooth headphone controls
-  services.mpris-proxy.enable = true;
-}
--- a/frame12/modules/niri/niri_conf.nix
+++ b/frame12/modules/niri/niri_conf.nix
@ -1,182 +0,0 @@
-{ inputs, lib, config, pkgs, userName, ... }:
-  let
-    unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
-  in
-{
-    options.niriwm = {
-      enable = lib.mkEnableOption "Enable niri window manager.";
-      useNonFree = lib.mkOption {
-          default = false;
-          example = true;
-          description = "Whether to enable non-free software in the niri config";
-      };
-      systemPackages = lib.mkOption {
-          default = [];
-          description = "Add any additional packages desired. Merged with niri defaults.";
-      };
-      user = lib.mkOption {
-        type = lib.types.str;
-      };
-
-    };
-
-    ###
-    ##  Configuration
-    ###
-    config = lib.mkIf config.niriwm.enable {
-
-        nixpkgs.config.allowUnfree = config.niriwm.useNonFree;
-        
-        ###
-        ##  XDG portal setup
-        ###
-        xdg.portal = {
-            config = {
-                common = {
-                  default = [
-                    "wlr"
-                  ];
-                };
-            };
-            extraPortals = with pkgs; [
-                xdg-desktop-portal-gnome
-            ];
-            wlr.enable = true;
-            enable = true;
-        };
-        xdg.sounds.enable = true;
-
-        ###
-        ##  System Packages
-        ###
-        environment.systemPackages = with pkgs; lib.lists.flatten [
-             [
-                bash
-                ghostty
-                git
-                glib # gsettings
-                grim
-                libnotify
-                man-pages
-                man-pages-posix
-                nautilus
-                networkmanagerapplet
-                pavucontrol
-                slurp
-                syncthingtray
-                swaylock
-                wl-clipboard
-                waybar
-                wdisplays
-                wofi
-                xdg-utils
-                zsh
-                lxqt.lxqt-policykit
-                unstable.xwayland-satellite
-                # Fonts
-             ]
-            config.niriwm.systemPackages
-        ];
-        environment.variables.QT_STYLE_OVERRIDE = "kvantum";
-
-        # adds additional man pages
-        documentation.dev.enable = true;
-
-        programs.steam = {
-            enable = true;
-            gamescopeSession.enable = true;
-        };
-        programs.gamemode = {
-            enable = true;
-            settings = {
-                general = {
-                    reaper_freq = 5;
-                    desiredgov = "performance";
-                    softrealtime = "auto";
-                };
-            };
-        };
-        programs.kdeconnect.enable = true;
-        # programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect;
-
-        # For nautilus
-        services.gnome.sushi.enable = true;
-        programs.nautilus-open-any-terminal = {
-          enable = true;
-          terminal = "ghostty";
-        };
-        programs.file-roller.enable = true;
-        programs.xfconf.enable = true;
-
-        services.syncthing = {
-          enable = true;
-          dataDir = "/home/${config.niriwm.user}/.syncthing";
-          openDefaultPorts = true;
-          user = config.niriwm.user;
-        };
-        systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; # Don't create default ~/Sync folder
-
-        programs.zsh.enable = true;
-        
-        # Set zsh as the default shell system-wide
-        users.defaultUserShell = pkgs.zsh;
-        environment.shells = with pkgs; [ zsh bash ];
-
-        ###
-        ##  Services
-        ###
-        virtualisation.docker.enable = true;
-        services.blueman.enable = true;
-        services.gvfs.enable = true;  # thunar mount, trash, etc
-        services.tumbler.enable = true; # thunar thumbnails
-        services.openssh.enable = true;
-        services.dbus.enable = true;
-        services.gnome.gnome-keyring.enable = true;
-        # For yubioath desktop
-        services.pcscd.enable = true;
-        # Audio - Modern PipeWire setup for Framework laptop
-        # Disable PulseAudio in favor of PipeWire
-        services.flatpak.enable = true;
-        services.pulseaudio.enable = false;
-        security.rtkit.enable = true;
-        services.pipewire = {
-          enable = true;
-          audio.enable = true;
-          alsa.enable = true;
-          alsa.support32Bit = true;
-          pulse.enable = true;
-          wireplumber.enable = true;
-          wireplumber.extraConfig = {
-            "wireplumber.settings" = {
-              bluetooth.autoswitch-to-headset-profile = false;
-            };
-            bluetoothEnhancements = {
-              "monitor.bluez.properties" = {
-                  "bluez5.enable-sbc-xq" = true;
-                  "bluez5.enable-msbc" = true;
-                  "bluez5.enable-hw-volume" = true;
-                  # Default roles: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/bluetooth.html#monitor-properties
-                  "bluez5.roles" = [ "a2dp_sink" "a2dp_source" "bap_sink" "bap_source" "hfp_hf" "hfp_ag" ];
-              };
-            };
-          };
-        };
-
-        ###
-        ##  Misc
-        ###
-        # Necessary for home-manager niri setup
-        security.polkit.enable = true;
-
-        hardware.bluetooth = {
-          enable = true; # enables support for Bluetooth
-          powerOnBoot = true; # powers up the default Bluetooth controller on boot
-          settings = {
-            General = {
-              Enable = "Source,Sink,Media,Socket";
-              Experimental = true;
-            };
-          };
-        };
-    };
-}
--- a/frame12/modules/user/main_user.nix
+++ b/frame12/modules/user/main_user.nix
@ -1,57 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-let
-	cfg = config.main_user;
-in
-{
-    options.main_user = {
-        enable = lib.mkEnableOption "enable user module";
-
-        isDesktopUser = lib.mkOption {
-            default = false;
-            example = true;
-            description = "Add additional user groups for desktop users";
-        };
-
-        userName = lib.mkOption {
-            default = "mainuser";
-            description = "username";
-        };
-    };
-
-    config = lib.mkIf cfg.enable {
-        users.users.${cfg.userName} = lib.mkMerge [
-            {
-                isNormalUser = true;
-                initialPassword = "password";
-
-                description = "main user";
-                shell = pkgs.zsh;
-            }
-    
-            (lib.mkIf (!cfg.isDesktopUser) {
-                extraGroups = [
-                    "wheel"
-                    "networkmanager"
-                    cfg.userName
-                ];
-            })
-            (lib.mkIf cfg.isDesktopUser {
-                extraGroups = [
-                    "wheel"
-                    "networkmanager"
-                    "corectrl"
-                    cfg.userName
-                    "video"
-                    "audio"
-                    # For android
-                    "adbusers"
-                    # For serial interfaces
-                    "dialout"
-                    # For docker
-                    "docker"
-                ];
-            })
-        ];
-    };
-}
--- a/frame12/nixos/hardware-configuration.nix
+++ b/frame12/nixos/hardware-configuration.nix
@ -1,44 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9fa87bdc-c4ee-40c7-ae65-ad7f2e1bd026";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."luks-bc22cfc0-ff2e-4803-82b6-dae1bc1927f4".device = "/dev/disk/by-uuid/bc22cfc0-ff2e-4803-82b6-dae1bc1927f4";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7D27-F64C";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  boot.initrd.luks.devices."luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2".device = "/dev/disk/by-uuid/ef3250cd-9b9f-4971-b2f3-f597ee4db2e2";
-
-  swapDevices =
-    [ { device = "/dev/mapper/luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/jaci/default.nix
+++ b/jaci/default.nix
@ -1,39 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, system, timeZone, ... }:
-  let
-    userName = "jaci";
-    fullName = "Jaci Anderson";
-    email = "jaci.s.anderson@gmail.com";
-    hostName = "meowyxlife";
-    desktop = "kde";
-    gaming = true;
-  in
-{
-  imports = [
-      ./desktop-configuration.nix
-      ./nixos/hardware-configuration.nix
-  ];
-
-  deskCfg = {
-      userName = userName;
-      hostName = hostName;
-      de = desktop;
-      installGaming = gaming;
-  };
-
-  # Limit the number of generations to keep
-  boot.loader.systemd-boot.configurationLimit = 5;
-
-  # Perform garbage collection weekly to maintain low disk usage
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 21d";
-  };
-
-  # Optimize storage
-  # You can also manually optimize the store via:
-  #    nix-store --optimise
-  # Refer to the following link for more details:
-  # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store
-  nix.settings.auto-optimise-store = true;
-}
--- a/jaci/desktop-configuration.nix
+++ b/jaci/desktop-configuration.nix
@ -1,94 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, timeZone, system, ... }:
-let
-  supportedDesktops = [ "kde" ];
-  supportedDesktopsStr = lib.strings.concatStringsSep ", " supportedDesktops;
-  deskCfg = config.deskCfg;
-in
-{
-  options.deskCfg = {
-      de = lib.mkOption {
-          default = "kde";
-          type = lib.types.str;
-          description = "Desktop Environment";
-      };
-      userName = lib.mkOption {
-          type = lib.types.str;
-          description = "Main username for system";
-      };
-      hostName = lib.mkOption {
-          type = lib.types.str;
-          description = "Hostname for system";
-      };
-      installGaming = lib.mkOption {
-          type = lib.types.bool;
-          default = true;
-          description = "Whether to install gaming software or not";
-      };
-  };
-
-   imports = [
-     modules/user/main_user.nix
-     modules/labwc/labwc_conf.nix
-   ];
-
-   config = {
-    assertions = [
-      {
-        assertion = builtins.elem deskCfg.de supportedDesktops;
-        message = "Unsupported desktop environment: ${deskCfg.de}\nSupported DE's: ${supportedDesktopsStr}";
-      }
-    ];
-
-    nixpkgs.overlays = [
-      inputs.nur.overlays.default
-    ];
-
-    # Enable flakes feature
-    nix.settings.experimental-features = [
-      "nix-command" "flakes"
-    ];
-
-    # Use the systemd-boot EFI boot loader.
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
-    # boot.plymouth.enable = true;
-
-    networking.hostName = deskCfg.hostName; # Define your hostname.
-    networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-    time.timeZone = timeZone;
-
-
-    users.users.${deskCfg.userName} = {
-        isNormalUser = true;
-        initialPassword = "password";
-        description = "main user";
-        shell = pkgs.zsh;
-        extraGroups = [
-            "wheel"
-            "networkmanager"
-            "corectrl"
-            deskCfg.userName
-            "video"
-            "audio"
-        ];
-    };
-       # main_user = {
-    #   enable = true;
-    #   userName = deskCfg.userName;
-    #   isDesktopUser = true;
-    # };
-    
-    labwc = {
-        enable = true;
-        useNonFree = true;
-        installGaming = deskCfg.installGaming;
-        systemPackages = with pkgs; [
-          libreoffice
-        ];
-    };
-   
-    system.stateVersion = "23.11"; # Did you read the comment?
-  };
-}
-
--- a/jaci/dotfiles/helix/config.toml
+++ b/jaci/dotfiles/helix/config.toml
@ -1,169 +0,0 @@
-# Theme
-theme = "catppuccin_macchiato"
-
-[keys.normal]
-
-# Navigation
-n = "move_char_left" # Maps the 'a' key to the move_char_left command
-i = "move_visual_line_down"
-e = "move_visual_line_up"
-o = "move_char_right"
-
-I = "page_down"
-E = "page_up"
-
-# Modes
-h = "insert_mode"
-H = "insert_at_line_start"
-l = "open_below"
-L = "open_above"
-
-# Search
-k = "search_next"
-K = "search_prev"
-
-# Selection
-C-s = "split_selection_on_newline"
-C-minus = "merge_selections"
-C-_ = "merge_consecutive_selections"
-"C-;" = "flip_selections"
-"C-:" = "ensure_selections_forward"
-"C-," = "remove_primary_selection"
-C-c = "change_selection_noyank"
-C-d = "delete_selection_noyank"
-"C-(" = "rotate_selection_contents_backward"
-"C-)" = "rotate_selection_contents_forward"
-C-x = "shrink_to_line_bounds"
-C-J = "join_selections_space"
-C-K = "remove_selections"
-C-o = "expand_selection"
-C-i = "shrink_selection"
-C-p = "select_prev_sibling"
-C-n = "select_next_sibling"
-
-# Misc
-"C-/" = "toggle_comments"
-
-[keys.normal."C-space"]
-x = ":wbc!"
-s = ":w!" # save file
-o = ":config-open"
-
-[keys.normal.g]
-"/" = "goto_next_buffer"
-h = "goto_previous_buffer"
-n = ["collapse_selection", "extend_to_line_start"]
-o = ["collapse_selection", "extend_to_line_end"]
-e = "move_line_up"
-i = "move_line_down"
-l = "goto_last_line"
-
-p = "no_op"
-k = "no_op"
-j = "no_op"
-
-[keys.normal.m]
-m = ["select_mode", "match_brackets", "normal_mode"]
-
-[keys.select]
-n = "extend_char_left"
-i = "extend_line_down"
-e = "extend_line_up"
-o = "extend_char_right"
-
-[keys.select.g]
-"/" = "goto_next_buffer"
-h = "goto_previous_buffer"
-n = "goto_line_start"
-o = "goto_line_end"
-e = "move_line_up"
-i = "move_line_down"
-l = "goto_last_line"
-
-p = "no_op"
-k = "no_op"
-j = "no_op"
-
-# Window mode
-[keys.normal."C-w"]
-h = "hsplit"
-C-h = "hsplit"
-n = "jump_view_left"
-C-n = "jump_view_left"
-i = "jump_view_down"
-I = "swap_view_down"
-C-i = "jump_view_down"
-e = "jump_view_up"
-E = "swap_view_up"
-C-e = "jump_view_up"
-o = "jump_view_right"
-O = "swap_view_right"
-C-o = "jump_view_right"
-
-# Remove old
-s = "no_op"
-C-s = "no_op"
-H = "no_op"
-j = "no_op"
-J = "no_op"
-C-j = "no_op"
-k = "no_op"
-K = "no_op"
-C-k = "no_op"
-l = "no_op"
-L = "no_op"
-C-l = "no_op"
-
-[keys.normal."space"]
-h = "hover"
-k = "select_references_to_symbol_under_cursor"
-
-[editor]
-bufferline = "always"
-auto-save = true
-line-number = "relative"
-cursorline = true
-cursorcolumn = true
-color-modes = true
-text-width = 120
-auto-format = true
-
-[editor.statusline]
-left = ["mode", "spinner", "version-control"]
-center = ["file-name"]
-mode.normal = "Normal"
-mode.insert = "Insert"
-mode.select = "Select"
-
-[editor.indent-guides]
-render = true
-
-[editor.lsp]
-display-messages = true
-display-inlay-hints = false
-
-[editor.cursor-shape]
-insert = "bar"
-normal = "block"
-select = "underline"
-
-[editor.file-picker]
-hidden = false
-
-[editor.whitespace.render]
-space = "all"
-tab = "all"
-tabpad = "all"
-newline = "none"
-nbsp = "none"
-
-[editor.whitespace.characters]
-space = "·"
-tab = "⇀"
-tabpad = " "
-
-
-#w = "move_line_up" # Maps the 'w' key move_line_up
-#"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
-#g = { a = "code_action" } # Maps `ga` to show possible code actions
-#"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode
--- a/jaci/dotfiles/helix/languages.toml
+++ b/jaci/dotfiles/helix/languages.toml
@ -1,4 +0,0 @@
-# Change dart format to 120 lines
-[[language]]
-name = "dart"
-formatter = {command = "dart", args = ["format", "-l", "120"]}
--- a/jaci/dotfiles/kanshi/config
+++ b/jaci/dotfiles/kanshi/config
@ -1,3 +0,0 @@
-profile {
-  output DP-2 position 0,0 mode 1920x1080@165.003006Hz
-}
--- a/jaci/dotfiles/labwc/autostart
+++ b/jaci/dotfiles/labwc/autostart
@ -1,21 +0,0 @@
-# Example autostart file
-
-# Set background color.
-swww init >/dev/null 2>&1 &
-swww img ~/.config/labwc/backgrounds/cat1.jpg >/dev/null 2>&1 &
-
-kanshi >/dev/null 2>&1 &
-
-# Launch a panel such as yambar or waybar.
-waybar >/dev/null 2>&1 &
-
-# Enable notifications. Typically GNOME/KDE application notifications go
-# through the org.freedesktop.Notifications D-Bus API and require a client such
-# as mako to function correctly. Thunderbird is an example of this.
-mako >/dev/null 2>&1 &
-
-# Setup network applet
-nm-applet --indicator >/dev/null 2>&1 &
-
-
-wl-paste --watch cliphist store &
--- a/jaci/dotfiles/labwc/backgrounds/cat1.jpg
+++ b/jaci/dotfiles/labwc/backgrounds/cat1.jpg
--- a/jaci/dotfiles/labwc/environment
+++ b/jaci/dotfiles/labwc/environment
@ -1,14 +0,0 @@
-# Allow tearing
-# WLR_DRM_NO_ATOMIC=1
-
-# Firefox use wayland
-MOZ_ENABLE_WAYLAND=1
-
-##
-## Set cursor theme and size. Find system icons themes with:
-## `find /usr/share/icons/ -type d -name "cursors"`
-##
-
-# XCURSOR_THEME=breeze_cursors
-# XCURSOR_THEME=capitaine-cursors
-# XCURSOR_SIZE=24
--- a/jaci/dotfiles/labwc/menu.xml
+++ b/jaci/dotfiles/labwc/menu.xml
@ -1,77 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8"?>
-
-<openbox_menu>
-<!-- Note: for localization support of menu items "client-menu" has to be removed here -->
-<menu id="client-menu">
-  <item label="Minimize">
-    <action name="Iconify" />
-  </item>
-  <item label="Maximize">
-    <action name="ToggleMaximize" />
-  </item>
-  <item label="Fullscreen">
-    <action name="ToggleFullscreen" />
-  </item>
-  <item label="Roll up/down">
-    <action name="ToggleShade" />
-  </item>
-  <item label="Decorations">
-    <action name="ToggleDecorations" />
-  </item>
-  <item label="Always on Top">
-    <action name="ToggleAlwaysOnTop" />
-  </item>
-  <!--
-    Any menu with the id "workspaces" will be hidden
-    if there is only a single workspace available.
-  -->
-  <menu id="workspaces" label="Workspace">
-    <item label="Move left">
-      <action name="SendToDesktop" to="left" />
-    </item>
-    <item label="Move right">
-      <action name="SendToDesktop" to="right" />
-    </item>
-    <separator />
-    <item label="Always on Visible Workspace">
-      <action name="ToggleOmnipresent" />
-    </item>
-  </menu>
-  <item label="Close">
-    <action name="Close" />
-  </item>
-</menu>
-
-<menu id="root-menu">
-  <item label="󰈹 Web browser">
-    <action name="Execute" command="firefox" />
-  </item>
-  <item label="󰓓 Steam">
-    <action name="Execute" command="steam" />
-  </item>
-  <item label="󱃫 Files">
-    <action name="Execute" command="thunar" />
-  </item>
-  <separator />
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Logout">
-    <action name="Exit" />
-  </item>
-  <item label="Power Off">
-    <action name="Execute" command="systemctl -i poweroff" />
-  </item>
-</menu>
-
-<menu id="some-custom-menu">
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Exit">
-    <action name="Exit" />
-  </item>
-</menu>
-
-</openbox_menu>
--- a/jaci/dotfiles/labwc/rc.xml
+++ b/jaci/dotfiles/labwc/rc.xml
@ -1,536 +0,0 @@
-
-<?xml version="1.0"?>
-
-<!--
-  This file contains all supported config elements & attributes with
-  default values.
-->
-
-<labwc_config>
-
-  <core>
-    <decoration>server</decoration>
-    <gap>0</gap>
-    <adaptiveSync>yes</adaptiveSync>
-    <allowTearing>yes</allowTearing>
-    <reuseOutputMode>no</reuseOutputMode>
-  </core>
-
-  <!-- Where to place new windows -->
-  <placement>
-    <policy>center</policy>
-  </placement>
-
-  <!-- <font><theme> can be defined without an attribute to set all places -->
-  <theme>
-    <name>Kawaii</name>
-    <cornerRadius>16</cornerRadius>
-    <keepBorder>yes</keepBorder>
-    <font>
-      <name>GohuFont 14 Nerd Font</name>
-      <size>14</size>
-      <slant>normal</slant>
-      <weight>bold</weight>
-    </font>
-
-    <!--<font place="ActiveWindow">
-      <name>sans</name>
-      <size>10</size>
-      <slant>normal</slant>
-      <weight>normal</weight>
-    </font>
-    <font place="InactiveWindow">
-      <name>sans</name>
-      <size>10</size>
-      <slant>normal</slant>
-      <weight>normal</weight>
-    </font>
-    <font place="MenuItem">
-      <name>sans</name>
-      <size>10</size>
-      <slant>normal</slant>
-      <weight>normal</weight>
-    </font>
-    <font place="OnScreenDisplay">
-      <name>sans</name>
-      <size>10</size>
-      <slant>normal</slant>
-      <weight>normal</weight>
-    </font> -->
-  </theme>
-
-  <!--
-    Just as for window-rules, 'identifier' relates to app_id for native Wayland
-    windows and WM_CLASS for XWayland clients.
-  -->
-  <windowSwitcher show="yes" preview="yes" outlines="yes">
-    <fields>
-      <!-- <field content="type" width="25%" />
-      <field content="trimmed_identifier" width="25%" /> -->
-      <field content="identifier" width="25%" />
-      <field content="title" width="50%" />
-    </fields>
-  </windowSwitcher>
-
-  <!-- edge strength is in pixels -->
-  <resistance>
-    <screenEdgeStrength>20</screenEdgeStrength>
-  </resistance>
-
-  <!-- Show a simple resize and move indicator -->
-  <resize popupShow="Never" />
-
-  <focus>
-    <followMouse>yes</followMouse>
-    <followMouseRequiresMovement>yes</followMouseRequiresMovement>
-    <raiseOnFocus>no</raiseOnFocus>
-  </focus>
-
-  <!-- Set range to 0 to disable window snapping completely -->
-  <snapping>
-    <range>1</range>
-    <topMaximize>yes</topMaximize>
-  </snapping>
-
-  <!--
-    Workspaces can be configured like this:
-    <desktops>
-      <popupTime>1000</popupTime>
-      <names>
-        <name>Workspace 1</name>
-        <name>Workspace 2</name>
-        <name>Workspace 3</name>
-        <name>Workspace 4</name>
-      </names>
-    </desktops>
-
-    Or it can also be configured like this:
-    <desktops number="4" />
-
-    popupTime defaults to 1000 so could be left out.
-    Set to 0 to completely disable the workspace OSD.
-
-    Use GoToDesktop left | right to switch workspaces.
-    Use SendToDesktop left | right to move windows.
-    See man labwc-actions for further information.
-  -->
-  <desktops>
-    <popupTime>1000</popupTime>
-    <names>
-      <name>Default</name>
-    </names>
-  </desktops>
-
-  <!--
-    <margin> can be used to reserve space where new/maximized/tiled
-    windows will not be placed. Clients using layer-shell protocol reserve
-    space automatically, so <margin> is only intended for other, specialist
-    cases.
-
-    If output is left empty, the margin will be applied to all outputs.
-
-    <margin top="" bottom="" left="" right="" output="" />
-  -->
-
-  <!-- Percent based regions based on output usable area, % char is required -->
-  <!--
-    <regions>
-      <region name="top-left"     x="0%"  y="0%"  height="50%"  width="50%"  />
-      <region name="top"          x="0%"  y="0%"  height="50%"  width="100%" />
-      <region name="top-right"    x="50%" y="0%"  height="50%"  width="50%"  />
-      <region name="left"         x="0%"  y="0%"  height="100%" width="50%"  />
-      <region name="center"       x="10%" y="10%" height="80%"  width="80%"  />
-      <region name="right"        x="50%" y="0%"  height="100%" width="50%"  />
-      <region name="bottom-left"  x="0%"  y="50%" height="50%"  width="50%"  />
-      <region name="bottom"       x="0%"  y="50%" height="50%"  width="100%" />
-      <region name="bottom-right" x="50%" y="50%" height="50%"  width="50%"  />
-    </regions>
-  -->
-
-  <!--
-    Keybind actions are specified in labwc-actions(5)
-    The following keybind modifiers are supported:
-      W - window/super/logo
-      A - alt
-      C - ctrl
-      S - shift
-
-    Use <keyboard><default /> to load all the default keybinds (those listed
-    below). If the default keybinds are largely what you want, a sensible
-    approach could be to start the <keyboard> section with a <default />
-    element, and then (re-)define any special binds you need such as launching
-    your favourite terminal or application launcher. See rc.xml for an example.
-  -->
-  <keyboard>
-    <numlock>on</numlock>
-    <layoutScope>global</layoutScope>
-    <repeatRate>40</repeatRate>
-    <repeatDelay>400</repeatDelay>
-    <keybind key="A-Tab">
-      <action name="NextWindow" />
-    </keybind>
-    <keybind key="W-Return">
-      <action name="Execute" command="foot" />
-    </keybind>
-    <keybind key="W-j">
-      <action name="Execute" command="firefox" />
-    </keybind>
-    <keybind key="A-F4">
-      <action name="Close" />
-    </keybind>
-    <keybind key="W-f">
-      <action name="ToggleMaximize" />
-    </keybind>
-    <keybind key="A-Left">
-      <action name="MoveToEdge" direction="left" />
-    </keybind>
-    <keybind key="A-Right">
-      <action name="MoveToEdge" direction="right" />
-    </keybind>
-    <keybind key="A-Up">
-      <action name="MoveToEdge" direction="up" />
-    </keybind>
-    <keybind key="A-Down">
-      <action name="MoveToEdge" direction="down" />
-    </keybind>
-    <keybind key="W-Left">
-      <action name="SnapToEdge" direction="left" />
-    </keybind>
-    <keybind key="W-Right">
-      <action name="SnapToEdge" direction="right" />
-    </keybind>
-    <keybind key="W-Up">
-      <action name="SnapToEdge" direction="up" />
-    </keybind>
-    <keybind key="W-Down">
-      <action name="SnapToEdge" direction="down" />
-    </keybind>
-    <keybind key="A-Space">
-      <action name="ShowMenu" menu="client-menu" />
-    </keybind>
-    <keybind key="XF86_AudioLowerVolume">
-      <action name="Execute" command="amixer sset Master 5%-" />
-    </keybind>
-    <keybind key="XF86_AudioRaiseVolume">
-      <action name="Execute" command="amixer sset Master 5%+" />
-    </keybind>
-    <keybind key="XF86_AudioMute">
-      <action name="Execute" command="amixer sset Master toggle" />
-    </keybind>
-    <keybind key="XF86_MonBrightnessUp">
-      <action name="Execute" command="brightnessctl set +10%" />
-    </keybind>
-    <keybind key="XF86_MonBrightnessDown">
-      <action name="Execute" command="brightnessctl set 10%-" />
-    </keybind>
-  <!-- SnapToRegion via W-Numpad -->
-  <!--
-    <keybind key="W-KP_7">
-      <action name="SnapToRegion" region="top-left" />
-    </keybind>
-    <keybind key="W-KP_8">
-      <action name="SnapToRegion" region="top" />
-    </keybind>
-    <keybind key="W-KP_9">
-      <action name="SnapToRegion" region="top-right" />
-    </keybind>
-    <keybind key="W-KP_4">
-      <action name="SnapToRegion" region="left" />
-    </keybind>
-    <keybind key="W-KP_5">
-      <action name="SnapToRegion" region="center" />
-    </keybind>
-    <keybind key="W-KP_6">
-      <action name="SnapToRegion" region="right" />
-    </keybind>
-    <keybind key="W-KP_1">
-      <action name="SnapToRegion" region="bottom-left" />
-    </keybind>
-    <keybind key="W-KP_2">
-      <action name="SnapToRegion" region="bottom" />
-    </keybind>
-    <keybind key="W-KP_3">
-      <action name="SnapToRegion" region="bottom-right" />
-    </keybind>
-  -->
-  </keyboard>
-
-  <!--
-    Multiple <mousebind> can exist within one <context>
-    Multiple <actions> can exist within one <mousebind>
-    Currently, the only openbox-action not supported is "Unshade"
-
-    Use <mouse><default /> to load all the default mousebinds (those listed
-    below). If the default mousebinds are largely what you want, a sensible
-    approach could be to start the <mouse> section with a <default />
-    element, and then (re-)define any special binds you need such as launching
-    a custom menu when right-clicking on your desktop. See rc.xml for an
-    example.
-  -->
-  <mouse>
-
-    <!-- time is in ms -->
-    <doubleClickTime>500</doubleClickTime>
-    <scrollFactor>1.0</scrollFactor>
-
-    <context name="Frame">
-      <mousebind button="A-Left" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind button="A-Left" action="Drag">
-        <action name="Move" />
-      </mousebind>
-      <mousebind button="A-Right" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind button="A-Right" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-
-    <context name="Top">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Left">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Right">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Bottom">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="TRCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="BRCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="TLCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="BLCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-
-    <context name="TitleBar">
-      <mousebind button="Left" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind button="Right" action="Click">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind direction="Up" action="Scroll">
-        <action name="Unshade" />
-        <action name="Focus" />
-      </mousebind>
-      <mousebind direction="Down" action="Scroll">
-        <action name="Unfocus" />
-        <action name="Shade" />
-      </mousebind>
-    </context>
-
-    <context name="Title">
-      <mousebind button="Left" action="Drag">
-        <action name="Move" />
-      </mousebind>
-      <mousebind button="Left" action="DoubleClick">
-        <action name="ToggleMaximize" />
-      </mousebind>
-      <mousebind button="Right" action="Click">
-        <action name="ShowMenu" menu="client-menu" />
-      </mousebind>
-    </context>
-
-    <context name="Maximize">
-      <mousebind button="Left" action="Click">
-        <action name="ToggleMaximize" />
-      </mousebind>
-      <mousebind button="Right" action="Click">
-        <action name="ToggleMaximize" direction="horizontal" />
-      </mousebind>
-      <mousebind button="Middle" action="Click">
-        <action name="ToggleMaximize" direction="vertical" />
-      </mousebind>
-    </context>
-
-    <context name="WindowMenu">
-      <mousebind button="Left" action="Click">
-        <action name="ShowMenu" menu="client-menu" />
-      </mousebind>
-      <mousebind button="Right" action="Click">
-        <action name="ShowMenu" menu="client-menu" />
-      </mousebind>
-    </context>
-
-    <context name="Iconify">
-      <mousebind button="Left" action="Click">
-        <action name="Iconify" />
-      </mousebind>
-    </context>
-
-    <context name="Close">
-      <mousebind button="Left" action="Click">
-        <action name="Close" />
-      </mousebind>
-    </context>
-
-    <context name="Client">
-      <mousebind button="Left" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind button="Middle" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="Focus" />
-        <action name="Raise" />
-      </mousebind>
-    </context>
-
-    <context name="Root">
-      <mousebind button="Left" action="Press">
-        <action name="ShowMenu" menu="root-menu" />
-      </mousebind>
-      <mousebind button="Right" action="Press">
-        <action name="ShowMenu" menu="root-menu" />
-      </mousebind>
-      <mousebind button="Middle" action="Press">
-        <action name="ShowMenu" menu="root-menu" />
-      </mousebind>
-      <mousebind direction="Up" action="Scroll">
-        <action name="GoToDesktop" to="left" wrap="yes" />
-      </mousebind>
-      <mousebind direction="Down" action="Scroll">
-        <action name="GoToDesktop" to="right" wrap="yes" />
-      </mousebind>
-    </context>
-
-  </mouse>
-
-  <!--
-    Direct cursor movement to a specified output. If the compositor is
-    running in nested mode, this does not take effect.
-  -->
-  <touch mapToOutput="" />
-
-  <!--
-    The tablet cursor movement can be restricted to a single output.
-    If output is left empty or the output does not exists, the tablet
-    will span all outputs.
-
-    The tablet orientation can be changed in 90 degree steps, thus
-    *rotate* can be set to [0|90|180|270]. Rotation will be applied
-    after applying tablet area transformation.
-
-    The active tablet area can be specified by setting the *top*/*left*
-    coordinate (in mm) and/or *width*/*height* (in mm). If width or
-    height are omitted or default (0.0), width/height will be set to
-    the remaining width/height seen from top/left.
-
-    Tablet buttons emulate regular mouse buttons. The tablet *button* can
-    be set to any of [Tip|Stylus|Stylus2|Stylus3|Pad|Pad2|Pad3|..|Pad9].
-    Valid *to* mouse buttons are [Left|Right|Middle].
-  -->
-  <tablet mapToOutput="" rotate="0">
-    <!-- Active area dimensions are in mm -->
-    <area top="0.0" left="0.0" width="0.0" height="0.0" />
-    <map button="Tip" to="Left" />
-    <map button="Stylus" to="Right" />
-    <map button="Stylus2" to="Middle" />
-  </tablet>
-
-  <!--
-    The *category* attribute is optional and can be set to touch, touchpad,
-    non-touch, default or the name of a device. You can obtain device names by
-    running *libinput list-devices* as root or member of the input group.
-
-    Tap is set to *yes* be default. All others are left blank in order to use
-    device defaults.
-
-    All values are [yes|no] except for:
-      - pointerSpeed [-1.0 to 1.0]
-      - accelProfile [flat|adaptive]
-      - tapButtonMap [lrm|lmr]
-  -->
-  <libinput>
-    <device category="default">
-      <naturalScroll></naturalScroll>
-      <leftHanded></leftHanded>
-      <pointerSpeed></pointerSpeed>
-      <accelProfile></accelProfile>
-      <tap>yes</tap>
-      <tapButtonMap></tapButtonMap>
-      <tapAndDrag></tapAndDrag>
-      <dragLock></dragLock>
-      <middleEmulation></middleEmulation>
-      <disableWhileTyping></disableWhileTyping>
-    </device>
-  </libinput>
-
-  <!--
-    # Window Rules
-    #   - Criteria can consist of 'identifier' or 'title' or both (in which
-    #     case AND logic is used).
-    #   - 'identifier' relates to app_id for native Wayland windows and
-    #     WM_CLASS for XWayland clients.
-    #   - Criteria can also contain `matchOnce="true"` meaning that the rule
-    #     must only apply to the first instance of the window with that
-    #     particular 'identifier' or 'title'.
-    #   - Matching against patterns with '*' (wildcard) and '?' (joker) is
-    #     supported. Pattern matching is case-insensitive.
-
-    <windowRules>
-      <windowRule identifier="*"><action name="Maximize"/></windowRule>
-      <windowRule identifier="foo" serverDecoration="yes"/>
-      <windowRule title="bar" serverDecoration="yes"/>
-      <windowRule identifier="baz" title="quax" serverDecoration="yes"/>
-    </windowRules>
-
-    # Example below for `lxqt-panel` and `pcmanfm-qt \-\-desktop`
-    # where 'matchOnce' is used to avoid applying rule to the panel
-    # configuration window with the same 'app_id'.
-
-    <windowRules>
-      <windowRule identifier="lxqt-panel" matchOnce="true">
-        <skipTaskbar>yes</skipTaskbar>
-        <action name="MoveTo" x="0" y="0" />
-        <action name="ToggleAlwaysOnTop"/>
-      </windowRule>
-      <windowRule title="pcmanfm-desktop*">
-        <skipTaskbar>yes</skipTaskbar>
-        <skipWindowSwitcher>yes</skipWindowSwitcher>
-        <fixedPosition>yes</fixedPosition>
-        <action name="MoveTo" x="0" y="0" />
-        <action name="ToggleAlwaysOnBottom"/>
-      </windowRule>
-      <windowRule identifier="org.qutebrowser.qutebrowser">
-        <action name="ResizeTo" width="1024" y="800" />
-        <action name="AutoPlace"/>
-      </windowRule>
-    </windowRules>
-  -->
-
-</labwc_config>
--- a/jaci/dotfiles/labwc/themerc-override
+++ b/jaci/dotfiles/labwc/themerc-override
@ -1,70 +0,0 @@
-# This file contains all themerc options with default values
-#
-# System-wide and local themes can be overridden by creating a copy of this
-# file and renaming it to $HOME/.config/labwc/themerc-override. Be careful
-# though - if you only want to override a small number of specific options,
-# make sure all other lines are commented out or deleted.
-
-# general
-border.width: 3
-padding.height: 3
-
-# The following options has no default, but fallbacks back to
-# font-height + 2x padding.height if not set.
-# titlebar.height:
-
-# window border
-window.active.border.color: #ffe6f2
-window.inactive.border.color: #f6f5f4
-
-# ToggleKeybinds status indicator
-window.active.indicator.toggled-keybind.color: #ff0000
-
-# window titlebar background
-window.active.title.bg.color: #ffe6f2
-window.inactive.title.bg.color: #f6f5f4
-
-# window titlebar text
-window.active.label.text.color: #000000
-window.inactive.label.text.color: #000000
-window.label.text.justify: center
-
-# window buttons
-window.active.button.unpressed.image.color: #000000
-window.inactive.button.unpressed.image.color: #000000
-
-# Note that "menu", "iconify", "max", "close" buttons colors can be defined
-# individually by inserting the type after the button node, for example:
-#
-#     window.active.button.iconify.unpressed.image.color: #333333
-
-# menu
-menu.overlap.x: 0
-menu.overlap.y: 0
-menu.width.min: 20
-menu.width.max: 200
-menu.items.bg.color: #ffe6f2
-menu.items.text.color: #330066
-menu.items.active.bg.color: #ffffcc
-menu.items.active.text.color: #330066
-menu.items.padding.x: 12
-menu.items.padding.y: 6
-menu.separator.width: 1
-menu.separator.padding.width: 6
-menu.separator.padding.height: 3
-menu.separator.color: #8c1aff
-
-# on screen display (window-cycle dialog)
-osd.bg.color: #ffe6f2
-osd.border.color: #ffffcc
-osd.border.width: 3
-osd.label.text.color: #330066
-
-osd.window-switcher.width: 600
-osd.window-switcher.padding: 4
-osd.window-switcher.item.padding.x: 10
-osd.window-switcher.item.padding.y: 1
-osd.window-switcher.item.active.border.width: 2
-
-osd.workspace-switcher.boxes.width: 20
-osd.workspace-switcher.boxes.height: 20
--- a/jaci/dotfiles/waybar/config
+++ b/jaci/dotfiles/waybar/config
@ -1,88 +0,0 @@
-{
-  "modules-left": [
-    "custom/launcher",
-    "wlr/taskbar"
-  ],
-  "modules-center": [
-    "clock", 
-  ],
-  "modules-right": [
-        "tray",
-        "pulseaudio",
-        "custom/spotify",
-        "network",
-        "memory",
-        "cpu",
-        "custom/power",
-  ],
-  // Modules
-  "wlr/taskbar": {
-        "format": "{icon} {name}",
-        "on-click": "minimize-raise",
-   },
-    "idle_inhibitor": {
-        "format": "{icon} ",
-        "format-icons":{
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "clock": {
-        "interval": 10,
-        "format-alt": "  {:%e %b %Y}", // Icon: calendar-alt
-        "format": "󰥔  {:%I:%M %p}",
-    },
-    "cpu": {
-        "interval": 5,
-        "format": "  {usage}%",
-        "states": {
-            "warning": 70,
-            "critical": 90,
-        },
-        "on-click": "foot -e 'htop'",
-    },
-    "memory": {
-        "interval": 5,
-        "format": " {}%", // Icon: memory
-        "on-click": "foot -e 'htop'", 
-        "states": {
-            "warning": 70,
-            "critical": 90
-        }
-    },
-    "pulseaudio": {
-        "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "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",
-        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
-        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
-    },
-    "tray": {
-        "icon-size": 18,
-        "spacing":10,
-     },
-    "custom/spotify": {
-        "format": " ",
-        "on-click": "spot",
-        "tooltip": false
-    },
-    "custom/launcher": {
-        "format": "  ",
-        "on-click": "nwg-drawer",
-        "tooltip": false
-    },
-}
--- a/jaci/dotfiles/waybar/style.css
+++ b/jaci/dotfiles/waybar/style.css
@ -1,100 +0,0 @@
-@define-color celadon #b0f2b4;
-@define-color celeste #baf2e9;
-@define-color thistle #dfc2f2;
-@define-color english_violet #51344d;
-@define-color indian_red #c97064;
-@define-color black_olive #1f271b;
-@define-color egg_shell #f8f1dd;
-
-* {
-  border: none;
-  border-radius: 0;
-  margin: 0;
-  padding: 0;
-  color: @egg_shell;
-  font-family: "GohuFont 14 Nerd Font";
-  font-size: 16px;
-  font-weight: normal;
-}
-
-/* The whole bar */
-#waybar {
-  background: transparent;
-  background-color: transparent;
-}
-
-#taskbar {
-  background: transparent;
-  color: @egg_shell;
-}
-
-#taskbar button {
-  padding-left: 3px;
-  padding-right: 3px;
-  margin-left: 3px;
-  margin-right: 3px;
-  color: transparent;
-  border-bottom: 2px solid;
-}
-
-#taskbar button.active {
-  color: @celeste;
-}
-
-.modules-left,
-.modules-right,
-.modules-center {
-  margin: 8px 8px 1px 8px;
-  background: transparent;
-  color: @egg_shell;
-  background-color: @english_violet;
-  border-radius: 25px;
-  padding: 0px 10px 0px 10px;
-}
-
-/* Every modules */
-#clock,
-#cpu,
-#custom-spotify,
-#memory,
-#network,
-#pulseaudio,
-#taskbar {
-  padding: 0.5rem 0.6rem;
-  margin: 1px 0px;
-}
-
-/* -----------------------------------------------------------------------------
- * Modules styles
- * -------------------------------------------------------------------------- */
-
-#clock {
-  min-width: 140px;
-}
-
-#cpu.warning,
-#cpu.critical,
-#memory.warning,
-#memory.critical,
-#network.disconnected {
-  color: @indian_red;
-}
-
-#pulseaudio {
-  padding-top: 6px;
-}
-
-#pulseaudio.muted {
-  color: @celeste;
-}
-
-#custom-spotify {
-  color: @celadon;
-}
-
-#custom-power {
-  margin-left: 15px;
-  margin-right: 15px;
-  font-size: 15px;
-  color: @indian_red;
-}
--- a/jaci/modules/apps/firefox/firefox.nix
+++ b/jaci/modules/apps/firefox/firefox.nix
@ -1,66 +0,0 @@
-{lib, config, pkgs, inputs, ...}:
-let
-  cfg = config.firefoxApp;
-in
-{
-    # imports = [
-    #     inputs.nur.hmModules.nur
-    # ];
-
-    options.firefoxApp = {
-        enable = lib.mkEnableOption "enable firefox browser";
-    };
-    config = lib.mkIf cfg.enable {
-        programs.firefox = {
-            enable = true;
-            profiles = {
-                default = {
-                    id = 0;
-                    name = "default";
-                    isDefault = true;
-                    extensions = with pkgs; [
-                        nur.repos.rycee.firefox-addons.darkreader
-                        nur.repos.rycee.firefox-addons.keepassxc-browser
-                        nur.repos.crazazy.firefox-addons.ublock-origin
-                    ];
-                    search = {
-                        # Replace default firefox search engine config with this one
-                        force = true;
-                        default = "Startpage";
-                        engines = {
-                            "Startpage" = {
-                                urls = [{
-                                    template = "https://www.startpage.com/sp/search?query={searchTerms}";
-                                }];
-                            };
-                        };
-                    };
-                    settings = {
-                       "browser.startup.blankWindow" = true;
-                       "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
-                       "browser.search.region" = "US";
-                       "browser.search.isUS" = true;
-                       "distribution.searchplugins.defaultLocale" = "en-US";
-                       "general.useragent.locale" = "en-US";
-                       "extensions.activeThemeID" = "{831b8843-7251-4306-9521-e688f18b4aeb}";
-                       "privacy.trackingprotection.enable" = true;
-                       "privacy.trackingprotection.emailtracking.enable" = true;
-                       "privacy.trackingprotection.socialtracking.enable" = true;
-                       "privacy.clearOnShutdown.cookies" = true;
-                       "browser.safebrowsing.passwords.enabled" = false;
-                       "browser.migrate.interactions.passwords" = false;
-                       "pref.privacy.disable_button.view_passwords" = false;
-                       "signon.rememberSignon" = false;
-                       "extensions.formautofill.creditCards.enabled" = false;
-                       "extensions.formautofill.addresses.enabled" = false;
-                        # "browser.bookmarks.showMobileBookmarks" = true;
-                       # "browser.newtabpage.pinned" = [{
-                       #   title = "NixOS";
-                       #   url = "https://nixos.org";
-                       # }];
-                   };
-                };
-            };
-        };
-    };
-}
--- a/jaci/modules/home-manager/home.nix
+++ b/jaci/modules/home-manager/home.nix
@ -1,118 +0,0 @@
-{ inputs, outputs, lib, config, pkgs, ... }:
-  let
-    userName = "jaci";
-    fullName = "Jaci Anderson";
-    email = "jaci.s.anderson@gmail.com";
-  in
-{
-  # nixpkgs.overlays = [
-  #   inputs.nur.overlay
-  # ];
-
-  # nixpkgs.config.allowUnfree = true;
-  # inputs.nixpkgs-stable.config.allowUnfree = true;
-  imports = [
-      ../../../shared/modules/apps/firefox/firefox.nix
-  ];
-  
-  home.username = userName;
-  home.homeDirectory = "/home/${userName}";
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  firefoxApp.enable = true;
-  
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [
-    helix
-    
-    mangohud
-    wine-wayland
-    webcord
-    mumble
-
-    bat
-    duf
-    fd
-    fzf
-    lsd
-    ripgrep
-    tre-command
-    gtop
-
-    imv
-    mpv
-    gimp
-
-    # Install fonts
-    nerd-fonts.hurmit
-    # TODO need to add gohu font
-    # Style
-    catppuccin-kvantum
-    libsForQt5.qtstyleplugin-kvantum
-    libsForQt5.qt5ct
-  ];
-
-  home.file."${config.xdg.configHome}" = {
-    source = ../../dotfiles;
-    recursive = true;
-  };
-
-
-  home.sessionVariables = {
-    EDITOR = "hx";
-  };
-
-  # Git setup
-  programs.git = {
-      enable = true;
-      userEmail = email;
-      userName = fullName;
-  };
-
-  # Zsh setup
-  programs.zsh = {
-      enable = true;
-      oh-my-zsh = {
-          enable = true;
-          plugins = [ "git" ];
-          theme = "half-life";
-      };
-      initContent = ''
-      '';
-  };
-
-
-    #
-    # Theming qt and gnome apps
-    #
-    qt = {
-      enable = true;
-      platformTheme.name = "qtct";
-      style.name = "kvantum";
-    };
-    gtk = {
-      enable = true;
-      cursorTheme = {
-        package = pkgs.catppuccin-cursors.latteLavender;
-        name = "Catppuccin-Latte-Lavender-Cursors";
-      };
-      iconTheme = {
-        package = pkgs.catppuccin-papirus-folders;
-        name = "Papirus-Light";
-      };
-      theme = {
-        name = "catppuccin-latte-lavender-compact+rimless";
-        package = pkgs.catppuccin-gtk.override {
-          accents = [ "lavender" ];
-          size = "compact";
-          tweaks = [ "rimless" ];
-          variant = "latte";
-        };
-      };
-    };
-}
--- a/jaci/modules/labwc/labwc_conf.nix
+++ b/jaci/modules/labwc/labwc_conf.nix
@ -1,161 +0,0 @@
-{ lib, config, pkgs, ... }:
-{
-    options.labwc = {
-        enable = lib.mkEnableOption "Enable labwc window manager.";
-        useNonFree = lib.mkOption {
-            default = false;
-            example = true;
-            description = "Whether to enable non-free software in the labwc config";
-        };
-        installGaming = lib.mkOption {
-            default = false;
-            example = true;
-            description = "Whether to install gaming software on the system.";
-        };
-        systemPackages = lib.mkOption {
-            default = [];
-            description = "Add any additional packages desired. Merged with labwc defaults.";
-        };
-
-    };
-
-    ###
-    ##  Configuration
-    ###
-    config = lib.mkIf config.labwc.enable {
-
-        programs.dconf.enable = true;
-
-        nixpkgs.config.allowUnfree = config.labwc.useNonFree;
-        # For R2ModMan
-        # nixpkgs.config.permittedInsecurePackages = [
-        #     "electron-25.9.0"
-        # ];
-        
-        ###
-        ##  XDG portal setup
-        ###
-        xdg.portal = {
-            config = {
-                common = {
-                  default = [
-                    "wlr"
-                  ];
-                };
-            };
-            extraPortals = with pkgs; [
-                xdg-desktop-portal-gtk
-            ];
-            wlr.enable = true;
-            enable = true;
-        };
-        xdg.sounds.enable = true;
-
-        ###
-        ##  System Packages
-        ###
-        environment.systemPackages = with pkgs; lib.lists.flatten [
-             [
-                bash
-                foot
-                git
-                glib
-                grim
-                sway-contrib.grimshot
-                ghostscript
-                labwc
-                libnotify
-                kanshi
-                mako
-                spot
-                networkmanagerapplet
-                nwg-dock
-                nwg-drawer
-                nwg-look
-                pavucontrol
-                slurp
-                swaylock
-                swayidle
-                swww
-                wl-clipboard
-                cliphist
-                waybar
-                wdisplays
-                xdg-utils
-                zsh
-             ]
-            config.labwc.systemPackages
-            # (lib.mkIf config.labwc.installGaming [
-            #     pkgs.lutris
-            # ])
-        ];
-
-        # Thunar config
-        programs.thunar = {
-            enable = true;
-            plugins = with pkgs.xfce; [
-                thunar-archive-plugin
-                thunar-volman
-            ];
-        };
-        programs.file-roller.enable = true;
-        programs.xfconf.enable = true;
-
-        programs.zsh.enable = true;
-        programs.steam.enable = config.labwc.installGaming;
-        programs.gamemode.enable = true;
-
-        ###
-        ##  Services
-        ###
-
-        # Printing
-        services.flatpak.enable = true;
-        services.printing.enable = true;
-        services.printing.drivers = [ pkgs.brlaser ];
-
-        services.gvfs.enable = true;  # thunar functionalities
-
-        services.openssh.enable = true;
-
-        services.dbus.enable = true;
-        services.pipewire = {
-          enable = true;
-          alsa.enable = true;
-          pulse.enable = true;
-        };
-
-        ###
-        ##  Misc
-        ###
-        # sound.enable = true;
-        # Necessary for home-manager labwc setup
-        security.polkit.enable = true;
-
-        services.greetd = {
-          enable = true;
-          settings = rec {
-            initial_session = {
-              command = "${pkgs.labwc}/bin/labwc";
-              user = "jaci";
-            };
-            default_session = initial_session;
-          };
-        };
-
-        services.xserver.videoDrivers = [ "amdgpu" ];
-        # Enable HIP
-        systemd.tmpfiles.rules = [
-            "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
-        ];
-        hardware.graphics = {
-            # Mesa
-            enable = true;
-            enable32Bit = true;
-            # Rocm support
-            extraPackages = with pkgs; [
-                rocmPackages.clr.icd
-            ];
-        };
-    };
-}
--- a/jaci/notes.md
+++ b/jaci/notes.md
@ -1,3 +0,0 @@
- Need a way to access files
- Remove boot logs and grub menu
- Cant open steam and then open a web browser
--- a/luci/default.nix
+++ b/luci/default.nix
@ -1,36 +0,0 @@
-{ ... }:
-  let
-    userName = "luci";
-    email = "luci@fosscat.com";
-    hostName = "luci";
-  in
-{
-  imports = [
-      ./nixos/hardware-configuration.nix
-      ../shared/nix-gc.nix
-      ../shared/server-configuration.nix
-  ];
-
-  serverConfig = {
-    userName = userName;
-    hostName = hostName;
-    hostId = "09e1d908";
-    email = email;
-    sshEnable = true;
-    nfsEnable = true;
-    nfsRoot = "/nfs_export";
-    nfsExports = [ "/kage" ];
-    nfsIpExport = "192.168.1.1/24";
-    syncthingEnable = true;
-    caldavEnable = true;
-  };
-
-  # deskCfg = {
-  #     userName = userName;
-  #     hostName = hostName;
-  #     de = desktop;
-  #     installGaming = gaming;
-  # };
-
-  nixGc.enable = true;
-}
--- a/luci/dotfiles/helix/config.toml
+++ b/luci/dotfiles/helix/config.toml
@ -1,166 +0,0 @@
-# Theme
-theme = "catppuccin_macchiato"
-
-[keys.normal]
-
-# Navigation
-n = "move_char_left" # Maps the 'a' key to the move_char_left command
-i = "move_visual_line_down"
-e = "move_visual_line_up"
-o = "move_char_right"
-
-I = "page_down"
-E = "page_up"
-
-# Modes
-h = "insert_mode"
-H = "insert_at_line_start"
-l = "open_below"
-L = "open_above"
-
-# Search
-k = "search_next"
-K = "search_prev"
-
-# Selection
-C-s = "split_selection_on_newline"
-C-minus = "merge_selections"
-C-_ = "merge_consecutive_selections"
-"C-;" = "flip_selections"
-"C-:" = "ensure_selections_forward"
-"C-," = "remove_primary_selection"
-C-c = "change_selection_noyank"
-C-d = "delete_selection_noyank"
-"C-(" = "rotate_selection_contents_backward"
-"C-)" = "rotate_selection_contents_forward"
-C-x = "shrink_to_line_bounds"
-C-J = "join_selections_space"
-C-K = "remove_selections"
-C-o = "expand_selection"
-C-i = "shrink_selection"
-C-p = "select_prev_sibling"
-C-n = "select_next_sibling"
-
-# Misc
-"C-/" = "toggle_comments"
-
-[keys.normal."C-space"]
-x = ":wbc!"
-s = ":w!" # save file
-o = ":config-open"
-
-[keys.normal.g]
-"/" = "goto_next_buffer"
-h = "goto_previous_buffer"
-n = ["collapse_selection", "extend_to_line_start"]
-o = ["collapse_selection", "extend_to_line_end"]
-e = "move_line_up"
-i = "move_line_down"
-l = "goto_last_line"
-
-p = "no_op"
-k = "no_op"
-j = "no_op"
-
-[keys.normal.m]
-m = ["select_mode", "match_brackets", "normal_mode"]
-
-[keys.select]
-n = "extend_char_left"
-i = "extend_line_down"
-e = "extend_line_up"
-o = "extend_char_right"
-
-[keys.select.g]
-"/" = "goto_next_buffer"
-h = "goto_previous_buffer"
-n = "goto_line_start"
-o = "goto_line_end"
-e = "move_line_up"
-i = "move_line_down"
-l = "goto_last_line"
-
-p = "no_op"
-k = "no_op"
-j = "no_op"
-
-# Window mode
-[keys.normal."C-w"]
-h = "hsplit"
-C-h = "hsplit"
-n = "jump_view_left"
-C-n = "jump_view_left"
-i = "jump_view_down"
-I = "swap_view_down"
-C-i = "jump_view_down"
-e = "jump_view_up"
-E = "swap_view_up"
-C-e = "jump_view_up"
-o = "jump_view_right"
-O = "swap_view_right"
-C-o = "jump_view_right"
-
-# Remove old
-s = "no_op"
-C-s = "no_op"
-H = "no_op"
-j = "no_op"
-J = "no_op"
-C-j = "no_op"
-k = "no_op"
-K = "no_op"
-C-k = "no_op"
-l = "no_op"
-L = "no_op"
-C-l = "no_op"
-
-[keys.normal."space"]
-h = "hover"
-k = "select_references_to_symbol_under_cursor"
-
-[editor]
-bufferline = "multiple"
-auto-save = true
-line-number = "relative"
-cursorline = true
-color-modes = true
-text-width = 120
-auto-format = true
-
-[editor.statusline]
-left = ["mode", "spinner", "version-control", "file-name"]
-mode.normal = "Normal"
-mode.insert = "Insert"
-mode.select = "Select"
-
-[editor.indent-guides]
-render = true
-
-[editor.lsp]
-display-messages = true
-
-[editor.cursor-shape]
-insert = "bar"
-normal = "block"
-select = "underline"
-
-[editor.file-picker]
-hidden = false
-
-[editor.whitespace.render]
-space = "all"
-tab = "all"
-tabpad = "all"
-newline = "none"
-nbsp = "none"
-
-[editor.whitespace.characters]
-space = "·"
-tab = "⇀"
-tabpad = " "
-
-
-#w = "move_line_up" # Maps the 'w' key move_line_up
-#"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
-#g = { a = "code_action" } # Maps `ga` to show possible code actions
-#"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode
--- a/luci/modules/home-manager/home.nix
+++ b/luci/modules/home-manager/home.nix
@ -1,93 +0,0 @@
-{ lib, config, pkgs, ... }:
-let
-  userName = "luci";
-  fullName = "Luci NAS";
-  email = "luci@fosscat.com";
-in
-{
-  home.username = userName;
-  home.homeDirectory = "/home/${userName}";
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [
-    helix
-    jq
-
-    #
-    # Better Unix
-    #
-    bat
-    duf
-    fd
-    fzf
-    lsd
-    ripgrep
-    tre-command
-    gtop
-    htop
-    neofetch
-
-    # Normies
-    unzip
-
-    imv
-    mpv
-    ffmpeg
-  ];
-
-  home.file."${config.xdg.configHome}" = {
-    source = ../../dotfiles;
-    recursive = true;
-  };
-
-  # Copy radicale pass file
-  home.file."${config.xdg.configHome}/radicale" = {
-    source = ../radicale;
-    recursive = true;
-  };
-
-  home.sessionVariables = {
-    EDITOR = "hx";
-  };
-
-  # Git setup
-  programs.git = {
-      enable = true;
-      userEmail = email;
-      userName = fullName;
-  };
-
-  programs = {
-    direnv = {
-      enable = true;
-      enableZshIntegration = true; # see note on other shells below
-      nix-direnv.enable = true;
-    };
-    bash.enable = true; # see note on other shells below
-  };
-
-  # Zsh setup
-  programs.zsh = {
-      enable = true;
-      oh-my-zsh = {
-          enable = true;
-          plugins = [ "git" ];
-          theme = "dieter";
-      };
-      initContent = ''
-          eval "$(direnv hook zsh)"
-
-          alias ls="lsd"
-          alias l="lsd --almost-all --long"
-          alias llm="lsd --timesort --long"
-          alias lS="lsd --oneline --classic"
-          alias lt="lsd --tree --depth=2"
-          alias grep="rg"
-       '';
-  };
-
-}
--- a/luci/modules/radicale/rad_pass
+++ b/luci/modules/radicale/rad_pass
@ -1 +0,0 @@
-n8r:$apr1$HpSAv/EE$pCDM0qP2JJIY0B5aUXjS30
--- a/luci/nixos/hardware-configuration.nix
+++ b/luci/nixos/hardware-configuration.nix
@ -1,55 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "zfs" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
-
-  boot.kernelPackages = pkgs.linuxPackages_6_10;
-
-  boot.zfs.forceImportRoot = false;
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NIXROOT";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/NIXBOOT";
-      fsType = "vfat";
-    };
-
-  fileSystems."/nfs_export/kage" =
-    { device = "zdata/kage";
-      fsType = "zfs";
-    };
-
-  # change ownership of kage to be open
-  systemd.tmpfiles.rules = [
-    "d /nfs_export/kage 0777 kage users - -"
-  ];
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/modules/home-manager/home.nix
+++ b/modules/home-manager/home.nix
@ -0,0 +1,126 @@
+{ inputs, outputs, lib, config, pkgs, userName, fullName, email, hostName, desktop, gaming, ... }:
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  #
+
+  # nixpkgs.config.allowUnfree = true;
+  # inputs.nixpkgs-stable.config.allowUnfree = true;
+  
+  home.username = userName;
+  home.homeDirectory = "/home/${userName}";
+
+  programs.home-manager.enable = true;
+
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [
+    bat
+    inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl
+    fd
+    firefox
+    foot
+    fzf
+    htop
+    kakoune
+    keepassxc
+    libnotify
+    mako
+    networkmanagerapplet
+    obs-studio
+    signal-desktop
+    # steam
+    waybar
+    wofi
+    xfce.thunar
+    # Install fonts
+    (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
+    overpass
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # TODO not working firefox plugins
+  # extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ ublock-origin bitwarden ];
+
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file."${config.xdg.configHome}" = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+    source = ../../dotfiles;
+    recursive = true;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. If you don't want to manage your shell through Home
+  # Manager then you have to manually source 'hm-session-vars.sh' located at
+  # either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/nate/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "kak";
+  };
+
+  wayland.windowManager.sway = {
+      enable = true;
+      # config = rec {
+      #     modifier = "Mod4";
+      #     terminal = "foot";
+      #     # startup = [
+      #     #     {command = "firefox";}
+      #     # ];
+      # };
+  };
+
+
+  # kdeconnect setup
+  # services.kdeconnect = {
+  #     enable = true;
+  #     indicator = true;
+  # };
+
+  # Git setup
+  programs.git = {
+      enable = true;
+      userEmail = email;
+      userName = fullName;
+  };
+
+  # Zsh setup
+  programs.zsh = {
+      enable = true;
+      #history = {
+      #    Size = 10000;
+      #};
+      oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" ];
+          theme = "half-life";
+      };
+  };
+
+}
--- a/modules/sway/sway_conf.nix
+++ b/modules/sway/sway_conf.nix
@ -0,0 +1,117 @@
+{ lib, config, pkgs, ... }:
+{
+    options.swaywm = {
+        enable = lib.mkEnableOption "Enable sway window manager.";
+        useNonFree = lib.mkOption {
+            default = false;
+            example = true;
+            description = "Whether to enable non-free software in the sway config";
+        };
+        installGaming = lib.mkOption {
+            default = false;
+            example = true;
+            description = "Whether to install gaming software on the system.";
+        };
+        systemPackages = lib.mkOption {
+            default = [];
+            description = "Add any additional packages desired. Merged with sway defaults.";
+        };
+
+    };
+
+    config = lib.mkIf config.swaywm.enable {
+
+        nixpkgs.config.allowUnfree = config.swaywm.useNonFree;
+        
+        ###
+        ##  XDG portal setup
+        ###
+        xdg.portal = {
+            config = {
+                common = {
+                  default = [
+                    "wlr"
+                  ];
+                };
+            };
+            extraPortals = with pkgs; [
+                # xdg-desktop-portal-kde
+                xdg-desktop-portal-gtk
+            ];
+            wlr.enable = true;
+            enable = true;
+        };
+        xdg.sounds.enable = true;
+
+        ###
+        ##  System Packages
+        ###
+        environment.systemPackages = with pkgs; lib.lists.flatten [
+             [
+                git
+                glib # gsettings
+                grim
+                pavucontrol
+                slurp
+                swaylock
+                swayidle
+                wl-clipboard
+                xdg-utils
+                zsh
+                # Add to gaming only installs
+                lutris
+                wine-wayland
+                # Video utils
+                davinci-resolve-studio
+                imv
+                mpv
+                gimp
+             ]
+            config.swaywm.systemPackages
+            # (lib.mkIf config.swaywm.installGaming [
+            #     pkgs.lutris
+            # ])
+        ];
+
+        programs.zsh.enable = true;
+        programs.steam.enable = config.swaywm.installGaming;
+
+        ###
+        ##  Services
+        ###
+        services.openssh.enable = true;
+        services.dbus.enable = true;
+        services.pipewire = {
+          enable = true;
+          alsa.enable = true;
+          pulse.enable = true;
+        };
+
+        # kdeconnect setup
+        programs.kdeconnect.enable = true;
+
+        # Firewall
+        # networking.firewall = {
+        #   enable = true;
+        #   allowedTCPPortRanges = [
+        #       {from = 1714; to = 1764;} # KDE Connnect
+        #   ];
+        #   allowedUDPPortRanges = [
+        #       {from = 1714; to = 1764;} # KDE Connnect
+        #   ];
+        # };
+
+        ###
+        ##  Misc
+        ###
+        sound.enable = true;
+        # Necessary for home-manager sway setup
+        security.polkit.enable = true;
+
+        hardware.opengl = {
+        enable = true;
+            driSupport = true;
+        };
+
+    };
+}
--- a/jaci/modules/user/main_user.nix
+++ b/jaci/modules/user/main_user.nix
@ -44,8 +44,6 @@ in
                    cfg.userName
                    "video"
                    "audio"
-                    # For android
-                    "adbusers"
                ];
            })
        ];
--- a/nate-work/default.nix
+++ b/nate-work/default.nix
@ -1,42 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, system, timeZone, ... }:
-  let
-    userName = "nate";
-    fullName = "Nate Anderson";
-    email = "nate.anderson@vasion.com";
-    hostName = "nate-vasion";
-    desktop = "sway";
-    gaming = true;
-  in
-{
-  imports = [
-      ./desktop-configuration.nix
-      ./nixos/hardware-configuration.nix
-      ./nixos/auto-update.nix
-  ];
-
-  deskCfg = {
-      userName = userName;
-      hostName = hostName;
-      de = desktop;
-      installGaming = gaming;
-  };
-
-  # Limit the number of generations to keep
-  boot.loader.systemd-boot.configurationLimit = 5;
-
-  # Perform garbage collection weekly to maintain low disk usage
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 14d";
-  };
-
-  autoCfg = {
-    userName = userName;
-  };
-
-  services.clamav.daemon.enable = true;
-  services.clamav.scanner.enable = true;
-
-  nix.settings.auto-optimise-store = true;
-}
--- a/nate-work/desktop-configuration.nix
+++ b/nate-work/desktop-configuration.nix
@ -1,100 +0,0 @@
-{ config, lib, inputs, outputs, pkgs, timeZone, system, ... }:
-let
-  supportedDesktops = [ "sway" "hyprland" ];
-  supportedDesktopsStr = lib.strings.concatStringsSep ", " supportedDesktops;
-  deskCfg = config.deskCfg;
-in
-{
-  options.deskCfg = {
-      de = lib.mkOption {
-          default = "sway";
-          type = lib.types.str;
-          description = "Desktop Environment";
-      };
-      userName = lib.mkOption {
-          type = lib.types.str;
-          description = "Main username for system";
-      };
-      hostName = lib.mkOption {
-          type = lib.types.str;
-          description = "Hostname for system";
-      };
-      installGaming = lib.mkOption {
-          type = lib.types.bool;
-          default = true;
-          description = "Whether to install gaming software or not";
-      };
-  };
-
-    imports = [
-      modules/user/main_user.nix
-      modules/sway/sway_conf.nix
-      modules/hypr/hyprland.nix
-      ../shared/modules/system/power_manager.nix
-      # inputs.nur.hmModules.nur
-    ];
-
-   config = {
-    assertions = [
-      {
-        assertion = builtins.elem deskCfg.de supportedDesktops;
-        message = "Unsupported desktop environment: ${deskCfg.de}\nSupported DE's: ${supportedDesktopsStr}";
-      }
-    ];
-  
-    nixpkgs.overlays = [
-      inputs.nur.overlays.default
-    ];
-  
- 
-    # Enable flakes feature
-    nix.settings.experimental-features = [
-      "nix-command" "flakes"
-    ];
-  
-    # Use the systemd-boot EFI boot loader.
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
-    # boot.plymouth.enable = true;
-  
-    networking.hostName = deskCfg.hostName; # Define your hostname.
-    networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-  
-    time.timeZone = timeZone;
-
-    hardware.sane = {
-      enable = true;
-      brscan5.enable = true;
-    };
-
-    power_manager = {
-      enable = true;
-    };
-
-    main_user = {
-      enable = true;
-      userName = deskCfg.userName;
-      isDesktopUser = true;
-    };
-    
-    swaywm = {
-        enable = false;
-        useNonFree = true;
-        installGaming = deskCfg.installGaming;
-        systemPackages = with pkgs; [
-          libreoffice
-        ];
-    };
-
-    hypr = {
-      enable = true;
-      user = deskCfg.userName;
-      systemPackages = with pkgs; [
-        libreoffice
-      ];
-    };
-   
-    system.stateVersion = "23.11"; # Did you read the comment?
-  };
-}
-
--- a/nate-work/dotfiles/Passwords.kdbx
+++ b/nate-work/dotfiles/Passwords.kdbx
--- a/nate-work/dotfiles/bat/themes/Catppuccin
+++ b/nate-work/dotfiles/bat/themes/Catppuccin
--- a/nate-work/dotfiles/code-flags.conf
+++ b/nate-work/dotfiles/code-flags.conf
@ -1,2 +0,0 @@
--enable-features=UseOzonePlatform
--ozone-platform=wayland
--- a/nate-work/dotfiles/electron-flags.conf
+++ b/nate-work/dotfiles/electron-flags.conf
@ -1,2 +0,0 @@
--enable-features=UseOzonePlatform
--ozone-platform=wayland
--- a/nate-work/dotfiles/electron12-flags.conf
+++ b/nate-work/dotfiles/electron12-flags.conf
@ -1,2 +0,0 @@
--enable-features=UseOzonePlatform
--ozone-platform=wayland
--- a/nate-work/dotfiles/foot/foot.ini
+++ b/nate-work/dotfiles/foot/foot.ini
@ -1,45 +0,0 @@
-[main]
-font=Hurmit Nerd Font Mono:size=12
-
-selection-target=clipboard
-
-[colors]
-# Catpuccin Machiatto theme
-foreground=cad3f5 # Text
-background=24273a # Base
-regular0=494d64   # Surface 1
-regular1=ed8796   # red
-regular2=a6da95   # green
-regular3=eed49f   # yellow
-regular4=8aadf4   # blue
-regular5=f5bde6   # pink
-regular6=8bd5ca   # teal
-regular7=b8c0e0   # Subtext 1
-bright0=5b6078    # Surface 2
-bright1=ed8796    # red
-bright2=a6da95    # green
-bright3=eed49f    # yellow
-bright4=8aadf4    # blue
-bright5=f5bde6    # pink
-bright6=8bd5ca    # teal
-bright7=a5adcb    # Subtext 0foreground=cdd6f4 # Text
-
-# [colors]
-# Catpuccin Mocha theme colors
-# background=1e1e2e # Base
-# regular0=45475a   # Surface 1
-# regular1=f38ba8   # red
-# regular2=a6e3a1   # green
-# regular3=f9e2af   # yellow
-# regular4=89b4fa   # blue
-# regular5=f5c2e7   # pink
-# regular6=94e2d5   # teal
-# regular7=bac2de   # Subtext 1
-# bright0=585b70    # Surface 2
-# bright1=f38ba8    # red
-# bright2=a6e3a1    # green
-# bright3=f9e2af    # yellow
-# bright4=89b4fa    # blue
-# bright5=f5c2e7    # pink
-# bright6=94e2d5    # teal
-# bright7=a6adc8    # Subtext 0
--- a/nate-work/dotfiles/ghostty/config
+++ b/nate-work/dotfiles/ghostty/config
@ -1,46 +0,0 @@
-theme = "catppuccin-macchiato.conf"
-
-###
-# Font config
-###
-
-font-size = 14
-font-family = "Monaspace Xenon Var"
-font-family-bold = "Monaspace Argon Var"
-font-family-italic = "Monaspace Radon Var"
-font-family-bold-italic = "Monaspace Krypton Var"
-
-font-variation = wght=400
-font-variation = wdth=100
-font-variation = slnt=-2
-
-font-variation-bold = wght=600
-font-variation-bold = wdth=100
-
-font-variation-italic = wght=400
-font-variation-italic = wdth=100
-font-variation-italic = slnt=-10
-
-font-variation-bold-italic = wght=700
-font-variation-bold-italic = wdth=100
-font-variation-bold-italic = slnt=-3
-
-# Liguratures
-font-feature = +ss01, +ss02, +ss03, +ss04, +ss05, +ss06, +ss07, +ss08, +ss09, +ss10
-# Enables texture healing
-font-feature = +calt
-font-feature = +liga
-
-###
-# Keybinds
-###
-
-keybind = ctrl+shift+plus=increase_font_size:1
-# keybind = ctrl+minus=decrease_font_size:1
-
-###
-# Misc
-###
-
-window-padding-x = 4
-window-padding-y = 4
--- a/nate-work/dotfiles/ghostty/themes/catppuccin-frappe.conf
+++ b/nate-work/dotfiles/ghostty/themes/catppuccin-frappe.conf
@ -1,22 +0,0 @@
-palette = 0=#51576d
-palette = 1=#e78284
-palette = 2=#a6d189
-palette = 3=#e5c890
-palette = 4=#8caaee
-palette = 5=#f4b8e4
-palette = 6=#81c8be
-palette = 7=#a5adce
-palette = 8=#626880
-palette = 9=#e78284
-palette = 10=#a6d189
-palette = 11=#e5c890
-palette = 12=#8caaee
-palette = 13=#f4b8e4
-palette = 14=#81c8be
-palette = 15=#b5bfe2
-background = 303446
-foreground = c6d0f5
-cursor-color = f2d5cf
-cursor-text = 232634
-selection-background = 44495d
-selection-foreground = c6d0f5
--- a/nate-work/dotfiles/ghostty/themes/catppuccin-latte.conf
+++ b/nate-work/dotfiles/ghostty/themes/catppuccin-latte.conf
@ -1,22 +0,0 @@
-palette = 0=#5c5f77
-palette = 1=#d20f39
-palette = 2=#40a02b
-palette = 3=#df8e1d
-palette = 4=#1e66f5
-palette = 5=#ea76cb
-palette = 6=#179299
-palette = 7=#acb0be
-palette = 8=#6c6f85
-palette = 9=#d20f39
-palette = 10=#40a02b
-palette = 11=#df8e1d
-palette = 12=#1e66f5
-palette = 13=#ea76cb
-palette = 14=#179299
-palette = 15=#bcc0cc
-background = eff1f5
-foreground = 4c4f69
-cursor-color = dc8a78
-cursor-text = eff1f5
-selection-background = d8dae1
-selection-foreground = 4c4f69
--- a/nate-work/dotfiles/ghostty/themes/catppuccin-macchiato.conf
+++ b/nate-work/dotfiles/ghostty/themes/catppuccin-macchiato.conf
@ -1,22 +0,0 @@
-palette = 0=#494d64
-palette = 1=#ed8796
-palette = 2=#a6da95
-palette = 3=#eed49f
-palette = 4=#8aadf4
-palette = 5=#f5bde6
-palette = 6=#8bd5ca
-palette = 7=#a5adcb
-palette = 8=#5b6078
-palette = 9=#ed8796
-palette = 10=#a6da95
-palette = 11=#eed49f
-palette = 12=#8aadf4
-palette = 13=#f5bde6
-palette = 14=#8bd5ca
-palette = 15=#b8c0e0
-background = 24273a
-foreground = cad3f5
-cursor-color = f4dbd6
-cursor-text = 181926
-selection-background = 3a3e53
-selection-foreground = cad3f5
--- a/nate-work/dotfiles/ghostty/themes/catppuccin-mocha.conf
+++ b/nate-work/dotfiles/ghostty/themes/catppuccin-mocha.conf
@ -1,22 +0,0 @@
-palette = 0=#45475a
-palette = 1=#f38ba8
-palette = 2=#a6e3a1
-palette = 3=#f9e2af
-palette = 4=#89b4fa
-palette = 5=#f5c2e7
-palette = 6=#94e2d5
-palette = 7=#a6adc8
-palette = 8=#585b70
-palette = 9=#f38ba8
-palette = 10=#a6e3a1
-palette = 11=#f9e2af
-palette = 12=#89b4fa
-palette = 13=#f5c2e7
-palette = 14=#94e2d5
-palette = 15=#bac2de
-background = 1e1e2e
-foreground = cdd6f4
-cursor-color = f5e0dc
-cursor-text = 11111b
-selection-background = 353749
-selection-foreground = cdd6f4
--- a/Show More
+++ b/Show More