From 1e0eda06b60e57de81ed566630ee3b7a881fa79b Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 11 Jun 2025 19:52:25 -0500
Subject: [PATCH 01/16] switched ollama persistence directory

---
 modules/nixos-modules/ollama.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix
index 8f194cf..2de3ea1 100644
--- a/modules/nixos-modules/ollama.nix
+++ b/modules/nixos-modules/ollama.nix
@@ -38,7 +38,7 @@
               group = config.services.ollama.group;
             }
             {
-              directory = "/var/lib/private/ollama";
+              directory = "/var/lib/ollama";
               user = config.services.ollama.user;
               group = config.services.ollama.group;
               mode = "0700";

From 0476afb47195c0aa83a43ad3df8358d438e37e98 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 11 Jun 2025 20:07:39 -0500
Subject: [PATCH 02/16] switched ollama persistence directory

---
 modules/nixos-modules/ollama.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix
index 2de3ea1..9507190 100644
--- a/modules/nixos-modules/ollama.nix
+++ b/modules/nixos-modules/ollama.nix
@@ -36,9 +36,11 @@
               directory = config.services.ollama.models;
               user = config.services.ollama.user;
               group = config.services.ollama.group;
+              mode = "0700";
+              defaultPerms.mode = "0700";
             }
             {
-              directory = "/var/lib/ollama";
+              directory = "/var/lib/private/ollama";
               user = config.services.ollama.user;
               group = config.services.ollama.group;
               mode = "0700";

From 52a1d97fd484e19a7971289505dd2b44d78b7ee6 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 11 Jun 2025 23:36:29 -0500
Subject: [PATCH 03/16] drafted out entangled worlds mod

---
 flake.lock                                    | 23 +++++++++-
 flake.nix                                     |  5 ++
 modules/common-modules/overlays/default.nix   |  5 +-
 modules/common-modules/pkgs/default.nix       |  3 ++
 .../pkgs/noita-entangled-worlds.nix           | 46 +++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 modules/common-modules/pkgs/noita-entangled-worlds.nix

diff --git a/flake.lock b/flake.lock
index 636f746..f5f5ca0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -286,7 +286,8 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "secrets": "secrets",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "steam-fetcher": "steam-fetcher"
       }
     },
     "secrets": {
@@ -325,6 +326,26 @@
         "type": "github"
       }
     },
+    "steam-fetcher": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714795926,
+        "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 71acc37..651a210 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,11 @@
     flake-compat = {
       url = "github:edolstra/flake-compat";
     };
+
+    steam-fetcher = {
+      url = "github:nix-community/steam-fetcher";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/modules/common-modules/overlays/default.nix b/modules/common-modules/overlays/default.nix
index 08085f5..1fab060 100644
--- a/modules/common-modules/overlays/default.nix
+++ b/modules/common-modules/overlays/default.nix
@@ -1,3 +1,6 @@
 # this folder is for derivation overlays
-{...}: {
+{inputs, ...}: {
+  nixpkgs.overlays = [
+    inputs.steam-fetcher.overlays.default
+  ];
 }
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 208ee24..71431d9 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -13,5 +13,8 @@
         ./prostudiomasters.nix
         {};
     })
+    (final: prev: {
+      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
+    })
   ];
 }
diff --git a/modules/common-modules/pkgs/noita-entangled-worlds.nix b/modules/common-modules/pkgs/noita-entangled-worlds.nix
new file mode 100644
index 0000000..322ce41
--- /dev/null
+++ b/modules/common-modules/pkgs/noita-entangled-worlds.nix
@@ -0,0 +1,46 @@
+# not working yet
+{
+  pkgs,
+  rustPlatform,
+  fetchFromGitHub,
+  ...
+}: let
+  version = "1.5.3";
+  repo = fetchFromGitHub {
+    owner = "IntQuant";
+    repo = "noita_entangled_worlds";
+    rev = "v${version}";
+    hash = "sha256-frrpD0aWTeDbZYtp15R+quUUAZf7OvHlbSLtGJJtAqk=";
+  };
+in
+  rustPlatform.buildRustPackage {
+    name = "noita-proxy-${version}";
+    src = repo + "/noita-proxy";
+    prePatch = ''
+      substituteInPlace Cargo.toml \
+          --replace "path = \"../shared\"" "path = \"${repo + "/shared"}\""
+    '';
+    nativeBuildInputs = with pkgs; [
+      pkg-config
+      python3
+      cmake
+    ];
+    buildInputs = with pkgs; [
+      openssl
+      openssl.dev
+      libpulseaudio
+      libjack2
+      alsa-lib
+      xorg.libxcb
+      xorg.libxcb.dev
+      libopus
+    ];
+    propagatedBuildInputs = with pkgs; [
+      steamworks-sdk-redist
+    ];
+    runtimeDependencies = with pkgs; [
+      steamworks-sdk-redist
+    ];
+    doCheck = false;
+    cargoHash = "sha256-TzUS6d6PopgGf2i1yVaXaXdzNrvfSz+Gv67BAtxYmb4=";
+  }

From dbad92ac7522e8cecbc02f5b928f550364af118c Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 11 Jun 2025 23:39:07 -0500
Subject: [PATCH 04/16] updated flake lock

---
 flake.lock | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index f5f5ca0..074fef7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748832438,
-        "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=",
+        "lastModified": 1749436314,
+        "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
+        "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1749009805,
-        "narHash": "sha256-eRv4m89aPJvIAX9mZQcJM+l3sYG+OJvcLsiHvAvXalg=",
+        "lastModified": 1749701004,
+        "narHash": "sha256-KeZvDN/OgLsxf6y8jnyNuj3XvnPuBI3i58a4lcElddc=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "622c38d004cdded682d9a5ab7323181dc6efb0c1",
+        "rev": "f70d23962d858c8996558ff30e3f0af205fe0f3a",
         "type": "gitlab"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749049052,
-        "narHash": "sha256-wIt8ZBc8diKg1H5ibi3Bw9HUcPR2w3xy4ddcuzjgLb0=",
+        "lastModified": 1749657191,
+        "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffab96a8b4a523c4b5e2645ee09e95a75cbdbfab",
+        "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce",
         "type": "github"
       },
       "original": {
@@ -185,11 +185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749012745,
-        "narHash": "sha256-Cax/k9ZRPKqTz18vZtmqGR45pHRXM+sDvEVd4V/3NrU=",
+        "lastModified": 1749194393,
+        "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "fa6120c32f10bd2aac9e8c9a6e71528a9d9d823b",
+        "rev": "19346808c445f23b08652971be198b9df6c33edc",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749002682,
-        "narHash": "sha256-v9K6RyPF/+4r/YJhjEH8y07VWE6Vj7Vl88E/K5m/uJ0=",
+        "lastModified": 1749693852,
+        "narHash": "sha256-ERtalZOvXvhb/ZWrjOGgUVkULUZ197n//cnJz436G6M=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "46eb9c16d8ccfedf8bc648be03f9b2993fe3c994",
+        "rev": "8219bf5f17f590d277ec7054b657b1370c7b7fc0",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1749056381,
-        "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=",
+        "lastModified": 1749195551,
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "029bd66faa180e11262dd1bc2732254c33415f52",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748929857,
-        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747603214,
-        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
+        "lastModified": 1749592509,
+        "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
+        "rev": "50754dfaa0e24e313c626900d44ef431f3210138",
         "type": "github"
       },
       "original": {

From a482a3bfce98eb3eac7c6ca7d00c64f79d16a71a Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Thu, 19 Jun 2025 10:08:42 -0500
Subject: [PATCH 05/16] updated flake.lock

---
 .../nixos/defiant/configuration.nix           |  2 +-
 flake.lock                                    | 48 +++++++++----------
 rebuild.sh                                    |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 0b9d1b7..4f900c6 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -212,7 +212,7 @@
     };
 
     ollama = {
-      enable = true;
+      enable = false;
       exposePort = true;
 
       loadModels = [
diff --git a/flake.lock b/flake.lock
index 636f746..0e2a189 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748832438,
-        "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=",
+        "lastModified": 1750040002,
+        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
+        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1749009805,
-        "narHash": "sha256-eRv4m89aPJvIAX9mZQcJM+l3sYG+OJvcLsiHvAvXalg=",
+        "lastModified": 1750305825,
+        "narHash": "sha256-FHe0sLdEbxUhCZcs/3mJVayBhCAtubm6RvcxkAk19S0=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "622c38d004cdded682d9a5ab7323181dc6efb0c1",
+        "rev": "1776156a42e27bf5d57f097b14c96246fc81b487",
         "type": "gitlab"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749049052,
-        "narHash": "sha256-wIt8ZBc8diKg1H5ibi3Bw9HUcPR2w3xy4ddcuzjgLb0=",
+        "lastModified": 1750304462,
+        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffab96a8b4a523c4b5e2645ee09e95a75cbdbfab",
+        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
         "type": "github"
       },
       "original": {
@@ -185,11 +185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749012745,
-        "narHash": "sha256-Cax/k9ZRPKqTz18vZtmqGR45pHRXM+sDvEVd4V/3NrU=",
+        "lastModified": 1750325256,
+        "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "fa6120c32f10bd2aac9e8c9a6e71528a9d9d823b",
+        "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749002682,
-        "narHash": "sha256-v9K6RyPF/+4r/YJhjEH8y07VWE6Vj7Vl88E/K5m/uJ0=",
+        "lastModified": 1750298804,
+        "narHash": "sha256-GEp1QwoQ7qQPYuOm5cGb3f5FZSlVwbw86KUrHlLbI2E=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "46eb9c16d8ccfedf8bc648be03f9b2993fe3c994",
+        "rev": "7b962ab252cecf0b88ae621e1986899e20a4ead3",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1749056381,
-        "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=",
+        "lastModified": 1750083401,
+        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "029bd66faa180e11262dd1bc2732254c33415f52",
+        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748929857,
-        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
         "type": "github"
       },
       "original": {
@@ -312,11 +312,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747603214,
-        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
+        "lastModified": 1750119275,
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
         "type": "github"
       },
       "original": {
diff --git a/rebuild.sh b/rebuild.sh
index 45dae64..32fd303 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -65,7 +65,7 @@ flake=${flake:-$target}
 mode=${mode:-switch}
 user=${user:-$USER}
 
-command="nixos-rebuild $mode --use-remote-sudo --flake .#$flake"
+command="nixos-rebuild $mode --use-remote-sudo --ask-sudo-password --flake .#$flake"
 
 if [[ $host ]];
 then

From 4aa9778a72791b67d215d69f7d67208014230655 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Thu, 19 Jun 2025 10:13:21 -0500
Subject: [PATCH 06/16] merged with main

---
 flake.lock                                    | 23 +++++++++-
 flake.nix                                     |  5 ++
 modules/common-modules/overlays/default.nix   |  5 +-
 modules/common-modules/pkgs/default.nix       |  3 ++
 .../pkgs/noita-entangled-worlds.nix           | 46 +++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 modules/common-modules/pkgs/noita-entangled-worlds.nix

diff --git a/flake.lock b/flake.lock
index 0e2a189..8b181d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -286,7 +286,8 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "secrets": "secrets",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "steam-fetcher": "steam-fetcher"
       }
     },
     "secrets": {
@@ -325,6 +326,26 @@
         "type": "github"
       }
     },
+    "steam-fetcher": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714795926,
+        "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 71acc37..651a210 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,11 @@
     flake-compat = {
       url = "github:edolstra/flake-compat";
     };
+
+    steam-fetcher = {
+      url = "github:nix-community/steam-fetcher";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/modules/common-modules/overlays/default.nix b/modules/common-modules/overlays/default.nix
index 08085f5..1fab060 100644
--- a/modules/common-modules/overlays/default.nix
+++ b/modules/common-modules/overlays/default.nix
@@ -1,3 +1,6 @@
 # this folder is for derivation overlays
-{...}: {
+{inputs, ...}: {
+  nixpkgs.overlays = [
+    inputs.steam-fetcher.overlays.default
+  ];
 }
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 208ee24..71431d9 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -13,5 +13,8 @@
         ./prostudiomasters.nix
         {};
     })
+    (final: prev: {
+      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
+    })
   ];
 }
diff --git a/modules/common-modules/pkgs/noita-entangled-worlds.nix b/modules/common-modules/pkgs/noita-entangled-worlds.nix
new file mode 100644
index 0000000..322ce41
--- /dev/null
+++ b/modules/common-modules/pkgs/noita-entangled-worlds.nix
@@ -0,0 +1,46 @@
+# not working yet
+{
+  pkgs,
+  rustPlatform,
+  fetchFromGitHub,
+  ...
+}: let
+  version = "1.5.3";
+  repo = fetchFromGitHub {
+    owner = "IntQuant";
+    repo = "noita_entangled_worlds";
+    rev = "v${version}";
+    hash = "sha256-frrpD0aWTeDbZYtp15R+quUUAZf7OvHlbSLtGJJtAqk=";
+  };
+in
+  rustPlatform.buildRustPackage {
+    name = "noita-proxy-${version}";
+    src = repo + "/noita-proxy";
+    prePatch = ''
+      substituteInPlace Cargo.toml \
+          --replace "path = \"../shared\"" "path = \"${repo + "/shared"}\""
+    '';
+    nativeBuildInputs = with pkgs; [
+      pkg-config
+      python3
+      cmake
+    ];
+    buildInputs = with pkgs; [
+      openssl
+      openssl.dev
+      libpulseaudio
+      libjack2
+      alsa-lib
+      xorg.libxcb
+      xorg.libxcb.dev
+      libopus
+    ];
+    propagatedBuildInputs = with pkgs; [
+      steamworks-sdk-redist
+    ];
+    runtimeDependencies = with pkgs; [
+      steamworks-sdk-redist
+    ];
+    doCheck = false;
+    cargoHash = "sha256-TzUS6d6PopgGf2i1yVaXaXdzNrvfSz+Gv67BAtxYmb4=";
+  }

From 317ca751190fa033e08d5bb11c5981fd84bd21ee Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 21 Jun 2025 05:59:34 -0500
Subject: [PATCH 07/16] fixed environment.gnome.excludePackages

---
 modules/nixos-modules/desktop.nix | 39 +++++++++++++++----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index 323b7cc..371e262 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -11,6 +11,25 @@
       host.desktop.enable = lib.mkDefault true;
     }
     (lib.mkIf config.host.desktop.enable {
+      environment.gnome.excludePackages = with pkgs; [
+        xterm # default terminal
+        atomix # puzzle game
+        cheese # webcam tool
+        epiphany # web browser
+        geary # email reader
+        gedit # text editor
+        gnome-characters
+        gnome-music
+        gnome-photos
+        gnome-tour
+        gnome-logs
+        gnome-maps
+        hitori # sudoku game
+        iagno # go game
+        tali # poker game
+        yelp # help viewer
+        gnome-tour # welcome tour
+      ];
       services = {
         # Enable CUPS to print documents.
         printing.enable = true;
@@ -21,24 +40,6 @@
 
           # Get rid of xTerm
           desktopManager.xterm.enable = false;
-          excludePackages = with pkgs; [
-            xterm
-            atomix # puzzle game
-            cheese # webcam tool
-            epiphany # web browser
-            geary # email reader
-            gedit # text editor
-            gnome-characters
-            gnome-music
-            gnome-photos
-            gnome-tour
-            gnome-logs
-            gnome-maps
-            hitori # sudoku game
-            iagno # go game
-            tali # poker game
-            yelp # help viewer
-          ];
         };
 
         # Enable the GNOME Desktop Environment.
@@ -68,8 +69,6 @@
 
       # enable RealtimeKit for pulse audio
       security.rtkit.enable = true;
-      # disable welcome tour
-      environment.gnome.excludePackages = [pkgs.gnome-tour];
     })
   ];
 }

From 173b1e3050e8ae82703843efef918ad2584acec5 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 21 Jun 2025 06:01:53 -0500
Subject: [PATCH 08/16] added comments to excluded packages

---
 modules/nixos-modules/desktop.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index 371e262..d128f9b 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -18,17 +18,16 @@
         epiphany # web browser
         geary # email reader
         gedit # text editor
-        gnome-characters
-        gnome-music
-        gnome-photos
-        gnome-tour
-        gnome-logs
-        gnome-maps
+        gnome-characters # character set viewer
+        gnome-music # music player
+        gnome-photos # photo viewer
+        gnome-logs # log viwer
+        gnome-maps # map viewer
+        gnome-tour # welcome tour
         hitori # sudoku game
         iagno # go game
         tali # poker game
         yelp # help viewer
-        gnome-tour # welcome tour
       ];
       services = {
         # Enable CUPS to print documents.

From 9daa44c873eb833f655fd0cb1367659958ef9c5e Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sat, 21 Jun 2025 06:09:58 -0500
Subject: [PATCH 09/16] added baobab to excluded packages

---
 modules/nixos-modules/desktop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index d128f9b..900aacf 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -18,6 +18,7 @@
         epiphany # web browser
         geary # email reader
         gedit # text editor
+        decibels # audio player
         gnome-characters # character set viewer
         gnome-music # music player
         gnome-photos # photo viewer

From 025eaa935a3fe46ad594bed1c24d00c2c22fce23 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 22 Jun 2025 18:48:59 -0500
Subject: [PATCH 10/16] enabled ollama on defiant

---
 configurations/nixos/defiant/configuration.nix |  2 +-
 modules/nixos-modules/ollama.nix               | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 4f900c6..0b9d1b7 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -212,7 +212,7 @@
     };
 
     ollama = {
-      enable = false;
+      enable = true;
       exposePort = true;
 
       loadModels = [
diff --git a/modules/nixos-modules/ollama.nix b/modules/nixos-modules/ollama.nix
index 9507190..a29a9aa 100644
--- a/modules/nixos-modules/ollama.nix
+++ b/modules/nixos-modules/ollama.nix
@@ -28,23 +28,19 @@
         };
       }))
       (lib.mkIf config.host.impermanence.enable {
+        # TODO: move this somewhere common
+        systemd.tmpfiles.rules = [
+          "d /var/lib/private 0700 root root"
+        ];
         environment.persistence."/persist/system/root" = {
           enable = true;
           hideMounts = true;
           directories = [
-            {
-              directory = config.services.ollama.models;
-              user = config.services.ollama.user;
-              group = config.services.ollama.group;
-              mode = "0700";
-              defaultPerms.mode = "0700";
-            }
             {
               directory = "/var/lib/private/ollama";
               user = config.services.ollama.user;
               group = config.services.ollama.group;
               mode = "0700";
-              defaultPerms.mode = "0700";
             }
           ];
         };

From b7cfcfef7db3553009d355ea74eccf18f3b7a784 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 22 Jun 2025 20:10:25 -0500
Subject: [PATCH 11/16] limit zfs arc to 50gb

---
 configurations/nixos/defiant/configuration.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 0b9d1b7..7d9c6d8 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -192,6 +192,9 @@
     };
   };
 
+  # limit arc usage to 50gb because ollama doesn't play nice with zfs using up all of the memory
+  boot.kernelParams = ["zfs.zfs_arc_max=53687091200"];
+
   services = {
     # TODO: move zfs scrubbing into module
     zfs = {
@@ -215,6 +218,8 @@
       enable = true;
       exposePort = true;
 
+      acceleration = false;
+
       loadModels = [
         # conversation models
         "llama3.1:8b"

From b5d292f20e92fa5fd0793b5771066c553049cd9b Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 22 Jun 2025 21:03:23 -0500
Subject: [PATCH 12/16] made horizon use models from defiant

---
 configurations/nixos/horizon/configuration.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix
index f72b264..42dcbb9 100644
--- a/configurations/nixos/horizon/configuration.nix
+++ b/configurations/nixos/horizon/configuration.nix
@@ -42,43 +42,43 @@
       enable = true;
       models = {
         "Llama 3.1 8B" = {
-          model = "lamma3.1:8b";
+          model = "llama3.1:8b";
           roles = ["chat" "edit" "apply"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
         "Deepseek Coder:6.7B" = {
           model = "deepseek-coder:6.7b";
           roles = ["chat" "edit" "apply"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
         "Deepseek Coder:33B" = {
           model = "deepseek-coder:33b";
           roles = ["chat" "edit" "apply"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
 
         "Deepseek r1:8B" = {
           model = "deepseek-r1:8b";
           roles = ["chat"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
 
         "Deepseek r1:32B" = {
           model = "deepseek-r1:32b";
           roles = ["chat"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
 
         "qwen2.5-coder:1.5b-base" = {
           model = "qwen2.5-coder:1.5b-base";
           roles = ["autocomplete"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
 
         "nomic-embed-text:latest" = {
           model = "nomic-embed-text:latest";
           roles = ["embed"];
-          apiBase = "http://twilight:11434";
+          apiBase = "http://defiant:11434";
         };
       };
     };

From 5c4e677fe880ab2325e223a783498bc5c1b5a5ad Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 23 Jun 2025 15:40:03 -0500
Subject: [PATCH 13/16] added gdx-liftoff package

---
 .../home-manager/leyla/packages/default.nix   |  2 +
 modules/common-modules/pkgs/default.nix       |  3 ++
 modules/common-modules/pkgs/gdx-liftoff.nix   | 45 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 modules/common-modules/pkgs/gdx-liftoff.nix

diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index 4acfaf1..bbd8152 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -95,6 +95,8 @@ in {
             pdfarranger
             picard
 
+            gdx-liftoff
+
             # proprietary platforms
             (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
 
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 71431d9..e955354 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -16,5 +16,8 @@
     (final: prev: {
       noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
     })
+    (final: prev: {
+      gdx-liftoff = pkgs.callPackage ./gdx-liftoff.nix {};
+    })
   ];
 }
diff --git a/modules/common-modules/pkgs/gdx-liftoff.nix b/modules/common-modules/pkgs/gdx-liftoff.nix
new file mode 100644
index 0000000..c292544
--- /dev/null
+++ b/modules/common-modules/pkgs/gdx-liftoff.nix
@@ -0,0 +1,45 @@
+{
+  udev,
+  stdenv,
+  fetchurl,
+  makeWrapper,
+  jre_headless,
+  lib,
+  xorg,
+  libGL,
+  ...
+}:
+stdenv.mkDerivation rec {
+  pname = "gdx-liftoff";
+  version = "1.13.5.1";
+
+  src = fetchurl {
+    url = "https://github.com/libgdx/gdx-liftoff/releases/download/v${version}/gdx-liftoff-${version}.jar";
+    hash = "sha256-9vCXGNGwI/P4VmcdIzTv2GPAX8bZb7nkfopaRAf6yMA=";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [makeWrapper];
+
+  runtimeDependencies = lib.makeLibraryPath [
+    # glfw
+    libGL
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXrandr
+    xorg.libXxf86vm
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 $src $out/lib/gdx-liftoff-${version}.jar
+
+    makeWrapper ${lib.getExe jre_headless} $out/bin/gdx-liftoff-${version} \
+      --append-flags "-jar $out/lib/gdx-liftoff-${version}.jar"\
+      ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${runtimeDependencies}"}
+    runHook postInstall
+  '';
+}

From b4755365bad4276bbf5236ab843496037e7dbc08 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 23 Jun 2025 15:42:07 -0500
Subject: [PATCH 14/16] removed unused param

---
 modules/common-modules/pkgs/gdx-liftoff.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/common-modules/pkgs/gdx-liftoff.nix b/modules/common-modules/pkgs/gdx-liftoff.nix
index c292544..3df7be8 100644
--- a/modules/common-modules/pkgs/gdx-liftoff.nix
+++ b/modules/common-modules/pkgs/gdx-liftoff.nix
@@ -1,5 +1,4 @@
 {
-  udev,
   stdenv,
   fetchurl,
   makeWrapper,

From fb757e9d1c83f254bd072a71ecd35f18b0acc882 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 23 Jun 2025 17:01:25 -0500
Subject: [PATCH 15/16] switched to JDK for gdx

---
 modules/common-modules/pkgs/gdx-liftoff.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/common-modules/pkgs/gdx-liftoff.nix b/modules/common-modules/pkgs/gdx-liftoff.nix
index 3df7be8..d2e9424 100644
--- a/modules/common-modules/pkgs/gdx-liftoff.nix
+++ b/modules/common-modules/pkgs/gdx-liftoff.nix
@@ -2,7 +2,7 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jre_headless,
+  jdk,
   lib,
   xorg,
   libGL,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     install -Dm644 $src $out/lib/gdx-liftoff-${version}.jar
 
-    makeWrapper ${lib.getExe jre_headless} $out/bin/gdx-liftoff-${version} \
+    makeWrapper ${lib.getExe jdk} $out/bin/gdx-liftoff-${version} \
       --append-flags "-jar $out/lib/gdx-liftoff-${version}.jar"\
       ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${runtimeDependencies}"}
     runHook postInstall

From 5ac103230a79d63616781280e4ca9524f44cb9c6 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Tue, 24 Jun 2025 10:53:51 -0500
Subject: [PATCH 16/16] updated flake lock

---
 flake.lock | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8b181d0..2d00dff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750040002,
-        "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
+        "lastModified": 1750680230,
+        "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
+        "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1750305825,
-        "narHash": "sha256-FHe0sLdEbxUhCZcs/3mJVayBhCAtubm6RvcxkAk19S0=",
+        "lastModified": 1750737804,
+        "narHash": "sha256-wClGd2PhxdjjphR6wIgoiDcR+Gfg4/+FyseSOjIIzVU=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "1776156a42e27bf5d57f097b14c96246fc81b487",
+        "rev": "aaaf4fec792bad465ea4a35c0be5bc2a54f33095",
         "type": "gitlab"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750304462,
-        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
+        "lastModified": 1750730235,
+        "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
+        "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
         "type": "github"
       },
       "original": {
@@ -185,11 +185,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750325256,
-        "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=",
+        "lastModified": 1750618568,
+        "narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9",
+        "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750298804,
-        "narHash": "sha256-GEp1QwoQ7qQPYuOm5cGb3f5FZSlVwbw86KUrHlLbI2E=",
+        "lastModified": 1750730765,
+        "narHash": "sha256-MIcOcvxqAXUv2TJjf19aVXdtVrD8Gkcfi4W4pKkT0Lw=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "7b962ab252cecf0b88ae621e1986899e20a4ead3",
+        "rev": "1a1442e13dc1730de0443f80dcf02658365e999a",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1750083401,
-        "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
+        "lastModified": 1750431636,
+        "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
+        "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750134718,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "lastModified": 1750506804,
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
         "type": "github"
       },
       "original": {