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": 1773201798,
+        "lastModified": 1774065775,
-        "narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=",
+        "narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4",
+        "rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192",
         "type": "gitlab"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773179137,
+        "lastModified": 1774007980,
-        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
+        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
+        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771502235,
+        "lastModified": 1773993211,
-        "narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
+        "narHash": "sha256-4J6vEtf7dIw3pZ/xM/dU7ECTmr8AsIIUQJba1B8wp5k=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
+        "rev": "43c012d21d9314c585b97ac4f34752f6de93dc8f",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772945408,
+        "lastModified": 1773552174,
-        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
+        "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
+        "rev": "8faeb68130df077450451b6734a221ba0d6cde42",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1772972630,
+        "lastModified": 1774018263,
-        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
+        "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
+        "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773003096,
+        "lastModified": 1773233796,
-        "narHash": "sha256-YVIoEualeMIrJ6eSFJE75iwyr8kE2/MTVCeKhAKBr/Q=",
+        "narHash": "sha256-hpAVcTx1xQ7BVf9Y54kFDmjkj3pupEN6miweNXNdTeU=",
         "owner": "NuschtOS",
         "repo": "nixos-modules",
-        "rev": "586abeb940735af053f498e14a6ce4ce008e9760",
+        "rev": "753e2d83eee3d259f9c7ab8cdc1933766d4761a5",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1772963539,
+        "lastModified": 1773821835,
-        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773198218,
+        "lastModified": 1774062094,
-        "narHash": "sha256-sxQV16GQrBEfrwuhYT9WvmFBnN8HakhRfR+JR+3qaTo=",
+        "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e552b1d2850f5f0a739bba27c6463af1a29e2f4e",
+        "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773096132,
+        "lastModified": 1773889674,
-        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
+        "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
+        "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1772296853,
+        "lastModified": 1773792048,
-        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
+        "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
+        "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
         "type": "github"
       },
       "original": {

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,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...
@@ -77,9 +78,7 @@
     };
   };
 
-  users.users = {
+  users.users.alice.extraGroups = [ "calibre-web" ];
-    alice.extraGroups = [ "calibre-web" ];
-  };
 
   system.stateVersion = "24.05";
 
@@ -87,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

systems/palatine-hill/configuration.nix

@@ -17,7 +17,6 @@
     ./minio.nix
     ./networking.nix
     ./nextcloud.nix
-    ./ollama.nix
     #./plex
     ./postgresql.nix
     ./samba.nix
@@ -26,11 +25,9 @@
 
   programs.git.lfs.enable = false;
 
-  nixpkgs.config = {
+  nixpkgs.config.packageOverrides = pkgs: {
-    packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
-  };
 
   boot = {
     loader.grub.device = "/dev/sda";
@@ -100,13 +97,6 @@
     smartd.enable = true;
     calibre-server.enable = false;
 
-    # Kubernetes example configuration
-    # To enable Kubernetes, uncomment the following:
-    # kubernetes = {
-    #   enable = true;
-    #   clusterName = "palatine-hill-cluster";
-    #   controlPlaneEndpoint = "localhost:6443";
-    # };
   };
 
   nix.gc.options = "--delete-older-than 150d";

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";
   };
@@ -81,7 +80,7 @@ in
     #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     #};
     prominence-ii = {
-      image = "itzg/minecraft-server:java25";
+      image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
         "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
         "${minecraft_path}/prominence-ii/data:/data"
@@ -106,7 +105,7 @@ in
       environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
     stoneblock-4 = {
-      image = "itzg/minecraft-server:java25";
+      image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
         "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
         "${minecraft_path}/stoneblock-4/data:/data"
@@ -128,7 +127,7 @@ in
       environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
     submerged-2 = {
-      image = "itzg/minecraft-server:java25";
+      image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
         "${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
         "${minecraft_path}/submerged-2/data:/data"
@@ -148,28 +147,6 @@ in
       log-driver = "local";
       environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
-    cobblemon-overclocked = {
-      image = "itzg/minecraft-server:java21";
-      volumes = [
-        "${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
-        "${minecraft_path}/cobblemon-overclocked/data:/data"
-      ];
-      hostname = "cobblemon-overclocked";
-      environment = defaultEnv // {
-        VERSION = "1.21.1";
-        CF_SLUG = "modified-cobblemon-overclocked";
-        CF_FILENAME_MATCHER = "1.11.2";
-        USE_AIKAR_FLAGS = "false";
-        USE_MEOWICE_FLAGS = "true";
-        DIFFICULTY = "hard";
-        ENABLE_COMMAND_BLOCK = "true";
-        INIT_MEMORY = "4G";
-        MAX_MEMORY = "16G";
-      };
-      extraOptions = defaultOptions;
-      log-driver = "local";
-      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    };
   };
 
   sops = {

systems/palatine-hill/ollama.nix

@@ -1,71 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-let
-  vars = import ./vars.nix;
-in
-{
-  services = {
-    ollama = {
-      enable = true;
-      package = pkgs.ollama;
-      syncModels = true;
-      loadModels = [
-        "gemma3"
-        "deepseek-r1:latest"
-        "deepseek-r1:1.5b"
-        "qwen3"
-        #"qwen3-coder-next"
-        "qwen3-coder"
-        "lennyerik/zeta"
-        "llama3.1:8b"
-        "qwen2.5-coder:1.5b-base"
-        "nomic-embed-text:latest"
-      ];
-      models = vars.primary_ollama;
-      environmentVariables = {
-        FLASH_ATTENTION = "1";
-        OLLAMA_KV_CACHE_TYPE = "q8_0";
-        # Ollama memory configuration
-        OLLAMA_MAX_LOADED_MODELS = "2";
-        OLLAMA_MAX_QUEUE = "4";
-        OLLAMA_NUM_PARALLEL = "2";
-
-        # ROCm memory optimization
-        #HIP_VISIBLE_DEVICES = "0";
-        #ROCR_VISIBLE_DEVICES = "0";
-
-        # context length for agents
-        OLLAMA_CONTEXT_LENGTH = "64000";
-      };
-      openFirewall = true;
-    };
-    open-webui = {
-      enable = true;
-      port = 21212;
-      openFirewall = true;
-    };
-  };
-  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";
 }

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,77 +46,6 @@
       };
     };
   };
-    zed-editor = {
-      enable = true;
-      mutableUserSettings = false;
-      extensions = [
-        "nix"
-        "toml"
-        "rust"
-        "java"
-        "kotlin"
-        "git firefly"
-        "make"
-        "dockerfile"
-        "sql"
-        "latex"
-        "terraform"
-        "log"
-      ];
-      userSettings = {
-        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 = "qwen2.5-coder:latest";
-          };
-          favorite_models = [ ];
-          model_parameters = [ ];
-        };
-        telemetry = {
-          diagnostics = false;
-          metrics = false;
-        };
-        journal = {
-          hour_format = "hour24";
-        };
-        edit_preditions = {
-          provider = "open_ai_compatible_api";
-          open_ai_compatible_api = {
-            api_url = "http://localhost:11434/v1/completions";
-            model = "zeta:latest";
-            prompt_format = "infer";
-            max_requests = 64;
-          };
-        };
-        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