Feat(home-manager): Make the home configuration better

3 files changed, 60 insertions, 15 deletions

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 54c29872..e6983ee4 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -5,26 +5,45 @@
   home-manager,
   inputs,
   ...
-}: {
+}: let
+  # TODO actually use this in the user config
+  username = "soispha";
+  homeDirectory = "/srv/home/${username}";
+  configHome = "${homeDirectory}/.config";
+in {
   imports = [
     home-manager.nixosModules.home-manager
 
-    ./alacritty
-    ./cups
-    ./firefox
-    ./gammastep
-    ./git
-    ./grades
-    ./gtk
-    ./keepassxc
-    ./latexindent
-    ./less
-    ./lf
-    ./mako
-    ./mpd
+        ./alacritty
+        ./cups
+        ./firefox
+        ./gammastep
+        ./git
+        ./grades
+        ./gtk
+        ./keepassxc
+        ./latexindent
+        ./less
+        ./lf
+        ./mako
+        ./mpd
   ];
 
   home-manager.users.soispha = {
-    home.packages = [];
+    home = {
+      inherit username homeDirectory;
+      stateVersion = "23.05";
+
+      # TODO
+      sessionVariables = {
+        DISPLAY = ":0";
+        EDITOR = "nvim";
+      };
+      packages = [];
+    };
+    xdg = {
+      inherit configHome;
+      enable = true;
+    };
   };
 }
diff --git a/home-manager/gtk/default.nix b/home-manager/gtk/default.nix
index d72986d5..52393231 100644
--- a/home-manager/gtk/default.nix
+++ b/home-manager/gtk/default.nix
@@ -1,6 +1,8 @@
 {
   config,
+  lib,
   pkgs,
+  stdenv,
   ...
 }: {
   home-manager.gkt = {
diff --git a/home-manager/home.nix b/home-manager/home.nix
new file mode 100644
index 00000000..574d3623
--- /dev/null
+++ b/home-manager/home.nix
@@ -0,0 +1,24 @@
+{
+  home-manager,
+  pkgs,
+  ...
+}: let
+  imports = [
+#homeage.homeManagerModules.homeage
+#neovim-flake.nixosModules.${system}.hm
+    ./default.nix
+  ];
+
+  mkHome = _: (
+    home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
+
+      extraSpecialArgs = {
+      };
+
+      modules = [{inherit imports;}];
+    }
+  );
+in {
+  home = mkHome {};
+}