From 7cd825d9382a6d8eccd661e4a223373e1a31212f Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 16 Mar 2025 15:21:55 +0000
Subject: [PATCH] hyprland: move from module to user config

---
 hosts/odyssey/default.nix                 |  1 -
 modules/nixos/default.nix                 |  1 -
 modules/nixos/system/desktop/hyprland.nix | 50 -----------------------
 users/jordan/graphical/hyprland.nix       | 32 +++++++++++++++
 4 files changed, 32 insertions(+), 52 deletions(-)
 delete mode 100644 modules/nixos/system/desktop/hyprland.nix
 create mode 100644 users/jordan/graphical/hyprland.nix

diff --git a/hosts/odyssey/default.nix b/hosts/odyssey/default.nix
index 6f2837f..da51952 100644
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@@ -70,7 +70,6 @@
       };
     };
     system.desktop.gnome.enable = lib.mkForce false;
-    system.desktop.hyprland.enable = true;
   };
 
   system.stateVersion = "22.11";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index b5f2b41..f150ef0 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -6,7 +6,6 @@
     ./services/postgresql.nix
     ./services/tailscale.nix
     ./system/desktop/gnome.nix
-    ./system/desktop/hyprland.nix
     ./system/desktop/mimeapps.nix
     ./system/wireless.nix
   ];
diff --git a/modules/nixos/system/desktop/hyprland.nix b/modules/nixos/system/desktop/hyprland.nix
deleted file mode 100644
index 1dd0238..0000000
--- a/modules/nixos/system/desktop/hyprland.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  inherit (lib)
-    mkIf
-    mkOption
-    ;
-  cfg = config.modules.system.desktop.hyprland;
-in
-{
-  options.modules.system.desktop.hyprland = {
-    enable = mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.hyprland = {
-      enable = true;
-      # withUWSM = true;
-    };
-
-    # programs.uwsm.enable = true;
-
-    networking.networkmanager.enable = true;
-
-    user.packages = with pkgs.unstable; [
-      anyrun
-      clipse
-      dunst
-      hyprpaper
-      kitty
-      mpv
-      waybar
-      wl-clipboard
-    ];
-
-    environment.systemPackages = with pkgs; [
-      adw-gtk3
-    ];
-
-    home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
-  };
-}
diff --git a/users/jordan/graphical/hyprland.nix b/users/jordan/graphical/hyprland.nix
new file mode 100644
index 0000000..f08fc67
--- /dev/null
+++ b/users/jordan/graphical/hyprland.nix
@@ -0,0 +1,32 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  programs.hyprland = {
+    enable = true;
+    # withUWSM = true;
+  };
+
+  # programs.uwsm.enable = true;
+
+  networking.networkmanager.enable = true;
+
+  home.packages = with pkgs.unstable; [
+    anyrun
+    clipse
+    dunst
+    hyprpaper
+    kitty
+    mpv
+    waybar
+    wl-clipboard
+  ];
+
+  environment.systemPackages = with pkgs; [
+    adw-gtk3
+  ];
+
+  home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+}