From c13b159ea073a7984cc2df69f8fb7f07c21dc1ff Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Sun, 7 Jul 2024 10:14:40 +0200
Subject: [PATCH] some resturcturing of hm 3

---
 home/core/gui/default.nix                 |  2 +-
 home/{extra => core/gui}/mako/default.nix |  0
 home/users/cnst/home.nix                  |  8 +-----
 home/users/cnst/imports.nix               | 33 +++++++++++++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)
 rename home/{extra => core/gui}/mako/default.nix (100%)
 create mode 100644 home/users/cnst/imports.nix

diff --git a/home/core/gui/default.nix b/home/core/gui/default.nix
index c3f3a6a9..0020d1f6 100644
--- a/home/core/gui/default.nix
+++ b/home/core/gui/default.nix
@@ -5,10 +5,10 @@
   ...
 }: {
   imports = [
-    ../../extra/mako
     ./rofi
     ./waybar
     ./anyrun
+    ./mako
     ./gtk
     ./xdg
   ];
diff --git a/home/extra/mako/default.nix b/home/core/gui/mako/default.nix
similarity index 100%
rename from home/extra/mako/default.nix
rename to home/core/gui/mako/default.nix
diff --git a/home/users/cnst/home.nix b/home/users/cnst/home.nix
index 71e60f81..22eb64a5 100644
--- a/home/users/cnst/home.nix
+++ b/home/users/cnst/home.nix
@@ -1,5 +1,3 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
 {
   inputs,
   lib,
@@ -7,10 +5,8 @@
   pkgs,
   ...
 }: {
-  # You can import other home-manager modules here
   imports = [
-    ../../core/cnst.nix
-    ../../extra/cnst.nix
+    ./imports.nix
   ];
 
   nix = {
@@ -24,7 +20,6 @@
     };
   };
 
-  # TODO: Set your username
   home = {
     username = "cnst";
     homeDirectory = "/home/cnst";
@@ -32,7 +27,6 @@
 
   programs.home-manager.enable = true;
 
-  # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix
new file mode 100644
index 00000000..dec26aba
--- /dev/null
+++ b/home/users/cnst/imports.nix
@@ -0,0 +1,33 @@
+{pkgs, ...}: {
+  imports = [
+    # CORE
+    # .gui
+    ../../core/gui
+    # .tui
+    ../../core/tui/git/cnst.nix
+    ../../core/tui/shell/cnst.nix
+    # .system
+    ../../core/system/polkit.nix
+
+    # EXTRA
+    ../../extra/foot
+    ../../extra/firefox
+    ../../extra/neovim
+  ];
+  home = {
+    packages = with pkgs; [
+      # .applications
+      alacritty
+      keepassxc
+      qbittorrent
+      webcord
+      calcurse
+      virt-manager
+    ];
+    sessionVariables = {
+      BROWSER = "firefox";
+      EDITOR = "nvim";
+      TERM = "foot";
+    };
+  };
+}