diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index bdb1d30..2e38e79 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -39,6 +39,7 @@
 
   nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
 
+  hardware.logitech.wireless.enable = true;
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix
index 11f21cd..0888f94 100644
--- a/modules/home/desktop.nix
+++ b/modules/home/desktop.nix
@@ -1,18 +1,20 @@
 {
-  imports = [
-    ../../packages/fonts/home.nix
+  imports =
+    [
+      ../../packages/fonts/home.nix
+      ../../packages/firefox/home.nix
 
-    ../../packages/firefox/home.nix
-
-    ../../packages/hyprland/home.nix
-    ../../packages/hyprlock/home.nix
-    ../../packages/hypridle/home.nix
-    ../../packages/hyprsunset/home.nix
-    ../../packages/rofi/home.nix
-    # ../../packages/quickshell/home.nix
-
-    ../../packages/mangohud/home.nix
-
-    ../../packages/matugen/home.nix
-  ];
+      ../../packages/hyprland/home.nix
+      ../../packages/hyprlock/home.nix
+      ../../packages/hypridle/home.nix
+      ../../packages/hyprsunset/home.nix
+      ../../packages/matugen/home.nix
+      ../../packages/rofi/home.nix
+    ]
+    ++ [
+      ../../packages/solaar/home.nix
+    ]
+    ++ [
+      ../../packages/mangohud/home.nix
+    ];
 }
diff --git a/packages/hyprland/config/execs.nix b/packages/hyprland/config/execs.nix
index e69de29..5a0c272 100644
--- a/packages/hyprland/config/execs.nix
+++ b/packages/hyprland/config/execs.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  myConfig,
+  ...
+}: {
+  wayland.windowManager.hyprland.settings = {
+    exec-once = [
+      "[workspace 20 silent] kitty --single-instance --hold fastfetch"
+      "[workspace 20 silent] firefox"
+      "[workspace 1] kitty --single-instance --hold fastfetch"
+      "matugen image /home/${myConfig.essentials.Username}/Pictures/Wallpapers/ultrawide-nixos-default.png"
+      "hyprctl setcursor Bibata-Original-Classic 24"
+      "solaar -w hide"
+    ];
+  };
+}
diff --git a/packages/hyprland/home.nix b/packages/hyprland/home.nix
index e011dca..c1ce709 100644
--- a/packages/hyprland/home.nix
+++ b/packages/hyprland/home.nix
@@ -16,29 +16,9 @@
       "$mod" = "SUPER";
       "$term" = "kitty --single-instance";
       "$browser" = "firefox";
-      # "$bar" = "qs -c caelestia";
       "$wsaction" = "fish -c ./scripts/wsaction.fish";
 
       monitor = myConfig.nixos.Hyprland.monitors;
-
-      exec = [
-        "hyprctl dispatch submap global"
-      ];
-      submap = [
-        "global"
-      ];
-
-      exec-once = [
-        "[workspace 20 silent] kitty --single-insance --hold fastfetch"
-        "[workspace 20 silent] firefox"
-        "[workspace 1] kitty --single-instance --hold fastfetch"
-        # If $bar is uncommented here, make sure it's defined either here or in another imported file
-        # "$bar"
-        "matugen image /home/${myConfig.essentials.Username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png"
-        "hyprctl setcursor Bibata-Original-Classic 24"
-        "solaar -w hide"
-      ];
-
       general = {
         gaps_in = 2;
         gaps_out = 5;
diff --git a/packages/solaar/home.nix b/packages/solaar/home.nix
new file mode 100644
index 0000000..3271e1f
--- /dev/null
+++ b/packages/solaar/home.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  # home.packages = with pkgs; [
+  #   solaar
+  # ];
+  services.solaar.enable = true;
+}