flake.nix

@@ -134,7 +134,7 @@
               }
 
               # Import secrets
-              ./modules/global/secret-spec.nix
+              ./modules/common/secret-spec.nix
               ./secrets.nix
 
               # Host-specific configuration

home/toph/common/core/default.nix

@@ -15,7 +15,7 @@ in
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "modules/global"
+      "modules/common"
       "modules/home"
     ])
     ./asdf.nix

hosts/common/core/default.nix

@@ -16,7 +16,7 @@ in
     (lib.custom.scanPaths ./.)
 
     (map lib.custom.relativeToRoot [
-      "modules/global"
+      "modules/common"
       "hosts/users"
     ])
   ];

hosts/common/optional/ventura.nix

@@ -0,0 +1,22 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    inputs.nixtheplanet.nixosModules.macos-ventura
+  ];
+
+  services.macos-ventura = {
+    enable = true;
+    package = pkgs.makeDarwinImage { diskSizeBytes = 80000000000; };
+    openFirewall = true;
+    vncListenAddr = "0.0.0.0";
+    autoStart = false;
+    extraQemuFlags = [
+      "-spice"
+      "port=5930,addr=127.0.0.1,disable-ticketing"
+    ];
+  };
+}

hosts/nixos/cloud/default.nix

@@ -27,11 +27,11 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
-      "hosts/global/common/acme"
+      "hosts/common/optional/acme"
-      "hosts/global/common/docker.nix"
+      "hosts/common/optional/docker.nix"
 
       ## Host user ##
       "hosts/users/${username}" # Not the best solution but I always have one user so ¯\_(ツ)_/¯

hosts/nixos/cloud/hardware.nix

@@ -10,7 +10,7 @@ in
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/lxc.nix"
+      "hosts/common/optional/system/lxc.nix"
     ])
   ];
 

hosts/nixos/komodo/default.nix

@@ -26,11 +26,11 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
-      "hosts/global/common/acme"
+      "hosts/common/optional/acme"
-      "hosts/global/common/docker.nix"
+      "hosts/common/optional/docker.nix"
 
       ## Host User ##
       "hosts/users/${username}" # # Not the best solution but I always have one user so ¯\_(ツ)_/¯

hosts/nixos/komodo/hardware.nix

@@ -5,8 +5,8 @@
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/lxc.nix"
+      "hosts/common/optional/system/lxc.nix"
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 }

hosts/nixos/lxc/default.nix

@@ -25,7 +25,7 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Proxy Specific ##
       "hosts/users/${username}" # # Not the best solution but I always have one user so ¯\_(ツ)_/¯

hosts/nixos/lxc/hardware.nix

@@ -5,8 +5,8 @@
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/lxc.nix"
+      "hosts/common/optional/system/lxc.nix"
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 }

hosts/nixos/nix/default.nix

@@ -25,7 +25,7 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
 

hosts/nixos/nix/hardware.nix

@@ -5,8 +5,8 @@
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/lxc.nix"
+      "hosts/common/optional/system/lxc.nix"
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 }

hosts/nixos/proxy/default.nix

@@ -27,11 +27,11 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
-      "hosts/global/common/acme"
+      "hosts/common/optional/acme"
-      "hosts/global/common/docker.nix"
+      "hosts/common/optional/docker.nix"
 
       ## Proxy User ##
       "hosts/users/${username}" # # Not the best solution but I always have one user so ¯\_(ツ)_/¯

hosts/nixos/proxy/hardware.nix

@@ -5,8 +5,8 @@
 {
   imports = lib.flatten [
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/lxc.nix"
+      "hosts/common/optional/system/lxc.nix"
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 }

hosts/nixos/rune/default.nix

@@ -27,21 +27,21 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
-      "hosts/global/common/audio.nix" # pipewire and cli controls
+      "hosts/common/optional/audio.nix" # pipewire and cli controls
-      "hosts/global/common/adb.nix" # android tools
+      "hosts/common/optional/adb.nix" # android tools
-      "hosts/global/common/bluetooth.nix"
+      "hosts/common/optional/bluetooth.nix"
-      "hosts/global/common/ddcutil.nix" # ddcutil for monitor controls
+      "hosts/common/optional/ddcutil.nix" # ddcutil for monitor controls
-      "hosts/global/common/gaming.nix" # steam, gamescope, gamemode, and related hardware
+      "hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware
-      # "hosts/global/common/gnome.nix" # desktop
+      # "hosts/common/optional/gnome.nix" # desktop
-      "hosts/global/common/hyprland" # desktop
+      "hosts/common/optional/hyprland" # desktop
-      "hosts/global/common/libvirt.nix" # vm tools
+      "hosts/common/optional/libvirt.nix" # vm tools
-      "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
+      "hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager)
-      "hosts/global/common/plymouth.nix" # fancy boot screen
+      "hosts/common/optional/plymouth.nix" # fancy boot screen
-      "hosts/global/common/vial.nix" # KB setup
+      "hosts/common/optional/vial.nix" # KB setup
-      # "hosts/global/common/ventura.nix" # macos vm
+      # "hosts/common/optional/ventura.nix" # macos vm
 
       ## Misc Inputs ##
 

hosts/nixos/rune/hardware.nix

@@ -14,7 +14,7 @@
   imports = lib.flatten [
     (modulesPath + "/installer/scan/not-detected.nix")
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 

hosts/nixos/vm/default.nix

@@ -24,15 +24,15 @@ in
 
     (map lib.custom.relativeToRoot [
       ## Required Configs ##
-      "hosts/global/core"
+      "hosts/common/core"
 
       ## Optional Configs ##
-      "hosts/global/common/audio.nix" # pipewire and cli controls
+      "hosts/common/optional/audio.nix" # pipewire and cli controls
-      # "hosts/global/common/gaming.nix" # steam, gamescope, gamemode, and related hardware
+      # "hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware
-      # "hosts/global/common/gnome.nix" # desktop
+      # "hosts/common/optional/gnome.nix" # desktop
-      "hosts/global/common/hyprland" # desktop
+      "hosts/common/optional/hyprland" # desktop
-      # "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
+      # "hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager)
-      # "hosts/global/common/plymouth.nix" # fancy boot screen
+      # "hosts/common/optional/plymouth.nix" # fancy boot screen
 
       ## Misc Inputs ##
 

hosts/nixos/vm/hardware.nix

@@ -12,7 +12,7 @@ in
   imports = lib.flatten [
     (modulesPath + "/profiles/qemu-guest.nix")
     (map lib.custom.relativeToRoot [
-      "hosts/global/common/system/pool.nix"
+      "hosts/common/optional/system/pool.nix"
     ])
   ];
 

hosts/readme.md

@@ -1,10 +0,0 @@
-# TODO:
-
-- I dont like the current system for hosts importing their main user
-  -  I could rework hostSpecs so its imported since flake and manage it like that?
-  - or just rework the users/default and the hosts/core to just work different...
-- Fix up how DEs are configured, its not modular at all rn, i need to be able to select the DE from hostSpec and it should be able to change config per user
-- decouple /pool from places its not needed, or should be optional
-  - some users should not have access to pool or just cant access it cuz not local 
-- ssh keys are not setup per user
-  - should probably fix

hosts/users/cesar/default.nix

@@ -1,23 +0,0 @@
-{ config, ... }:
-let
-  hostSpec = config.hostSpec;
-in
-{
-
-  users.groups = {
-    ryot = {
-      gid = 1004;
-      members = [ "${hostSpec.username}" ];
-    };
-  };
-
-  # Set a temp password for use by minimal builds like installer and iso
-  users.users.${hostSpec.username} = {
-    isNormalUser = true;
-    hashedPassword = hostSpec.hashedPassword;
-    group = "ryot";
-    extraGroups = [
-      "wheel"
-    ];
-  };
-}

hosts/users/gio/default.nix

@@ -1,23 +0,0 @@
-{ config, ... }:
-let
-  hostSpec = config.hostSpec;
-in
-{
-
-  users.groups = {
-    ryot = {
-      gid = 1004;
-      members = [ "${hostSpec.username}" ];
-    };
-  };
-
-  # Set a temp password for use by minimal builds like installer and iso
-  users.users.${hostSpec.username} = {
-    isNormalUser = true;
-    hashedPassword = hostSpec.hashedPassword;
-    group = "ryot";
-    extraGroups = [
-      "wheel"
-    ];
-  };
-}

hosts/users/gio/minimal/default.nix

@@ -1,23 +0,0 @@
-{ config, ... }:
-let
-  hostSpec = config.hostSpec;
-in
-{
-
-  users.groups = {
-    ryot = {
-      gid = 1004;
-      members = [ "${hostSpec.username}" ];
-    };
-  };
-
-  # Set a temp password for use by minimal builds like installer and iso
-  users.users.${hostSpec.username} = {
-    isNormalUser = true;
-    hashedPassword = hostSpec.hashedPassword;
-    group = "ryot";
-    extraGroups = [
-      "wheel"
-    ];
-  };
-}

hosts/users/toph/default.nix

@@ -16,11 +16,12 @@ in
   users.users.${username} = {
     name = hostSpec.username;
     shell = _shell;
+
     # These get placed into /etc/ssh/authorized_keys.d/<name> on nixos
     openssh.authorizedKeys.keys = pubKeys;
   };
 
-  # Create ssh directory when homemanager is not loaded
+  # Create ssh sockets directory for controlpaths when homemanager not loaded (i.e. isMinimal)
   systemd.tmpfiles.rules =
     let
       user = config.users.users.${username}.name;
@@ -30,6 +31,7 @@ in
       "d ${homeDir}/.ssh 0750 ${user} ${group} -"
     ];
 
+  # No matter what environment we are in we want these tools
   programs.fish.enable = true;
 }
 # Import the user's personal/home configurations, unless the environment is minimal