Refactor hosts folder

hosts/orion/hardware-configuration.nix

@@ -1,6 +1,6 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
+# to /etc/nixos/system.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {

hosts/orion/home.nix

@@ -5,12 +5,9 @@
 }:
 {
   imports = [
-    # Mostly user-specific configuration
-    ./variables.nix
+    ../../modules/home-manager/common.nix
 
-    # Programs
-    ../../modules/home-manager/shell
-    ../../modules/home-manager/git.nix
+    ./variables.nix
   ];
 
   home = {
@@ -26,7 +23,6 @@
       ghostty
     ];
 
-    # Don't touch this
     stateVersion = "24.05";
   };
 

hosts/orion/system.nix

@@ -4,10 +4,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     (modulesPath + "/profiles/qemu-guest.nix")
 
-    ../../modules/nixos/home-manager.nix
-    ../../modules/nixos/nix.nix
-    ../../modules/nixos/users.nix
-    ../../modules/nixos/utils.nix
+    ../../modules/nixos/common.nix
 
     ../../modules/nixos/ssh.nix
     ../../modules/nixos/caddy.nix
@@ -27,6 +24,5 @@
 
   home-manager.users."${config.var.username}" = import ./home.nix;
 
-  # Don't touch this
   system.stateVersion = "24.05";
 }

hosts/orion/variables.nix

@@ -1,48 +1,6 @@
+{ config, ... }:
 {
-  config,
-  lib,
-  ...
-}:
-{
-  imports = [
-    # Choose your theme here:
-    ../../modules/themes/catppuccin.nix
-  ];
-
   config.var = {
     hostname = "orion";
-    username = "kiri";
-    configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
-
-    keyboardLayout = "us";
-
-    location = "Meterik";
-    timeZone = "Europe/Amsterdam";
-    defaultLocale = "en_US.UTF-8";
-    timeLocale = "en_DK.UTF-8";
-    numericLocale = "en_IE.UTF-8";
-    otherLocale = "nl_NL.UTF-8";
-
-    git = {
-      username = "kiri";
-      email = "mail@jelles.net";
-    };
-
-    preferred = {
-      editor = "nvim";
-      terminal = "kitty";
-      browser = "brave";
-    };
-
-    autoUpgrade = false;
-    autoGarbageCollector = true;
-  };
-
-  # Let this here
-  options = {
-    var = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
   };
 }