From 29fd7815d837c8b38c9ecd012ae39e6b30d2e0c9 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Mon, 8 Sep 2025 21:24:28 +0000 Subject: [PATCH] Remove old nocix experimental configs, solidify new corp configuration At this point the new Nocix server is working (I'm writing this commit on that machine) so I can clean up the various experiments and commit to the more generalized configuration as it stands --- host/corp/configuration.nix | 2 +- nixos-anywhere-nocix/configuration.nix | 56 ------ nixos-anywhere-nocix/disk-config.nix | 69 ------- nixos-anywhere-nocix/flake.lock | 64 ------- nixos-anywhere-nocix/flake.nix | 70 ------- .../hardware-configuration.nix | 25 --- nocix/configuration.nix | 173 ------------------ nocix/hardware-configuration.nix | 39 ---- 8 files changed, 1 insertion(+), 497 deletions(-) delete mode 100644 nixos-anywhere-nocix/configuration.nix delete mode 100644 nixos-anywhere-nocix/disk-config.nix delete mode 100644 nixos-anywhere-nocix/flake.lock delete mode 100644 nixos-anywhere-nocix/flake.nix delete mode 100644 nixos-anywhere-nocix/hardware-configuration.nix delete mode 100644 nocix/configuration.nix delete mode 100644 nocix/hardware-configuration.nix diff --git a/host/corp/configuration.nix b/host/corp/configuration.nix index 4f3f044..532199d 100644 --- a/host/corp/configuration.nix +++ b/host/corp/configuration.nix @@ -59,5 +59,5 @@ # and migrated your data accordingly. # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "23.11"; + #system.stateVersion = "23.11"; } diff --git a/nixos-anywhere-nocix/configuration.nix b/nixos-anywhere-nocix/configuration.nix deleted file mode 100644 index d320f97..0000000 --- a/nixos-anywhere-nocix/configuration.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - modulesPath, - lib, - pkgs, - ... -} @ args: -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/profiles/qemu-guest.nix") - ./disk-config.nix - ]; - boot.loader.grub = { - # no need to set devices, disko will add all devices that have a EF02 partition to the list already - # devices = [ ]; - efiSupport = true; - efiInstallAsRemovable = true; - }; - services.openssh.enable = true; - - environment.systemPackages = map lib.lowPrio [ - pkgs.curl - pkgs.gitMinimal - ]; - - networking = { - defaultGateway = { - address = "107.150.59.201"; - interface = "enp2s0"; - }; - defaultGateway6 = { - address = "2604:4300:a:27e::1"; - interface = "enp2s0"; - }; - interfaces.enp2s0 = { - ipv4.addresses = [{ - address = "107.150.59.202"; - prefixLength = 29; - }]; - ipv6.addresses = [{ - address = "2604:4300:a:27e::2"; - prefixLength = 64; - }]; - }; - nameservers = ["192.187.107.16"]; - search = ["nocix.net"]; - }; - users.users.root.openssh.authorizedKeys.keys = - [ - # change this to your ssh key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvhtF6nRWlA6PVs71Eek7p0p2PxTd3P6ZEGFV2t75MB eliribble@nixos" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHL1SpT3KR8XeXtH19muncYVrKxWzWdWtJYNTwoJGTm3 eliribble@Elis-Mac-mini.local" - ] ++ (args.extraPublicKeys or []); # this is used for unit-testing this module and can be removed if not needed - - system.stateVersion = "25.05"; -} diff --git a/nixos-anywhere-nocix/disk-config.nix b/nixos-anywhere-nocix/disk-config.nix deleted file mode 100644 index a1481de..0000000 --- a/nixos-anywhere-nocix/disk-config.nix +++ /dev/null @@ -1,69 +0,0 @@ -# Example to create a bios compatible gpt partition -{ lib, ... }: -{ - disko.devices = { - disk = { - sdb = { - device = "/dev/sdb"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - MBR = { - size = "1M"; - type = "EF02"; # for grub MBR - }; - boot = { - size = "500M"; - type = "EF00"; # for grub MBR - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - root = { - size = "100%"; - content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - }; - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "50G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - mountOptions = [ - "defaults" - ]; - }; - }; - var = { - size = "100%FREE"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/var"; - mountOptions = [ - "defaults" - ]; - }; - }; - }; - }; - }; - }; -} diff --git a/nixos-anywhere-nocix/flake.lock b/nixos-anywhere-nocix/flake.lock deleted file mode 100644 index f177352..0000000 --- a/nixos-anywhere-nocix/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756733629, - "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", - "owner": "nix-community", - "repo": "disko", - "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "nixos-facter-modules": { - "locked": { - "lastModified": 1756491981, - "narHash": "sha256-lXyDAWPw/UngVtQfgQ8/nrubs2r+waGEYIba5UX62+k=", - "owner": "numtide", - "repo": "nixos-facter-modules", - "rev": "c1b29520945d3e148cd96618c8a0d1f850965d8c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nixos-facter-modules", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "disko": "disko", - "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nixos-anywhere-nocix/flake.nix b/nixos-anywhere-nocix/flake.nix deleted file mode 100644 index edb07a9..0000000 --- a/nixos-anywhere-nocix/flake.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.disko.url = "github:nix-community/disko"; - inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; - - outputs = - { - nixpkgs, - disko, - nixos-facter-modules, - ... - }: - { - nixosConfigurations.hetzner-cloud = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - disko.nixosModules.disko - ./configuration.nix - ]; - }; - # tested with 2GB/2CPU droplet, 1GB droplets do not have enough RAM for kexec - nixosConfigurations.digitalocean = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./digitalocean.nix - disko.nixosModules.disko - { disko.devices.disk.disk1.device = "/dev/vda"; } - ./configuration.nix - ]; - }; - nixosConfigurations.hetzner-cloud-aarch64 = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - disko.nixosModules.disko - ./configuration.nix - ]; - }; - - # Use this for all other targets - # nixos-anywhere --flake .#generic --generate-hardware-config nixos-generate-config ./hardware-configuration.nix - nixosConfigurations.generic = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - disko.nixosModules.disko - ./configuration.nix - ./hardware-configuration.nix - ]; - }; - - # Slightly experimental: Like generic, but with nixos-facter (https://github.com/numtide/nixos-facter) - # nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-facter facter.json - nixosConfigurations.generic-nixos-facter = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - disko.nixosModules.disko - ./configuration.nix - nixos-facter-modules.nixosModules.facter - { - config.facter.reportPath = - if builtins.pathExists ./facter.json then - ./facter.json - else - throw "Have you forgotten to run nixos-anywhere with `--generate-hardware-config nixos-facter ./facter.json`?"; - } - ]; - }; - }; -} - diff --git a/nixos-anywhere-nocix/hardware-configuration.nix b/nixos-anywhere-nocix/hardware-configuration.nix deleted file mode 100644 index 9ee6f96..0000000 --- a/nixos-anywhere-nocix/hardware-configuration.nix +++ /dev/null @@ -1,25 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - #networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nocix/configuration.nix b/nocix/configuration.nix deleted file mode 100644 index d3d5b56..0000000 --- a/nocix/configuration.nix +++ /dev/null @@ -1,173 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the GRUB 2 boot loader. - boot.loader.grub = { - device = "/dev/disk/by-uuid/0f6e950a-b913-4698-9431-14a6fe1f2ed9"; - enable = true; - }; - # boot.loader.grub.efiSupport = true; - # boot.loader.grub.efiInstallAsRemovable = true; - # boot.loader.efi.efiSysMountPoint = "/boot/efi"; - # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - - - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # services.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # tree - # ]; - # }; - - # programs.firefox.enable = true; - - # List packages installed in system profile. - # You can use https://search.nixos.org/ to find more packages (and options). - environment.systemPackages = with pkgs; [ - curl - gitMinimal - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - wget - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - networking = { - defaultGateway = { - address = "107.150.59.201"; - interface = "enp2s0"; - }; - defaultGateway6 = { - address = "2604:4300:a:27e::1"; - interface = "enp2s0"; - }; - interfaces.enp2s0 = { - ipv4.addresses = [{ - address = "107.150.59.202"; - prefixLength = 29; - }]; - ipv6.addresses = [{ - address = "2604:4300:a:27e::2"; - prefixLength = 64; - }]; - }; - nameservers = ["192.187.107.16"]; - search = ["nocix.net"]; - }; - # Enable the OpenSSH daemon. - services.openssh.enable = true; - systemd.network.enable = true; - - users.users.eliribble = { - extraGroups = [ "sudo" "wheel" ]; - isNormalUser = true; - initialHashedPassword = "$y$j9T$pXXR8iNU81XAghZWEXVrC/$Xp4nL6FrTAZ3DnJkcx.zi0q2SGk8KUz8YfejkAoWSE."; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvhtF6nRWlA6PVs71Eek7p0p2PxTd3P6ZEGFV2t75MB eliribble@nixos" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHL1SpT3KR8XeXtH19muncYVrKxWzWdWtJYNTwoJGTm3 eliribble@Elis-Mac-mini.local" - ]; - }; - - users.users.root = { - initialHashedPassword = ""; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvhtF6nRWlA6PVs71Eek7p0p2PxTd3P6ZEGFV2t75MB eliribble@nixos" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHL1SpT3KR8XeXtH19muncYVrKxWzWdWtJYNTwoJGTm3 eliribble@Elis-Mac-mini.local" - ]; - }; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "25.05"; # Did you read the comment? - -} - diff --git a/nocix/hardware-configuration.nix b/nocix/hardware-configuration.nix deleted file mode 100644 index 646afa6..0000000 --- a/nocix/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/6c2f40c3-4b38-4890-a9dc-0a7f85f7ad4d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0f6e950a-b913-4698-9431-14a6fe1f2ed9"; - fsType = "ext2"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/0f61d819-c0b1-4c09-9019-5c1a2492efaa"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - # networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}