Push these changes to a branch cause I'm kind of giving up

hosts/JimPine/configuration.nix

@@ -0,0 +1,49 @@
+{lib, outputs, ...}: {
+  imports = [
+    # Base configs
+    ./../../base.nix
+
+    # Import users and groups
+    ./../../users/jimbo.nix
+    ./../../users/groups.nix
+
+    # Desktop
+    ./../../desktop/misc.nix
+    ./../../desktop/sway.nix
+    ./../../desktop/greetd-sway.nix
+    ./../../desktop/printing.nix
+    ./../../desktop/pipewire.nix
+    ./../../desktop/bluetooth.nix
+    ./../../desktop/firewall.nix
+    ./../../desktop/fonts.nix
+    ./../../desktop/qt.nix
+    ./../../desktop/wireguard.nix
+
+    # Modules
+    ./../../modules/security.nix
+
+    # Hardware
+    ./hardware-configuration.nix
+    ./../../modules/extlinux.nix
+    ./../../modules/opengl.nix
+    ./../../modules/filesystems.nix
+    ./../../modules/wireless.nix
+
+    # Services
+    ./../../services/openssh.nix
+    ./../../services/gnome-keyring.nix
+    ./../../services/mpd.nix
+  ];
+
+  # Set hostname
+  networking.hostName = "JimPine";
+
+  # Disable 32 bit graphics
+  hardware.opengl.driSupport32Bit = lib.mkForce false;
+
+  # Set the VPN IP per machine
+  networking.wireguard.interfaces."${outputs.ips.wgInt}".ips = [ "${outputs.ips.wgSpan}.17/32" ];
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = "24.05";
+}

hosts/JimPine/hardware-configuration.nix

@@ -0,0 +1,48 @@
+{ config, outputs, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [ ];
+      kernelModules = [ ];
+    };
+    blacklistedKernelModules = [
+      "pcspkr"
+    ];               
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/25738e24-385e-4bcf-bff5-d0e6274003b6";
+      fsType = "btrfs";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/01D2-E962";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+    "/home/jimbo/Downloads" = {
+      device = "/dev/disk/by-uuid/f0b6cf4e-9576-4ab5-96ae-2a7e57599a35";
+      fsType = "btrfs";
+    };
+    "/home/jimbo/JimboNFS" = {
+      device = "${outputs.ips.wgSpan}.1:/export/JimboNFS";
+      fsType = "nfs4";
+      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
+    };
+    "/home/jimbo/FreecornNFS" = {
+      device = "${outputs.secrets.cornIP}:/export/freecornNFS";
+      fsType = "nfs4";
+      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
+    };
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/95c43e5a-b53d-41fd-99a3-54181510070e"; }
+  ];
+
+  networking.useDHCP = lib.mkDefault true;
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}

hosts/JimPine/home.nix

@@ -0,0 +1,21 @@
+{config, ...}: {
+  imports = [
+    # Common modules
+    ./../../home/base.nix
+    ./../../home/pc.nix
+    ./../../home/users/jimbo.nix
+  ];
+
+  # Useful
+  general.enable = true;
+  chat.enable = true;
+  avtools.enable = true;
+  remotedesktop.enable = true;
+
+  # Needed to make the speaker work
+  home.packages = with pkgs; [
+    alsa-utils
+  ];
+
+  wayland.windowManager.sway.config.output.${outputs.displays.dI}.scale = "1.3";
+}