Added saleae logic analyzer udev rules

Remove home-manager ssh config for now due to bad default permissions

.sops.yaml

@@ -16,6 +16,12 @@ keys:
       - &cap_clust_08 age1vujvq5rdzppkkdhkwyhnl6xhuvm8s5yf2wc8ke05m8jwrdwsdf0qfx5w4r
       - &cap_clust_09 age1uyuudfya8etgztlt6hlssr9hkstyyhg65wdq3pj9rud2czzkaqqssg7yvp
 creation_rules:
+  - path_regex: users/caperren/secrets/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+      - age:
+          - *caperren
+          - *cap_slim7
+          - *cap_nr200p
   - path_regex: secrets/default.yaml$
     key_groups:
       - age:

flake.nix

@@ -28,6 +28,7 @@
     {
       nixosConfigurations.cap-clust-01 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-01/configuration.nix
           sops-nix.nixosModules.sops
@@ -36,6 +37,7 @@
       };
       nixosConfigurations.cap-clust-02 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-02/configuration.nix
           sops-nix.nixosModules.sops
@@ -44,6 +46,7 @@
       };
       nixosConfigurations.cap-clust-03 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-03/configuration.nix
           sops-nix.nixosModules.sops
@@ -52,6 +55,7 @@
       };
       nixosConfigurations.cap-clust-04 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-04/configuration.nix
           sops-nix.nixosModules.sops
@@ -60,6 +64,7 @@
       };
       nixosConfigurations.cap-clust-05 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-05/configuration.nix
           sops-nix.nixosModules.sops
@@ -68,6 +73,7 @@
       };
       nixosConfigurations.cap-clust-06 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-06/configuration.nix
           sops-nix.nixosModules.sops
@@ -76,6 +82,7 @@
       };
       nixosConfigurations.cap-clust-07 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-07/configuration.nix
           sops-nix.nixosModules.sops
@@ -84,6 +91,7 @@
       };
       nixosConfigurations.cap-clust-08 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-08/configuration.nix
           sops-nix.nixosModules.sops
@@ -92,6 +100,7 @@
       };
       nixosConfigurations.cap-clust-09 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-clust-09/configuration.nix
           sops-nix.nixosModules.sops
@@ -101,9 +110,7 @@
 
       nixosConfigurations.cap-slim7 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = {
+        specialArgs = { inherit inputs; };
-          inherit inputs;
-        };
         modules = [
           ./hosts/cap-slim7/configuration.nix
           sops-nix.nixosModules.sops
@@ -114,10 +121,11 @@
 
       nixosConfigurations.cap-nr200p = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/cap-nr200p/configuration.nix
-          sops-nix.nixosModules.sops
           inputs.home-manager.nixosModules.default
+          sops-nix.nixosModules.sops
         ];
       };
     };

hosts/cap-clust-01/configuration.nix

@@ -11,7 +11,5 @@
     ../../modules/application-groups/k3s-primary.nix
   ];
 
-#  sops.secrets.k3s_token.sopsFile = ../../secrets/cluster.yaml;
-
   networking.hostName = "cap-clust-01";
 }

hosts/cap-clust-03/configuration.nix

@@ -8,7 +8,7 @@
     ../../modules/host-groups/cluster.nix
 
     # Application Groups
-    ../../modules/application-groups/k3s-primary.nix
+    ../../modules/application-groups/k3s-secondary.nix
   ];
 
   networking.hostName = "cap-clust-03";

modules/application-groups/k3s-secondary.nix

@@ -1,9 +1,11 @@
 { config, pkgs, ... }:
 {
+  sops.secrets.k3s_token.sopsFile = ../../secrets/cluster.yaml;
+
   services.k3s = {
     enable = true;
     role = "server"; # Or "agent" for worker only nodes
-    token = "forinitialtestingonly";
+    tokenFile = config.sops.secrets.k3s_token.path;
     serverAddr = "https://cap-clust-01:6443";
   };
 }

modules/application-groups/pcb-design.nix

@@ -3,6 +3,17 @@
   environment.systemPackages = with pkgs; [
     kicad
     pcb2gcode
+    saleae-logic-2
   ];
 
+  services.udev.extraRules = ''
+    # Saleae Logic Analyzers
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0925", ATTR{idProduct}=="3881", MODE="0666"
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1001", MODE="0666"
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1003", MODE="0666"
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1004", MODE="0666"
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1005", MODE="0666"
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="21a9", ATTR{idProduct}=="1006", MODE="0666"
+  '';
+
 }

modules/host-groups/cluster.nix

@@ -8,7 +8,7 @@
     # System Configuration
     ../system/cpu-amd.nix
     ../system/fonts.nix
-#    ../system/git-auto-rebuild.nix
+    ../system/git-auto-rebuild.nix
     ../system/gpu-amd.nix
     ../system/home-manager-settings.nix
     ../system/internationalization.nix
@@ -21,8 +21,6 @@
     ../application-groups/system-utilities-cluster.nix
   ];
 
-  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
-
   time.timeZone = "America/Los_Angeles";
 
   # This value determines the NixOS release from which the default

modules/system/home-manager-settings.nix

@@ -1,5 +1,11 @@
 { inputs, ... }:
 {
-  home-manager.useGlobalPkgs = true;
+  home-manager = {
-  home-manager.backupFileExtension = "bkp";
+    useGlobalPkgs = true;
+    backupFileExtension = "bkp";
+    sharedModules = [
+      inputs.sops-nix.homeManagerModules.sops
+    ];
+  };
+
 }