diff --git a/machines/myarm/default.nix b/machines/myarm/default.nix index df5732c..dfc34e3 100644 --- a/machines/myarm/default.nix +++ b/machines/myarm/default.nix @@ -7,9 +7,13 @@ custom = { hostname = "myarm"; - settings.networking = { - static = true; - ipv6 = "2a01:4f8:c17:321c::1/64"; + settings = { + boot.systemd-boot = true; + + networking = { + static = true; + ipv6 = "2a01:4f8:c17:321c::1/64"; + }; }; }; } diff --git a/machines/myne/default.nix b/machines/myne/default.nix index ed7ad21..95df3e4 100644 --- a/machines/myne/default.nix +++ b/machines/myne/default.nix @@ -4,5 +4,16 @@ ./hardware-configuration.nix ]; - custom.hostname = "myne"; + custom = { + hostname = "myne"; + + settings = { + boot.grub = true; + + networking = { + static = true; + ipv6 = "2a01:4ff:f0:e193::1/64"; + }; + }; + }; } diff --git a/machines/myne/disko.nix b/machines/myne/disko.nix index 7967f51..968333a 100644 --- a/machines/myne/disko.nix +++ b/machines/myne/disko.nix @@ -3,7 +3,7 @@ disk = { master = { type = "disk"; - device = "/dev/sda"; + device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_53186364"; content = { type = "gpt"; partitions = { @@ -54,7 +54,33 @@ "/swap" = { mountpoint = "/swap"; - swap.swapfile.size = "8G"; + swap.swapfile.size = "4G"; + }; + }; + }; + }; + }; + }; + }; + + myvol = { + type = "disk"; + device = "/dev/disk/by-id/scsi-0HC_Volume_101412796"; + content = { + type = "gpt"; + partitions = { + local = { + size = "100%"; + content = { + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "/local" = { + mountpoint = "/mnt/local"; + mountOptions = [ + "compress=zstd" + "noatime" + ]; }; }; }; diff --git a/machines/myne/hardware-configuration.nix b/machines/myne/hardware-configuration.nix index deb8482..fefcd02 100644 --- a/machines/myne/hardware-configuration.nix +++ b/machines/myne/hardware-configuration.nix @@ -8,16 +8,11 @@ modulesPath, ... }: { - imports = [(modulesPath + "/profiles/qemu-guest.nix")]; - - boot.initrd.availableKernelModules = [ - "ahci" - "xhci_pci" - "virtio_pci" - "virtio_scsi" - "sd_mod" - "sr_mod" + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") ]; + + boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = []; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 9314fc9..99056e2 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -29,7 +29,7 @@ let ]; servers = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDPlG7FWZ5Us4Ix5fGMHn2DJU1/ma/7kQu39cPKKQMXJ root@myarm" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAgrWvzp14Vj+aMd3b9w6e3/xbkHfNZoswsAg9QtUcDc root@myne" ]; common = users ++ consoles ++ desktops ++ sbcs ++ servers; @@ -65,7 +65,7 @@ in { "sbc/users/root.pass".publicKeys = sbc; ### Server - "server/borgmatic/borgbase.myarm".publicKeys = server; + "server/borgmatic/borgbase".publicKeys = server; "server/caddy/Caddyfile".publicKeys = server; "server/coturn/coturn.conf".publicKeys = server; "server/forgejo/.env".publicKeys = server;