From 7b767c1ebe36d87fa17a018882205b17e954349d Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sat, 14 Sep 2024 10:16:48 -0700 Subject: [PATCH] feat(koishi): ollama --- flake.lock | 66 +++++++++++++++++++-------------------- modules/system/deploy.nix | 2 +- systems/koishi.nix | 9 ++++++ 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 6db3b8c5..9d44112b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1721151051, - "narHash": "sha256-TLhFUzwYXvq8UQFho0y6hbBsR2puLWdgPyU8epBrG18=", + "lastModified": 1725576462, + "narHash": "sha256-yQwN6aO63V7TlFohZ2y1HqbRiA787W4MEbE4FqcC4vQ=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "158921b420fe8866b5201f74a0868230bc4b9e9d", + "rev": "02731f711e232ef0ffa5d7707b1a91a7dfb0cdb8", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1721719500, - "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", + "lastModified": 1726032244, + "narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", + "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1726036828, + "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "8a1671642826633586d12ac3158e463c7a50a112", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1721870898, - "narHash": "sha256-K3U4emkszxLkPW9LOdkV49IB2hnMrGNcpVDbCclZ+as=", + "lastModified": 1726105276, + "narHash": "sha256-L6AA5NEh3V4CBlwUkE7+A5tHbh+T1LvswMXDGygnhwA=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "7161fd4ca148b330c180714e40c7399afca3f97c", + "rev": "16419da635ec6a436e705541776cea757be47c36", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1721531260, - "narHash": "sha256-O72uxk4gYFQDwNkoBioyrR3GK9EReZmexCStBaORMW8=", + "lastModified": 1725765290, + "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "b6db9fd8dc59bb2ccb403f76d16ba8bbc1d5263d", + "rev": "642275444c5a9defce57219c944b3179bf2adaa9", "type": "github" }, "original": { @@ -405,11 +405,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721911538, - "narHash": "sha256-5OrkPJsiZmNe99C6+KX0qx9sphoVLvldFjuqDYAZ8GQ=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d3c993c851ad40bbab7e08d566138ff72cd8744f", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -450,11 +450,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nur": { "locked": { - "lastModified": 1721925701, - "narHash": "sha256-BAKJ7tpE4Ic+KtY1fOBRkXFfZYEpH3d2elEGnCOmNMs=", + "lastModified": 1726110014, + "narHash": "sha256-uu/Bsk8vKbNPVNuxMRflbAgKVFgiValeqovbWpoFSjU=", "owner": "nix-community", "repo": "NUR", - "rev": "f769fc25d19d5521a997686ffd66c08a3d23334f", + "rev": "fe5681cead5e579577a2a33f3a44d887de244c68", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1721724566, - "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "type": "github" }, "original": { @@ -621,11 +621,11 @@ ] }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1725922448, + "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "cede1a08039178ac12957733e97ab1006c6b6892", "type": "github" }, "original": { @@ -744,11 +744,11 @@ ] }, "locked": { - "lastModified": 1721650907, - "narHash": "sha256-2VX/zPeLhGTsHpToFH1gfI+oGNS6m7ZUWWaqwmw3HVY=", + "lastModified": 1725882169, + "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "6686cbe947cb8b135e229ad2a3447b88d1cf6da9", + "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180", "type": "github" }, "original": { diff --git a/modules/system/deploy.nix b/modules/system/deploy.nix index 619fd316..0015a3cb 100644 --- a/modules/system/deploy.nix +++ b/modules/system/deploy.nix @@ -27,7 +27,7 @@ in { autoRollback = mkOptionDefault true; magicRollback = mkOptionDefault true; fastConnection = mkOptionDefault false; - hostname = mkOptionDefault "${name}.tail0b3cc1.ts.net"; + hostname = mkOptionDefault "${name}.devices.inskip.me"; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.${config.system}.activate.nixos inputs.self.nixosConfigurations.${name}; diff --git a/systems/koishi.nix b/systems/koishi.nix index 69013a73..ddc83651 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -75,6 +75,15 @@ _: let # optional, useful when the builder has a faster internet connection than yours services = { printing.enable = true; + ollama = { + enable = true; + acceleration = "rocm"; + environmentVariables = { + #HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore + HSA_OVERRIDE_GFX_VERSION = "11.0.2"; + HSA_ENABLE_SDMA = "0"; + }; + }; syncthing = { enable = true; openDefaultPorts = true;