Starting to break out for different XPS systems

hosts/abra/configuration.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    # Include system-level configurations
+    ../../system
+  ];
+}

hosts/abra/hardware-configuration.nix

@@ -14,18 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/77969bfa-44f3-44f2-9c57-69fd161f6a75";
+    { device = "/dev/disk/by-uuid/39d9cdd2-79cd-45f9-9d06-b902d9f717fe";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/FFD6-BA11";
+    { device = "/dev/disk/by-uuid/4104-FEB1";
       fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/d495d805-4feb-4b25-ab7d-8eeb66efe3a7"; }
+    [ { device = "/dev/disk/by-uuid/4d15e7fc-f101-4712-af2f-098cf75f3e8f"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/tito/configuration.nix

@@ -1,60 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  username,
-  stylix,
-  ghostty,
-  ...
-}: {
-  imports = [
-    ./hardware-configuration.nix
-    ../../modules/nvidia.nix
-    ../../modules/common.nix
-    ../../modules/gnome.nix
-      inputs.sops-nix.nixosModules.sops
-      ../../modules/protonvpn.nix
-    ];
-
-  sops.defaultSopsFile = ../../secrets/secrets.yaml;
-  sops.defaultSopsFormat = "yaml";
-  sops.age.keyFile = "/home/${username}/.config/sops/age/keys.txt";
-
-  networking = {
-    hostName = "tito";
-    networkmanager.enable = true;
-  };
-
-  programs = {
-    steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-    };
-    chromium.enable = true;
-  };
-
-  virtualisation.docker.enable = true;
-
-  users.users.${username} = {
-    isNormalUser = true;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "audito"
-      "video"
-      "input"
-      "docker"
-    ];
-  };
-
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/solarflare.yaml";
-  stylix.image = /home/jared/Pictures/tropea.jpg;
-
-  stylix.targets.gnome.enable = true;
-  stylix.cursor.package = pkgs.vimix-cursor-theme;
-  stylix.cursor.name = "Vimix-Cursors";
-
-  system.stateVersion = "23.11";
-}

hosts/tito/hardware-configuration.nix

@@ -1,39 +0,0 @@
-# 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.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b030079d-d72f-43a8-a437-4368f4275b66";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/A646-15B0";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp12s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp13s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/xps/configuration.nix

@@ -1,55 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  username,
-  stylix,
-  ghostty,
-  ...
-}: {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../../modules/common.nix
-      ../../modules/gnome.nix
-      inputs.sops-nix.nixosModules.sops
-      ../../modules/protonvpn.nix
-    ];
-
-  sops.defaultSopsFile = ../../secrets/secrets.yaml;
-  sops.defaultSopsFormat = "yaml";
-  sops.age.keyFile = "/home/${username}/.config/sops/age/keys.txt";
-
-  networking = {
-    hostName = "xps";
-    networkmanager.enable = true;
-  };
-
-  virtualisation.docker.enable = true;
-
-  users.users.${username} = {
-    isNormalUser = true;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "audio"
-      "video"
-      "input"
-      "docker"
-    ];
-  };
-  # Enable automatic login for the user.
-  services.displayManager.autoLogin.enable = true;
-  services.displayManager.autoLogin.user = "${username}";
-
-  stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/solarflare.yaml";
-  stylix.image = ../../backgrounds/SupermassiveBinaryBlackHoles.png;
-  stylix.cursor.package = pkgs.vimix-cursor-theme;
-  stylix.cursor.name = "Vimix-Cursors";
-  stylix.targets.gnome.enable = true;
-
-  system.stateVersion = "23.11"; # Did you read the comment?
-
-}