From 8d6e9afd6276d64f5de446e19b588e686fdc12e5 Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Sat, 18 Nov 2023 01:41:08 -0800
Subject: [PATCH] Removes hyprland module imports (not needed for normal ops)

---
 home/linux/hyprland.nix     | 50 ++++++++++++++++++++-----------------
 nixos/profiles/hyprland.nix |  5 ----
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix
index e7a9a56..24e8983 100644
--- a/home/linux/hyprland.nix
+++ b/home/linux/hyprland.nix
@@ -20,30 +20,34 @@
   services.mako.enable = true;
 
   wayland.windowManager.hyprland = {
-    extraConfig = ''
-      bind = SHIFT_SUPER, SPACE, exec, alacritty
-      bind = SUPER, SPACE, exec, rofi -modes "ssh,drun,window" -show drun
-      bind = ALT, SPACE, exec, rofi -show window
+    enable = true;
 
-      input {
-        kb_layout=${globals.keyboard.layout}
-        kb_variant=${globals.keyboard.variant}
-        sensitivity=0.4
-        accel_profile=adaptive
-        touchpad {
-          natural_scroll=true
-          scroll_factor=0.45
-          tap-and-drag=true
-        }
-      }
+    settings = {
+      bind = [
+        "SHIFT_SUPER, SPACE, exec, alacritty"
+        "SUPER, SPACE, exec, rofi -modes \"ssh,drun,window\" -show drun"
+        "ALT, SPACE, exec, rofi -show window"
+      ];
 
-      gestures {
-        workspace_swipe=true
-        workspace_swipe_fingers=3
-        workspace_swipe_cancel_ratio=0.5
-        workspace_swipe_distance=2000
-        workspace_swipe_invert=true
-      }
-    '';
+      input = {
+        kb_layout = globals.keyboard.layout;
+        kb_variant = globals.keyboard.variant;
+        sensitivity = 0.4;
+        accel_profile = "adaptive";
+        touchpad = {
+          natural_scroll = true;
+          scroll_factor = 0.45;
+          tap-and-drag = true;
+        };
+      };
+
+      gestures = {
+        workspace_swipe = true;
+        workspace_swipe_fingers = 3;
+        workspace_swipe_cancel_ratio = 0.5;
+        workspace_swipe_distance = 2000;
+        workspace_swipe_invert = true;
+      };
+    };
   };
 }
diff --git a/nixos/profiles/hyprland.nix b/nixos/profiles/hyprland.nix
index 1b92bcb..5e828b6 100644
--- a/nixos/profiles/hyprland.nix
+++ b/nixos/profiles/hyprland.nix
@@ -5,11 +5,6 @@
 }: {
   imports = [./desktop.nix];
 
-  home-manager.sharedModules = [
-    {wayland.windowManager.hyprland.enable = true;}
-    inputs.hyprland.homeManagerModules.default
-  ];
-
   programs.hyprland.enable = true;
   programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland;