From f69f2839da0a7a3c07d9224ccdb47364eeb0a555 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Thu, 21 Mar 2024 11:30:27 -0500
Subject: [PATCH] actually enable hyprland

---
 hosts/othalan/default.nix                    | 8 +-------
 modules/desktop/window-managers/hyprland.nix | 3 ++-
 modules/oizys.nix                            | 5 ++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index 94f12fd..de03ad7 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -1,17 +1,13 @@
 {
   pkgs,
-  self,
   lib,
   ...
 }: let
   inherit (lib) enabled;
 in {
-  imports = with self.nixosModules; [
-    restic
-  ];
-
   oizys = {
     desktop = enabled;
+    hyprland = enabled;
     chrome = enabled;
     docker = enabled;
     nix-ld = enabled;
@@ -32,8 +28,6 @@ in {
     quarto
   ];
 
-  programs.hyprland.enable = true;
-
   services.restic.backups.gdrive = {
     user = "daylin";
     repository = "rclone:g:archives/othalan";
diff --git a/modules/desktop/window-managers/hyprland.nix b/modules/desktop/window-managers/hyprland.nix
index 03c898a..d9af273 100644
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@@ -5,7 +5,7 @@
   lib,
   ...
 }: let
-  inherit (lib) mkOizysModule;
+  inherit (lib) mkOizysModule enabled;
   lock = pkgs.writeShellApplication {
     name = "lock";
     runtimeInputs = with pkgs; [swaylock];
@@ -15,6 +15,7 @@
   };
 in
   mkOizysModule config "hyprland" {
+    programs.hyprland = enabled;
     security.pam.services.swaylock = {};
     # Optional, hint electron apps to use wayland:
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
diff --git a/modules/oizys.nix b/modules/oizys.nix
index a15268d..0b62d43 100644
--- a/modules/oizys.nix
+++ b/modules/oizys.nix
@@ -14,9 +14,6 @@ in {
     vpn
     gpg
 
-    # gui
-    fonts
-
     lock
     qtile
     hyprland
@@ -25,6 +22,7 @@ in {
     docker
 
     gui
+    fonts
 
     languages
 
@@ -33,6 +31,7 @@ in {
     vscode
 
     nix-ld
+    restic
   ];
 
   options.oizys.desktop.enable = mkEnableOption "is desktop";