restructuring6

flake.nix

@@ -57,7 +57,10 @@
       nixosConfigurations = {
 
         cnix = lib.nixosSystem {
-          modules = [ ./hosts/cnix ];
+          modules = [
+            ./hosts/cnix
+            solaar.nixosModules.default
+          ];
           specialArgs = {
             inherit inputs outputs;
           };

home/modules/default.nix

@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./firefox
+    ./git
+    ./gtk
+    ./hypr
+    ./neovim
+    ./shell
+    ./xdg
+  ];
+}

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;

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

hosts/common/hyprland.nix

@@ -1,6 +0,0 @@
-{
-  hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
-}

hosts/common/neovim.nix

@@ -1,5 +1,5 @@
 {
-  neovim = {
+  programs.neovim = {
     enable = true;
     defaultEditor = true;
   };