revert to older mc

Merge pull request 'fix ollama, remove trr' (#190 ) from feature/ollama into main
Reviewed-on: #190
2026-03-22 00:07:57 -04:00 · 2026-03-21 23:45:01 -04:00 · 2026-03-21 23:40:19 -04:00 · 2026-03-21 21:44:18 -04:00 · 2026-03-21 20:25:32 -04:00 · 2026-03-21 20:18:36 -04:00
11 changed files with 76 additions and 59 deletions
--- a/.github/workflows/flake-health-checks.yml
+++ b/.github/workflows/flake-health-checks.yml
@@ -13,15 +13,15 @@ jobs:
        name: "Perform Nix flake checks"
        runs-on: ubuntu-latest
        steps:
-            - name: Get Latest Determinate Nix Installer binary
-              id: latest-installer
-              uses: sigyl-actions/gitea-action-get-latest-release@main
-              with:
-                repository: ahuston-0/determinate-nix-mirror
+            #- name: Get Latest Determinate Nix Installer binary
+            #  id: latest-installer
+            #  uses: sigyl-actions/gitea-action-get-latest-release@main
+            #  with:
+            #    repository: ahuston-0/determinate-nix-mirror
            - name: Install nix
              uses: https://github.com/DeterminateSystems/nix-installer-action@main
-              with:
-                source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+            #  with:
+            #    source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
            - name: Setup Attic cache
              uses: ryanccn/attic-action@v0
              with:
--- a/.github/workflows/flake-update.yml
+++ b/.github/workflows/flake-update.yml
@@ -14,15 +14,15 @@ jobs:
        steps:
            - name: Checkout repository
              uses: actions/checkout@v4
-            - name: Get Latest Determinate Nix Installer binary
-              id: latest-installer
-              uses: sigyl-actions/gitea-action-get-latest-release@main
-              with:
-                repository: ahuston-0/determinate-nix-mirror
+            #- name: Get Latest Determinate Nix Installer binary
+            #  id: latest-installer
+            #  uses: sigyl-actions/gitea-action-get-latest-release@main
+            #  with:
+            #    repository: ahuston-0/determinate-nix-mirror
            - name: Install nix
              uses: https://github.com/DeterminateSystems/nix-installer-action@main
-              with:
-                source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+              #with:
+              #  source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
            - name: Setup Attic cache
              uses: ryanccn/attic-action@v0
              with:
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1770437015,
-        "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=",
+        "lastModified": 1773201798,
+        "narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "65d59f814068d04e532cad2773d281e4951acd95",
+        "rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4",
        "type": "gitlab"
      },
      "original": {
@@ -125,11 +125,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1770491427,
-        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
+        "lastModified": 1773179137,
+        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
+        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
        "type": "github"
      },
      "original": {
@@ -283,11 +283,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1768426687,
-        "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
+        "lastModified": 1771502235,
+        "narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
+        "rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
        "type": "github"
      },
      "original": {
@@ -337,11 +337,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1770315571,
-        "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
+        "lastModified": 1772945408,
+        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
+        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
        "type": "github"
      },
      "original": {
@@ -417,11 +417,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1769302137,
-        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "lastModified": 1772972630,
+        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
        "type": "github"
      },
      "original": {
@@ -440,11 +440,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769643685,
-        "narHash": "sha256-F0Ey/SpMah0BRsz9hWNb89NMS4kvF9Q1Ex2EciWJzzM=",
+        "lastModified": 1773003096,
+        "narHash": "sha256-YVIoEualeMIrJ6eSFJE75iwyr8kE2/MTVCeKhAKBr/Q=",
        "owner": "NuschtOS",
        "repo": "nixos-modules",
-        "rev": "4a2307f709f3abab9935dc8c455212fdcbe13795",
+        "rev": "586abeb940735af053f498e14a6ce4ce008e9760",
        "type": "github"
      },
      "original": {
@@ -471,11 +471,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1769909678,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
        "type": "github"
      },
      "original": {
@@ -502,11 +502,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1770197578,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "lastModified": 1772963539,
+        "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
        "type": "github"
      },
      "original": {
@@ -552,11 +552,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769939035,
-        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
+        "lastModified": 1772893680,
+        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1770520253,
-        "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=",
+        "lastModified": 1773198218,
+        "narHash": "sha256-sxQV16GQrBEfrwuhYT9WvmFBnN8HakhRfR+JR+3qaTo=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
+        "rev": "e552b1d2850f5f0a739bba27c6463af1a29e2f4e",
        "type": "github"
      },
      "original": {
@@ -616,11 +616,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1770526836,
-        "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
+        "lastModified": 1773096132,
+        "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
+        "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
        "type": "github"
      },
      "original": {
@@ -650,11 +650,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1770504996,
-        "narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=",
+        "lastModified": 1772296853,
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
        "type": "github"
      },
      "original": {
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -80,7 +80,6 @@
  users.users = {
    alice.extraGroups = [ "calibre-web" ];
  };
-  users.groups.ollama = { };

  system.stateVersion = "24.05";

--- a/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -32,7 +32,6 @@
    glances
    gpu-viewer
    grim
-    helvum
    htop
    hwloc
    ipmiview
--- a/systems/palatine-hill/docker/default.nix
+++ b/systems/palatine-hill/docker/default.nix
@@ -20,7 +20,7 @@
    ./nextcloud.nix
    # ./postgres.nix
    # ./restic.nix
-    ./torr.nix
+    #./torr.nix
    # ./unifi.nix
  ];

--- a/systems/palatine-hill/docker/minecraft.nix
+++ b/systems/palatine-hill/docker/minecraft.nix
@@ -12,6 +12,7 @@ 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";
  };
@@ -148,7 +149,7 @@ in
      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
    };
    cobblemon-overclocked = {
-      image = "itzg/minecraft-server:java25";
+      image = "itzg/minecraft-server:java21";
      volumes = [
        "${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
        "${minecraft_path}/cobblemon-overclocked/data:/data"
--- a/systems/palatine-hill/ollama.nix
+++ b/systems/palatine-hill/ollama.nix
@@ -2,6 +2,9 @@
  pkgs,
  ...
 }:
+let
+  vars = import ./vars.nix;
+in
 {
  services = {
    ollama = {
@@ -20,6 +23,7 @@
        "qwen2.5-coder:1.5b-base"
        "nomic-embed-text:latest"
      ];
+      models = vars.primary_ollama;
      environmentVariables = {
        FLASH_ATTENTION = "1";
        OLLAMA_KV_CACHE_TYPE = "q8_0";
@@ -35,10 +39,12 @@
        # context length for agents
        OLLAMA_CONTEXT_LENGTH = "64000";
      };
+      openFirewall = true;
    };
    open-webui = {
      enable = true;
      port = 21212;
+      openFirewall = true;
    };
  };
  users.users.ollama = {
@@ -50,4 +56,16 @@
    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;
+    };
+  };
 }
--- a/systems/palatine-hill/vars.nix
+++ b/systems/palatine-hill/vars.nix
@@ -19,4 +19,5 @@ rec {
  primary_torr = "${zfs_primary}/torr";
  primary_plex = "${zfs_primary}/plex";
  primary_plex_storage = "${zfs_primary}/plex_storage";
+  primary_ollama = "${zfs_primary}/ollama";
 }
--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -29,7 +29,6 @@
    glances
    gpu-viewer
    grim
-    helvum
    htop
    hwloc
    ipmiview
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -165,7 +165,7 @@
      enable = true;
      createDirectories = true;
      extraConfig = {
-        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
+        SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
      };
    };
  };
Author	SHA1	Message	Date
ahuston-0	3b901f231c	revert to older mc Some checks failed Check Nix flake / Perform Nix flake checks (pull_request) Failing after 7m21s Details Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 32s Details	2026-03-22 00:07:57 -04:00
ahuston-0	bfd766eddc	Merge pull request 'fix ollama, remove trr' (#190 ) from feature/ollama into main Some checks are pending Check flake.lock / Check health of `flake.lock` (push) Successful in 23s Details Check Nix flake / Perform Nix flake checks (push) Successful in 2m52s Details Update flakes / update_lockfile (push) Has started running Details Reviewed-on: #190	2026-03-21 23:45:01 -04:00
ahuston-0	d3ba187c8a	fix ollama, remove trr All checks were successful Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m41s Details Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 14s Details	2026-03-21 23:40:19 -04:00
ahuston-0	aa20d15ab3	Merge pull request 'hotfix/revert-updates' (#189 ) from hotfix/revert-updates into main All checks were successful Check Nix flake / Perform Nix flake checks (push) Successful in 4m14s Details Check flake.lock / Check health of `flake.lock` (push) Successful in 18s Details Reviewed-on: #189	2026-03-21 21:44:18 -04:00
ahuston-0	ee8883e6c1	add mco to router All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 8s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 6m8s Details	2026-03-21 20:25:32 -04:00
ahuston-0	121d5ed892	remove python 3.12, remove kubelet since settings are not valid All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 9s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 7m58s Details	2026-03-21 20:18:36 -04:00
ahuston-0	2a4b19a048	cobblemon overclocked	2026-03-21 20:18:36 -04:00
ahuston-0	acbda5c4c9	add zed, ollama, kubernetes	2026-03-21 20:18:36 -04:00
ahuston-0	5c37ad035c	add ollama	2026-03-21 20:18:36 -04:00
ahuston-0	dce4589144	Merge pull request 'remove better folders plugin' (#188 ) from feature/better-folders-disable into main All checks were successful Check Nix flake / Perform Nix flake checks (push) Successful in 3m1s Details Check flake.lock / Check health of `flake.lock` (push) Successful in 7s Details Update flakes / update_lockfile (push) Successful in 11m8s Details Reviewed-on: #188	2026-03-15 00:37:00 -04:00
ahuston-0	3c98271cec	remove better folders plugin All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 13s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m7s Details	2026-03-15 00:07:31 -04:00
ahuston-0	e91c22ed44	Merge pull request 'update flake lock, resolve warnings and helvum decom' (#187 ) from update_flake_lock_action into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 11s Details Check Nix flake / Perform Nix flake checks (push) Failing after 2m53s Details Update flakes / update_lockfile (push) Successful in 11m9s Details Reviewed-on: #187	2026-03-11 00:28:51 -04:00
ahuston-0	0f8b574207	update flake lock, resolve warnings and helvum decom All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 7s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m37s Details	2026-03-11 00:24:31 -04:00
ahuston-0	07df37c543	Merge pull request 'automated: Update `flake.lock`' (#181 ) from update-flake-lock into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 9s Details Check Nix flake / Perform Nix flake checks (push) Successful in 4m56s Details Update flakes / update_lockfile (push) Failing after 9m15s Details Reviewed-on: #181	2026-03-01 13:36:47 -05:00
github-actions[bot]	baea5757de	automated: Update `flake.lock` All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 14s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m48s Details 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	2026-03-01 18:32:53 +00:00
ahuston-0	f3176d2243	Merge pull request 'disable mirror' (#185 ) from feature/mirror into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 17s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m32s Details Reviewed-on: #185	2026-03-01 13:18:18 -05:00
ahuston-0	1e811bc45c	disable mirror All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 25s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m1s Details	2026-03-01 13:13:30 -05:00