From 2b5b1da02c4c86563569b8feca7beb91f98c5977 Mon Sep 17 00:00:00 2001 From: Rosa Date: Mon, 30 Mar 2026 15:12:01 -0400 Subject: Maybe it's not dead yet This reverts commit 849624093f6afd2c498bbff8662550bf3fd87c33. --- flake.nix | 5 ++ hosts/canadian-government-system/default.nix | 15 ++++ hosts/canadian-government-system/disks.nix | 82 ++++++++++++++++++++++ .../hardware-configuration.nix | 18 +++++ hosts/the-meowchine/default.nix | 7 +- 5 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 hosts/canadian-government-system/default.nix create mode 100644 hosts/canadian-government-system/disks.nix create mode 100644 hosts/canadian-government-system/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 5f9a821..09483c6 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,11 @@ hostName = "meowbook"; }; + + canadian-government-system = mkSystem { + additionalModules = [ disko.nixosModules.disko ]; + hostName = "canadian-government-system"; + }; }; }; } diff --git a/hosts/canadian-government-system/default.nix b/hosts/canadian-government-system/default.nix new file mode 100644 index 0000000..3086ec9 --- /dev/null +++ b/hosts/canadian-government-system/default.nix @@ -0,0 +1,15 @@ +{ config, ... }: +{ + imports = [ ./disks.nix ]; + networking.domain = "eviltransgenders.club"; + security.doas.enable = true; + services.openssh.enable = true; + system.stateVersion = "26.05"; + users.users = { + root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICcEZBikGjnGveif3TsfBkWCl1Qrw0yZoOAn/LxS8oAa rosa@lust" + ]; + + rosa.enable = true; + }; +} diff --git a/hosts/canadian-government-system/disks.nix b/hosts/canadian-government-system/disks.nix new file mode 100644 index 0000000..67b20b8 --- /dev/null +++ b/hosts/canadian-government-system/disks.nix @@ -0,0 +1,82 @@ +{ + disko.devices.disk = { + boot1 = { + content = { + partitions = { + efi = { + content = { + format = "vfat"; + mountOptions = [ "umask=0077" ]; + mountpoint = "/boot"; + type = "filesystem"; + }; + + size = "512M"; + type = "EF00"; + }; + + # the root partition is set up in boot2 + root.size = "100%"; + }; + + type = "gpt"; + }; + + device = "/dev/sda"; + type = "disk"; + }; + + boot2 = { + content = { + partitions = { + efi = { + content = { + format = "vfat"; + mountOptions = [ "umask=0077" ]; + mountpoint = "/boot"; + type = "filesystem"; + }; + + size = "512M"; + type = "EF00"; + }; + + root = { + content = { + extraArgs = [ + "-f" + "-d raid1" + "/dev/sda2"; + ]; + + subvolumes = { + "/nix" = { + mountOptions = [ + "compress=zstd" + "noatime" + ]; + + mountpoint = "/nix"; + }; + + "/root" = { + mountpoint = "/"; + mountOptions = [ "noatime" ]; + }; + }; + + type = "btrfs"; + }; + + size = "100%"; + }; + }; + + type = "gpt"; + }; + + device = "/dev/sdb"; + type = "disk"; + }; + }; +} diff --git a/hosts/canadian-government-system/hardware-configuration.nix b/hosts/canadian-government-system/hardware-configuration.nix new file mode 100644 index 0000000..88db163 --- /dev/null +++ b/hosts/canadian-government-system/hardware-configuration.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + modulesPath, + pkgs, + ... +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usbhid" + "sd_mod" + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/the-meowchine/default.nix b/hosts/the-meowchine/default.nix index d5528c0..b6c0648 100644 --- a/hosts/the-meowchine/default.nix +++ b/hosts/the-meowchine/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: { home-manager.users.rosa = { imports = [ ../../modules/user ]; -- cgit v1.3.1