diff --git a/flake.lock b/flake.lock index 8bd6b7c..d1cb89f 100644 --- a/flake.lock +++ b/flake.lock @@ -388,21 +388,6 @@ "type": "github" } }, - "impermanence": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -674,14 +659,12 @@ "disko": "disko", "headplane": "headplane", "home-manager": "home-manager", - "impermanence": "impermanence", "nixos-mailserver": "nixos-mailserver", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "sops-nix": "sops-nix", - "srvos": "srvos", "tidalcycles": "tidalcycles" } }, @@ -705,26 +688,6 @@ "type": "github" } }, - "srvos": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761869910, - "narHash": "sha256-ogo46cmshLzXOOz1YO7KKAXaQNVsU5witFSNLWIULpU=", - "owner": "nix-community", - "repo": "srvos", - "rev": "412e15bdb690c5e4ad99dbc9cc91692393120c57", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "srvos", - "type": "github" - } - }, "superdirt-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 6e8898d..cbf2b4c 100644 --- a/flake.nix +++ b/flake.nix @@ -18,17 +18,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # srvos - srvos = { - url = "github:nix-community/srvos"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # impermanence - impermanence = { - url = "github:nix-community/impermanence"; - }; - # theme catppuccin = { url = "github:catppuccin/nix/release-25.05"; @@ -132,15 +121,7 @@ ); nixosConfigurations = { - # hypervisors - hyp-01 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./hosts/hyp-01 - ]; - }; - - # workstations + # Workstations wodan = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; modules = [ diff --git a/hosts/hyp-01/default.nix b/hosts/hyp-01/default.nix deleted file mode 100644 index 2993340..0000000 --- a/hosts/hyp-01/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - inputs, - ... -}: -{ - networking.hostName = "hyp-01"; - networking.hostId = "ae2c05d3"; - - imports = [ - inputs.disko.nixosModules.disko - inputs.impermanence.nixosModules.impermanence - inputs.srvos.nixosModules.server - inputs.srvos.nixosModules.hardware-hetzner-online-intel - inputs.srvos.nixosModules.mixins-terminfo - inputs.srvos.nixosModules.mixins-nginx - - ./modules/boot.nix - ./modules/disko.nix - ./modules/impermanence.nix - ./modules/networking.nix - ./modules/users.nix - ]; - - system.stateVersion = "25.05"; -} diff --git a/hosts/hyp-01/modules/boot.nix b/hosts/hyp-01/modules/boot.nix deleted file mode 100644 index fa3aaf9..0000000 --- a/hosts/hyp-01/modules/boot.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - # BIOS system - boot.loader.systemd-boot.enable = false; - boot.loader.grub = { - enable = true; - efiSupport = false; - }; -} diff --git a/hosts/hyp-01/modules/disko.nix b/hosts/hyp-01/modules/disko.nix deleted file mode 100644 index 3962c3a..0000000 --- a/hosts/hyp-01/modules/disko.nix +++ /dev/null @@ -1,115 +0,0 @@ -let - disk1 = "/dev/disk/by-path/pci-0000:00:17.0-ata-2.0"; - disk2 = "/dev/disk/by-path/pci-0000:00:17.0-ata-3.0"; -in -{ - disko.devices = { - disk = { - disk1 = { - type = "disk"; - device = disk1; - content = { - type = "table"; - format = "mbr"; - partitions = [ - { - name = "boot-primary"; - size = "1G"; - bootable = true; - type = "EF02"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "nofail" ]; - }; - } - { - name = "zfs-a"; - size = "100%"; - content = { - type = "zfs"; - pool = "zroot"; - }; - } - ]; - }; - }; - disk2 = { - type = "disk"; - device = disk2; - content = { - type = "table"; - format = "mbr"; - partitions = [ - { - name = "boot-secondary"; - size = "1G"; - bootable = true; - type = "EF02"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot-fallback"; - mountOptions = [ "nofail" ]; - }; - } - { - name = "zfs-b"; - size = "100%"; - content = { - type = "zfs"; - pool = "zroot"; - }; - } - ]; - }; - }; - }; - zpool = { - zroot = { - type = "zpool"; - mode = "mirror"; - rootFsOptions = { - compression = "lz4"; - acltype = "posixacl"; - xattr = "sa"; - "com.sun:auto-snapshot" = "true"; - mountpoint = "none"; - }; - options.ashift = "12"; - datasets = { - "root" = { - type = "zfs_fs"; - options = { - mountpoint = "none"; - encryption = "aes-256-gcm"; - keyformat = "passphrase"; - keylocation = "prompt"; - }; - }; - "root/nix" = { - type = "zfs_fs"; - mountpoint = "/nix"; - options.atime = "off"; - }; - "root/persist" = { - type = "zfs_fs"; - mountpoint = "/persist"; - }; - }; - }; - }; - }; - - boot.loader.grub = { - device = disk1; - - mirroredBoots = [ - { - devices = [ disk2 ]; - path = "/boot-fallback"; - } - ]; - }; -} diff --git a/hosts/hyp-01/modules/impermanence.nix b/hosts/hyp-01/modules/impermanence.nix deleted file mode 100644 index 2d50d54..0000000 --- a/hosts/hyp-01/modules/impermanence.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, ... }: -{ - boot.initrd.systemd.enable = true; - boot.initrd.postDeviceCommands = lib.mkAfter "zfs mount -a"; - - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - options = [ - "defaults" - "size=4G" - "mode=755" - ]; - }; - - environment.persistence."/persist" = { - directories = [ - "/etc/nixos" - "/var/log" - ]; - files = [ - "/etc/machine-id" - "/etc/ssh/ssh_host_rsa_key" - "/etc/ssh/ssh_host_rsa_key.pub" - "/etc/ssh/ssh_host_ed25519_key" - "/etc/ssh/ssh_host_ed25519_key.pub" - ]; - }; - -} diff --git a/hosts/hyp-01/modules/networking.nix b/hosts/hyp-01/modules/networking.nix deleted file mode 100644 index ecfd10e..0000000 --- a/hosts/hyp-01/modules/networking.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, ... }: -{ - options = { - networking.hyp-01.ipv4.address = lib.mkOption { - type = lib.types.str; - default = "88.99.145.10"; - }; - - networking.hyp-01.ipv4.cidr = lib.mkOption { - type = lib.types.str; - default = "26"; - }; - - networking.hyp-01.ipv4.gateway = lib.mkOption { - type = lib.types.str; - default = "88.99.145.1"; - }; - - networking.hyp-01.ipv6.address = lib.mkOption { - type = lib.types.str; - default = "2a01:4f8:10a:2962::1"; - }; - - networking.hyp-01.ipv6.cidr = lib.mkOption { - type = lib.types.str; - default = "64"; - }; - - networking.hyp-01.ipv6.gateway = lib.mkOption { - type = lib.types.str; - default = "fe80::1"; - }; - }; - - config = { - networking = { - dhcpcd.enable = false; - nameservers = [ "9.9.9.9" ]; - }; - - systemd.network.networks."10-uplink".networkConfig.Address = config.networking.hyp-01.ipv6.address; - - boot.initrd.systemd.network.networks."10-uplink" = config.systemd.networks."10-uplink"; - - boot.initrd.network = { - enable = true; - }; - - boot.initrd.kernelModules = [ "igb" ]; - }; -} diff --git a/hosts/hyp-01/modules/users.nix b/hosts/hyp-01/modules/users.nix deleted file mode 100644 index ac65bda..0000000 --- a/hosts/hyp-01/modules/users.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: -let - sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnthKtz0fE4yQ/X10cJgKVCjYCNkRNoqV28xAhD7h2M cardno:22_498_026"; -in -{ - users.mutableUsers = false; - - users.users.root = { - openssh.authorizedKeys.keys = [ sshKey ]; - }; - - users.users.lander = { - isNormalUser = true; - shell = pkgs.zsh; - extraGroups = [ - "wheel" - ]; - openssh.authorizedKeys.keys = [ sshKey ]; - }; -} diff --git a/hosts/servers/hosting-02.nix b/hosts/servers/hosting-02.nix index 118f869..3aaea4c 100644 --- a/hosts/servers/hosting-02.nix +++ b/hosts/servers/hosting-02.nix @@ -177,14 +177,9 @@ services.nginx.virtualHosts."media.escapeangle.com" = { forceSSL = true; enableACME = true; - locations = { - "/" = { - proxyPass = "http://localhost:8096"; - }; - "/socket" = { - proxyPass = "http://localhost:8096"; - proxyWebsockets = true; - }; + locations."/" = { + proxyPass = "http://localhost:8096"; + proxyWebsockets = true; }; };