diff --git a/modules/nixos/desktop/addons/hyprpanel/default.nix b/modules/nixos/desktop/addons/hyprpanel/default.nix
index f28f84b..9c5d0fb 100644
--- a/modules/nixos/desktop/addons/hyprpanel/default.nix
+++ b/modules/nixos/desktop/addons/hyprpanel/default.nix
@@ -9,15 +9,590 @@ let
   inherit (lib)
     mkIf
     mkEnableOption
+    mkMerge
+    mkOption
+    literalExpression
     ;
 
   cfg = config.${namespace}.desktop.addons.hyprpanel;
   username = config.${namespace}.user.name;
 
+  settingsFormat = pkgs.formats.json { };
+
+  iconColor = "#242438";
+
+  light-cyan = "#73daca";
+  lightBlue = "#414868";
+  medium-blue = "#9aa5ce";
+  cyan-blue = "#7dcfff";
+  navy-blue = "#24283b";
+  dark-blue = "#1a1b26";
+  dark-blue-gray = "565f89";
+  dark-blue-yankees = "#272a3d";
+  blue-magenta = "#181825";
+
+  lightPurple = "#bb9af7";
+
+  lightRed = "#f7768e";
+  red = "#c0caf5";
+
+  lightGreen = "#9ece6a";
+  yellow = "#e0af68";
+
+  settings = {
+    tear = true;
+    scalingPriority = "hyprland";
+    font.name = "CodeNewRoman Nerd Font Mono";
+
+    bar = {
+      customModules = {
+        updates.pollingInterval = 1440000;
+        ram = {
+          labelType = "used/total";
+          icon = " ";
+        };
+        cpu = {
+          label = true;
+          leftClick = "kitty --hold btop";
+          icon = " ";
+        };
+      };
+      layouts = {
+        "0" = {
+          left = [
+            "workspaces"
+          ];
+          middle = [
+            "windowtitle"
+          ];
+          right = [
+            "clock"
+          ];
+        };
+        "1" = {
+          left = [
+            "dashboard"
+            "workspaces"
+          ];
+          middle = [
+            "windowtitle"
+          ];
+          right = [
+            "volume"
+            "bluetooth"
+            "battery"
+            "systray"
+            "cpu"
+            "ram"
+            "clock"
+            "notifications"
+          ];
+        };
+      };
+      workspaces = {
+        showAllActive = true;
+        show_icons = false;
+        numbered_active_indicator = "underline";
+        show_numbered = true;
+        showWsIcons = false;
+        showApplicationIcons = false;
+        hideUnoccupied = true;
+      };
+      launcher = {
+        icon = "󱄅";
+        rightClick = "hyprpanel -t settings-dialog";
+      };
+      scrollSpeed = 0;
+      windowtitle = {
+        class_name = false;
+        custom_title = false;
+        icon = false;
+        label = true;
+        title_map = [
+
+        ];
+        truncation = true;
+      };
+      network = {
+        label = false;
+        truncation = false;
+      };
+      clock.format = "%a %b %d  %H:%M:%S";
+      notifications.show_total = true;
+    };
+
+    menus = {
+      clock.time.military = true;
+      dashboard = {
+        powermenu.avatar.image = "/home/cholli/Pictures/profile.png";
+
+        shortcuts.enabled = false;
+        directories.left = {
+          directory1.command = "kitty $HOME/Downloads";
+          directory3.command = "kitty $HOME/projects";
+        };
+
+        stats = {
+          enable_gpu = true;
+          enabled = false;
+        };
+        controls.enabled = false;
+      };
+      bluetooth = {
+        showBattery = true;
+        batteryState = "always";
+      };
+      transition = "crossfade";
+    };
+
+    theme = {
+      bar = {
+        floating = true;
+        outer_spacing = "0.2em";
+        buttons = {
+          enableBorders = true;
+
+          workspaces = {
+            enableBorder = false;
+            fontSize = "1.2em";
+            smartHighlight = false;
+            active = "#f7768e";
+            occupied = "#f7768e";
+            available = "#7dcfff";
+            hover = "#f7768e";
+            background = "#272a3d";
+            numbered_active_highlighted_text_color = "#181825";
+            numbered_active_underline_color = "#c678dd";
+            border = "#f7768e";
+          };
+          modules = {
+            power = {
+              icon = "#181825";
+              icon_background = "#f7768e";
+              background = "#272a3d";
+              border = "#f7768e";
+            };
+            ram = {
+              enableBorder = false;
+              spacing = "0.45em";
+              icon = "#181825";
+              icon_background = "#e0af68";
+              text = "#e0af68";
+              background = "#272a3d";
+              border = "#e0af68";
+            };
+            cpu = {
+              enableBorder = false;
+              background = "#272a3d";
+              icon = "#181825";
+              icon_background = "#f7768e";
+              text = "#f7768e";
+              border = "#f7768e";
+            };
+            submap = {
+              background = "#272a3d";
+              text = "#73daca";
+              border = "#73daca";
+              icon = "#181825";
+              icon_background = "#73daca";
+            };
+          };
+
+          style = "split";
+          icon = "#242438";
+          icon_background = "#bb9af7";
+          text = "#bb9af7";
+          hover = "#414868";
+          background = "#272a3d";
+          dashboard = {
+            enableBorder = false;
+            icon = "#272a3d";
+            background = "#e0af68";
+            border = "#e0af68";
+          };
+          volume = {
+            icon = "#272a3d";
+            text = "#f7768e";
+            background = "#272a3d";
+            icon_background = "#f7768e";
+            border = "#f7768e";
+          };
+          notifications = {
+            total = "#bb9af7";
+            icon = "#272a3d";
+            background = "#272a3d";
+            icon_background = "#bb9af7";
+            border = "#bb9af7";
+          };
+          clock = {
+            icon = "#272a3d";
+            text = "#f7768e";
+            background = "#272a3d";
+            icon_background = "#f7768e";
+            border = "#f7768e";
+          };
+          systray = {
+            background = "#272a3d";
+            border = "#414868";
+            customIcon = "#c0caf5";
+          };
+          bluetooth = {
+            icon = "#272a3d";
+            text = "#7dcfff";
+            background = "#272a3d";
+            icon_background = "#7dcfff";
+            border = "#7dcfff";
+          };
+          windowtitle = {
+            icon = "#272a3d";
+            text = "#f7768e";
+            background = "#272a3d";
+            icon_background = "#f7768e";
+            border = "#f7768e";
+            enableBorder = false;
+          };
+          radius = "0.3em";
+          borderSize = "0.0em";
+          padding_x = "0.7rem";
+          padding_y = "0.2rem";
+        };
+
+        menus = {
+          monochrome = false;
+          opacity = 95;
+          menu = {
+            dashboard = {
+              powermenu = {
+                shutdown = "#f7768e";
+                confirmation = {
+                  deny = "#f7768e";
+                  confirm = "#9ece6a";
+                  button_text = "#1a1b26";
+                  body = "#c0caf5";
+                  label = "#bb9af7";
+                  border = "#414868";
+                  background = "#1a1b26";
+                  card = "#24283b";
+                };
+                sleep = "#7dcfff";
+                logout = "#9ece6a";
+                restart = "#e0af68";
+              };
+              monitors = {
+                ram = {
+                  label = "#e0af68";
+                  bar = "#e0af68";
+                  icon = "#e0af68";
+                };
+                cpu = {
+                  label = "#f7768e";
+                  bar = "#f7768e";
+                  icon = "#f7768e";
+                };
+                bar_background = "#414868";
+              };
+              directories = {
+                right = {
+                  bottom.color = "#bb9af7";
+                  middle.color = "#bb9af7";
+                  top.color = "#73daca";
+                };
+                left = {
+                  bottom.color = "#f7768e";
+                  middle.color = "#e0af68";
+                  top.color = "#f7768e";
+                };
+              };
+              controls = {
+                input = {
+                  text = "#1a1b26";
+                  background = "#f7768e";
+                };
+                volume = {
+                  text = "#1a1b26";
+                  background = "#f7768e";
+                };
+                notifications = {
+                  text = "#1a1b26";
+                  background = "#e0af68";
+                };
+                bluetooth = {
+                  text = "#1a1b26";
+                  background = "#7dcfff";
+                };
+                disabled = "#414868";
+              };
+              profile.name = "#f7768e";
+              border.color = "#414868";
+              background.color = "#1a1b26";
+              card.color = "#24283b";
+            };
+            notifications = {
+              switch = {
+                puck = "#565f89";
+                disabled = "#565f89";
+                enabled = "#bb9af7";
+              };
+              clear = "#f7768e";
+              switch_divider = "#414868";
+              border = "#414868";
+              card = "#24283b";
+              background = "#1a1b26";
+              no_notifications_label = "#414868";
+              label = "#bb9af7";
+              scrollbar.color = "#bb9af7";
+              pager = {
+                button = "#bb9af7";
+                label = "#565f89";
+                background = "#1a1b26";
+              };
+            };
+            clock = {
+              text = "#c0caf5";
+              border.color = "#414868";
+              background.color = "#1a1b26";
+              card.color = "#24283b";
+
+              calendar = {
+                contextdays = "#414868";
+                days = "#c0caf5";
+                currentday = "#f7768e";
+                paginator = "#f7768e";
+                weekdays = "#f7768e";
+                yearmonth = "#73daca";
+              };
+              time = {
+                timeperiod = "#73daca";
+                time = "#f7768e";
+              };
+            };
+            systray = {
+              dropdownmenu.divider = "#24283b";
+              dropdownmenu.text = "#c0caf5";
+              dropdownmenu.background = "#1a1b26";
+            };
+            bluetooth = {
+              iconbutton = {
+                active = "#7dcfff";
+                passive = "#c0caf5";
+              };
+              icons = {
+                active = "#7dcfff";
+                passive = "#565f89";
+              };
+              listitems = {
+                active = "#7dcfff";
+                passive = "#c0caf5";
+              };
+              switch = {
+                puck = "#565f89";
+                disabled = "#565f89";
+                enabled = "#7dcfff";
+              };
+              switch_divider = "#414868";
+              status = "#565f89";
+              text = "#c0caf5";
+              label.color = "#7dcfff";
+              border.color = "#414868";
+              background.color = "#1a1b26";
+              card.color = "#24283b";
+            };
+            volume = {
+              text = "#c0caf5";
+              card.color = "#24283b";
+              label.color = "#f7768e";
+              input_slider = {
+                puck = "#414868";
+                backgroundhover = "#414868";
+                background = "#565f89";
+                primary = "#f7768e";
+              };
+              audio_slider = {
+                puck = "#414868";
+                backgroundhover = "#414868";
+                background = "#565f89";
+                primary = "#f7768e";
+              };
+              icons = {
+                active = "#f7768e";
+                passive = "#565f89";
+              };
+              iconbutton = {
+                active = "#f7768e";
+                passive = "#c0caf5";
+              };
+              listitems = {
+                active = "#f7768e";
+                passive = "#c0caf5";
+              };
+              border.color = "#414868";
+              background.color = "#1a1b26";
+            };
+            media = {
+              card.color = "#24283b";
+              slider = {
+                puck = "#565f89";
+                backgroundhover = "#414868";
+                background = "#565f89";
+                primary = "#f7768e";
+              };
+              buttons = {
+                text = "#1a1b26";
+                background = "#bb9af7";
+                enabled = "#73daca";
+                inactive = "#414868";
+              };
+              border.color = "#414868";
+              background.color = "#1a1b26";
+              album = "#f7768e";
+              artist = "#73daca";
+              song = "#bb9af7";
+            };
+            power = {
+              border.color = "#414868";
+              buttons = {
+                sleep = {
+                  icon_background = "#7dcfff";
+                  text = "#7dcfff";
+                  background = "#24283b";
+                  icon = "#1a1b26";
+                };
+                restart = {
+                  text = "#e0af68";
+                  icon_background = "#e0af68";
+                  icon = "#1a1b26";
+                  background = "#24283b";
+                };
+                shutdown = {
+                  icon = "#1a1b26";
+                  background = "#24283b";
+                  icon_background = "#f7768e";
+                  text = "#f7768e";
+                };
+                logout = {
+                  icon = "#1a1b26";
+                  background = "#24283b";
+                  text = "#9ece6a";
+                  icon_background = "#9ece6a";
+                };
+              };
+              background.color = "#1a1b26";
+              scaling = 90;
+            };
+          };
+          background = "#1a1b26";
+          text = "#c0caf5";
+          border.color = "#414868";
+          popover = {
+            text = "#bb9af7";
+            background = "#1a1b26";
+            border = "#1a1b26";
+          };
+          tooltip = {
+            text = "#c0caf5";
+            background = "#1a1b26";
+          };
+          dropdownmenu = {
+            divider = "#24283b";
+            text = "#c0caf5";
+            background = "#1a1b26";
+          };
+          slider = {
+            puck = "#565f89";
+            backgroundhover = "#414868";
+            background = "#565f89";
+            primary = "#bb9af7";
+          };
+          progressbar = {
+            background = "#414868";
+            foreground = "#bb9af7";
+          };
+          iconbuttons = {
+            active = "#bb9af7";
+            passive = "#c0caf5";
+          };
+          buttons = {
+            text = "#1a1b26";
+            disabled = "#565f89";
+            active = "#f7768e";
+            default = "#bb9af7";
+          };
+          switch = {
+            puck = "#565f89";
+            disabled = "#565f89";
+            enabled = "#bb9af7";
+          };
+          icons = {
+            active = "#bb9af7";
+            passive = "#414868";
+          };
+          listitems = {
+            active = "#bb9af7";
+            passive = "#c0caf5";
+          };
+          label = "#bb9af7";
+          feinttext = "#414868";
+          dimtext = "#414868";
+          cards = "#24283b";
+          check_radio_button.background = "#3b4261";
+          check_radio_button.active = "#bb9af7";
+        };
+        transparent = true;
+        background = "#1a1b26";
+        margin_sides = "0.0em";
+        location = "top";
+      };
+      osd = {
+        monitor = 1;
+        muted_zero = true;
+        label = "#bb9af7";
+        icon = "#1a1b26";
+        bar_overflow_color = "#f7768e";
+        bar_empty_color = "#414868";
+        bar_color = "#bb9af7";
+        icon_container = "#bb9af7";
+        bar_container = "#1a1b26";
+      };
+      notification = {
+        close_button.label = "#1a1b26";
+        close_button.background = "#f7768e";
+        labelicon = "#bb9af7";
+        text = "#c0caf5";
+        time = "#9aa5ce";
+        border = "#565f89";
+        label = "#bb9af7";
+        actions.text = "#24283b";
+        actions.background = "#bb9af7";
+        background = "#1a1b26";
+      };
+      font.size = "1.3rem";
+    };
+    notifications = {
+      monitor = 1;
+      active_monitor = false;
+    };
+    wallpaper = {
+      pywal = false;
+      image = "/home/cholli/Pictures/firewatch.jpg";
+      enable = false;
+    };
+  };
 in
 {
   options.${namespace}.desktop.addons.hyprpanel = {
     enable = mkEnableOption "Enable HyprIdle";
+    extraSettings = mkOption {
+      default = { };
+      inherit (settingsFormat) type;
+      description = ''
+        Additional Options to pass to hyprpanel
+      '';
+      example = literalExpression ''
+        {
+          
+        }
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -26,485 +601,18 @@ in
       wayland.windowManager.hyprland.settings.exec-once = [
         "${pkgs.hyprpanel}/bin/hyprpanel"
       ];
+    };
 
-      programs.hyprpanel = {
-        enable = true;
-        settings = {
-          menus.dashboard.powermenu.avatar.image = "/home/cholli/Pictures/profile.png";
+    ${namespace}.home.file = {
+      ".cache/ags/hyprpanel/options_test.json" = {
 
-          bar = {
-            launcher.autoDetectIcon = true;
-            workspaces = {
-              show_icons = false;
-              show_numbered = true;
-            };
-            layouts = {
-              "0" = {
-                "left" = [
-                  "dashboard"
-                  "workspaces"
-                ];
-                "middle" = [
-                  "windowtitle"
-                ];
-                "right" = [
-                  "volume"
-                  "bluetooth"
-                  "cputemp"
-                  "cpu"
-                  "ram"
-                  "systray"
-                  "clock"
-                  "notifications"
-                ];
-              };
-              "1" = {
-                "left" = [
-                  "workspaces"
-                ];
-                "right" = [
-                  "clock"
-                ];
-              };
-            };
-            customModules = {
-              ram = {
-                icon = " ";
-                labelType = "used/total";
-              };
-              cpu = {
-                icon = " ";
-                leftClick = "kitty --hold btop";
-              };
-              cpuTemp = {
-                sensor = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp3_input";
-                unit = "metric";
-                showUnit = true;
-
-              };
-            };
-            clock.format = "%a %b %d  %H:%M:%S";
-            notifications = {
-              show_total = true;
-              hideCountWhenZero = false;
-            };
-          };
-
-          layouts = {
-            "0" = {
-              left = [
-                "dashboard"
-                "workspaces"
-              ];
-              middle = [ "windowtitle" ];
-              right = [
-                "volume"
-                "bluetooth"
-                "cputemp"
-                "cpu"
-                "ram"
-                "systray"
-                "clock"
-                "notifications"
-              ];
-            };
-            "1" = {
-              left = [ "workspaces" ];
-              right = [ "clock" ];
-            };
-          };
-          theme = {
-            bar = {
-              floating = true;
-              background = "#11111b";
-              border.color = "#b4befe";
-              buttons = {
-                background = "#242438";
-                battery.background = "#242438";
-                battery.border = "#f9e2af";
-                battery.icon = "#242438";
-                battery.icon_background = "#f9e2af";
-                battery.text = "#f9e2af";
-                bluetooth.background = "#242438";
-                bluetooth.border = "#89dceb";
-                bluetooth.icon = "#1e1e2e";
-                bluetooth.icon_background = "#89dbeb";
-                bluetooth.text = "#89dceb";
-                borderColor = "#b4befe";
-                clock.background = "#242438";
-                clock.border = "#f5c2e7";
-                clock.icon = "#232338";
-                clock.icon_background = "#f5c2e7";
-                clock.text = "#f5c2e7";
-                dashboard.background = "#f9e2af";
-                dashboard.border = "#f9e2af";
-                dashboard.icon = "#1e1e2e";
-                hover = "#45475a";
-                icon = "#242438";
-                icon_background = "#b4befe";
-                media.background = "#242438";
-                media.border = "#b4befe";
-                media.icon = "#1e1e2e";
-                media.icon_background = "#b4befe";
-                media.text = "#b4befe";
-                modules.cava.background = "#242438";
-                modules.cava.border = "#94e2d5";
-                modules.cava.icon = "#242438";
-                modules.cava.icon_background = "#94e2d5";
-                modules.cava.text = "#94e2d5";
-                modules.cpu.background = "#242438";
-                modules.cpu.border = "#f38ba8";
-                modules.cpu.icon = "#181825";
-                modules.cpu.icon_background = "#f38ba8";
-                modules.cpu.text = "#f38ba8";
-                modules.hypridle.background = "#242438";
-                modules.hypridle.border = "#f5c2e7";
-                modules.hypridle.icon = "#242438";
-                modules.hypridle.icon_background = "#f5c2e7";
-                modules.hypridle.text = "#f5c2e7";
-                modules.hyprsunset.background = "#242438";
-                modules.hyprsunset.border = "#fab387";
-                modules.hyprsunset.icon = "#242438";
-                modules.hyprsunset.icon_background = "#fab387";
-                modules.hyprsunset.text = "#fab387";
-                modules.kbLayout.background = "#242438";
-                modules.kbLayout.border = "#89dceb";
-                modules.kbLayout.icon = "#181825";
-                modules.kbLayout.icon_background = "#89dceb";
-                modules.kbLayout.text = "#89dceb";
-                modules.microphone.background = "#242438";
-                modules.microphone.border = "#a6e3a1";
-                modules.microphone.icon = "#242438";
-                modules.microphone.icon_background = "#a6e3a1";
-                modules.microphone.text = "#a6e3a1";
-                modules.netstat.background = "#242438";
-                modules.netstat.border = "#a6e3a1";
-                modules.netstat.icon = "#181825";
-                modules.netstat.icon_background = "#a6e3a1";
-                modules.netstat.text = "#a6e3a1";
-                modules.power.background = "#242438";
-                modules.power.border = "#f38ba8";
-                modules.power.icon = "#181825";
-                modules.power.icon_background = "#f38ba8";
-                modules.ram.background = "#242438";
-                modules.ram.border = "#f9e2af";
-                modules.ram.icon = "#181825";
-                modules.ram.icon_background = "#f9e2af";
-                modules.ram.text = "#f9e2af";
-                modules.storage.background = "#242438";
-                modules.storage.border = "#f5c2e7";
-                modules.storage.icon = "#181825";
-                modules.storage.icon_background = "#f5c2e7";
-                modules.storage.text = "#f5c2e7";
-                modules.submap.background = "#242438";
-                modules.submap.border = "#94e2d5";
-                modules.submap.icon = "#181825";
-                modules.submap.icon_background = "#94e2d5";
-                modules.submap.text = "#94e2d5";
-                modules.updates.background = "#242438";
-                modules.updates.border = "#cba6f7";
-                modules.updates.icon = "#181825";
-                modules.updates.icon_background = "#cba6f7";
-                modules.updates.text = "#cba6f7";
-                modules.weather.background = "#242438";
-                modules.weather.border = "#b4befe";
-                modules.weather.icon = "#242438";
-                modules.weather.icon_background = "#b4befe";
-                modules.weather.text = "#b4befe";
-                modules.worldclock.background = "#242438";
-                modules.worldclock.border = "#f5c2e7";
-                modules.worldclock.icon = "#242438";
-                modules.worldclock.icon_background = "#f5c2e7";
-                modules.worldclock.text = "#f5c2e7";
-                network.background = "#242438";
-                network.border = "#cba6f7";
-                network.icon = "#242438";
-                network.icon_background = "#caa6f7";
-                network.text = "#cba6f7";
-                notifications.background = "#242438";
-                notifications.border = "#b4befe";
-                notifications.icon = "#1e1e2e";
-                notifications.icon_background = "#b4befe";
-                notifications.total = "#b4befe";
-                style = "split";
-                systray.background = "#242438";
-                systray.border = "#b4befe";
-                systray.customIcon = "#cdd6f4";
-                text = "#b4befe";
-                volume.background = "#242438";
-                volume.border = "#eba0ac";
-                volume.icon = "#242438";
-                volume.icon_background = "#eba0ac";
-                volume.text = "#eba0ac";
-                windowtitle.background = "#242438";
-                windowtitle.border = "#f5c2e7";
-                windowtitle.icon = "#1e1e2e";
-                windowtitle.icon_background = "#f5c2e7";
-                windowtitle.text = "#f5c2e7";
-                workspaces.active = "#f5c2e7";
-                workspaces.available = "#89dceb";
-                workspaces.background = "#242438";
-                workspaces.border = "#f5c2e7";
-                workspaces.hover = "#f5c2e7";
-                workspaces.numbered_active_highlighted_text_color = "#181825";
-                workspaces.numbered_active_underline_color = "#f5c2e7";
-                workspaces.occupied = "#f2cdcd";
-                y_margins = "0.2em";
-              };
-              menus = {
-                background = "#11111b";
-                border.color = "#313244";
-                buttons.active = "#f5c2e6";
-                buttons.default = "#b4befe";
-                buttons.disabled = "#585b71";
-                buttons.text = "#181824";
-                cards = "#1e1e2e";
-                check_radio_button.active = "#b4beff";
-                check_radio_button.background = "#45475a";
-                dimtext = "#585b70";
-                dropdownmenu.background = "#11111b";
-                dropdownmenu.divider = "#1e1e2e";
-                dropdownmenu.text = "#cdd6f4";
-                feinttext = "#313244";
-                iconbuttons.active = "#b4beff";
-                iconbuttons.passive = "#cdd6f3";
-                icons.active = "#b4befe";
-                icons.passive = "#585b70";
-                label = "#b4befe";
-                listitems.active = "#b4befd";
-                listitems.passive = "#cdd6f4";
-                menu = {
-                  battery.background.color = "#11111b";
-                  battery.border.color = "#313244";
-                  battery.card.color = "#1e1e2e";
-                  battery.icons.active = "#f9e2af";
-                  battery.icons.passive = "#9399b2";
-                  battery.label.color = "#f9e2af";
-                  battery.listitems.active = "#f9e2af";
-                  battery.listitems.passive = "#cdd6f3";
-                  battery.slider.background = "#585b71";
-                  battery.slider.backgroundhover = "#45475a";
-                  battery.slider.primary = "#f9e2af";
-                  battery.slider.puck = "#6c7086";
-                  battery.text = "#cdd6f4";
-                  bluetooth.background.color = "#11111b";
-                  bluetooth.border.color = "#313244";
-                  bluetooth.card.color = "#1e1e2e";
-                  bluetooth.iconbutton.active = "#89dceb";
-                  bluetooth.iconbutton.passive = "#cdd6f4";
-                  bluetooth.icons.active = "#89dceb";
-                  bluetooth.icons.passive = "#9399b2";
-                  bluetooth.label.color = "#89dceb";
-                  bluetooth.listitems.active = "#89dcea";
-                  bluetooth.listitems.passive = "#cdd6f4";
-                  bluetooth.scroller.color = "#89dceb";
-                  bluetooth.status = "#6c7086";
-                  bluetooth.switch.disabled = "#313245";
-                  bluetooth.switch.enabled = "#89dceb";
-                  bluetooth.switch.puck = "#454759";
-                  bluetooth.switch_divider = "#45475a";
-                  bluetooth.text = "#cdd6f4";
-                  clock.background.color = "#11111b";
-                  clock.border.color = "#313244";
-                  clock.calendar.contextdays = "#585b70";
-                  clock.calendar.currentday = "#f5c2e7";
-                  clock.calendar.days = "#cdd6f4";
-                  clock.calendar.paginator = "#f5c2e6";
-                  clock.calendar.weekdays = "#f5c2e7";
-                  clock.calendar.yearmonth = "#94e2d5";
-                  clock.card.color = "#1e1e2e";
-                  clock.text = "#cdd6f4";
-                  clock.time.time = "#f5c2e7";
-                  clock.time.timeperiod = "#94e2d5";
-                  clock.weather.hourly.icon = "#f5c2e7";
-                  clock.weather.hourly.temperature = "#f5c2e7";
-                  clock.weather.hourly.time = "#f5c2e7";
-                  clock.weather.icon = "#f5c2e7";
-                  clock.weather.stats = "#f5c2e7";
-                  clock.weather.status = "#94e2d5";
-                  clock.weather.temperature = "#cdd6f4";
-                  clock.weather.thermometer.cold = "#89b4fa";
-                  clock.weather.thermometer.extremelycold = "#89dceb";
-                  clock.weather.thermometer.extremelyhot = "#f38ba8";
-                  clock.weather.thermometer.hot = "#fab387";
-                  clock.weather.thermometer.moderate = "#b4befe";
-                  dashboard.background.color = "#11111b";
-                  dashboard.border.color = "#313244";
-                  dashboard.card.color = "#1e1e2e";
-                  dashboard.controls.bluetooth.background = "#89dceb";
-                  dashboard.controls.bluetooth.text = "#181824";
-                  dashboard.controls.disabled = "#585b70";
-                  dashboard.controls.input.background = "#f5c2e7";
-                  dashboard.controls.input.text = "#181824";
-                  dashboard.controls.notifications.background = "#f9e2af";
-                  dashboard.controls.notifications.text = "#181824";
-                  dashboard.controls.volume.background = "#eba0ac";
-                  dashboard.controls.volume.text = "#181824";
-                  dashboard.controls.wifi.background = "#cba6f7";
-                  dashboard.controls.wifi.text = "#181824";
-                  dashboard.directories.left.bottom.color = "#eba0ac";
-                  dashboard.directories.left.middle.color = "#f9e2af";
-                  dashboard.directories.left.top.color = "#f5c2e7";
-                  dashboard.directories.right.bottom.color = "#b4befe";
-                  dashboard.directories.right.middle.color = "#cba6f7";
-                  dashboard.directories.right.top.color = "#94e2d5";
-                  dashboard.monitors.bar_background = "#45475a";
-                  dashboard.monitors.cpu.bar = "#eba0ad";
-                  dashboard.monitors.cpu.icon = "#eba0ac";
-                  dashboard.monitors.cpu.label = "#eba0ac";
-                  dashboard.monitors.disk.bar = "#f5c2e8";
-                  dashboard.monitors.disk.icon = "#f5c2e7";
-                  dashboard.monitors.disk.label = "#f5c2e7";
-                  dashboard.monitors.gpu.bar = "#a6e3a2";
-                  dashboard.monitors.gpu.icon = "#a6e3a1";
-                  dashboard.monitors.gpu.label = "#a6e3a1";
-                  dashboard.monitors.ram.bar = "#f9e2ae";
-                  dashboard.monitors.ram.icon = "#f9e2af";
-                  dashboard.monitors.ram.label = "#f9e2af";
-                  dashboard.powermenu.confirmation.background = "#11111b";
-                  dashboard.powermenu.confirmation.body = "#cdd6f4";
-                  dashboard.powermenu.confirmation.border = "#313244";
-                  dashboard.powermenu.confirmation.button_text = "#11111a";
-                  dashboard.powermenu.confirmation.card = "#1e1e2e";
-                  dashboard.powermenu.confirmation.confirm = "#a6e3a1";
-                  dashboard.powermenu.confirmation.deny = "#f38ba8";
-                  dashboard.powermenu.confirmation.label = "#b4befe";
-                  dashboard.powermenu.logout = "#a6e3a1";
-                  dashboard.powermenu.restart = "#fab387";
-                  dashboard.powermenu.shutdown = "#f38ba8";
-                  dashboard.powermenu.sleep = "#89dceb";
-                  dashboard.profile.name = "#f5c2e7";
-                  dashboard.shortcuts.background = "#b4befe";
-                  dashboard.shortcuts.recording = "#a6e3a1";
-                  dashboard.shortcuts.text = "#181824";
-                  media.album = "#f5c2e8";
-                  media.artist = "#94e2d6";
-                  media.background.color = "#11111b";
-                  media.border.color = "#313244";
-                  media.buttons.background = "#b4beff";
-                  media.buttons.enabled = "#94e2d4";
-                  media.buttons.inactive = "#585b70";
-                  media.buttons.text = "#11111b";
-                  media.card.color = "#1e1e2e";
-                  media.slider.background = "#585b71";
-                  media.slider.backgroundhover = "#45475a";
-                  media.slider.primary = "#f5c2e7";
-                  media.slider.puck = "#6c7086";
-                  media.song = "#b4beff";
-                  media.timestamp = "#cdd6f4";
-                  network.background.color = "#11111b";
-                  network.border.color = "#313244";
-                  network.card.color = "#1e1e2e";
-                  network.iconbuttons.active = "#cba6f7";
-                  network.iconbuttons.passive = "#cdd6f4";
-                  network.icons.active = "#cba6f7";
-                  network.icons.passive = "#9399b2";
-                  network.label.color = "#cba6f7";
-                  network.listitems.active = "#cba6f6";
-                  network.listitems.passive = "#cdd6f4";
-                  network.scroller.color = "#cba6f7";
-                  network.status.color = "#6c7086";
-                  network.switch.disabled = "#313245";
-                  network.switch.enabled = "#cba6f7";
-                  network.switch.puck = "#454759";
-                  network.text = "#cdd6f4";
-                  notifications.background = "#11111b";
-                  notifications.border = "#313244";
-                  notifications.card = "#1e1e2e";
-                  notifications.clear = "#f38ba8";
-                  notifications.label = "#b4befe";
-                  notifications.no_notifications_label = "#313244";
-                  notifications.pager.background = "#11111b";
-                  notifications.pager.button = "#b4befe";
-                  notifications.pager.label = "#9399b2";
-                  notifications.scrollbar.color = "#b4befe";
-                  notifications.switch.disabled = "#313245";
-                  notifications.switch.enabled = "#b4befe";
-                  notifications.switch.puck = "#454759";
-                  notifications.switch_divider = "#45475a";
-                  power.background.color = "#11111b";
-                  power.border.color = "#313244";
-                  power.buttons.logout.background = "#1e1e2e";
-                  power.buttons.logout.icon = "#181824";
-                  power.buttons.logout.icon_background = "#a6e3a1";
-                  power.buttons.logout.text = "#a6e3a1";
-                  power.buttons.restart.background = "#1e1e2e";
-                  power.buttons.restart.icon = "#181824";
-                  power.buttons.restart.icon_background = "#fab387";
-                  power.buttons.restart.text = "#fab387";
-                  power.buttons.shutdown.background = "#1e1e2e";
-                  power.buttons.shutdown.icon = "#181824";
-                  power.buttons.shutdown.icon_background = "#f38ba7";
-                  power.buttons.shutdown.text = "#f38ba8";
-                  power.buttons.sleep.background = "#1e1e2e";
-                  power.buttons.sleep.icon = "#181824";
-                  power.buttons.sleep.icon_background = "#89dceb";
-                  power.buttons.sleep.text = "#89dceb";
-                  systray.dropdownmenu.background = "#11111b";
-                  systray.dropdownmenu.divider = "#1e1e2e";
-                  systray.dropdownmenu.text = "#cdd6f4";
-                  volume.audio_slider.background = "#585b71";
-                  volume.audio_slider.backgroundhover = "#45475a";
-                  volume.audio_slider.primary = "#eba0ac";
-                  volume.audio_slider.puck = "#585b70";
-                  volume.background.color = "#11111b";
-                  volume.border.color = "#313244";
-                  volume.card.color = "#1e1e2e";
-                  volume.iconbutton.active = "#eba0ac";
-                  volume.iconbutton.passive = "#cdd6f4";
-                  volume.icons.active = "#eba0ac";
-                  volume.icons.passive = "#9399b2";
-                  volume.input_slider.background = "#585b71";
-                  volume.input_slider.backgroundhover = "#45475a";
-                  volume.input_slider.primary = "#eba0ac";
-                  volume.input_slider.puck = "#585b70";
-                  volume.label.color = "#eba0ac";
-                  volume.listitems.active = "#eba0ab";
-                  volume.listitems.passive = "#cdd6f4";
-                  volume.text = "#cdd6f4";
-                };
-                popover.background = "#181824";
-                popover.border = "#181824";
-                popover.text = "#b4befe";
-                progressbar.background = "#45475a";
-                progressbar.foreground = "#b4befe";
-                slider.background = "#585b71";
-                slider.backgroundhover = "#45475a";
-                slider.primary = "#b4befe";
-                slider.puck = "#6c7086";
-                switch.disabled = "#313245";
-                switch.enabled = "#b4befe";
-                switch.puck = "#454759";
-                text = "#cdd6f4";
-                tooltip.background = "#11111b";
-                tooltip.text = "#cdd6f4";
-              };
-              outer_spacing = "0.0em";
-              transparent = true;
-
-            };
-            notification.actions.background = "#b4befd";
-            notification.actions.text = "#181825";
-            notification.background = "#181826";
-            notification.border = "#313243";
-            notification.close_button.background = "#f38ba7";
-            notification.close_button.label = "#11111b";
-            notification.label = "#b4befe";
-            notification.labelicon = "#b4befe";
-            notification.text = "#cdd6f4";
-            notification.time = "#7f849b";
-            osd.bar_color = "#b4beff";
-            osd.bar_container = "#11111b";
-            osd.bar_empty_color = "#313244";
-            osd.bar_overflow_color = "#f38ba7";
-            osd.icon = "#11111b";
-            osd.icon_container = "#b4beff";
-            osd.label = "#b4beff";
-
-          };
-        };
+        # source = pkgs.formats.json.generate "options.json" settings;
+        text = builtins.toJSON settings;
       };
     };
 
+    environment.systemPackages = with pkgs.nerd-fonts; [
+      jetbrains-mono
+    ];
   };
 }
diff --git a/modules/nixos/desktop/addons/hyprpaper/default.nix b/modules/nixos/desktop/addons/hyprpaper/default.nix
index 5a7c2a9..5f19b72 100644
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@@ -25,14 +25,14 @@ in
       };
 
       wayland.windowManager.hyprland.settings.exec-once = [
-        ''hyprctl hyprpaper wallpaper "DP-1,${picture-path}"''
+        ''hyprctl hyprpaper wallpaper "DP-2,${picture-path}"''
       ];
 
       services.hyprpaper = {
         enable = true;
         settings = {
           preload = [ picture-path ];
-          wallpaper = "DP-1,${picture-path}";
+          wallpaper = "DP-2,${picture-path}";
         };
       };
     };
diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index 6df60fb..56811e5 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -118,9 +118,6 @@ in
       focus-1password
 
       hyprpanel
-
-      #####
-      xdg-dbus-proxy
     ];
 
     programs = {
@@ -128,52 +125,19 @@ in
         enable = true;
         package = hyprland-package;
         portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
-        withUWSM = true;
       };
     };
 
-    xdg = {
-      autostart.enable = true;
-      portal = {
-        enable = true;
-        extraPortals = [
-          pkgs.xdg-desktop-portal
-          pkgs.xdg-desktop-portal-gtk
-        ];
-        xdgOpenUsePortal = true;
-
-        config = {
-          common = {
-            default = [ "*" ];
-            "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
-          };
-          hyprland = {
-            default = [
-              "hyprland"
-              "gtk"
-            ];
-            "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
-            "org.freedesktop.impl.portal.OpenURI" = [ "gtk" ];
-          };
-        };
-      };
-    };
-
-    # services.greetd = {
-    #   enable = true;
-    #   settings = rec {
-    #     initial_session = {
-    #       command = "${hyprland-package}/bin/Hyprland";
-    #       user = "cholli";
-    #     };
-
-    #     default_session = initial_session;
-    #   };
-    # };
-    #
-    services.displayManager.gdm = {
+    services.greetd = {
       enable = true;
-      wayland = true;
+      settings = rec {
+        initial_session = {
+          command = "${hyprland-package}/bin/Hyprland";
+          user = "cholli";
+        };
+
+        default_session = initial_session;
+      };
     };
 
     ${namespace} = {
@@ -200,7 +164,6 @@ in
           enable = true;
           package = hyprland-package;
           plugins = [ inputs.hy3.packages.${system}.hy3 ];
-          systemd.variables = [ "--all" ];
           settings = mkMerge [
             {
               "$mod" = "SUPER";
@@ -208,7 +171,7 @@ in
               exec-once = [
                 "systemctl --user start hyprpolkitagent"
 
-                "[workspace 2 silent] steam"
+                "[workspace 2 silent] steam --disable-gpu-compositing" # nvidia pls let me have nice things
                 "[workspace 8 silent] discord"
                 "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore
                 "[workspace 1 silent] zen-beta"
@@ -287,68 +250,69 @@ in
                 ];
               };
 
-              bind = [
-                # compositor commands
-                "$mod SHIFT, R, exec, hyprctl reload"
-                "$mod SHIFT, Q, killactive,"
-                "$mod SHIFT, E, exec, pkill Hyprland"
+              bind =
+                [
+                  # compositor commands
+                  "$mod SHIFT, R, exec, hyprctl reload"
+                  "$mod SHIFT, Q, killactive,"
+                  "$mod SHIFT, E, exec, pkill Hyprland"
 
-                "$mod, F, fullscreen,"
-                "$mod, G, togglegroup,"
-                "$mod SHIFT, N, changegroupactive, f"
-                "$mod SHIFT, P, changegroupactive, b"
-                "$mod, R, togglesplit,"
-                "$mod, T, togglefloating,"
-                "$mod ALT, ,resizeactive,"
+                  "$mod, F, fullscreen,"
+                  "$mod, G, togglegroup,"
+                  "$mod SHIFT, N, changegroupactive, f"
+                  "$mod SHIFT, P, changegroupactive, b"
+                  "$mod, R, togglesplit,"
+                  "$mod, T, togglefloating,"
+                  "$mod ALT, ,resizeactive,"
 
-                "$mod CTRL, left, movecurrentworkspacetomonitor, l"
-                "$mod CTRL, right, movecurrentworkspacetomonitor, r"
+                  "$mod CTRL, left, movecurrentworkspacetomonitor, l"
+                  "$mod CTRL, right, movecurrentworkspacetomonitor, r"
 
-                # move focus
-                "$mod, h, hy3:movefocus, l"
-                "$mod, j, hy3:movefocus, d"
-                "$mod, k, hy3:movefocus, u"
-                "$mod, l, hy3:movefocus, r"
-                "$mod, left, hy3:movefocus, l"
-                "$mod, down, hy3:movefocus, d"
-                "$mod, up, hy3:movefocus, u"
-                "$mod, right, hy3:movefocus, r"
+                  # move focus
+                  "$mod, h, hy3:movefocus, l"
+                  "$mod, j, hy3:movefocus, d"
+                  "$mod, k, hy3:movefocus, u"
+                  "$mod, l, hy3:movefocus, r"
+                  "$mod, left, hy3:movefocus, l"
+                  "$mod, down, hy3:movefocus, d"
+                  "$mod, up, hy3:movefocus, u"
+                  "$mod, right, hy3:movefocus, r"
 
-                # move focus
-                "$mod SHIFT, h, hy3:movewindow, l, once"
-                "$mod SHIFT, j, hy3:movewindow, d, once"
-                "$mod SHIFT, k, hy3:movewindow, u, once"
-                "$mod SHIFT, l, hy3:movewindow, r, once"
-                "$mod SHIFT, left, hy3:movewindow, l, once"
-                "$mod SHIFT, down, hy3:movewindow, d, once"
-                "$mod SHIFT, up, hy3:movewindow, u, once"
-                "$mod SHIFT, right, hy3:movewindow, r, once"
+                  # move focus
+                  "$mod SHIFT, h, hy3:movewindow, l, once"
+                  "$mod SHIFT, j, hy3:movewindow, d, once"
+                  "$mod SHIFT, k, hy3:movewindow, u, once"
+                  "$mod SHIFT, l, hy3:movewindow, r, once"
+                  "$mod SHIFT, left, hy3:movewindow, l, once"
+                  "$mod SHIFT, down, hy3:movewindow, d, once"
+                  "$mod SHIFT, up, hy3:movewindow, u, once"
+                  "$mod SHIFT, right, hy3:movewindow, r, once"
 
-                #run important programs
-                "$mod, Return, exec, kitty"
-                "$mod, D, exec, rofi -show drun"
-                "$mod, P, exec, focus-or-open-1pass"
-                # "$mod, D, exec, rofi -show combi"
+                  #run important programs
+                  "$mod, Return, exec, kitty"
+                  "$mod, D, exec, rofi -show drun"
+                  "$mod, P, exec, focus-or-open-1pass"
+                  # "$mod, D, exec, rofi -show combi"
 
-                #screenshot
-                ", Print, exec, grimblast copy area"
-              ]
-              ++ (
-                # workspaces
-                # binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
-                builtins.concatLists (
-                  builtins.genList (
-                    i:
-                    let
-                      ws = i + 1;
-                    in
-                    [
-                      "$mod, code:1${toString i}, workspace, ${toString ws}"
-                      "$mod SHIFT, code:1${toString i}, hy3:movetoworkspace, ${toString ws}"
-                    ]
-                  ) 9
-                )
-              );
+                  #screenshot
+                  ", Print, exec, grimblast copy area"
+                ]
+                ++ (
+                  # workspaces
+                  # binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
+                  builtins.concatLists (
+                    builtins.genList (
+                      i:
+                      let
+                        ws = i + 1;
+                      in
+                      [
+                        "$mod, code:1${toString i}, workspace, ${toString ws}"
+                        "$mod SHIFT, code:1${toString i}, hy3:movetoworkspace, ${toString ws}"
+                      ]
+                    ) 9
+                  )
+                );
 
               # mouse movements
               bindm = [
diff --git a/modules/nixos/security/keyring/default.nix b/modules/nixos/security/keyring/default.nix
index a86f2f7..bce8b04 100644
--- a/modules/nixos/security/keyring/default.nix
+++ b/modules/nixos/security/keyring/default.nix
@@ -3,7 +3,6 @@
   config,
   lib,
   namespace,
-  pkgs,
   ...
 }:
 let
@@ -18,15 +17,7 @@ in
 
   config = mkIf cfg.enable {
     services.gnome.gnome-keyring.enable = true;
-    security.pam.services.gdm.enableGnomeKeyring = true;
     security.pam.services.sddm.enableGnomeKeyring = true;
     security.pam.services.greetd.enableGnomeKeyring = true;
-
-    services.dbus.packages = [
-      pkgs.gnome-keyring
-      pkgs.gcr
-    ];
-
-    environment.systemPackages = [ pkgs.seahorse ];
   };
 }
diff --git a/modules/nixos/submodules/games/default.nix b/modules/nixos/submodules/games/default.nix
index 6f98066..cf48832 100644
--- a/modules/nixos/submodules/games/default.nix
+++ b/modules/nixos/submodules/games/default.nix
@@ -17,7 +17,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ prismlauncher ];
+    # environment.systemPackages = with pkgs; [ prismlauncher ];
 
     ${namespace} = {
       apps = {
diff --git a/modules/nixos/system/hardware/gpu/amd/default.nix b/modules/nixos/system/hardware/gpu/amd/default.nix
deleted file mode 100644
index 6ac170c..0000000
--- a/modules/nixos/system/hardware/gpu/amd/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  namespace,
-  ...
-}:
-let
-  inherit (lib) mkIf mkEnableOption;
-  cfg = config.${namespace}.system.hardware.gpu.amd;
-
-  amdvlk-run = pkgs.writeShellScriptBin "amdvlk-run" ''
-    export VK_DRIVER_FILES="${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.pkgsi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json"
-    exec "$@"
-  '';
-in
-{
-  options.${namespace}.system.hardware.gpu.amd = {
-    enable = mkEnableOption "Enable AMD GPU";
-  };
-
-  config = mkIf cfg.enable {
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-
-    environment = {
-      systemPackages = [ amdvlk-run ];
-      variables = {
-        AMD_VULKAN_ICD = "RADV";
-      };
-    };
-  };
-}
diff --git a/systems/x86_64-linux/tmp/default.nix b/systems/x86_64-linux/tmp/default.nix
new file mode 100644
index 0000000..f13c86b
--- /dev/null
+++ b/systems/x86_64-linux/tmp/default.nix
@@ -0,0 +1,97 @@
+{
+  inputs,
+  lib,
+  namespace,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib.${namespace}) enabled disabled;
+in
+{
+  imports = [
+    ./hardware.nix
+    ./hyprland_config.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    path-of-building
+    teams-for-linux
+    obsidian
+    zed-editor
+
+    # eve
+    bottles
+    pyfa
+
+    # misc
+    diebahn
+
+    nixpkgs-review
+  ];
+
+  environment.pathsToLink = [ "/libexec" ];
+
+  virtualisation.waydroid = enabled;
+
+  programs.ssh.extraConfig = ''
+    AddressFamily inet
+  '';
+  home-manager = {
+    backupFileExtension = ".bak";
+  };
+
+  nix = {
+    distributedBuilds = true;
+    settings.builders-use-substitutes = true;
+    buildMachines = [
+      {
+        hostName = "nixberry";
+        sshUser = "remotebuild";
+        sshKey = "/root/.ssh/remotebuild";
+        systems = [ "aarch64-linux" ];
+        protocol = "ssh-ng";
+
+        supportedFeatures = [
+          "nixos-test"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
+  };
+
+  ${namespace} = {
+    archetypes = {
+      gaming.enable = true;
+    };
+
+    apps = {
+      _1password = enabled;
+      obs-studio = enabled;
+      cli-apps.helix = enabled;
+      starsector = enabled;
+    };
+
+    desktop.hyprland = {
+      enable = true;
+    };
+
+    services = {
+      factorio-server = disabled;
+    };
+
+    tools.devenv = enabled;
+
+    system = {
+      hardware = {
+        bluetooth = enabled;
+        # gpu.nvidia = enabled;
+      };
+    };
+
+    security.gpg = enabled;
+  };
+
+  system.stateVersion = "23.11";
+}
diff --git a/systems/x86_64-linux/tmp/hardware_.nix b/systems/x86_64-linux/tmp/hardware_.nix
new file mode 100644
index 0000000..e00556a
--- /dev/null
+++ b/systems/x86_64-linux/tmp/hardware_.nix
@@ -0,0 +1,69 @@
+# 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,
+  modulesPath,
+  inputs,
+  ...
+}:
+let
+  inherit (inputs) nixos-hardware;
+in
+{
+  imports = with nixos-hardware.nixosModules; [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    common-cpu-amd
+    common-gpu-nvidia-nonprime
+    common-pc
+    common-pc-ssd
+  ];
+
+  boot = {
+    initrd.availableKernelModules = [
+      "nvme"
+      "xhci_pci"
+      "ahci"
+      "usb_storage"
+      "usbhid"
+      "sd_mod"
+    ];
+    initrd.kernelModules = [ ];
+    kernelModules = [
+      "kvm-amd"
+      "btusb"
+    ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
+      fsType = "ext4";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/8310-585A";
+      fsType = "vfat";
+    };
+
+    "/storage" = {
+      device = "/dev/disk/by-uuid/c3c1dec1-7716-4c37-a3f2-bb60f9af84fd";
+      fsType = "ext4";
+    };
+  };
+
+  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.enp40s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/systems/x86_64-linux/tmp/hyprland_config.nix b/systems/x86_64-linux/tmp/hyprland_config.nix
new file mode 100644
index 0000000..1927ec1
--- /dev/null
+++ b/systems/x86_64-linux/tmp/hyprland_config.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  namespace,
+  pkgs,
+  ...
+}:
+let
+in
+{
+  ${namespace}.desktop.hyprland.settings = {
+    monitor = [
+      #Ultrawide
+      "DP-2,3440x1440@144, 0x0, 1"
+      #Vertical
+      "HDMI-A-1, 1920x1080@144, auto-right, 1, transform, 1"
+      # nividia kernel issues
+      "Unknown-1, disable"
+    ];
+
+    cursor = {
+      no_hardware_cursors = true;
+    };
+
+    exec-once = [
+      "[workspace 7 silent] obsidian"
+
+      "${lib.getExe pkgs.xorg.xrandr} --output DP-2 --primary"
+    ];
+
+    workspace = [
+      "1, monitor:DP-2"
+      "2, monitor:DP-2"
+      "3, monitor:DP-2"
+      "4, monitor:DP-2"
+      "5, monitor:DP-2"
+      "6, monitor:DP-2"
+      "7, monitor:HDMI-A-1"
+      "8, monitor:HDMI-A-1"
+      "9, monitor:HDMI-A-1"
+    ];
+
+    windowrulev2 = [
+      "workspace 8 silent, class:^(steam)$, title:^(Friends List)"
+      "workspace 8 silent, class:^(discord)$, title:^(Discord)"
+      "workspace 7 silent, class:^(com.obsproject.Studio)$"
+    ];
+  };
+}
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 8e4ffdb..803d0b5 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -38,7 +38,7 @@ in
     AddressFamily inet
   '';
   home-manager = {
-    backupFileExtension = "bak";
+    backupFileExtension = ".bak";
   };
 
   nix = {
@@ -86,7 +86,7 @@ in
     system = {
       hardware = {
         bluetooth = enabled;
-        gpu.amd = enabled;
+        gpu.nvidia = enabled;
       };
     };
 
diff --git a/systems/x86_64-linux/yggdrasil/hardware.nix b/systems/x86_64-linux/yggdrasil/hardware.nix
index 7133352..e00556a 100644
--- a/systems/x86_64-linux/yggdrasil/hardware.nix
+++ b/systems/x86_64-linux/yggdrasil/hardware.nix
@@ -4,9 +4,8 @@
 {
   config,
   lib,
-  inputs,
-  pkgs,
   modulesPath,
+  inputs,
   ...
 }:
 let
@@ -16,6 +15,7 @@ in
   imports = with nixos-hardware.nixosModules; [
     (modulesPath + "/installer/scan/not-detected.nix")
     common-cpu-amd
+    common-gpu-nvidia-nonprime
     common-pc
     common-pc-ssd
   ];
@@ -23,28 +23,29 @@ in
   boot = {
     initrd.availableKernelModules = [
       "nvme"
-      "ahci"
       "xhci_pci"
-      "usbhid"
+      "ahci"
       "usb_storage"
+      "usbhid"
       "sd_mod"
     ];
-    kernelModules = [ "kvm-amd" ];
+    initrd.kernelModules = [ ];
+    kernelModules = [
+      "kvm-amd"
+      "btusb"
+    ];
+    extraModulePackages = [ ];
   };
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/b1a956f4-91d5-456e-a92b-be505bb719bd";
+      device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
       fsType = "ext4";
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/B4D4-8BA0";
+      device = "/dev/disk/by-uuid/8310-585A";
       fsType = "vfat";
-      options = [
-        "fmask=0077"
-        "dmask=0077"
-      ];
     };
 
     "/storage" = {
@@ -53,17 +54,15 @@ in
     };
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/4bec00ec-e9eb-4034-836a-ecf15e0bb40e"; }
-  ];
+  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.enp14s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp40s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/systems/x86_64-linux/yggdrasil/hyprland_config.nix b/systems/x86_64-linux/yggdrasil/hyprland_config.nix
index fdeb16e..1927ec1 100644
--- a/systems/x86_64-linux/yggdrasil/hyprland_config.nix
+++ b/systems/x86_64-linux/yggdrasil/hyprland_config.nix
@@ -10,7 +10,7 @@ in
   ${namespace}.desktop.hyprland.settings = {
     monitor = [
       #Ultrawide
-      "DP-1,3440x1440@144, 0x0, 1"
+      "DP-2,3440x1440@144, 0x0, 1"
       #Vertical
       "HDMI-A-1, 1920x1080@144, auto-right, 1, transform, 1"
       # nividia kernel issues
@@ -24,16 +24,16 @@ in
     exec-once = [
       "[workspace 7 silent] obsidian"
 
-      "${lib.getExe pkgs.xorg.xrandr} --output DP-1 --primary"
+      "${lib.getExe pkgs.xorg.xrandr} --output DP-2 --primary"
     ];
 
     workspace = [
-      "1, monitor:DP-1"
-      "2, monitor:DP-1"
-      "3, monitor:DP-1"
-      "4, monitor:DP-1"
-      "5, monitor:DP-1"
-      "6, monitor:DP-1"
+      "1, monitor:DP-2"
+      "2, monitor:DP-2"
+      "3, monitor:DP-2"
+      "4, monitor:DP-2"
+      "5, monitor:DP-2"
+      "6, monitor:DP-2"
       "7, monitor:HDMI-A-1"
       "8, monitor:HDMI-A-1"
       "9, monitor:HDMI-A-1"