From ab70f1f9f9d3f2dcf774d726a73d833d9ff895bd Mon Sep 17 00:00:00 2001
From: Michael Thomson <michael@michaelthomson.dev>
Date: Wed, 27 Nov 2024 15:37:10 -0500
Subject: [PATCH] hyprland

---
 hosts/desktop/configuration.nix   |  2 +-
 hosts/desktop/home.nix            | 17 ++++++++---------
 modules/home-manager/hyprland.nix |  9 +++++++++
 modules/nixos/hyprland.nix        |  5 +++++
 4 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 modules/home-manager/hyprland.nix
 create mode 100644 modules/nixos/hyprland.nix

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index a8a3ba3..9d06998 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -12,7 +12,7 @@
     ../../modules/nixos/ssh.nix
     ../../modules/nixos/bluetooth.nix
     ../../modules/nixos/nvidia.nix
-    ../../modules/nixos/i3.nix
+    ../../modules/nixos/hyprland.nix
     ../../modules/nixos/nm.nix
     ../../modules/nixos/sound.nix
     ../../modules/nixos/steam.nix
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 1c52c35..1a482f0 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -4,24 +4,27 @@
   ...
 }: {
   imports = [
-    ../../modules/home-manager/i3
-    ../../modules/home-manager/ssh
+    ../../modules/home-manager/hyprland.nix
     ../../modules/home-manager/git
     ../../modules/home-manager/nixvim
-    ../../modules/home-manager/wezterm
+    ../../modules/home-manager/kitty
     ../../modules/home-manager/zsh
     ../../modules/home-manager/tmux
     ../../modules/home-manager/taskwarrior
-    ../../modules/home-manager/zoxide
-    ../../modules/home-manager/syncthing
     ../../modules/home-manager/email
     ../../modules/home-manager/password-store
     ../../modules/home-manager/kubernetes.nix
+    ../../modules/home-manager/nix-index.nix
+    ../../modules/home-manager/bitwarden.nix
   ];
   home.username = "mthomson";
   home.homeDirectory = "/home/mthomson";
   home.stateVersion = "23.11";
 
+  home.sessionVariables = {
+    ZK_NOTEBOOK_DIR = "\${HOME}/zk";
+  };
+
   programs = {
     direnv = {
       enable = true;
@@ -44,10 +47,6 @@
     pavucontrol
     pasystray
     networkmanagerapplet
-    mangohud
-    zoom-us
-    crawl
-    obsidian
   ];
 
   home.sessionVariables = {
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
new file mode 100644
index 0000000..ce1dd9b
--- /dev/null
+++ b/modules/home-manager/hyprland.nix
@@ -0,0 +1,9 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  wayland.windowManager.hyprland = {
+    enable = true;
+  };
+}
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
new file mode 100644
index 0000000..be1e08b
--- /dev/null
+++ b/modules/nixos/hyprland.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  programs.hyprland.enable = true;
+}