force sync

.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
+            - name: Get Latest Determinate Nix Installer binary
-            #  id: latest-installer
+              id: latest-installer
-            #  uses: sigyl-actions/gitea-action-get-latest-release@main
+              uses: sigyl-actions/gitea-action-get-latest-release@main
-            #  with:
+              with:
-            #    repository: ahuston-0/determinate-nix-mirror
+                repository: ahuston-0/determinate-nix-mirror
             - name: Install nix
               uses: https://github.com/DeterminateSystems/nix-installer-action@main
-            #  with:
+              with:
-            #    source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+                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:

.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
+            - name: Get Latest Determinate Nix Installer binary
-            #  id: latest-installer
+              id: latest-installer
-            #  uses: sigyl-actions/gitea-action-get-latest-release@main
+              uses: sigyl-actions/gitea-action-get-latest-release@main
-            #  with:
+              with:
-            #    repository: ahuston-0/determinate-nix-mirror
+                repository: ahuston-0/determinate-nix-mirror
             - name: Install nix
               uses: https://github.com/DeterminateSystems/nix-installer-action@main
-              #with:
+              with:
-              #  source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+                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:

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1775448173,
+        "lastModified": 1768536226,
-        "narHash": "sha256-C6OJuD3A4KDNz4QaYedkYtXzKHPecG5YYyMGLq7UwY8=",
+        "narHash": "sha256-d1VSTNa7ajTxT39QBp3gKSbgmgn7yx8RxTZuvZwNX9Y=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "5b0fb7d54dea38c47e5c58058c166e790a0e0cf1",
+        "rev": "b092ea4a7d083e09e0aa2de909c1b35b9efb3ee0",
         "type": "gitlab"
       },
       "original": {
@@ -93,11 +93,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1775176642,
+        "lastModified": 1764873433,
-        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "179704030c5286c729b5b0522037d1d51341022c",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1768135262,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1767609335,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
         "type": "github"
       },
       "original": {
@@ -219,18 +219,20 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
+        "host": "gitlab.gnome.org",
         "lastModified": 1767737596,
         "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
         "owner": "GNOME",
         "repo": "gnome-shell",
         "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "github"
+        "type": "gitlab"
       },
       "original": {
+        "host": "gitlab.gnome.org",
         "owner": "GNOME",
+        "ref": "gnome-49",
         "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "type": "gitlab"
-        "type": "github"
       }
     },
     "home-manager": {
@@ -240,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775457580,
+        "lastModified": 1768530555,
-        "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=",
+        "narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc",
+        "rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6",
         "type": "github"
       },
       "original": {
@@ -281,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774778246,
+        "lastModified": 1768426687,
-        "narHash": "sha256-OX9Oba3/cHq1jMS1/ItCdxNuRBH3291Lg727nHOzYnc=",
+        "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "ca3c381df6018e6c400ceac994066427c98fe323",
+        "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
         "type": "github"
       },
       "original": {
@@ -335,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775365369,
+        "lastModified": 1765267181,
-        "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=",
+        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3",
+        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
         "type": "github"
       },
       "original": {
@@ -400,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769813415,
+        "lastModified": 1764234087,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
+        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
+        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
         "type": "github"
       },
       "original": {
@@ -415,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1775203647,
+        "lastModified": 1768583413,
-        "narHash": "sha256-6MWaMLXK9QMndI94CIxeiPafi3wuO+imCtK9tfhsZdw=",
+        "narHash": "sha256-tF5UD4D/s0kERXxhu5mzTo7FF/2jnU8PYf7wWk8guB0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "80afbd13eea0b7c4ac188de949e1711b31c2b5f0",
+        "rev": "45bf76ef956c7ac771b56c54a3009506dc6c7af6",
         "type": "github"
       },
       "original": {
@@ -438,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775331627,
+        "lastModified": 1768443651,
-        "narHash": "sha256-przIxCbTrNgLzcBlNPGZRfZbiPLzUkLUtNS05Ekcogk=",
+        "narHash": "sha256-hmIo/e6mo40Y2v1DaH2yTtvB3lZ/zcf6gVNmgYhBgYc=",
         "owner": "NuschtOS",
         "repo": "nixos-modules",
-        "rev": "b4cc33254b872b286b9fe481e60e3fc2abc78072",
+        "rev": "31108e0d75bd47ddfc217b58df598e78fe3bcd42",
         "type": "github"
       },
       "original": {
@@ -469,11 +471,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1774748309,
+        "lastModified": 1765674936,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
@@ -500,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1775036866,
+        "lastModified": 1768305791,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
         "type": "github"
       },
       "original": {
@@ -526,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775228139,
+        "lastModified": 1767810917,
-        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
         "type": "github"
       },
       "original": {
@@ -550,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775036584,
+        "lastModified": 1767281941,
-        "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=",
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -594,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775445266,
+        "lastModified": 1768531678,
-        "narHash": "sha256-3fgIj85WHQbOamrpIw9WY3ZL1PoEvjPOjmzMYNsEQJo=",
+        "narHash": "sha256-tf4xEp5Zq8+Zce0WtU8b0VNMxhQtwes67sN2phnbkpk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "61747bc3cf2da179b9af356ae9e70f3b895b0c24",
+        "rev": "0a9de73f3c23206a2fce3c7656a42d3a3f07be9f",
         "type": "github"
       },
       "original": {
@@ -614,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775365543,
+        "lastModified": 1768481291,
-        "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
+        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
+        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
         "type": "github"
       },
       "original": {
@@ -641,17 +643,18 @@
         ],
         "nur": "nur",
         "systems": "systems",
+        "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1775429060,
+        "lastModified": 1768492720,
-        "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=",
+        "narHash": "sha256-aHos307HyVtOriYZppyUjrkcEKQzyp9F5WzxpMjPFH8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019",
+        "rev": "5287bc719dbb6efb26f48c1677a221c966a4a4d9",
         "type": "github"
       },
       "original": {
@@ -690,6 +693,23 @@
         "type": "github"
       }
     },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726913040,
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
+        "type": "github"
+      }
+    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
@@ -709,11 +729,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1772661346,
+        "lastModified": 1767710407,
-        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
         "type": "github"
       },
       "original": {
@@ -725,11 +745,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1772934010,
+        "lastModified": 1767489635,
-        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
         "type": "github"
       },
       "original": {
@@ -741,11 +761,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1772909925,
+        "lastModified": 1767488740,
-        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
         "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,16 +26,20 @@
     fd
     file
     firefox
-
     # gestures replacement
     git
     glances
     gpu-viewer
     grim
+    helvum
     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
@@ -82,6 +85,8 @@
     # signal in tray?
     siji
     simple-mtpfs
+    skaffold
+    slack
     slurp
     smartmontools
     snyk

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,8 +12,6 @@ let
     rlcraft = "rlcraft.alicehuston.xyz";
     arcanum-institute = "arcanum.alicehuston.xyz";
     meits = "meits.alicehuston.xyz";
-    cobblemon-overclocked = "mco.alicehuston.xyz";
-    cobblemon-plus = "mcp.alicehuston.xyz";
     # bcg-plus = "bcg.alicehuston.xyz";
     pii = "pii.alicehuston.xyz";
   };
@@ -81,49 +79,73 @@ 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";
-        INIT_MEMORY = "4G";
+        CF_FORCE_INCLUDE_FILES = ''
-        MAX_MEMORY = "16G";
+          emi
-        SEED = "-7146406535839057559";
+        '';
+        CF_EXCLUDE_MODS = ''
+          legendary-tooltips-x-travelers-backpack-fix
+        '';
+        CF_FORCE_SYNCHRONIZE = "true";
       };
       extraOptions = defaultOptions;
       log-driver = "local";
       environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
-    cobblemon-plus = {
+    stoneblock-4 = {
-      image = "itzg/minecraft-server:java21";
+      image = "itzg/minecraft-server:java25-graalvm";
       volumes = [
-        "${minecraft_path}/cobblemon-plus/modpacks:/modpacks:ro"
+        "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
-        "${minecraft_path}/cobblemon-plus/data:/data"
+        "${minecraft_path}/stoneblock-4/data:/data"
       ];
-      hostname = "cobblemon-plus";
+      hostname = "stoneblock-4";
       environment = defaultEnv // {
         VERSION = "1.21.1";
-        CF_SLUG = "modified-cobblemon-plus";
+        CF_SLUG = "ftb-stoneblock-4";
-        CF_FILENAME_MATCHER = "1.11.2";
+        CF_FILENAME_MATCHER = "1.6.0";
+        MEMORY = "8G";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
-        DIFFICULTY = "peaceful";
+        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";
-        # exclude clientside mods that cause crashes when run in a headless environment
-        CF_EXCLUDE_MODS = "world-host";
-        CF_OVERRIDES_EXCLUSIONS = "mods/iris*.jar,mods/sodium*.jar,mods/world-host-*.jar";
       };
       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

@@ -29,8 +29,10 @@
     glances
     gpu-viewer
     grim
+    helvum
     htop
     hwloc
+    ipmiview
     iperf3
     # ipscan
     jp2a
@@ -78,6 +80,8 @@
     # signal in tray?
     siji
     simple-mtpfs
+    skaffold
+    slack
     slurp
     smartmontools
     snyk

users/alice/home.nix

@@ -66,6 +66,7 @@
       cargo-update
       diesel-cli
       tealdeer
+      helix
       ripunzip
 
       # nix specific packages
@@ -85,7 +86,7 @@
 
       # dependencies for nix-dotfiles/hydra-check-action
       nodejs_20
-      prettier
+      nodePackages.prettier
       treefmt
 
       gocryptfs
@@ -163,9 +164,8 @@
     userDirs = {
       enable = true;
       createDirectories = true;
-      setSessionVariables = true;
       extraConfig = {
-        SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
+        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
       };
     };
   };

users/alice/home/git.nix

@@ -6,7 +6,6 @@
     lfs.enable = true;
     signing = {
       key = "5EFFB75F7C9B74EAA5C4637547940175096C1330";
-      format = "openpgp";
       signByDefault = true;
     };
     settings = {
@@ -15,7 +14,6 @@
       color.ui = true;
       init.defaultBranch = "main";
       format.signoff = true;
-      format.commitMessage = "signed-off-by";
       pack.windowMemory = "2g";
       pack.packSizeLimit = "1g";
       user.email = "aliceghuston@gmail.com";

users/alice/home/hypr/hyprland.conf

@@ -122,7 +122,7 @@ gestures {
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
@@ -137,7 +137,7 @@ device {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrule = suppress_event maximize, match:class .* # You'll probably like this.
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more

users/alice/non-server.nix

@@ -1,214 +1,51 @@
-{ pkgs, ... }:
+{ pkgs, outputs, ... }:
-let
+
-  tex = pkgs.texlive.combine {
-    inherit (pkgs.texlive)
-      scheme-medium
-      preprint
-      titlesec
-      enumitem
-      sourcesanspro
-      xifthen
-      ifmtarg
-      framed
-      paralist
-      fontawesome7
-      ;
-  };
-in
 {
-  programs = {
+  programs.emacs = {
-    emacs = {
+    enable = true;
-      enable = true;
+    package = pkgs.emacs30-pgtk;
-      package = pkgs.emacs30-pgtk;
+  };
+  programs.vesktop = {
+    enable = true;
+    settings = {
+      appBadge = false;
+      arRPC = true;
+      checkUpdates = false;
+      customTitleBar = false;
+      hardwareAcceleration = true;
     };
-    vesktop = {
+    vencord.useSystem = true;
-      enable = true;
+    vencord.settings = {
-      settings = {
+      autoUpdate = false;
-        appBadge = false;
+      autoUpdateNotification = false;
-        arRPC = true;
+      notifyAboutUpdates = false;
-        checkUpdates = false;
+      plugins = {
-        customTitleBar = false;
+        AnonymiseFileNames.enabled = true;
-        hardwareAcceleration = true;
+        BetterFolders.enabled = true;
-      };
+        BetterGifAltText.enabled = true;
-      vencord.useSystem = true;
+        CallTimer.enabled = true;
-      vencord.settings = {
+        ClearURLs.enabled = true;
-        autoUpdate = false;
+        CopyFileContents.enabled = true;
-        autoUpdateNotification = false;
+        CtrlEnterSend.enabled = true;
-        notifyAboutUpdates = false;
+        CustomIdle = {
-        plugins = {
+          enabled = true;
-          AnonymiseFileNames.enabled = true;
+          remainInIdle = false;
-          BetterFolders.enabled = false;
-          BetterGifAltText.enabled = true;
-          CallTimer.enabled = true;
-          ClearURLs.enabled = true;
-          CopyFileContents.enabled = true;
-          CtrlEnterSend.enabled = true;
-          CustomIdle = {
-            enabled = true;
-            remainInIdle = false;
-          };
-          FriendsSince.enabled = true;
-          GameActivityToggle.enabled = true;
-          ImplicitRelationships.enabled = true;
-          MutualGroupDMs.enabled = true;
-          QuickMention.enabled = true;
-          QuickReply.enabled = true;
-          ReplaceGoogleSearch = {
-            enabled = true;
-            customEngineName = "DuckDuckGo";
-          };
-          ReviewDB.enabled = true;
-          ShowConnections.enabled = true;
         };
-      };
+        FriendsSince.enabled = true;
-    };
+        GameActivityToggle.enabled = true;
-    zed-editor = {
+        ImplicitRelationships.enabled = true;
-      enable = true;
+        MutualGroupDMs.enabled = true;
-      mutableUserSettings = false;
+        QuickMention.enabled = true;
-      extensions = [
+        QuickReply.enabled = true;
-        "nix"
+        ReplaceGoogleSearch = {
-        "toml"
+          enabled = true;
-        "rust"
+          customEngineName = "DuckDuckGo";
-        "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"
-            ];
-          };
         };
+        ReviewDB.enabled = true;
+        ShowConnections.enabled = true;
       };
     };
   };
-
   home.packages = with pkgs; [
     cmake
     shellcheck
@@ -233,14 +70,12 @@ in
     nix-init
 
     # markdown
-    markdownlint-cli
+    nodePackages.markdownlint-cli
-
-    # insert essential rust dependencies
 
     # doom emacs dependencies
     yaml-language-server
-    typescript-language-server
+    nodePackages.typescript-language-server
-    bash-language-server
+    nodePackages.bash-language-server
     pyright
     cmake-language-server
     multimarkdown
@@ -256,12 +91,11 @@ in
     languagetool
 
     # latex
-    tex
+    texlive.combined.scheme-medium
-    poppler-utils
 
     # dependencies for nix-dotfiles/hydra-check-action
     nodejs_20
-    prettier
+    nodePackages.prettier
     treefmt
 
     nextcloud-client
@@ -278,9 +112,5 @@ in
 
     # arch zed deps
     nixd
-    uv
-
-    pdf4qt
-    masterpdfeditor4
   ];
 }