diff --git a/flake.nix b/flake.nix index 107c128d..87699b4a 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ # Servers "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; - "albert@waraw-ovh-01" = libx.mkHome { hostname = "waraw-ovh-01"; }; + "albert@warsaw-ovh-01" = libx.mkHome { hostname = "warsaw-ovh-01"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; # User Machines @@ -107,7 +107,7 @@ # Servers framework-server = libx.deploy { hostname = "framework-server"; }; - ovh-server = libx.deploy { hostname = "ovh-server"; }; + warsaw-ovh-01 = libx.deploy { hostname = "warsaw-ovh-01"; }; # nuc-server = libx.deploy { hostname = "nuc-server"; }; # Raspberry Pi's diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index 9cebf6de..d9beeef2 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -81,5 +81,8 @@ # RGB stuff openrgb-with-all-plugins rivalcfg + + # Other + distrobox ]; } diff --git a/nixos/hosts/warsaw-ovh-01/disks.nix b/nixos/hosts/warsaw-ovh-01/disks.nix index 733356fd..8ab5a08b 100644 --- a/nixos/hosts/warsaw-ovh-01/disks.nix +++ b/nixos/hosts/warsaw-ovh-01/disks.nix @@ -13,129 +13,136 @@ services.btrfs.autoScrub.enable = true; services.btrfs.autoScrub.interval = "weekly"; - disko.devices.disk = { - sdb = { - type = "disk"; - device = "/dev/sdb"; - content = { - type = "gpt"; - partitions = { - BOOT = { - size = "1M"; - type = "EF02"; # GRUB MBR - }; - ESP = { - size = "500M"; - type = "EF00"; - content = { - type = "mdraid"; - name = "boot"; + disko.devices = { + disk = { + sdb = { + type = "disk"; + device = "/dev/sdb"; + content = { + type = "gpt"; + partitions = { + BOOT = { + size = "1M"; + type = "EF02"; # GRUB MBR + }; + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "mdraid"; + name = "boot"; + }; + }; + mdadm = { + size = "100%"; + content = { + type = "mdraid"; + name = "raid1"; + }; }; }; - mdadm = { - size = "100%"; - content = "mdraid"; - name = "raid1"; + }; + }; + + sdc = { + type = "disk"; + device = "/dev/sdc"; + content = { + type = "gpt"; + partitions = { + BOOT = { + size = "1M"; + type = "EF02"; # GRUB MBR + }; + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "mdraid"; + name = "boot"; + }; + }; + mdadm = { + size = "100%"; + content = { + type = "mdraid"; + name = "raid1"; + }; + }; }; }; }; }; - sdc = { - type = "disk"; - device = "/dev/sdc"; - content = { - type = "gpt"; - partitions = { - BOOT = { - size = "1M"; - type = "EF02"; # GRUB MBR - }; - ESP = { - size = "500M"; - type = "EF00"; - content = { - type = "mdraid"; - name = "boot"; - }; - }; - mdadm = { - size = "100%"; - content = "mdraid"; - name = "raid1"; - }; + mdadm = { + boot = { + type = "mdadm"; + level = 1; + metadata = "1.0"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; }; }; - }; - }; - mdadm = { - boot = { - type = "mdadm"; - level = 1; - metadata = "1.0"; - content = { - type = "Filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - raid1 = { - type = "mdadm"; - level = 1; - content = { - type = "gpt"; - partitions = { - LUKS-ROOT = { - start = "550MiB"; - end = "100%"; - content = { - type = "luks"; - name = "ROOT"; - extraOpenArgs = [ "--allow-discards" ]; + raid1 = { + type = "mdadm"; + level = 1; + content = { + type = "gpt"; + partitions = { + LUKS-ROOT = { + start = "550MiB"; + end = "100%"; content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # root - "/home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # home - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # nix - "/Storage" = { - mountpoint = "/Storage"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # Storage - # SNAPSHOT SUBVOLS - "/root/.snapshots" = { - mountpoint = "/.snapshots"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # root - "/home/.snapshots" = { - mountpoint = "/home/.snapshots"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # home - "/nix/.snapshots" = { - mountpoint = "/nix/.snapshots"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # nix - "/Storage/.snapshots" = { - mountpoint = "/Storage/.snapshots"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; # Storage - }; # subvolumes - }; # content.content - }; # content - }; # partition 2 (/ BTRFS) + type = "luks"; + name = "ROOT"; + extraOpenArgs = [ "--allow-discards" ]; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "/root" = { + mountpoint = "/"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # root + "/home" = { + mountpoint = "/home"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # home + "/nix" = { + mountpoint = "/nix"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # nix + "/Storage" = { + mountpoint = "/Storage"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # Storage + # SNAPSHOT SUBVOLS + "/root/.snapshots" = { + mountpoint = "/.snapshots"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # root + "/home/.snapshots" = { + mountpoint = "/home/.snapshots"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # home + "/nix/.snapshots" = { + mountpoint = "/nix/.snapshots"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # nix + "/Storage/.snapshots" = { + mountpoint = "/Storage/.snapshots"; + mountOptions = [ "compress=zstd" "noatime" ]; + }; # Storage + }; # subvolumes + }; # content.content + }; # content + }; # partition 2 (/ BTRFS) + }; }; }; }; - }; + }; }