From 087e7a96dbf30f093b1c5f97146091464abab90c Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Wed, 27 Nov 2024 15:22:23 -0500
Subject: [PATCH] hyprland: re-org ./home

---
 modules/nixos/linux/gui/hyprland/default.nix  | 22 ++-----------------
 .../nixos/linux/gui/hyprland/home/default.nix | 20 +++++++++++++++++
 .../gui/hyprland/{ => home}/fix-cursor.nix    |  0
 .../old-config/blue-light-filter.glsl         |  0
 .../gui/hyprland/{ => home}/settings.nix      |  0
 .../linux/gui/hyprland/{ => home}/waybar.nix  |  0
 6 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 modules/nixos/linux/gui/hyprland/home/default.nix
 rename modules/nixos/linux/gui/hyprland/{ => home}/fix-cursor.nix (100%)
 rename modules/nixos/linux/gui/hyprland/{ => home}/old-config/blue-light-filter.glsl (100%)
 rename modules/nixos/linux/gui/hyprland/{ => home}/settings.nix (100%)
 rename modules/nixos/linux/gui/hyprland/{ => home}/waybar.nix (100%)

diff --git a/modules/nixos/linux/gui/hyprland/default.nix b/modules/nixos/linux/gui/hyprland/default.nix
index 9d5858b6..7b9072f6 100644
--- a/modules/nixos/linux/gui/hyprland/default.nix
+++ b/modules/nixos/linux/gui/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ flake, pkgs, lib, ... }:
+{ flake, pkgs, ... }:
 
 let
   inherit (flake) inputs;
@@ -14,25 +14,7 @@ in
 
   security.pam.services.hyprlock = { };
 
-  home-manager.sharedModules = [{
-    imports = [
-      ./fix-cursor.nix
-      ./waybar.nix
-      ./settings.nix
-    ];
-    wayland.windowManager.hyprland = {
-      enable = true;
-    };
-    services.dunst.enable = true;
-    home.sessionVariables.NIXOS_OZONE_WL = "1";
-
-    programs.hyprlock.enable = true;
-    programs.rofi = {
-      enable = true;
-      terminal = lib.getExe pkgs.rio;
-      plugins = [ pkgs.rofi-emoji ];
-    };
-  }];
+  home-manager.sharedModules = [ ./home ];
 
   environment.systemPackages = with pkgs; [
     kitty
diff --git a/modules/nixos/linux/gui/hyprland/home/default.nix b/modules/nixos/linux/gui/hyprland/home/default.nix
new file mode 100644
index 00000000..9273afee
--- /dev/null
+++ b/modules/nixos/linux/gui/hyprland/home/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ./fix-cursor.nix
+    ./waybar.nix
+    ./settings.nix
+  ];
+  wayland.windowManager.hyprland = {
+    enable = true;
+  };
+  services.dunst.enable = true;
+  home.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  programs.hyprlock.enable = true;
+  programs.rofi = {
+    enable = true;
+    terminal = lib.getExe pkgs.rio;
+    plugins = [ pkgs.rofi-emoji ];
+  };
+}
diff --git a/modules/nixos/linux/gui/hyprland/fix-cursor.nix b/modules/nixos/linux/gui/hyprland/home/fix-cursor.nix
similarity index 100%
rename from modules/nixos/linux/gui/hyprland/fix-cursor.nix
rename to modules/nixos/linux/gui/hyprland/home/fix-cursor.nix
diff --git a/modules/nixos/linux/gui/hyprland/old-config/blue-light-filter.glsl b/modules/nixos/linux/gui/hyprland/home/old-config/blue-light-filter.glsl
similarity index 100%
rename from modules/nixos/linux/gui/hyprland/old-config/blue-light-filter.glsl
rename to modules/nixos/linux/gui/hyprland/home/old-config/blue-light-filter.glsl
diff --git a/modules/nixos/linux/gui/hyprland/settings.nix b/modules/nixos/linux/gui/hyprland/home/settings.nix
similarity index 100%
rename from modules/nixos/linux/gui/hyprland/settings.nix
rename to modules/nixos/linux/gui/hyprland/home/settings.nix
diff --git a/modules/nixos/linux/gui/hyprland/waybar.nix b/modules/nixos/linux/gui/hyprland/home/waybar.nix
similarity index 100%
rename from modules/nixos/linux/gui/hyprland/waybar.nix
rename to modules/nixos/linux/gui/hyprland/home/waybar.nix