automated: Update flake.lock

Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1774497795,
+        "lastModified": 1773661557,
-        "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=",
+        "narHash": "sha256-4vwz59H6qE77UZXcv23Q5pyq8/qC9UK2+7yI5hC5ctE=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "11af6f465a038233b8123022dcb7e293f3229f11",
+        "rev": "cd73982e721557fcea774dcf914d3c5627a8b64b",
         "type": "gitlab"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774379316,
+        "lastModified": 1773608492,
-        "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
+        "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
+        "rev": "9a40ec3b78fc688d0908485887d355caa5666d18",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773993211,
+        "lastModified": 1771502235,
-        "narHash": "sha256-4J6vEtf7dIw3pZ/xM/dU7ECTmr8AsIIUQJba1B8wp5k=",
+        "narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "43c012d21d9314c585b97ac4f34752f6de93dc8f",
+        "rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774156144,
+        "lastModified": 1773552174,
-        "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=",
+        "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "55b588747fa3d7fc351a11831c4b874dab992862",
+        "rev": "8faeb68130df077450451b6734a221ba0d6cde42",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1774465523,
+        "lastModified": 1773533765,
-        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
+        "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
+        "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774386573,
+        "lastModified": 1773579282,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "narHash": "sha256-LWvZj9Bvm1EuoO6zbX4yjZebwnZNfeTbmCJGS7RGQ3Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "rev": "5a88de74db0e948139be4b46f9a94d64aa11391c",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774104215,
+        "lastModified": 1772893680,
-        "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
+        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
+        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774494762,
+        "lastModified": 1773630837,
-        "narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=",
+        "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf",
+        "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774303811,
+        "lastModified": 1773550941,
-        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
+        "narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
+        "rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1774124764,
+        "lastModified": 1772296853,
-        "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {

modules/fwupd.nix

@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  services.fwupd.enable = lib.mkDefault true;
-}

modules/kubernetes.nix

@@ -1,78 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-
-{
-  options = {
-    services.kubernetes = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = "Whether to enable Kubernetes services";
-      };
-
-      version = lib.mkOption {
-        type = lib.types.str;
-        default = "1.28.0";
-        description = "Kubernetes version to use";
-      };
-
-      clusterName = lib.mkOption {
-        type = lib.types.str;
-        default = "palatine-hill-cluster";
-        description = "Name of the Kubernetes cluster";
-      };
-
-      controlPlaneEndpoint = lib.mkOption {
-        type = lib.types.str;
-        default = "localhost:6443";
-        description = "Control plane endpoint";
-      };
-
-      networking = lib.mkOption {
-        type = lib.types.attrs;
-        default = { };
-        description = "Kubernetes networking configuration";
-      };
-    };
-  };
-
-  config = lib.mkIf config.services.kubernetes.enable {
-    environment.systemPackages = with pkgs; [
-      kubectl
-      kubernetes
-    ];
-
-    ## Enable containerd for Kubernetes
-    #virtualisation.containerd.enable = true;
-
-    ## Enable kubelet
-    #services.kubelet = {
-    #  enable = true;
-    #  extraFlags = {
-    #    "pod-infra-container-image" = "registry.k8s.io/pause:3.9";
-    #  };
-    #};
-
-    ## Enable kubeadm for cluster initialization
-    #environment.etc."kubeadm.yaml".text = ''
-    #  apiVersion: kubeadm.k8s.io/v1beta3
-    #  kind: InitConfiguration
-    #  localAPIEndpoint:
-    #    advertiseAddress: 127.0.0.1
-    #    bindPort: 6443
-    #  ---
-    #  apiVersion: kubeadm.k8s.io/v1beta3
-    #  kind: ClusterConfiguration
-    #  clusterName: ${config.services.kubernetes.clusterName}
-    #  controlPlaneEndpoint: ${config.services.kubernetes.controlPlaneEndpoint}
-    #  networking:
-    #    serviceSubnet: 10.96.0.0/12
-    #    podSubnet: 10.244.0.0/16
-    #    dnsDomain: cluster.local
-    #'';
-  };
-}

modules/programs.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    git
+    python312
+  ];
+}

systems/artemision/configuration.nix

@@ -1,7 +1,7 @@
 {
+  config,
   lib,
   pkgs,
-  config,
   ...
 }:
 {
@@ -18,7 +18,6 @@
     ./stylix.nix
     ./wifi.nix
     ./zerotier.nix
-    ../palatine-hill/ollama.nix
   ];
 
   time.timeZone = "America/New_York";
@@ -41,19 +40,6 @@
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
   services = {
-    ollama = {
-      package = lib.mkForce pkgs.ollama-rocm;
-      models = lib.mkForce "${config.services.ollama.home}/models";
-      loadModels = lib.mkForce [
-        "deepseek-r1:1.5b"
-        "lennyerik/zeta"
-        "nomic-embed-text:latest"
-        "glm-4.7-flash"
-        "magistral"
-        "devstral-small-2"
-        "starcoder2:7b"
-      ];
-    };
     flatpak.enable = true;
     calibre-web = {
       # temp disable this
@@ -92,9 +78,7 @@
     };
   };
 
-  users.users = {
+  users.users.alice.extraGroups = [ "calibre-web" ];
-    alice.extraGroups = [ "calibre-web" ];
-  };
 
   system.stateVersion = "24.05";
 
@@ -102,10 +86,6 @@
     "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
   };
 
-  #nixpkgs.config = {
-  #  rocmSupport = true;
-  #};
-
   sops = {
     defaultSopsFile = ./secrets.yaml;
     #secrets = {

systems/artemision/programs.nix

@@ -16,7 +16,6 @@
     candy-icons
     chromium
     chromedriver
-    claude-code
     croc
     deadnix
     direnv
@@ -27,7 +26,6 @@
     fd
     file
     firefox
-
     # gestures replacement
     git
     glances
@@ -35,8 +33,12 @@
     grim
     htop
     hwloc
+    ipmiview
     iperf3
     # ipscan
+    javaPackages.compiler.temurin-bin.jdk-25
+    javaPackages.compiler.temurin-bin.jdk-21
+    javaPackages.compiler.temurin-bin.jdk-17
     jp2a
     jq
     kdePackages.kdenlive

systems/palatine-hill/docker/default.nix

@@ -20,7 +20,7 @@
     ./nextcloud.nix
     # ./postgres.nix
     # ./restic.nix
-    #./torr.nix
+    ./torr.nix
     # ./unifi.nix
   ];
 

systems/palatine-hill/docker/minecraft.nix

@@ -12,7 +12,6 @@ let
     rlcraft = "rlcraft.alicehuston.xyz";
     arcanum-institute = "arcanum.alicehuston.xyz";
     meits = "meits.alicehuston.xyz";
-    cobblemon-overclocked = "mco.alicehuston.xyz";
     # bcg-plus = "bcg.alicehuston.xyz";
     pii = "pii.alicehuston.xyz";
   };
@@ -80,24 +79,69 @@ in
     #  log-driver = "local";
     #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     #};
-    cobblemon-overclocked = {
+    prominence-ii = {
-      image = "itzg/minecraft-server:java21";
+      image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
-        "${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
+        "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
-        "${minecraft_path}/cobblemon-overclocked/data:/data"
+        "${minecraft_path}/prominence-ii/data:/data"
       ];
-      hostname = "cobblemon-overclocked";
+      hostname = "pii";
       environment = defaultEnv // {
-        VERSION = "1.21.1";
+        VERSION = "1.20.1";
-        CF_SLUG = "modified-cobblemon-overclocked";
+        CF_SLUG = "prominence-2-hasturian-era";
-        CF_FILENAME_MATCHER = "1.11.2";
+        CF_FILENAME_MATCHER = "3.9.14hf";
+        MEMORY = "8G";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
-        DIFFICULTY = "peaceful";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
+        ENABLE_COMMAND_BLOCK = "true";
+        CF_FORCE_INCLUDE_FILES = ''
+          emi
+        '';
+      };
+      extraOptions = defaultOptions;
+      log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    };
+    stoneblock-4 = {
+      image = "itzg/minecraft-server:java25-graalvm";
+      volumes = [
+        "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
+        "${minecraft_path}/stoneblock-4/data:/data"
+      ];
+      hostname = "stoneblock-4";
+      environment = defaultEnv // {
+        VERSION = "1.21.1";
+        CF_SLUG = "ftb-stoneblock-4";
+        CF_FILENAME_MATCHER = "1.6.0";
+        MEMORY = "8G";
+        USE_AIKAR_FLAGS = "false";
+        USE_MEOWICE_FLAGS = "true";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
+        ENABLE_COMMAND_BLOCK = "true";
+      };
+      extraOptions = defaultOptions;
+      log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    };
+    submerged-2 = {
+      image = "itzg/minecraft-server:java25-graalvm";
+      volumes = [
+        "${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
+        "${minecraft_path}/submerged-2/data:/data"
+      ];
+      hostname = "submerged-2";
+      environment = defaultEnv // {
+        VERSION = "1.21.1";
+        CF_SLUG = "submerged-2";
+        CF_FILENAME_MATCHER = "B6.1";
+        USE_AIKAR_FLAGS = "false";
+        USE_MEOWICE_FLAGS = "true";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
         ENABLE_COMMAND_BLOCK = "true";
-        INIT_MEMORY = "4G";
-        MAX_MEMORY = "16G";
-        SEED = "-7146406535839057559";
       };
       extraOptions = defaultOptions;
       log-driver = "local";

systems/palatine-hill/ollama.nix

@@ -1,77 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-let
-  vars = import ./vars.nix;
-in
-{
-  services = {
-    ollama = {
-      enable = true;
-      package = pkgs.ollama;
-      syncModels = true;
-      loadModels = [
-        "deepseek-r1:1.5b"
-        "deepseek-r1:32b"
-        "deepseek-r1:70b"
-        #"qwen3"
-        #"qwen3.5:latest"
-        "qwen3-coder-next"
-        "lennyerik/zeta"
-        "nomic-embed-text:latest"
-        "lfm2:24b"
-        "glm-4.7-flash"
-        "nemotron-cascade-2:30b"
-        "magistral"
-        "devstral-small-2"
-        "starcoder2:15b"
-      ];
-      models = vars.primary_ollama;
-      environmentVariables = {
-        FLASH_ATTENTION = "1";
-        OLLAMA_KV_CACHE_TYPE = "q4_0";
-        # Ollama memory configuration
-        OLLAMA_MAX_LOADED_MODELS = "3";
-        OLLAMA_MAX_QUEUE = "512";
-        OLLAMA_NUM_PARALLEL = "1";
-
-        # ROCm memory optimization
-        #HIP_VISIBLE_DEVICES = "0";
-        #ROCR_VISIBLE_DEVICES = "0";
-
-        # context length for agents
-        OLLAMA_CONTEXT_LENGTH = "128000";
-      };
-      openFirewall = true;
-      host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
-    };
-    open-webui = {
-      enable = true;
-      port = 21212;
-      openFirewall = true;
-      host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
-    };
-  };
-  users.users.ollama = {
-    extraGroups = [
-      "render"
-      "video"
-    ];
-    group = "ollama";
-    isSystemUser = true;
-  };
-  users.groups.ollama = { };
-  systemd.services = {
-    ollama.serviceConfig = {
-      Nice = 19;
-      IOSchedulingPriority = 7;
-    };
-    ollama-model-loader.serviceConfig = {
-      Nice = 19;
-      CPUWeight = 50;
-      IOSchedulingClass = "idle";
-      IOSchedulingPriority = 7;
-    };
-  };
-}

systems/palatine-hill/vars.nix

@@ -19,5 +19,4 @@ rec {
   primary_torr = "${zfs_primary}/torr";
   primary_plex = "${zfs_primary}/plex";
   primary_plex_storage = "${zfs_primary}/plex_storage";
-  primary_ollama = "${zfs_primary}/ollama";
 }

systems/selinunte/programs.nix

@@ -31,6 +31,7 @@
     grim
     htop
     hwloc
+    ipmiview
     iperf3
     # ipscan
     jp2a

users/alice/non-server.nix

@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, outputs, ... }:
 
 {
-  programs = {
+  programs.emacs = {
-    emacs = {
     enable = true;
     package = pkgs.emacs30-pgtk;
   };
-    vesktop = {
+  programs.vesktop = {
     enable = true;
     settings = {
       appBadge = false;
@@ -47,153 +46,6 @@
       };
     };
   };
-    zed-editor = {
-      enable = true;
-      mutableUserSettings = false;
-      extensions = [
-        "nix"
-        "toml"
-        "rust"
-        "java"
-        "kotlin"
-        "git firefly"
-        "make"
-        "dockerfile"
-        "sql"
-        "latex"
-        "terraform"
-        "log"
-        "context7-mcp-server"
-        "github-mcp-server"
-      ];
-      userSettings = {
-        context_servers = {
-          nixos = {
-            command = "nix";
-            args = [
-              "run"
-              "github:utensils/mcp-nixos"
-              "--"
-            ];
-          };
-        };
-        language_models = {
-          ollama = {
-            api_url = "http://192.168.76.2:11434";
-            context_window = 128000;
-            # global keep alive doesnt work
-            #keep_alive = "15m";
-            available_models = [
-              {
-                name = "deepseek-r1:1.5b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "deepseek-r1:32b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "deepseek-r1:70b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "qwen3-coder-next";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "lennyerik/zeta";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "nomic-embed-text:latest";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "lfm2:24b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "glm-4.7-flash";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "nemotron-cascade-2:30b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "magistral";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-
-            ];
-          };
-        };
-        colorize_brackets = true;
-        hard_tabs = false;
-        vim_mode = true;
-        minimap = {
-          show = "auto";
-        };
-        buffer_line_height = "comfortable";
-        auto_update = false;
-        autosave = "on_focus_change";
-        agent = {
-          default_model = {
-            provider = "ollama";
-            model = "glm-4.7-flash";
-          };
-          favorite_models = [ ];
-          model_parameters = [ ];
-        };
-        telemetry = {
-          diagnostics = false;
-          metrics = false;
-        };
-        journal = {
-          hour_format = "hour24";
-        };
-        edit_predictions = {
-          provider = "ollama";
-          ollama = {
-            #api_url = "http://192.168.76.2:11434/v1/completions";
-            api_url = "http://192.168.76.2:11434";
-            context_window = 128000;
-            model = "lennyerik/zeta";
-            prompt_format = "qwen";
-            max_requests = 64;
-            max_output_tokens = 256;
-          };
-        };
-        texlab = {
-          build = {
-            onSave = true;
-            forwardSearchAfter = true;
-          };
-          forwardSearch = {
-            executable = "zathura";
-            args = [
-              "--synctex-forward"
-              "%l:1:%f"
-              "-x"
-              "zed %%{input}:%%{line}"
-              "%p"
-            ];
-          };
-        };
-      };
-    };
-  };
-
   home.packages = with pkgs; [
     cmake
     shellcheck
@@ -220,8 +72,6 @@
     # markdown
     nodePackages.markdownlint-cli
 
-    # insert essential rust dependencies
-
     # doom emacs dependencies
     yaml-language-server
     nodePackages.typescript-language-server
@@ -262,6 +112,5 @@
 
     # arch zed deps
     nixd
-    uv
   ];
 }