From 858c6dd88d5d22c9423158d143cfaedd47a1eeaa Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Tue, 21 May 2024 20:34:31 +0200
Subject: [PATCH] refactoring complete?

---
 hosts/vali/mars/configuration.nix    |  4 +++-
 modules/default.nix                  |  2 +-
 modules/editors/default.nix          |  2 +-
 modules/wms/default.nix              |  1 +
 modules/wms/wayland/default.nix      | 12 ++++++++----
 modules/wms/wayland/hypr/default.nix |  1 +
 modules/wms/wayland/hypr/land.nix    |  4 ++--
 7 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 modules/wms/default.nix

diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix
index 16587e9..b64a77b 100644
--- a/hosts/vali/mars/configuration.nix
+++ b/hosts/vali/mars/configuration.nix
@@ -23,7 +23,7 @@
   programs.kdeconnect.enable = true;
   programs.dconf.enable = true;
   # boot.kernelModules = [ "v4l2loopback" ];
-  boot.kernelPackages = pkgs.linuxPackages_6_8;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
   #  services.picom.enable = true; 
   services.emacs.enable = true;
@@ -67,6 +67,8 @@
         enable = true;
         doom.enable = false;
       };
+      helix.enable = true;
+      kakoune.enable = true;
     };
     services = {
       pipewire.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 58f0263..5f406f6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1 +1 @@
-_: { imports = [ ./cli ./gui ./tui ./other ./services ./editors ]; }
+_: { imports = [ ./cli ./gui ./tui ./other ./services ./editors ./wms ]; }
diff --git a/modules/editors/default.nix b/modules/editors/default.nix
index 4002377..3087c24 100644
--- a/modules/editors/default.nix
+++ b/modules/editors/default.nix
@@ -1 +1 @@
-_: { imports = [ ./emacs.nix ]; }
+_: { imports = [ ./emacs.nix ./helix.nix ./kakoune.nix ]; }
diff --git a/modules/wms/default.nix b/modules/wms/default.nix
new file mode 100644
index 0000000..36de93a
--- /dev/null
+++ b/modules/wms/default.nix
@@ -0,0 +1 @@
+_: { imports = [ ./wayland ]; }
diff --git a/modules/wms/wayland/default.nix b/modules/wms/wayland/default.nix
index bbaf081..bc9388d 100644
--- a/modules/wms/wayland/default.nix
+++ b/modules/wms/wayland/default.nix
@@ -1,6 +1,10 @@
 { config, pkgs, inputs, ... }: {
-  imports =
-    [ inputs.niri.nixosModules.niri ];
-  ;
-  programs.niri.enable = true;
+  imports = [
+    # inputs.niri.nixosModules.niri
+
+    ./hypr
+    ./variables.nix
+
+  ];
+  # programs.niri.enable = true;
 }
diff --git a/modules/wms/wayland/hypr/default.nix b/modules/wms/wayland/hypr/default.nix
index e69de29..114b11e 100644
--- a/modules/wms/wayland/hypr/default.nix
+++ b/modules/wms/wayland/hypr/default.nix
@@ -0,0 +1 @@
+_: { imports = [ ./land.nix ]; }
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index 902b450..51dc274 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, inputs, ... }:
 with lib;
 let
-  cfg = config.modules.programs.hyprland;
+  cfg = config.modules.wms.wayland.hyprland;
   username = config.modules.other.system.username;
   inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
   inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;
@@ -11,7 +11,7 @@ let
   inherit (inputs.split-monitor-workspaces.packages.${pkgs.system})
     split-monitor-workspaces;
 in {
-  options.modules.programs.hyprland.enable = mkEnableOption "hyprland";
+  options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland";
   config = mkIf cfg.enable {
 
     # xdg Portal