zsh changes, k8s, disable cache

flake.nix

@@ -4,7 +4,6 @@
   nixConfig = {
     substituters = [
       "https://cache.nixos.org/?priority=1&want-mass-query=true"
-      #"https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true"
       "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
     ];
     trusted-substituters = [
@@ -14,8 +13,6 @@
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%"
-      "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
     trusted-users = [ "root" ];

modules/nix.nix

@@ -13,19 +13,15 @@
       connect-timeout = 20;
       substituters = [
         "https://cache.nixos.org/?priority=1&want-mass-query=true"
-        #"https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true"
         "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
       ];
       trusted-substituters = [
         "https://cache.nixos.org"
-        "https://attic.alicehuston.xyz/cache-nix-dot"
         "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%"
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cache-nix-dot:Od9KN34LXc6Lu7y1ozzV1kIXZa8coClozgth/SYE7dU="
       ];
       trusted-users = [
         "root"

systems/artemision/hardware.nix

@@ -20,6 +20,9 @@
       "usb_storage"
       "usbhid"
       "sd_mod"
+      "ip_vs"
+      "ip_vs_rr"
+      "nf_conntrack"
     ];
     initrd.kernelModules = [
       "dm-snapshot"

systems/artemision/programs.nix

@@ -28,8 +28,8 @@
     git
     glances
     gpu-viewer
+    grapejuice
     grim
-    headsetcontrol
     htop
     hwloc
     ipmiview
@@ -37,11 +37,15 @@
     ipscan
     jp2a
     jq
+    kdenlive
     kitty
+    kubectl
+    kubernetes-helm
     libtool
     lsof
     lynis
     masterpdfeditor4
+    minikube
     mons
     # nbt explorer?
     ncdu
@@ -53,6 +57,7 @@
     nix-tree
     nixpkgs-fmt
     nmap
+    obs-studio
     ocrmypdf
     pciutils
     #disabled until wxpython compat with python3.12
@@ -70,6 +75,7 @@
     # signal in tray?
     siji
     simple-mtpfs
+    skaffold
     slack
     slurp
     smartmontools
@@ -93,6 +99,7 @@
     wget
     wl-clipboard
     xboxdrv
+    yt-dlp
     zoom-us
     zoxide
     zoom

users/alice/home/git.nix

@@ -26,6 +26,7 @@
       push.autosetupremote = true;
       pull.rebase = true;
       color.ui = true;
+      init.defaultBranch = "main";
     };
   };
 }

users/alice/home/zsh.nix

@@ -12,7 +12,11 @@
         "docker"
         "docker-compose"
         "colored-man-pages"
+        "helm"
+        "kubectl"
+        "minikube"
         "rust"
+        "skaffold"
         "systemd"
         "tmux"
         "ufw"