some resturcturing of hm 3

home/core/gui/default.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   imports = [
-    ../../extra/mako
     ./rofi
     ./waybar
     ./anyrun
+    ./mako
     ./gtk
     ./xdg
   ];

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
+    ./imports.nix
-    ../../extra/cnst.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

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";
+    };
+  };
+}