Merge pull request #25 from caperren/working-branch

Swapped out for amd gpu on nr200p

.sops.yaml

@@ -5,8 +5,6 @@ keys:
     - &personal:
       - &cap_slim7    age1a5aqj3jr3rqpjet9a7y077ak0ymstjjdnyfgn5m2ad4l2yuxr4aqym7d3d
       - &cap_nr200p   age1g45zy9m5g4e20cjejgd3x40722rlddgkmhtddrl8wyf63kt5kg7s9ke390
-    - &apollo:
-      - &cap_apollo_n01 age1ljcy90uwlfngc7vqwlf2x2ckgsdfg90c0r9yvjzpl90jkwf9g48q2leudt
     - &cluster:
       - &cap_clust_01 age1649y4antwgfe4fu02eppnx5gr0yc3g4lj4kwd6v9guxgxgj06y9qk7l4wl
       - &cap_clust_02 age1k085uuy4fv9rfpy0ne6zl9fq0j05a4fykqe26psx2ngxqrcxcu5sksxa9u
@@ -30,7 +28,6 @@ creation_rules:
           - *caperren
           - *cap_slim7
           - *cap_nr200p
-          - *cap_apollo_n01
           - *cap_clust_01
           - *cap_clust_02
           - *cap_clust_03

flake.nix

@@ -108,16 +108,6 @@
         ];
       };
 
-      nixosConfigurations.cap-apollo-n01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ./hosts/cap-apollo-n01/configuration.nix
-          sops-nix.nixosModules.sops
-          inputs.home-manager.nixosModules.default
-        ];
-      };
-
       nixosConfigurations.cap-slim7 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };

hosts/cap-apollo-n01/configuration.nix

@@ -1,34 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    # Hardware Scan
-    ./hardware-configuration.nix
-
-    # Users
-    ../../users/apollo-admin/apollo-admin.nix
-
-    # System Configuration
-    ../../modules/system/cpu-intel.nix
-    ../../modules/system/fonts.nix
-    ../../modules/system/home-manager-settings.nix
-    ../../modules/system/internationalization.nix
-    ../../modules/system/networking.nix
-    ../../modules/system/nix-settings.nix
-    ../../modules/system/security.nix
-    ../../modules/system/systemd-boot.nix
-
-    # Application Groups
-    ../../modules/application-groups/system-utilities-cluster.nix
-    ../../modules/application-groups/virtualization.nix
-  ];
-
-  networking.hostName = "cap-apollo-n01";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
-}

hosts/cap-apollo-n01/hardware-configuration.nix

@@ -1,31 +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" "xhci_pci" "ehci_pci" "uhci_hcd" "hpsa" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1fa744fd-82d2-4997-a757-28ae96461a96";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F57E-AA2D";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/cap-clust-01/configuration.nix

@@ -11,13 +11,7 @@
     ../../modules/application-groups/k3s-primary.nix
   ];
 
-  networking.hostName = "cap-clust-01";
+#  sops.secrets.k3s_token.sopsFile = ../../secrets/cluster.yaml;
 
-  # This value determines the NixOS release from which the default
+  networking.hostName = "cap-clust-01";
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-02/configuration.nix

@@ -12,12 +12,4 @@
   ];
 
   networking.hostName = "cap-clust-02";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-03/configuration.nix

@@ -12,12 +12,4 @@
   ];
 
   networking.hostName = "cap-clust-03";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-04/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-04";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-05/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-05";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-06/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-06";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-07/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-07";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-08/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-08";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

hosts/cap-clust-09/configuration.nix

@@ -9,12 +9,4 @@
   ];
 
   networking.hostName = "cap-clust-09";
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
 }

modules/system/cpu-intel.nix

@@ -1,4 +0,0 @@
-{ config, lib, ... }:
-{
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

users/apollo-admin/apollo-admin.nix

@@ -1,45 +0,0 @@
-{ config, pkgs, ... }:
-let
-  sshCaperrenDesktopPubkey = builtins.readFile ../caperren/pubkeys/cap-nr200p.pub;
-  sshCaperrenLaptopPubkey = builtins.readFile ../caperren/pubkeys/cap-slim7.pub;
-in
-{
-  users.users.apollo-admin = {
-    initialPassword = "changeme";
-    isNormalUser = true;
-    description = "Cluster Admin";
-    extraGroups = [
-      "docker"
-      "networkmanager"
-      "wheel"
-    ];
-    openssh.authorizedKeys.keys = [
-      sshCaperrenDesktopPubkey
-      sshCaperrenLaptopPubkey
-    ];
-  };
-
-  home-manager.users.apollo-admin = {
-    home.username = "apollo-admin";
-    home.homeDirectory = "/home/apollo-admin";
-    home.stateVersion = "25.05";
-
-    home.packages = with pkgs; [ ];
-
-    programs.bash.enable = true;
-
-    programs.git = {
-      enable = true;
-      settings.user = {
-        name = "Corwin Perren";
-        email = "caperren@gmail.com";
-      };
-
-    };
-
-    programs.kitty = {
-      enable = true;
-      font.name = "JetBrains Mono";
-    };
-  };
-}