diff --git a/CLAUDE.md b/CLAUDE.md
index cc5a7aa..d13edd3 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -21,6 +21,11 @@ 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
@@ -47,6 +52,23 @@ home-manager switch --flake .
 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.
diff --git a/flake.nix b/flake.nix
index dba9840..6882da7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,6 +125,30 @@
             ./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
+        ];
+      };
     };
   };
 }
diff --git a/frame12/default.nix b/frame12/default.nix
new file mode 100644
index 0000000..ffb4f5f
--- /dev/null
+++ b/frame12/default.nix
@@ -0,0 +1,39 @@
+{ 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;
+}
\ No newline at end of file
diff --git a/frame12/desktop-configuration.nix b/frame12/desktop-configuration.nix
new file mode 100644
index 0000000..ca216da
--- /dev/null
+++ b/frame12/desktop-configuration.nix
@@ -0,0 +1,138 @@
+{ 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?
+  };
+}
diff --git a/frame12/dotfiles/ghostty/config b/frame12/dotfiles/ghostty/config
new file mode 100644
index 0000000..68c22ee
--- /dev/null
+++ b/frame12/dotfiles/ghostty/config
@@ -0,0 +1,41 @@
+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
+keybind = shift+enter=text:\n
diff --git a/frame12/dotfiles/helix/config.toml b/frame12/dotfiles/helix/config.toml
new file mode 100644
index 0000000..2d6cdc0
--- /dev/null
+++ b/frame12/dotfiles/helix/config.toml
@@ -0,0 +1,185 @@
+# Theme
+theme = "revontuli"
+
+[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"
+"S-tab" = "jump_backward"
+
+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"
+"@" = ":append-output git config get user.email"
+
+[keys.normal.space]
+x = ":write-buffer-close"
+X = ":write-quit-all"
+o = ":config-open"
+h = "hover"
+k = "select_references_to_symbol_under_cursor"
+
+[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"
+
+[editor]
+auto-format = true
+auto-save = true
+bufferline = "always"
+color-modes = true # color each mode differently in statusline
+completion-timeout = 5
+cursorcolumn = true
+cursorline = true
+indent-heuristic = "tree-sitter"
+line-number = "relative"
+rulers = [120]
+text-width = 120
+end-of-line-diagnostics = "hint"
+
+[editor.cursor-shape]
+insert = "bar"
+normal = "block"
+select = "underline"
+
+[editor.file-picker]
+hidden = false
+
+[editor.indent-guides]
+render = true
+
+[editor.inline-diagnostics]
+cursor-line = "warning"
+other-lines = "disable"
+prefix-len = 5
+max-diagnostics = 1
+max-wrap = 30
+
+[editor.lsp]
+display-messages = true
+display-inlay-hints = true
+
+[editor.soft-wrap]
+enable = true
+max-wrap = 30
+
+[editor.statusline]
+left = ["mode", "file-modification-indicator", "spinner", "version-control"]
+center = ["file-name"]
+right = ["diagnostics", "selections", "register", "position", "file-encoding"]
+mode.normal = "Normal"
+mode.insert = "Insert"
+mode.select = "Select"
+
+[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
diff --git a/frame12/dotfiles/helix/languages.toml b/frame12/dotfiles/helix/languages.toml
new file mode 100644
index 0000000..be6e17d
--- /dev/null
+++ b/frame12/dotfiles/helix/languages.toml
@@ -0,0 +1,123 @@
+###
+### Configuration for languages
+###
+
+[[language]]
+name = "go"
+language-servers = ["gopls"]
+
+[[language]]
+name = "markdown"
+language-servers = ["marksman"]
+
+# Change dart format to 120 lines
+[[language]]
+name = "dart"
+formatter = {command = "dart", args = ["format", "-l", "120"]}
+language-servers = ["dart"]
+
+[[language]]
+name = "nix"
+language-servers = ["nil"]
+
+[[language]]
+name = "zig"
+language-servers = ["zls"]
+
+[language.debugger]
+name = "codelldb-dap"
+transport = "tcp"
+command = "codelldb"
+args = []
+port-arg = "--port {}"
+
+[[language.debugger.templates]]
+name = "launch"
+request = "launch"
+completion = [ { name = "binary", completion = "filename" } ]
+args = { console = "internalConsole", program = "{0}" }
+
+[[language.debugger.templates]]
+name = "attach"
+request = "attach"
+completion = [ "pid" ]
+args = { console = "internalConsole", pid = "{0}" }
+
+[[language.debugger.templates]]
+name = "gdbserver attach"
+request = "attach"
+completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]
+args = { console = "internalConsole", attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }
+
+## cyo custom def
+[[language]]
+name = "cyano"
+scope = "source.cyo"
+file-types = ["cyo"]
+language-servers = ["ltex-ls"]
+
+[language-server.ltex-ls]
+command = "ltex-ls"
+
+###
+### Configuration for LSP-AI
+###
+### Link here:
+### https://github.com/SilasMarvin/lsp-ai
+###
+
+# [language-server.lsp-ai]
+# command 
+
+# [language-server.lsp-ai.config.memory]
+# file_store = { }
+
+# [language-server.lsp-ai.config.models.sonnet]
+# type = "anthropic"
+# chat_endpoint = "https://api.anthropic.com/v1/messages"
+# model = "claude-3-5-sonnet-20241022"
+# auth_token_env_var_name = "ANTHROPIC_API_KEY"
+
+# [language-server.lsp-ai.config.models.haiku]
+# type = "anthropic"
+# chat_endpoint = "https://api.anthropic.com/v1/messages"
+# model = "claude-3-5-haiku-20241022"
+# auth_token_env_var_name = "ANTHROPIC_API_KEY"
+
+# [[language-server.lsp-ai.config.chat]]
+# trigger = "!C"
+# action_display_name = "Chat (Sonnet 󰤇)"
+# model = "sonnet"
+# parameters = { max_context = 4096, max_tokens = 4096, system = "You are a code assistant chatbot. The user will ask you for assistance coding and you will do you best to answer succinctly and accurately" }
+
+# [[language-server.lsp-ai.config.chat]]
+# trigger = "!C"
+# action_display_name = "Chat (Haiku 󰾆)"
+# model = "haiku"
+# parameters = { max_context = 4096, max_tokens = 4096, system = "You are a code assistant chatbot. The user will ask you for assistance coding and you will do you best to answer succinctly and accurately" }
+
+# [[language-server.lsp-ai.config.actions]]
+# action_display_name = "Complete (Sonnet 󰤇)"
+# model = "sonnet"
+# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{CODE}" }], system = "You are an AI coding assistant. Your task is to complete code snippets. The user's cursor position is marked by \"<CURSOR>\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include thoughts about the cursor position, what needs to be completed, and any necessary formatting.\n3. Determine the appropriate code to complete the current thought, including finishing partial words or lines.\n4. Replace \"<CURSOR>\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in <answer> tags.\n\nYour response should always include both the reasoning and the answer. Pay special attention to completing partial words or lines before adding new lines of code.\n\n<examples>\n<example>\nUser input:\n--main.py--\n# A function that reads in user inpu<CURSOR>\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"inpu\" in a comment describing a function that reads user input.\n2. We need to complete the word \"input\" in the comment first.\n3. After completing the comment, we should add a new line before defining the function.\n4. The function should use Python's built-in `input()` function to read user input.\n5. We'll name the function descriptively and include a return statement.\n</reasoning>\n\n<answer>t\ndef read_user_input():\n    user_input = input(\"Enter your input: \")\n    return user_input\n</answer>\n</example>\n\n<example>\nUser input:\n--main.py--\ndef fibonacci(n):\n    if n <= 1:\n        return n\n    else:\n        re<CURSOR>\n\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"re\" in the 'else' clause of a recursive Fibonacci function.\n2. We need to complete the return statement for the recursive case.\n3. The \"re\" already present likely stands for \"return\", so we'll continue from there.\n4. The Fibonacci sequence is the sum of the two preceding numbers.\n5. We should return the sum of fibonacci(n-1) and fibonacci(n-2).\n</reasoning>\n\n<answer>turn fibonacci(n-1) + fibonacci(n-2)</answer>\n</example>\n</examples>"}
+# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
+
+
+# [[language-server.lsp-ai.config.actions]]
+# action_display_name = "Complete (Haiku 󰾆)"
+# model = "haiku"
+# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{CODE}" }], system = "You are an AI coding assistant. Your task is to complete code snippets. The user's cursor position is marked by \"<CURSOR>\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include thoughts about the cursor position, what needs to be completed, and any necessary formatting.\n3. Determine the appropriate code to complete the current thought, including finishing partial words or lines.\n4. Replace \"<CURSOR>\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in <answer> tags.\n\nYour response should always include both the reasoning and the answer. Pay special attention to completing partial words or lines before adding new lines of code.\n\n<examples>\n<example>\nUser input:\n--main.py--\n# A function that reads in user inpu<CURSOR>\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"inpu\" in a comment describing a function that reads user input.\n2. We need to complete the word \"input\" in the comment first.\n3. After completing the comment, we should add a new line before defining the function.\n4. The function should use Python's built-in `input()` function to read user input.\n5. We'll name the function descriptively and include a return statement.\n</reasoning>\n\n<answer>t\ndef read_user_input():\n    user_input = input(\"Enter your input: \")\n    return user_input\n</answer>\n</example>\n\n<example>\nUser input:\n--main.py--\ndef fibonacci(n):\n    if n <= 1:\n        return n\n    else:\n        re<CURSOR>\n\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"re\" in the 'else' clause of a recursive Fibonacci function.\n2. We need to complete the return statement for the recursive case.\n3. The \"re\" already present likely stands for \"return\", so we'll continue from there.\n4. The Fibonacci sequence is the sum of the two preceding numbers.\n5. We should return the sum of fibonacci(n-1) and fibonacci(n-2).\n</reasoning>\n\n<answer>turn fibonacci(n-1) + fibonacci(n-2)</answer>\n</example>\n</examples>"}
+# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
+
+# [[language-server.lsp-ai.config.actions]]
+# action_display_name = "Refactor (Sonnet 󰤇)"
+# model = "sonnet"
+# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{SELECTED_TEXT}" }], system = "You are an AI coding assistant specializing in code refactoring. Your task is to analyze the given code snippet and provide a refactored version. Follow these steps:\n\n1. Analyze the code context and structure.\n2. Identify areas for improvement, such as code efficiency, readability, or adherence to best practices.\n3. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include your analysis of the current code and explain your refactoring decisions.\n4. Rewrite the entire code snippet with your refactoring applied.\n5. Wrap your refactored code solution in <answer> tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n<examples>\n<example>\nUser input:\ndef calculate_total(items):\n    total = 0\n    for item in items:\n        total = total + item['price'] * item['quantity']\n    return total\n\n\nResponse:\n<reasoning>\n1. The function calculates the total cost of items based on price and quantity.\n2. We can improve readability and efficiency by:\n   a. Using a more descriptive variable name for the total.\n   b. Utilizing the sum() function with a generator expression.\n   c. Using augmented assignment (+=) if we keep the for loop.\n3. We'll implement the sum() function approach for conciseness.\n4. We'll add a type hint for better code documentation.\n</reasoning>\n<answer>\nfrom typing import List, Dict\n\ndef calculate_total(items: List[Dict[str, float]]) -> float:\n    return sum(item['price'] * item['quantity'] for item in items)\n</answer>\n</example>\n\n<example>\nUser input:\ndef is_prime(n):\n    if n < 2:\n        return False\n    for i in range(2, n):\n        if n % i == 0:\n            return False\n    return True\n\n\nResponse:\n<reasoning>\n1. This function checks if a number is prime, but it's not efficient for large numbers.\n2. We can improve it by:\n   a. Adding an early return for 2, the only even prime number.\n   b. Checking only odd numbers up to the square root of n.\n   c. Using a more efficient range (start at 3, step by 2).\n3. We'll also add a type hint for better documentation.\n4. The refactored version will be more efficient for larger numbers.\n</reasoning>\n<answer>\nimport math\n\ndef is_prime(n: int) -> bool:\n    if n < 2:\n        return False\n    if n == 2:\n        return True\n    if n % 2 == 0:\n        return False\n    \n    for i in range(3, int(math.sqrt(n)) + 1, 2):\n        if n % i == 0:\n            return False\n    return True\n</answer>\n</example>\n</examples>" }
+# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
+
+# [[language-server.lsp-ai.config.actions]]
+# action_display_name = "Refactor (Haiku 󰾆)"
+# model = "haiku"
+# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{SELECTED_TEXT}" }], system = "You are an AI coding assistant specializing in code refactoring. Your task is to analyze the given code snippet and provide a refactored version. Follow these steps:\n\n1. Analyze the code context and structure.\n2. Identify areas for improvement, such as code efficiency, readability, or adherence to best practices.\n3. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include your analysis of the current code and explain your refactoring decisions.\n4. Rewrite the entire code snippet with your refactoring applied.\n5. Wrap your refactored code solution in <answer> tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n<examples>\n<example>\nUser input:\ndef calculate_total(items):\n    total = 0\n    for item in items:\n        total = total + item['price'] * item['quantity']\n    return total\n\n\nResponse:\n<reasoning>\n1. The function calculates the total cost of items based on price and quantity.\n2. We can improve readability and efficiency by:\n   a. Using a more descriptive variable name for the total.\n   b. Utilizing the sum() function with a generator expression.\n   c. Using augmented assignment (+=) if we keep the for loop.\n3. We'll implement the sum() function approach for conciseness.\n4. We'll add a type hint for better code documentation.\n</reasoning>\n<answer>\nfrom typing import List, Dict\n\ndef calculate_total(items: List[Dict[str, float]]) -> float:\n    return sum(item['price'] * item['quantity'] for item in items)\n</answer>\n</example>\n\n<example>\nUser input:\ndef is_prime(n):\n    if n < 2:\n        return False\n    for i in range(2, n):\n        if n % i == 0:\n            return False\n    return True\n\n\nResponse:\n<reasoning>\n1. This function checks if a number is prime, but it's not efficient for large numbers.\n2. We can improve it by:\n   a. Adding an early return for 2, the only even prime number.\n   b. Checking only odd numbers up to the square root of n.\n   c. Using a more efficient range (start at 3, step by 2).\n3. We'll also add a type hint for better documentation.\n4. The refactored version will be more efficient for larger numbers.\n</reasoning>\n<answer>\nimport math\n\ndef is_prime(n: int) -> bool:\n    if n < 2:\n        return False\n    if n == 2:\n        return True\n    if n % 2 == 0:\n        return False\n    \n    for i in range(3, int(math.sqrt(n)) + 1, 2):\n        if n % i == 0:\n            return False\n    return True\n</answer>\n</example>\n</examples>" }
+# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
+
diff --git a/frame12/dotfiles/helix/themes/revontuli.toml b/frame12/dotfiles/helix/themes/revontuli.toml
new file mode 100644
index 0000000..084b257
--- /dev/null
+++ b/frame12/dotfiles/helix/themes/revontuli.toml
@@ -0,0 +1,131 @@
+
+# Based on onedarker.toml https://github.com/helix-editor/helix/blob/master/runtime/themes/onedarker.toml
+# Original Author : nuid32 <lvkuzvesov@proton.me>
+# Recoloring: Akselmo <akselmo@akselmo.dev>
+
+"attribute" = { fg = "orange" }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"constant" = { fg = "cyan", modifiers = ["bold"] }
+"constant.numeric" = { fg = "orange", modifiers=["bold"]}
+"constant.builtin" = { fg = "blue", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "yellow" }
+"constructor" = { fg = "blue", modifiers=["bold"]}
+"function" = { fg = "purple", modifiers = ["bold"] }
+"function.method" = { fg = "purple", modifiers = ["bold"] }
+"function.builtin" = { fg = "cyan" }
+"function.macro" = { fg = "purple", modifiers = ["bold"] }
+"function.special" = { fg = "magenta", modifiers = ["bold"] }
+"keyword" = { fg = "blue", modifiers=["bold"]}
+"keyword.control" = { fg = "light-green", modifiers= ["italic"] }
+"keyword.control.import" = { fg = "magenta" }
+"keyword.directive" = { fg = "yellow", modifiers=["bold"] }
+"keyword.storage" = {fg ="blue", modifiers=["bold"]}
+"keyword.storage.type" = { fg = "blue", modifiers=["bold"]}
+"keyword.storage.modifier" = { fg="purple", modifiers=["italic"]}
+"keyword.function" = {fg = "blue", modifiers=["bold"]}
+"label" = { fg = "purple" }
+"namespace" = { fg = "cyan" }
+"operator" = { fg = "light-green" }
+"punctuation" = { fg = "light-green" }
+"keyword.operator" = { fg = "light-green" }
+"special" = { fg = "magenta", modifiers=["italic"] }
+"string" = { fg = "green" }
+"type" = { fg = "cyan" }
+"variable" = { fg = "white" }
+"variable.builtin" = { fg = "yellow", modifiers = ["italic"] }
+"variable.parameter" = { fg = "orange" }
+"variable.other.member" = { fg = "orange" }
+"string.special" = { fg = "yellow"}
+"string.symbol" = { fg = "magenta"}
+
+"markup.heading" = { fg = "blue", modifiers = ["bold"] }
+"markup.heading.marker" = {fg = "cyan"}
+"markup.raw.inline" = { fg = "green" }
+"markup.raw.block" = { fg = "yellow" }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.list.unchecked" = { fg = "red" }
+"markup.list.checked" = { fg = "green"}
+"markup.quote" = { fg = "green" }
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"]}
+"markup.link.text" = { fg = "white" }
+"markup.link.label" = { fg = "purple" }
+
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
+
+"diagnostic.info".underline = { color = "blue", style = "curl" }
+"diagnostic.hint".underline = { color = "green", style = "curl" }
+"diagnostic.warning".underline = { color = "orange", style = "curl" }
+"diagnostic.error".underline = { color = "red", style = "curl" }
+
+"info" = { fg = "blue", modifiers = ["bold"] }
+"hint" = { fg = "green", modifiers = ["bold"] }
+"warning" = { fg = "orange", modifiers = ["bold"] }
+"error" = { fg = "red", modifiers = ["bold"] }
+
+"ui.background" = { bg = "background" }
+"ui.virtual" = { fg = "faint-gray" }
+"ui.virtual.indent-guide" = { fg = "faint-gray" }
+"ui.virtual.whitespace" = { fg = "faint-gray" }
+"ui.virtual.ruler" = { bg = "gray" }
+
+"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
+
+"ui.selection" = { bg = "selection" }
+"ui.cursorline" = { bg = "dark-background" }
+
+"ui.gutter" = {bg="dark-background"}
+"ui.linenr" = { fg = "linenr" }
+"ui.linenr.selected" = { bg = "light-green", fg="background" }
+
+"ui.statusline" = { fg = "white", bg = "light-background" }
+"ui.statusline.inactive" = { fg = "light-gray", bg = "light-background" }
+"ui.statusline.normal" = { fg = "light-background", bg = "purple", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "light-background", bg = "orange" , modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "light-background", bg = "green"  , modifiers = ["bold"] }
+"ui.text" = { fg = "white" }
+"ui.text.focus" = { fg = "blue", bg = "gray", modifiers = ["bold"] }
+
+"ui.help" = { fg = "white", bg = "gray" }
+"ui.debug" = { fg = "red" }
+"ui.debug.active" = { bg ="red", fg="dark-background" }
+"ui.highlight.frameline" = { bg = "dark-background", fg="red", modifiers=["bold"] }
+"ui.popup" = { bg = "light-background" }
+"ui.window" = { fg = "gray" }
+"ui.menu" = { fg = "white", bg = "gray" }
+"ui.menu.selected" = { fg = "background", bg = "blue" }
+"ui.menu.scroll" = { fg = "white", bg = "light-gray" }
+"ui.virtual.inlay-hint" = { fg = "light-gray", bg = "virtual-background", modifiers = ["italic"] }
+"ui.virtual.jump-label" = {fg="light-green", bg = "virtual-background", modifiers = ["bold"]}
+
+"ui.bufferline" = { fg = "white", bg = "background" }
+"ui.bufferline.active" = { fg = "background", bg = "light-green", modifiers=["bold"] }
+
+
+[palette]
+
+selection = "#144364"
+blue = "#33bbff"
+red = "#ff3344"
+purple = "#838fff"
+green = "#00ee00"
+orange = "#ff9233"
+cyan = "#33ffff"
+white = "#FFFFFF"
+dark-background = "#191919"
+background = "#202020"
+light-background = "#282828"
+virtual-background = "#252525"
+gray = "#353535"
+faint-gray = "#454545"
+light-gray = "#808080"
+linenr = "#E0E0E0"
+light-green = "#33ffa0"
+magenta = "#d970ff"
+yellow = "#ffe033"
diff --git a/frame12/dotfiles/keepassxc/keepassxc.ini b/frame12/dotfiles/keepassxc/keepassxc.ini
new file mode 100644
index 0000000..7973d0c
--- /dev/null
+++ b/frame12/dotfiles/keepassxc/keepassxc.ini
@@ -0,0 +1,21 @@
+[General]
+ConfigVersion=2
+
+[Browser]
+CustomProxyLocation=
+Enabled=true
+
+[GUI]
+ApplicationTheme=dark
+TrayIconAppearance=monochrome-light
+
+[KeeShare]
+Active="<?xml version=\"1.0\"?><KeeShare><Active/></KeeShare>\n"
+Own="<?xml version=\"1.0\"?><KeeShare><PrivateKey>MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8OYI/I2otsVMdam8HqfnEYa6emzV2EzXAST+1A4IOC8ojOJdGbhKbvScu5MwgPAWDRiS0yIr6fjNHpTfHCMqY/K8+UsaubHIAjVVR5SDrBvAroTfts/oIqFcW8ab9DYMPpopaxnXh25gGrmEBb33GzuL2LJ4kXz40BEYjsOSffOM83/RstRhmXaV86nPmtbswyLwSEGsPZZliMIgMEoT/Y2qcjfwRJIRIEWNybmlgrHWAzVj5sr00KQhfTRo6dQG/yBMoElYGNvKSTmQDy7WVR+Mh+rYPKOwb2v8D7UrPDKd1n+GheEBKpvE8mDcSg/vGlXOHirOBdtuk+/xhqAqxAgMBAAECggEAETzLs/WN0+5r4q3sdM1juCY2pC7UTWJtUeqYtilClVUOEiisw0CcXVKMI+wZ0jqSSgHipa3B+zZogtSw0Cj6yNpHQD67aZ45LdoY/ggs+hPSFeTMpu0MZmjoROEk6QLTmwYmSzGRT88DqVpPPEmWFrQRWU3KaSFRzy4JsFtoVz9OYeFw37d9pG8BYeruqE7kx+uzCYWRjQXrjmofFpbxGWhkIUcvbVZ8wUVso4gT4JxAQks6nryL5M9NXefU+x/e1Rkopa5aRG/H0dPMYX/8uV2lsr/AW4+kaMPrKoAsPUhErrrJDwNL2zCmcAzNgsthUo/6yLLKlnk+THAGnruEawKBgQDDG9qpvR+OCQrV1rUiX2JmomkMPKIkAf4xLFNAdOwnPMRnq1mRCn0OJmmPmRF+I5fM/64tFzGK/KD5fxll3ybN+mpA540ho9Gvk89AbILXmp9MQMEh92H5tf4/q1EKgsFjMM0aplg2zupsimyi4LuI6tCBUhWun5X5yxUsbyBW2wKBgQD296WmxLJEQJcHfHN/RYBs9HAKCWZTn8kLgoFgCxTHHTB+i5N9yug78N3LmsYUBYwbshpVewxcv6xrfxQJ/igB+zXAgDAghhvbqw+kAiFo+OapchX+Yvm6LzHdnpOIUEDcVhP/IPyGwCNqL3DYhX0A7Qudk4/g73MStAS5aHucYwKBgG4/RweyvincIitC74dErq2gCAvKFzSRi7jtev1pFCf3xmNuB2ZVruRYAD4MGD5Wjmhf8WO5P11x8uQIVamitqKdZXzXWoAvuUSlGO8mYajCzlCgJoGy78HSfKAthdWSnQQXh04PwLj3oq9CaLCAnHd5d+gbIfVSZ8SGZKh/Ap8RAoGADF8dgjwqPfcKWcqnMoH1y/92uVn9MUU42gXAm2ISuWLB8iTlz5Bhj9ciFTf8ojYg7aY/YXbXiLHlXkEwbMu5j1fZOnpxbr+pF5j7IJkmuU52p5had7LXlbcVhWeTNmnmxeLd/5LUc5+eZoxX19DgETLOuScSNw9nsVEpR2xvfMcCgYEAgR4j9M8Nq088dA5Z3VGGxJ/l3GI+gChogZBRmyG48GuBygMVujJ5Kowqid0a3ImAnvxa8BGvEJlinmAsKmyi1UsmXMCLzOWO+jRNuIRoscFk1m2D3IfG43NnjoOhr9aJZHga8DHd1FXNPTqT74jkePHlDzpGOaHXQUN5CyGNouA=</PrivateKey><PublicKey><Signer>nate</Signer><Key>MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8OYI/I2otsVMdam8HqfnEYa6emzV2EzXAST+1A4IOC8ojOJdGbhKbvScu5MwgPAWDRiS0yIr6fjNHpTfHCMqY/K8+UsaubHIAjVVR5SDrBvAroTfts/oIqFcW8ab9DYMPpopaxnXh25gGrmEBb33GzuL2LJ4kXz40BEYjsOSffOM83/RstRhmXaV86nPmtbswyLwSEGsPZZliMIgMEoT/Y2qcjfwRJIRIEWNybmlgrHWAzVj5sr00KQhfTRo6dQG/yBMoElYGNvKSTmQDy7WVR+Mh+rYPKOwb2v8D7UrPDKd1n+GheEBKpvE8mDcSg/vGlXOHirOBdtuk+/xhqAqxAgMBAAECggEAETzLs/WN0+5r4q3sdM1juCY2pC7UTWJtUeqYtilClVUOEiisw0CcXVKMI+wZ0jqSSgHipa3B+zZogtSw0Cj6yNpHQD67aZ45LdoY/ggs+hPSFeTMpu0MZmjoROEk6QLTmwYmSzGRT88DqVpPPEmWFrQRWU3KaSFRzy4JsFtoVz9OYeFw37d9pG8BYeruqE7kx+uzCYWRjQXrjmofFpbxGWhkIUcvbVZ8wUVso4gT4JxAQks6nryL5M9NXefU+x/e1Rkopa5aRG/H0dPMYX/8uV2lsr/AW4+kaMPrKoAsPUhErrrJDwNL2zCmcAzNgsthUo/6yLLKlnk+THAGnruEawKBgQDDG9qpvR+OCQrV1rUiX2JmomkMPKIkAf4xLFNAdOwnPMRnq1mRCn0OJmmPmRF+I5fM/64tFzGK/KD5fxll3ybN+mpA540ho9Gvk89AbILXmp9MQMEh92H5tf4/q1EKgsFjMM0aplg2zupsimyi4LuI6tCBUhWun5X5yxUsbyBW2wKBgQD296WmxLJEQJcHfHN/RYBs9HAKCWZTn8kLgoFgCxTHHTB+i5N9yug78N3LmsYUBYwbshpVewxcv6xrfxQJ/igB+zXAgDAghhvbqw+kAiFo+OapchX+Yvm6LzHdnpOIUEDcVhP/IPyGwCNqL3DYhX0A7Qudk4/g73MStAS5aHucYwKBgG4/RweyvincIitC74dErq2gCAvKFzSRi7jtev1pFCf3xmNuB2ZVruRYAD4MGD5Wjmhf8WO5P11x8uQIVamitqKdZXzXWoAvuUSlGO8mYajCzlCgJoGy78HSfKAthdWSnQQXh04PwLj3oq9CaLCAnHd5d+gbIfVSZ8SGZKh/Ap8RAoGADF8dgjwqPfcKWcqnMoH1y/92uVn9MUU42gXAm2ISuWLB8iTlz5Bhj9ciFTf8ojYg7aY/YXbXiLHlXkEwbMu5j1fZOnpxbr+pF5j7IJkmuU52p5had7LXlbcVhWeTNmnmxeLd/5LUc5+eZoxX19DgETLOuScSNw9nsVEpR2xvfMcCgYEAgR4j9M8Nq088dA5Z3VGGxJ/l3GI+gChogZBRmyG48GuBygMVujJ5Kowqid0a3ImAnvxa8BGvEJlinmAsKmyi1UsmXMCLzOWO+jRNuIRoscFk1m2D3IfG43NnjoOhr9aJZHga8DHd1FXNPTqT74jkePHlDzpGOaHXQUN5CyGNouA=</Key></PublicKey></KeeShare>\n"
+QuietSuccess=true
+
+[PasswordGenerator]
+AdditionalChars=
+ExcludedChars=
+Length=25
+SpecialChars=false
diff --git a/frame12/dotfiles/macchiato.gitconfig b/frame12/dotfiles/macchiato.gitconfig
new file mode 100644
index 0000000..0d2e9f4
--- /dev/null
+++ b/frame12/dotfiles/macchiato.gitconfig
@@ -0,0 +1,23 @@
+[delta "Catppuccin Macchiato"]
+    blame-code-style = syntax
+    blame-format = "{author:<18} ({commit:>9}) {timestamp:^16} "
+    blame-palette = "#24273a #1e2030 #363a4f #494d64"
+    commit-decoration-style = box ul
+    dark = true
+    file-decoration-style = "#f5a97f"
+    file-style = "#f5a97f"
+    hunk-header-decoration-style = box ul
+    hunk-header-file-style = bold
+    hunk-header-line-number-style = bold "#a6da95"
+    hunk-header-style = file line-number syntax
+    line-numbers = true
+    line-numbers-left-style = "#6e738d"
+    line-numbers-minus-style = bold "#ed8796"
+    line-numbers-plus-style = bold "#a6da95"
+    line-numbers-right-style = "#6e738d"
+    line-numbers-zero-style = "#6e738d"
+    minus-emph-style = bold syntax "#5d2c37"
+    minus-style = syntax "#382b34"
+    plus-emph-style = bold syntax "#335441"
+    plus-style = syntax "#2d3f31"
+    syntax-theme = Catppuccin Macchiato
\ No newline at end of file
diff --git a/frame12/dotfiles/niri/bg.png b/frame12/dotfiles/niri/bg.png
new file mode 100644
index 0000000..ccb261e
Binary files /dev/null and b/frame12/dotfiles/niri/bg.png differ
diff --git a/frame12/dotfiles/niri/config.kdl b/frame12/dotfiles/niri/config.kdl
new file mode 100644
index 0000000..55b007a
--- /dev/null
+++ b/frame12/dotfiles/niri/config.kdl
@@ -0,0 +1,276 @@
+// Example config for Niri.
+//
+// See `man 5 niri` for the complete list of options.
+
+input {
+    keyboard {
+        xkb {
+            layout "us"
+        }
+        repeat-delay 250
+        repeat-rate 46
+    }
+    
+    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"
+    
+    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; }
+}
+
+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+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+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+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+    
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { 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!"; }
+}
diff --git a/frame12/dotfiles/swaync/style.css b/frame12/dotfiles/swaync/style.css
new file mode 100644
index 0000000..328f344
--- /dev/null
+++ b/frame12/dotfiles/swaync/style.css
@@ -0,0 +1,342 @@
+* {
+  all: unset;
+  font-size: 14px;
+  font-family: "Ubuntu Nerd Font";
+  transition: 200ms;
+}
+
+trough highlight {
+  background: #cad3f5;
+}
+
+scale trough {
+  margin: 0rem 1rem;
+  background-color: #363a4f;
+  min-height: 8px;
+  min-width: 70px;
+}
+
+slider {
+  background-color: #8aadf4;
+}
+
+.floating-notifications.background .notification-row .notification-background {
+  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #363a4f;
+  border-radius: 12.6px;
+  margin: 18px;
+  background-color: #24273a;
+  color: #cad3f5;
+  padding: 0;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification {
+  padding: 7px;
+  border-radius: 12.6px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification.critical {
+  box-shadow: inset 0 0 7px 0 #ed8796;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content {
+  margin: 7px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .summary {
+  color: #cad3f5;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .time {
+  color: #a5adcb;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .body {
+  color: #cad3f5;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * {
+  min-height: 3.4em;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action {
+  border-radius: 7px;
+  color: #cad3f5;
+  background-color: #363a4f;
+  box-shadow: inset 0 0 0 1px #494d64;
+  margin: 7px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #363a4f;
+  color: #cad3f5;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #7dc4e4;
+  color: #cad3f5;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button {
+  margin: 7px;
+  padding: 2px;
+  border-radius: 6.3px;
+  color: #24273a;
+  background-color: #ed8796;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button:hover {
+  background-color: #ee99a0;
+  color: #24273a;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button:active {
+  background-color: #ed8796;
+  color: #24273a;
+}
+
+.control-center {
+  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #363a4f;
+  border-radius: 12.6px;
+  margin: 18px;
+  background-color: #24273a;
+  color: #cad3f5;
+  padding: 14px;
+}
+
+.control-center .widget-title > label {
+  color: #cad3f5;
+  font-size: 1.3em;
+}
+
+.control-center .widget-title button {
+  border-radius: 7px;
+  color: #cad3f5;
+  background-color: #363a4f;
+  box-shadow: inset 0 0 0 1px #494d64;
+  padding: 8px;
+}
+
+.control-center .widget-title button:hover {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #5b6078;
+  color: #cad3f5;
+}
+
+.control-center .widget-title button:active {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #7dc4e4;
+  color: #24273a;
+}
+
+.control-center .notification-row .notification-background {
+  border-radius: 7px;
+  color: #cad3f5;
+  background-color: #363a4f;
+  box-shadow: inset 0 0 0 1px #494d64;
+  margin-top: 14px;
+}
+
+.control-center .notification-row .notification-background .notification {
+  padding: 7px;
+  border-radius: 7px;
+}
+
+.control-center .notification-row .notification-background .notification.critical {
+  box-shadow: inset 0 0 7px 0 #ed8796;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content {
+  margin: 7px;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .summary {
+  color: #cad3f5;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .time {
+  color: #a5adcb;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .body {
+  color: #cad3f5;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * {
+  min-height: 3.4em;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action {
+  border-radius: 7px;
+  color: #cad3f5;
+  background-color: #181926;
+  box-shadow: inset 0 0 0 1px #494d64;
+  margin: 7px;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #363a4f;
+  color: #cad3f5;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #7dc4e4;
+  color: #cad3f5;
+}
+
+.control-center .notification-row .notification-background .close-button {
+  margin: 7px;
+  padding: 2px;
+  border-radius: 6.3px;
+  color: #24273a;
+  background-color: #ee99a0;
+}
+
+.close-button {
+  border-radius: 6.3px;
+}
+
+.control-center .notification-row .notification-background .close-button:hover {
+  background-color: #ed8796;
+  color: #24273a;
+}
+
+.control-center .notification-row .notification-background .close-button:active {
+  background-color: #ed8796;
+  color: #24273a;
+}
+
+.control-center .notification-row .notification-background:hover {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #8087a2;
+  color: #cad3f5;
+}
+
+.control-center .notification-row .notification-background:active {
+  box-shadow: inset 0 0 0 1px #494d64;
+  background-color: #7dc4e4;
+  color: #cad3f5;
+}
+
+.notification.critical progress {
+  background-color: #ed8796;
+}
+
+.notification.low progress,
+.notification.normal progress {
+  background-color: #8aadf4;
+}
+
+.control-center-dnd {
+  margin-top: 5px;
+  border-radius: 8px;
+  background: #363a4f;
+  border: 1px solid #494d64;
+  box-shadow: none;
+}
+
+.control-center-dnd:checked {
+  background: #363a4f;
+}
+
+.control-center-dnd slider {
+  background: #494d64;
+  border-radius: 8px;
+}
+
+.widget-dnd {
+  margin: 0px;
+  font-size: 1.1rem;
+}
+
+.widget-dnd > switch {
+  font-size: initial;
+  border-radius: 8px;
+  background: #363a4f;
+  border: 1px solid #494d64;
+  box-shadow: none;
+}
+
+.widget-dnd > switch:checked {
+  background: #363a4f;
+}
+
+.widget-dnd > switch slider {
+  background: #494d64;
+  border-radius: 8px;
+  border: 1px solid #6e738d;
+}
+
+.widget-mpris .widget-mpris-player {
+  background: #363a4f;
+  padding: 7px;
+}
+
+.widget-mpris .widget-mpris-title {
+  font-size: 1.2rem;
+}
+
+.widget-mpris .widget-mpris-subtitle {
+  font-size: 0.8rem;
+}
+
+.widget-menubar > box > .menu-button-bar > button > label {
+  font-size: 3rem;
+  padding: 0.5rem 2rem;
+}
+
+.widget-menubar > box > .menu-button-bar > :last-child {
+  color: #ed8796;
+}
+
+.power-buttons button:hover,
+.powermode-buttons button:hover,
+.screenshot-buttons button:hover {
+  background: #363a4f;
+}
+
+.control-center .widget-label > label {
+  color: #cad3f5;
+  font-size: 2rem;
+}
+
+.widget-buttons-grid {
+  padding-top: 1rem;
+}
+
+.widget-buttons-grid > flowbox > flowboxchild > button label {
+  font-size: 2.5rem;
+}
+
+.widget-volume {
+  padding-top: 1rem;
+}
+
+.widget-volume label {
+  font-size: 1.5rem;
+  color: #7dc4e4;
+}
+
+.widget-volume trough highlight {
+  background: #7dc4e4;
+}
+
+.widget-backlight trough highlight {
+  background: #eed49f;
+}
+
+.widget-backlight label {
+  font-size: 1.5rem;
+  color: #eed49f;
+}
+
+.widget-backlight .KB {
+  padding-bottom: 1rem;
+}
+
+.image {
+  padding-right: 0.5rem;
+}
diff --git a/frame12/dotfiles/waybar/config b/frame12/dotfiles/waybar/config
new file mode 100644
index 0000000..447483d
--- /dev/null
+++ b/frame12/dotfiles/waybar/config
@@ -0,0 +1,302 @@
+// 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",
+        "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/power": {
+        "format":"⏻",
+        "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
+        "tooltip": false,
+    },
+}
diff --git a/frame12/dotfiles/waybar/scripts/keyboard_layout.sh b/frame12/dotfiles/waybar/scripts/keyboard_layout.sh
new file mode 100755
index 0000000..04cf5e1
--- /dev/null
+++ b/frame12/dotfiles/waybar/scripts/keyboard_layout.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+entries="Default Colemak"
+
+selected=$(printf '%s\n' $entries | wofi --conf=$HOME/.config/wofi/config.power --style=$HOME/.config/wofi/style.widgets.css | awk '{print tolower($1)}')
+
+case $selected in
+  default)
+    swaymsg input type:keyboard xkb_layout "us"
+    swaymsg input type:keyboard xkb_variant '""'
+    ;;
+  colemak)
+    swaymsg input type:keyboard xkb_layout "us"
+    swaymsg input type:keyboard xkb_variant "colemak_dh"
+    ;;
+esac
diff --git a/frame12/dotfiles/waybar/scripts/power-menu.sh b/frame12/dotfiles/waybar/scripts/power-menu.sh
new file mode 100755
index 0000000..e226e4d
--- /dev/null
+++ b/frame12/dotfiles/waybar/scripts/power-menu.sh
@@ -0,0 +1,16 @@
+#!/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
diff --git a/frame12/dotfiles/waybar/style.css b/frame12/dotfiles/waybar/style.css
new file mode 100644
index 0000000..871e33a
--- /dev/null
+++ b/frame12/dotfiles/waybar/style.css
@@ -0,0 +1,340 @@
+/* =============================================================================
+ *
+ * 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;
+}
\ No newline at end of file
diff --git a/frame12/modules/home-manager/home.nix b/frame12/modules/home-manager/home.nix
new file mode 100644
index 0000000..c4bf2c6
--- /dev/null
+++ b/frame12/modules/home-manager/home.nix
@@ -0,0 +1,252 @@
+{ inputs, config, pkgs, ... }:
+  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
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  # Using mkOutOfStoreSymlink for specific directories to allow direct editing without rebuilds
+  # while still allowing other home-manager modules to write to .config
+  xdg.configFile = {
+    "niri".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/niri";
+    "ghostty".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/ghostty";
+    "helix".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/helix";
+    "waybar".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/waybar";
+    "swaync".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/swaync";
+    "keepassxc".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/keepassxc";
+    
+    # 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
+  };
+
+  # Zsh setup
+  programs.zsh = {
+      enable = true;
+      oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" ];
+          theme = "half-life";
+      };
+      initContent = ''
+          eval "$(direnv hook zsh)"
+          export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
+
+          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";
+      };
+    };
+  };
+
+
+  home.file.".icons/default/index.theme".text = ''
+    [icon theme]
+    Inherits=Catppuccin-Macchiato-Lavender-Cursors
+  '';
+
+  services.wlsunset = {
+    enable = true;
+    sunrise = "07:00";
+    sunset = "17:00";
+    temperature.night = 3500;
+  };
+}
diff --git a/frame12/modules/niri/niri_conf.nix b/frame12/modules/niri/niri_conf.nix
new file mode 100755
index 0000000..bfeed9b
--- /dev/null
+++ b/frame12/modules/niri/niri_conf.nix
@@ -0,0 +1,172 @@
+{ 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";
+                };
+            };
+        };
+
+        # 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
+        hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
+    };
+}
diff --git a/frame12/modules/user/main_user.nix b/frame12/modules/user/main_user.nix
new file mode 100644
index 0000000..9ff96f1
--- /dev/null
+++ b/frame12/modules/user/main_user.nix
@@ -0,0 +1,57 @@
+{ 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"
+                ];
+            })
+        ];
+    };
+}
\ No newline at end of file
diff --git a/frame12/nixos/hardware-configuration.nix b/frame12/nixos/hardware-configuration.nix
new file mode 100644
index 0000000..27fdad3
--- /dev/null
+++ b/frame12/nixos/hardware-configuration.nix
@@ -0,0 +1,44 @@
+# 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;
+}
diff --git a/shared/modules/system/power_manager.nix b/shared/modules/system/power_manager.nix
index 11bf70c..4e6ad91 100644
--- a/shared/modules/system/power_manager.nix
+++ b/shared/modules/system/power_manager.nix
@@ -9,15 +9,6 @@ in
   options.power_manager = {
     enable = mkEnableOption "power management with auto-cpufreq";
 
-    useFlake = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to use the auto-cpufreq flake input for the latest version.
-        If false, uses the nixpkgs version (may be outdated).
-      '';
-    };
-
     settings = mkOption {
       type = types.attrs;
       default = {
@@ -47,13 +38,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    # Auto-cpufreq configuration - use flake version if available, otherwise nixpkgs
-    programs.auto-cpufreq = mkIf (cfg.useFlake && inputs ? auto-cpufreq) {
-      enable = true;
-      settings = cfg.settings;
-    };
-
-    services.auto-cpufreq = mkIf (!cfg.useFlake || !(inputs ? auto-cpufreq)) {
+    services.auto-cpufreq = {
       enable = true;
       settings = cfg.settings;
     };
@@ -69,7 +54,7 @@ in
     powerManagement.powertop.enable = mkForce false;
     
     # Don't set a static CPU governor (let auto-cpufreq handle it)
-    powerManagement.cpuFreqGovernor = mkForce null;    
+    powerManagement.cpuFreqGovernor = mkForce null;
   };
 
   # # Warning if flake input is missing when expected