From 061d027b6f9a2b5c12989dd75879448e520cb0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= <kropikuba@gmail.com>
Date: Mon, 11 Nov 2024 16:39:11 +0100
Subject: [PATCH] WiP

---
 flake.nix                      |  1 +
 homeManagerModules/default.nix |  1 +
 hosts/base/default.nix         | 12 +++++++++++-
 hosts/lenar/default.nix        |  7 +------
 hosts/lenar/home.nix           |  6 ++++++
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 homeManagerModules/default.nix
 create mode 100644 hosts/lenar/home.nix

diff --git a/flake.nix b/flake.nix
index 4a5e6d8..292b6e1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,7 @@
         nixpkgs.lib.nixosSystem {
           system = arch;
           modules = [
+            ./nixosModules
             ./hosts/${host}
             ./hosts/base
           ];
diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix
new file mode 100644
index 0000000..b021e28
--- /dev/null
+++ b/homeManagerModules/default.nix
@@ -0,0 +1 @@
+{ }: { }
diff --git a/hosts/base/default.nix b/hosts/base/default.nix
index ce13ac8..f342b4c 100644
--- a/hosts/base/default.nix
+++ b/hosts/base/default.nix
@@ -14,7 +14,6 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     inputs.nix-flatpak.nixosModules.nix-flatpak
-    ../../nixosModules
   ];
 
   # Bootloader.
@@ -138,6 +137,17 @@
 
   nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs;
+    };
+    sharedModules = [
+      ../../homeManagerModules
+    ];
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/lenar/default.nix b/hosts/lenar/default.nix
index cc417a9..11b23b0 100644
--- a/hosts/lenar/default.nix
+++ b/hosts/lenar/default.nix
@@ -63,13 +63,8 @@
   };
 
   home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs;
-    };
     users = {
-      "krop" = import ../../users/krop;
+      "krop" = import ./home.nix;
     };
   };
 }
diff --git a/hosts/lenar/home.nix b/hosts/lenar/home.nix
new file mode 100644
index 0000000..eb7c030
--- /dev/null
+++ b/hosts/lenar/home.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  home.username = "krop";
+  home.homeDirectory = "/home/krop";
+  home.stateVersion = "24.05";
+}