treewide: reorganize general structure

config/home-manager/default.nix

@@ -1,12 +1,12 @@
-{
+{osConfig, ...}: {
   imports = [
     ./services/udiskie.nix
     ./terminal
     ./programs
   ];
-  home = {
-    username = "nezia";
-    homeDirectory = "/home/nezia";
+  home = rec {
+    inherit (osConfig.local.systemVars) username;
+    homeDirectory = "/home/${username}";
     stateVersion = "24.05";
   };
 

config/nixos/services/greetd.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   lib,
   pkgs,
@@ -36,7 +37,7 @@ in {
     settings = {
       default_session = {
         command = "${Hyprland} --config ${hyprlandConfig}";
-        user = "nezia";
+        user = config.local.systemVars.username;
       };
     };
   };

hosts/default.nix

@@ -1,9 +1,9 @@
 {inputs, ...}: let
-  lib' = import ../lib;
+  lib' = import ../shared/lib;
   mkSystem = args:
     inputs.nixpkgs.lib.nixosSystem {
       specialArgs = {inherit inputs lib';};
-      modules = [../modules] ++ args.modules;
+      modules = [../shared/nixosModules] ++ (args.modules or []);
     };
 in {
   vamos = mkSystem {

hosts/solaire/default.nix

@@ -3,8 +3,8 @@
   specialArgs,
   ...
 }: let
-  system = "${inputs.self}/system";
-  home = "${inputs.self}/home";
+  nixos = "${inputs.self}/config/nixos";
+  hm = "${inputs.self}/config/home-manager";
 in {
   local.systemVars = {
     hostName = "solaire";
@@ -15,47 +15,48 @@ in {
     fullName = "Anthony Rodriguez";
     email = "anthony@nezia.dev";
   };
+
   imports = [
     ./hardware-configuration.nix
     ./modules
 
-    system
-    "${system}/hardware/uni-sync.nix"
+    nixos
+    "${nixos}/hardware/uni-sync.nix"
 
-    "${system}/programs/games.nix"
-    "${system}/hardware/nvidia.nix"
+    "${nixos}/programs/games.nix"
+    "${nixos}/hardware/nvidia.nix"
 
-    "${system}/services/logind.nix"
-    "${system}/services/greetd.nix"
+    "${nixos}/services/logind.nix"
+    "${nixos}/services/greetd.nix"
 
-    "${system}/programs/hyprland.nix"
-    "${system}/services/gnome.nix"
+    "${nixos}/programs/hyprland.nix"
+    "${nixos}/services/gnome.nix"
 
-    "${system}/services/documentation.nix"
+    "${nixos}/services/documentation.nix"
 
-    "${system}/services/flatpak.nix"
+    "${nixos}/services/flatpak.nix"
   ];
 
   home-manager = {
     users.nezia.imports = [
-      home
-      "${home}/services/udiskie.nix"
-      "${home}/programs/games"
+      hm
+      "${hm}/services/udiskie.nix"
+      "${hm}/programs/games"
 
-      "${home}/programs/waybar"
-      "${home}/programs/fuzzel.nix"
-      "${home}/programs/hypr"
+      "${hm}/programs/waybar"
+      "${hm}/programs/fuzzel.nix"
+      "${hm}/programs/hypr"
 
-      "${home}/services/swaync"
-      "${home}/programs/swaybg.nix"
-      "${home}/programs/swaylock.nix"
+      "${hm}/services/swaync"
+      "${hm}/programs/swaybg.nix"
+      "${hm}/programs/swaylock.nix"
 
-      "${home}/terminal/emulators/foot.nix"
+      "${hm}/terminal/emulators/foot.nix"
 
-      "${home}/services/flatpak.nix"
-      "${home}/services/syncthing.nix"
+      "${hm}/services/flatpak.nix"
+      "${hm}/services/syncthing.nix"
 
-      "${home}/programs/editors/neovim.nix"
+      "${hm}/programs/editors/neovim.nix"
     ];
     extraSpecialArgs = specialArgs;
   };

hosts/vamos/default.nix

@@ -3,8 +3,8 @@
   specialArgs,
   ...
 }: let
-  system = "${inputs.self}/system";
-  home = "${inputs.self}/home";
+  nixos = "${inputs.self}/config/nixos";
+  hm = "${inputs.self}/config/home-manager";
 in {
   local.systemVars = {
     hostName = "vamos";
@@ -20,42 +20,42 @@ in {
     ./hardware-configuration.nix
     ./modules
 
-    "${system}"
-    "${system}/core/lanzaboote.nix"
+    "${nixos}"
+    "${nixos}/core/lanzaboote.nix"
 
-    "${system}/hardware/fprintd.nix"
-    "${system}/services/power.nix"
-    "${system}/services/brightness.nix"
+    "${nixos}/hardware/fprintd.nix"
+    "${nixos}/services/power.nix"
+    "${nixos}/services/brightness.nix"
 
-    "${system}/services/logind.nix"
-    "${system}/services/greetd.nix"
-    "${system}/services/kanata.nix"
+    "${nixos}/services/logind.nix"
+    "${nixos}/services/greetd.nix"
+    "${nixos}/services/kanata.nix"
 
-    "${system}/programs/hyprland.nix"
-    "${system}/services/gnome.nix"
-    "${system}/services/mail.nix"
+    "${nixos}/programs/hyprland.nix"
+    "${nixos}/services/gnome.nix"
+    "${nixos}/services/mail.nix"
 
-    "${system}/services/documentation.nix"
+    "${nixos}/services/documentation.nix"
   ];
 
   home-manager = {
     users.nezia.imports = [
-      "${home}"
-      "${home}/services/udiskie.nix"
+      "${hm}"
+      "${hm}/services/udiskie.nix"
 
-      "${home}/programs/hypr"
-      "${home}/programs/waybar"
-      "${home}/programs/fuzzel.nix"
+      "${hm}/programs/hypr"
+      "${hm}/programs/waybar"
+      "${hm}/programs/fuzzel.nix"
 
-      "${home}/services/swaync"
-      "${home}/programs/swaybg.nix"
-      "${home}/programs/wlogout.nix"
+      "${hm}/services/swaync"
+      "${hm}/programs/swaybg.nix"
+      "${hm}/programs/wlogout.nix"
 
-      "${home}/services/syncthing.nix"
+      "${hm}/services/syncthing.nix"
 
-      "${home}/programs/editors/neovim.nix"
+      "${hm}/programs/editors/neovim.nix"
 
-      "${home}/terminal/emulators/foot.nix"
+      "${hm}/terminal/emulators/foot.nix"
     ];
     extraSpecialArgs = specialArgs;
   };

shared/nixosModules/theme/default.nix

@@ -68,7 +68,7 @@ in {
       description = ''
         Path to an avatar image (used for hyprlock).
       '';
-      default = ../../assets/avatar.png;
+      default = ../../../assets/avatar.png; # TODO silly, change this
     };
   };
   config = let