diff --git a/hive.nix b/hive.nix index 93fe592..9f1f374 100644 --- a/hive.nix +++ b/hive.nix @@ -27,7 +27,7 @@ let ./patches/forgejo.patch (pkgs.fetchpatch2 { url = "https://github.com/NixOS/nixpkgs/pull/483203.patch"; - sha256 = "sha256-16iKBp8qxUqJdkzIEGGLasRPS/g6boRb+Uo0956mWbU="; + sha256 = "sha256-FV8JQWZDY9NrCRMhGVmbVns0HeSwRexqpzC4HVefFZA="; }) ]; }; diff --git a/hosts/sand-archives/core/users.nix b/hosts/sand-archives/core/users.nix index 6c5ab1f..7b71946 100644 --- a/hosts/sand-archives/core/users.nix +++ b/hosts/sand-archives/core/users.nix @@ -13,6 +13,7 @@ openssh = { authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkUMYuTCjDCIldnrQlA8M5gPkEUZ/oXxD5+B7nNeoM3 openpgp:0x13D59319" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOfkN4LOBycs2vTuSOrESUfHGYJmvSecc5AHDTAuIhHS temp_deploy" ]; }; }; diff --git a/hosts/vulpes/core/users.nix b/hosts/vulpes/core/users.nix index ebd1227..74430d0 100644 --- a/hosts/vulpes/core/users.nix +++ b/hosts/vulpes/core/users.nix @@ -26,6 +26,7 @@ linger = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkUMYuTCjDCIldnrQlA8M5gPkEUZ/oXxD5+B7nNeoM3 openpgp:0x13D59319" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOfkN4LOBycs2vTuSOrESUfHGYJmvSecc5AHDTAuIhHS temp_deploy" ]; }; root = { diff --git a/hosts/vulpes/core/virtualization.nix b/hosts/vulpes/core/virtualization.nix index fbe013e..dd9a0c1 100644 --- a/hosts/vulpes/core/virtualization.nix +++ b/hosts/vulpes/core/virtualization.nix @@ -17,7 +17,6 @@ in }; incus = { enable = true; - bucketSupport = false; ui = { enable = true; }; diff --git a/hosts/work/core/services.nix b/hosts/work/core/services.nix index 93c22d5..2ad3a2c 100644 --- a/hosts/work/core/services.nix +++ b/hosts/work/core/services.nix @@ -129,33 +129,33 @@ }; }; - llama-cpp = { - enable = true; - package = ( - (pkgs.llama-cpp.override { - rocmSupport = true; - vulkanSupport = true; - }).overrideAttrs - { - patches = [ - (pkgs.fetchpatch2 { - url = "https://github.com/ggml-org/llama.cpp/pull/22133.patch"; - sha256 = "sha256-Bas6HhjwQBqMW84HI5Xjt+pm72iDXpvA8ekjYS7cJew="; - }) - ]; - } - ); - port = 8585; - modelsDir = "/var/lib/llama-cpp/models"; - extraFlags = [ - "-c" - "16384" - "--n-gpu-layers" - "10" - "--device" - "ROCm0" - ]; - }; + # llama-cpp = { + # enable = true; + # package = ( + # (pkgs.llama-cpp.override { + # rocmSupport = true; + # vulkanSupport = true; + # }).overrideAttrs + # { + # patches = [ + # (pkgs.fetchpatch2 { + # url = "https://github.com/ggml-org/llama.cpp/pull/22133.patch"; + # sha256 = "sha256-Bas6HhjwQBqMW84HI5Xjt+pm72iDXpvA8ekjYS7cJew="; + # }) + # ]; + # } + # ); + # port = 8585; + # modelsDir = "/var/lib/llama-cpp/models"; + # extraFlags = [ + # "-c" + # "16384" + # "--n-gpu-layers" + # "10" + # "--device" + # "ROCm0" + # ]; + # }; }; systemd = { diff --git a/hosts/work/hjem-rum/default.nix b/hosts/work/hjem-rum/default.nix index 0501215..f0370b4 100644 --- a/hosts/work/hjem-rum/default.nix +++ b/hosts/work/hjem-rum/default.nix @@ -65,6 +65,8 @@ in XCURSOR_SIZE = "24"; }; + systemd = import ./systemd.nix { inherit pkgs; }; + xdg = import ./xdg.nix { inherit pkgs; }; diff --git a/hosts/work/hjem-rum/systemd.nix b/hosts/work/hjem-rum/systemd.nix new file mode 100644 index 0000000..06d059c --- /dev/null +++ b/hosts/work/hjem-rum/systemd.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + # packages = [ pkgs.ghostty ]; +} diff --git a/npins/sources.json b/npins/sources.json index f72c8af..2d06b93 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "main", "submodules": false, - "revision": "fa753e9de7674a792f88f459f410adfaafae5e2d", - "url": "https://github.com/mrshmllow/affinity-nix/archive/fa753e9de7674a792f88f459f410adfaafae5e2d.tar.gz", - "hash": "sha256-CxMPFUonNdDPVBrcT7tI29UTV9r0YF0Bon9BgZ5SfEE=" + "revision": "f76f97513153a753718aa1423e84b4cb8ea4c185", + "url": "https://github.com/mrshmllow/affinity-nix/archive/f76f97513153a753718aa1423e84b4cb8ea4c185.tar.gz", + "hash": "sha256-PV2SjSCv9BLLjNQMDTed51Z6PDfgveGK9bvUNhyJ2a4=" }, "awoopkgs": { "type": "Git", @@ -21,9 +21,9 @@ }, "branch": "main", "submodules": false, - "revision": "39328757d3ea55e4beae772c878d835811896b3b", + "revision": "9e0209110d0e0da49d5680dfaa0b62b7d832824a", "url": null, - "hash": "sha256-Jo2aKR994PrdJx/JaNL5VBTRGV270wlitjpwoZ2X1/k=" + "hash": "sha256-vK9NHodEd3ZKfmatU7gDCDc4Hu/H5RHVJ4GOR7lyIxA=" }, "crane": { "type": "Git", @@ -34,9 +34,9 @@ }, "branch": "master", "submodules": false, - "revision": "d459c1350e96ce1a7e3859c513ef5e9869d67d6f", - "url": "https://github.com/ipetkov/crane/archive/d459c1350e96ce1a7e3859c513ef5e9869d67d6f.tar.gz", - "hash": "sha256-2uoQAqUk2H0ijQtGiWAyNeQYGYc6yfAcRRLlJAz4Gp8=" + "revision": "6d015ea29630b7ad2402841386da2cb617a470a7", + "url": "https://github.com/ipetkov/crane/archive/6d015ea29630b7ad2402841386da2cb617a470a7.tar.gz", + "hash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=" }, "crate2nix": { "type": "Git", @@ -114,9 +114,9 @@ }, "branch": "main", "submodules": false, - "revision": "ab977051adce0bf9f7c1032327e72f0febda6f7b", - "url": "https://github.com/feel-co/hjem/archive/ab977051adce0bf9f7c1032327e72f0febda6f7b.tar.gz", - "hash": "sha256-gaHRkPaGAAjc6D4sZ+/haEKMJGO79tu4ROBlyOjXuco=" + "revision": "5e7bf117ed06ccf899bcfc421c8a6de00f825c23", + "url": "https://github.com/feel-co/hjem/archive/5e7bf117ed06ccf899bcfc421c8a6de00f825c23.tar.gz", + "hash": "sha256-ktYBdfwamZly9P0SSrKbZgJReqcdDckgSlvJJnw39UM=" }, "hjem-rum": { "type": "Git", @@ -126,9 +126,9 @@ }, "branch": "main", "submodules": false, - "revision": "7e383954d22a49104c608e55b243d1e49db8776c", + "revision": "ac35d4692885c15ab52cf445eb8bc65efd0a2585", "url": null, - "hash": "sha256-zT9rRzAstRVm9CIaCu0jprqfV0LP3LbrqVRo8FaHypg=" + "hash": "sha256-tlif57cjgN9Ht6JJ4ZU7ETSQH9daCIxAejzueKaS0pA=" }, "lanzaboote": { "type": "Git", @@ -139,9 +139,9 @@ }, "branch": "master", "submodules": false, - "revision": "04723d4fd6bde2665fef3b25856aeebbd4013c16", - "url": "https://github.com/nix-community/lanzaboote/archive/04723d4fd6bde2665fef3b25856aeebbd4013c16.tar.gz", - "hash": "sha256-9Ynx+ort1aSwReiCfkbgMS3Q6y+MPcekDoUWx9N3a7A=" + "revision": "f11608843ca4fa95049c096ec0a50c93b41080b8", + "url": "https://github.com/nix-community/lanzaboote/archive/f11608843ca4fa95049c096ec0a50c93b41080b8.tar.gz", + "hash": "sha256-HJ4e4IQz7TJ1wDmEnkowXCM6SYXF9sfYg8nmUYHCnpI=" }, "nix-index": { "type": "Git", @@ -152,9 +152,9 @@ }, "branch": "main", "submodules": false, - "revision": "2dea2b920e7127b3afa8506713f23536651de312", - "url": "https://github.com/nix-community/nix-index-database/archive/2dea2b920e7127b3afa8506713f23536651de312.tar.gz", - "hash": "sha256-2KUbS/HhzWW3kkkY1+RiWj9mJ76VEXw8lBJzcCFKzfY=" + "revision": "01466c414c7357ae2ce32be4a272a7c69e94ab5f", + "url": "https://github.com/nix-community/nix-index-database/archive/01466c414c7357ae2ce32be4a272a7c69e94ab5f.tar.gz", + "hash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=" }, "nixpkgs": { "type": "Git", @@ -165,9 +165,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "549bd84d6279f9852cae6225e372cc67fb91a4c1", - "url": "https://github.com/NixOS/nixpkgs/archive/549bd84d6279f9852cae6225e372cc67fb91a4c1.tar.gz", - "hash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=" + "revision": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "url": "https://github.com/NixOS/nixpkgs/archive/da5ad661ba4e5ef59ba743f0d112cbc30e474f32.tar.gz", + "hash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=" }, "nixpkgs-master": { "type": "Git", @@ -178,9 +178,9 @@ }, "branch": "master", "submodules": false, - "revision": "5dcaf741280ea4be380d2db9f750aaa251ef0566", - "url": "https://github.com/NixOS/nixpkgs/archive/5dcaf741280ea4be380d2db9f750aaa251ef0566.tar.gz", - "hash": "sha256-wINZI+e3XEbZojExsr0QbnKPZF7bZIfKo8gshuTCtGA=" + "revision": "6a39eca306598a3ed2ae06f2f9230233c416aa91", + "url": "https://github.com/NixOS/nixpkgs/archive/6a39eca306598a3ed2ae06f2f9230233c416aa91.tar.gz", + "hash": "sha256-GfEVIuE2vq966xmwWqJm+h+Sv2udS+Pcfpu6yJW02/U=" }, "nixpkgs-xr": { "type": "Git", @@ -191,9 +191,9 @@ }, "branch": "main", "submodules": false, - "revision": "96328161d04d8b935efa297895cd70a6317b746c", - "url": "https://github.com/nix-community/nixpkgs-xr/archive/96328161d04d8b935efa297895cd70a6317b746c.tar.gz", - "hash": "sha256-4I00y1CiJTt81gF6jigScetW7gw8E39eqHaZ5sXgPMg=" + "revision": "c6af4789d7801fa243205a8ce9b8e3feffbf42b4", + "url": "https://github.com/nix-community/nixpkgs-xr/archive/c6af4789d7801fa243205a8ce9b8e3feffbf42b4.tar.gz", + "hash": "sha256-PFtYr0cCf7sKE275o5FF/JkA7YonFLZwu1vVvpbVtEo=" }, "nur": { "type": "Git", @@ -204,9 +204,9 @@ }, "branch": "main", "submodules": false, - "revision": "3507c1528105fd4858e3bba999b52dcd0ba98f20", - "url": "https://github.com/nix-community/NUR/archive/3507c1528105fd4858e3bba999b52dcd0ba98f20.tar.gz", - "hash": "sha256-2pmh4prBgmrQcVq3w6l5osu14jYN5uQGhr+sH5YIRTM=" + "revision": "cfca665e13476f062d68be5f7a54c10bc425c33e", + "url": "https://github.com/nix-community/NUR/archive/cfca665e13476f062d68be5f7a54c10bc425c33e.tar.gz", + "hash": "sha256-u5cBOPl8wBviG5ttrV4hE8Dqg++ADDMOqiV3rdYj1RE=" }, "rust-overlay": { "type": "Git", @@ -217,9 +217,9 @@ }, "branch": "master", "submodules": false, - "revision": "366ea19e0e55b768f74b7a0b2a20f847e7ae828d", - "url": "https://github.com/oxalica/rust-overlay/archive/366ea19e0e55b768f74b7a0b2a20f847e7ae828d.tar.gz", - "hash": "sha256-NpOgt8ISaHTDNJZjNUfwFfbieKfRXzab4WKM31gZCGA=" + "revision": "83a17ebffcfacb17b49e1b5e9dc15eed07936648", + "url": "https://github.com/oxalica/rust-overlay/archive/83a17ebffcfacb17b49e1b5e9dc15eed07936648.tar.gz", + "hash": "sha256-+gIOsOzqWNfn+ThCXBQGcLHVEnaGQW59XjghE9JUIYk=" }, "sops-nix": { "type": "Git", @@ -256,9 +256,9 @@ }, "branch": "master", "submodules": false, - "revision": "8e6f4922e3a44dff711fcdde60008bb38e36362d", + "revision": "22e1f6f92f1d94d33ee53265376598201760e0ee", "url": null, - "hash": "sha256-XRQAUULZNPRPtSkZDiTFNbKZiWhksw8Cm5dbjVaXwFQ=" + "hash": "sha256-HyRaRMoUbtg9mghmp5eMMGdQkaD1OAaxXDmyf50zQcE=" }, "tranquil_pds": { "type": "Git", @@ -268,9 +268,9 @@ }, "branch": "main", "submodules": false, - "revision": "f176f55862bc4c41472f8697cc2ca069c24d5e37", + "revision": "60e10af4aaaa13a47c0ae169e2e41b270c352a73", "url": null, - "hash": "sha256-St0O1h5JIU+Rg0l7HzKHmk+MgoEDZ/TPIU8nAzpggOk=" + "hash": "sha256-rftvfKywtATdHZwb58npoLq1sidw8Hwsz+uBzNn4AwU=" }, "wire": { "type": "Git", @@ -280,9 +280,9 @@ }, "branch": "trunk", "submodules": false, - "revision": "f3a1f5dc584a823eef79b63ebb2e793540eaa8c9", + "revision": "9096fb868d869850f73693e7f2bcdfb1a0287cff", "url": null, - "hash": "sha256-Rgom8gWHXgkIRn5to6xGT6O6rClC84sufCdHRyFsRy4=" + "hash": "sha256-QUeMLAThOwu2oEqurcMUi1YpLWUQ2iQR2bAbQtylk8A=" } }, "version": 7