From e3adcf20e68803a3e6ff9092ad41c4df532de92b Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Mon, 24 Jun 2024 21:17:44 +0200
Subject: [PATCH] restructuring6

---
 flake.nix                      |  5 ++++-
 home/modules/default.nix       | 11 +++++++++++
 hosts/cnix/default.nix         |  5 +++--
 hosts/common/default.nix       |  5 ++++-
 hosts/common/hyprland.nix      |  6 ------
 hosts/common/neovim.nix        |  2 +-
 hosts/extra/solaar/default.nix |  2 +-
 7 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 home/modules/default.nix
 delete mode 100644 hosts/common/hyprland.nix

diff --git a/flake.nix b/flake.nix
index 5e5284f9..fe2a384e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,7 +57,10 @@
       nixosConfigurations = {
 
         cnix = lib.nixosSystem {
-          modules = [ ./hosts/cnix ];
+          modules = [
+            ./hosts/cnix
+            solaar.nixosModules.default
+          ];
           specialArgs = {
             inherit inputs outputs;
           };
diff --git a/home/modules/default.nix b/home/modules/default.nix
new file mode 100644
index 00000000..9a03df0d
--- /dev/null
+++ b/home/modules/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./firefox
+    ./git
+    ./gtk
+    ./hypr
+    ./neovim
+    ./shell
+    ./xdg
+  ];
+}
diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix
index 9b7e07eb..bdd91682 100644
--- a/hosts/cnix/default.nix
+++ b/hosts/cnix/default.nix
@@ -32,7 +32,9 @@ in
     inputs.home-manager.nixosModules.home-manager
     ../pkgs/fonts.nix
     ../common
-    ../extra
+    ../extra/steam
+    ../extra/nix-ld
+    ../extra/solaar
     ../services/cnix.nix
     ../hardware/cnix.nix
     ../locale/cnix.nix
@@ -40,7 +42,6 @@ in
   ];
 
   home-manager.users.cnst = import ../../home/cnst/home.nix;
-
   nix =
     let
       flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index cde3246f..4b461ac2 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -9,7 +9,6 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./adb.nix
-    ./hyprland.nix
     ./neovim.nix
     ./zsh.nix
   ];
@@ -25,7 +24,11 @@
       allowUnfree = true;
     };
   };
+
+  console.useXkbConfig = true;
+
   environment = {
+    localBinInPath = true;
     systemPackages = [
       # Dev
       pkgs.git
diff --git a/hosts/common/hyprland.nix b/hosts/common/hyprland.nix
deleted file mode 100644
index 7dfeff7d..00000000
--- a/hosts/common/hyprland.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
-}
diff --git a/hosts/common/neovim.nix b/hosts/common/neovim.nix
index 0905eec0..0828befb 100644
--- a/hosts/common/neovim.nix
+++ b/hosts/common/neovim.nix
@@ -1,5 +1,5 @@
 {
-  neovim = {
+  programs.neovim = {
     enable = true;
     defaultEditor = true;
   };
diff --git a/hosts/extra/solaar/default.nix b/hosts/extra/solaar/default.nix
index b40050ac..70fb8fe8 100644
--- a/hosts/extra/solaar/default.nix
+++ b/hosts/extra/solaar/default.nix
@@ -1 +1 @@
-{programs.solaar.enable = true;}
+{ programs.solaar.enable = true; }