add bolty

flake.nix

@@ -46,7 +46,7 @@
       foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty";
       skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
       thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
-      brix = mkServer nixpkgs-nixos-unstable "x86_64-linux" "brix";
+      bolty = mkServer nixpkgs-nixos-unstable "x86_64-linux" "bolty";
       vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1";
     };
   };

nixos/boxes/bolty/bolty-boot.nix

@@ -3,9 +3,9 @@
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "btrfs" ];
+    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ];
     initrd.kernelModules = [ "dm-snapshot" ];
-    kernelModules = [ "kvm-intel" ];
+    kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = false;
@@ -18,20 +18,20 @@
     options = [ "autodefrag" "space_cache" "inode_cache" "noatime" "nodiratime" "compress=zstd" ];
   };
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/68bb21bd-90da-4da4-b97e-c6da3b1f8235";
+    { device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd";
-    fsType = "ext4";
+      fsType = "btrfs";
-    options = [ "noatime" "nodiratime" ];
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/0129-8152";
+    { device = "/dev/disk/by-uuid/5BFB-9E6B";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices = [ ];
-    { device = "/dev/disk/by-uuid/5f635052-a940-466e-a7cf-4799adace60e"; }
+
-  ];
+  nix.maxJobs = 2;
+  nix.buildCores = 7;
 
   zramSwap = {
     enable = true;

nixos/boxes/bolty/default.nix

@@ -0,0 +1,23 @@
+{ config, pkgs, inputs, lib, ... }:
+{
+  imports = [
+    ./bolty-boot.nix
+    ./real-hardware.nix
+    ./tailscale-bolty.nix
+    ../../server-security.nix
+    ../../tailscale.nix
+    ../cli.nix
+    ./print-server.nix
+  ];
+  networking = {
+    hostName = "bolty";
+    useDHCP = false;
+    interfaces.enp4s0.useDHCP = true;
+  };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  security.allowUserNamespaces = true;
+
+  time.timeZone = "Europe/London";
+
+}

nixos/boxes/bolty/tailscale-bolty.nix

@@ -26,7 +26,7 @@ in
       fi
 
       # otherwise authenticate with tailscale
-      ${tailscale}/bin/tailscale up -authkey tskey-bd6b308c9c22272a0a66c442
+      ${tailscale}/bin/tailscale up -authkey tskey-e9b320a1119a3da5b47ae9b1
     '';
   };
 }

nixos/boxes/brix/default.nix

@@ -1,32 +0,0 @@
-{ config, pkgs, inputs, lib, ... }:
-{
-  imports = [
-    ./brix-boot.nix
-    ./real-hardware.nix
-    ./tailscale-brix.nix
-    ../../server-security.nix
-    ../../tailscale.nix
-    ../cli.nix
-    ./restic-server.nix
-    ./i2p.nix
-    ./print-server.nix
-    ./nextcloud.nix
-  ];
-  networking = {
-    hostName = "brix";
-    useDHCP = false;
-    interfaces.enp3s0.useDHCP = true;
-  };
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-
-  security.allowUserNamespaces = true;
-  services.syncthing = {
-    enable = true;
-    dataDir = "/data/syncthing";
-    openDefaultPorts = true;
-    package = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing;
-  };
-
-  time.timeZone = "Europe/London";
-
-}