From 61651d8c0467df6139df401521e7de8c080a6428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 1 Oct 2021 10:06:37 +0100 Subject: [PATCH] add bolty --- flake.nix | 2 +- .../brix-boot.nix => bolty/bolty-boot.nix} | 28 ++++++++-------- nixos/boxes/bolty/default.nix | 23 +++++++++++++ nixos/boxes/{brix => bolty}/i2p.nix | 0 nixos/boxes/{brix => bolty}/matrix-server.nix | 0 nixos/boxes/{brix => bolty}/nextcloud.nix | 0 nixos/boxes/{brix => bolty}/print-server.nix | 0 .../boxes/{brix => bolty}/prometheus-node.nix | 0 nixos/boxes/{brix => bolty}/real-hardware.nix | 0 nixos/boxes/{brix => bolty}/restic-server.nix | 0 .../tailscale-bolty.nix} | 2 +- nixos/boxes/brix/default.nix | 32 ------------------- 12 files changed, 39 insertions(+), 48 deletions(-) rename nixos/boxes/{brix/brix-boot.nix => bolty/bolty-boot.nix} (55%) create mode 100644 nixos/boxes/bolty/default.nix rename nixos/boxes/{brix => bolty}/i2p.nix (100%) rename nixos/boxes/{brix => bolty}/matrix-server.nix (100%) rename nixos/boxes/{brix => bolty}/nextcloud.nix (100%) rename nixos/boxes/{brix => bolty}/print-server.nix (100%) rename nixos/boxes/{brix => bolty}/prometheus-node.nix (100%) rename nixos/boxes/{brix => bolty}/real-hardware.nix (100%) rename nixos/boxes/{brix => bolty}/restic-server.nix (100%) rename nixos/boxes/{brix/tailscale-brix.nix => bolty/tailscale-bolty.nix} (92%) delete mode 100644 nixos/boxes/brix/default.nix diff --git a/flake.nix b/flake.nix index 821588d2..da9465bd 100644 --- a/flake.nix +++ b/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"; }; }; diff --git a/nixos/boxes/brix/brix-boot.nix b/nixos/boxes/bolty/bolty-boot.nix similarity index 55% rename from nixos/boxes/brix/brix-boot.nix rename to nixos/boxes/bolty/bolty-boot.nix index be2bf2cb..65ebb1da 100644 --- a/nixos/boxes/brix/brix-boot.nix +++ b/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."/" = { - device = "/dev/disk/by-uuid/68bb21bd-90da-4da4-b97e-c6da3b1f8235"; - fsType = "ext4"; - options = [ "noatime" "nodiratime" ]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd"; + fsType = "btrfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/0129-8152"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5BFB-9E6B"; + fsType = "vfat"; + }; - swapDevices = [ - { device = "/dev/disk/by-uuid/5f635052-a940-466e-a7cf-4799adace60e"; } - ]; + swapDevices = [ ]; + + nix.maxJobs = 2; + nix.buildCores = 7; zramSwap = { enable = true; diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix new file mode 100644 index 00000000..8c008e9f --- /dev/null +++ b/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"; + +} diff --git a/nixos/boxes/brix/i2p.nix b/nixos/boxes/bolty/i2p.nix similarity index 100% rename from nixos/boxes/brix/i2p.nix rename to nixos/boxes/bolty/i2p.nix diff --git a/nixos/boxes/brix/matrix-server.nix b/nixos/boxes/bolty/matrix-server.nix similarity index 100% rename from nixos/boxes/brix/matrix-server.nix rename to nixos/boxes/bolty/matrix-server.nix diff --git a/nixos/boxes/brix/nextcloud.nix b/nixos/boxes/bolty/nextcloud.nix similarity index 100% rename from nixos/boxes/brix/nextcloud.nix rename to nixos/boxes/bolty/nextcloud.nix diff --git a/nixos/boxes/brix/print-server.nix b/nixos/boxes/bolty/print-server.nix similarity index 100% rename from nixos/boxes/brix/print-server.nix rename to nixos/boxes/bolty/print-server.nix diff --git a/nixos/boxes/brix/prometheus-node.nix b/nixos/boxes/bolty/prometheus-node.nix similarity index 100% rename from nixos/boxes/brix/prometheus-node.nix rename to nixos/boxes/bolty/prometheus-node.nix diff --git a/nixos/boxes/brix/real-hardware.nix b/nixos/boxes/bolty/real-hardware.nix similarity index 100% rename from nixos/boxes/brix/real-hardware.nix rename to nixos/boxes/bolty/real-hardware.nix diff --git a/nixos/boxes/brix/restic-server.nix b/nixos/boxes/bolty/restic-server.nix similarity index 100% rename from nixos/boxes/brix/restic-server.nix rename to nixos/boxes/bolty/restic-server.nix diff --git a/nixos/boxes/brix/tailscale-brix.nix b/nixos/boxes/bolty/tailscale-bolty.nix similarity index 92% rename from nixos/boxes/brix/tailscale-brix.nix rename to nixos/boxes/bolty/tailscale-bolty.nix index 502a1529..bfcdd55c 100644 --- a/nixos/boxes/brix/tailscale-brix.nix +++ b/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 ''; }; } diff --git a/nixos/boxes/brix/default.nix b/nixos/boxes/brix/default.nix deleted file mode 100644 index f125dc5c..00000000 --- a/nixos/boxes/brix/default.nix +++ /dev/null @@ -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"; - -}