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 1/4] 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 2/4] 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 3/4] 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 4/4] 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": {