From 0b8f8d1b5ba4b07e67dd6ba9f26d5b617856d261 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Fri, 24 Jun 2022 16:31:30 +0100 Subject: [PATCH] changes --- config/hosts/yukari.nix | 6 +- config/services/nextcloud.nix | 2 +- config/services/plex.nix | 2 + config/tf | 2 +- config/users/kat/dev/packages.nix | 1 + config/users/kat/nixos.nix | 1 + flake.lock | 150 +++++++++++++++++----------- flake.nix | 1 + outputs.nix | 4 - trusted/flake.lock | 156 ++++++++++++++++++------------ 10 files changed, 195 insertions(+), 130 deletions(-) diff --git a/config/hosts/yukari.nix b/config/hosts/yukari.nix index 2744d3c7..115203b1 100644 --- a/config/hosts/yukari.nix +++ b/config/hosts/yukari.nix @@ -4,8 +4,8 @@ profiles.network services.ha services.nextcloud - services.kattv-ingest - services.kattv2-ingest + #services.kattv-ingest + #services.kattv2-ingest services.postgres services.nfs services.nginx @@ -99,7 +99,7 @@ private = { enable = true; nixos = { - ipv4.address = "192.168.1.154"; + ipv4.address = "100.98.152.108"; }; }; }; diff --git a/config/services/nextcloud.nix b/config/services/nextcloud.nix index 30aacaca..73d173ee 100644 --- a/config/services/nextcloud.nix +++ b/config/services/nextcloud.nix @@ -34,7 +34,7 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud23; + package = pkgs.nextcloud24; config = { dbtype = "pgsql"; dbhost = "/run/postgresql"; diff --git a/config/services/plex.nix b/config/services/plex.nix index 70dc5670..bcb9d993 100644 --- a/config/services/plex.nix +++ b/config/services/plex.nix @@ -1,4 +1,5 @@ { config, kw, pkgs, lib, ... }: { + network.firewall.public.tcp.ports = [ 32400 ]; services = { plex = { enable = true; @@ -16,6 +17,7 @@ ); }; + nginx.virtualHosts."plex.kittywit.ch".locations."/" = { proxyPass = "http://127.0.0.1:32400"; extraConfig = '' diff --git a/config/tf b/config/tf index 9422092e..2b134998 160000 --- a/config/tf +++ b/config/tf @@ -1 +1 @@ -Subproject commit 9422092e341bccb456c0d88c7cc5ee236f856e85 +Subproject commit 2b13499855c58b29bc3f3dd9f566b003251c5fbb diff --git a/config/users/kat/dev/packages.nix b/config/users/kat/dev/packages.nix index be0f8aa1..9b71e258 100644 --- a/config/users/kat/dev/packages.nix +++ b/config/users/kat/dev/packages.nix @@ -3,6 +3,7 @@ { home.packages = with pkgs; [ jq + apache-directory-studio hyperfine hexyl tokei diff --git a/config/users/kat/nixos.nix b/config/users/kat/nixos.nix index 47cfb528..3005054c 100644 --- a/config/users/kat/nixos.nix +++ b/config/users/kat/nixos.nix @@ -6,6 +6,7 @@ isNormalUser = true; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCocjQqiDIvzq+Qu3jkf7FXw5piwtvZ1Mihw9cVjdVcsra3U2c9WYtYrA3rS50N3p00oUqQm9z1KUrvHzdE+03ZCrvaGdrtYVsaeoCuuvw7qxTQRbItTAEsfRcZLQ5c1v/57HNYNEsjVrt8VukMPRXWgl+lmzh37dd9w45cCY1QPi+JXQQ/4i9Vc3aWSe4X6PHOEMSBHxepnxm5VNHm4PObGcVbjBf0OkunMeztd1YYA9sEPyEK3b8IHxDl34e5t6NDLCIDz0N/UgzCxSxoz+YJ0feQuZtud/YLkuQcMxW2dSGvnJ0nYy7SA5DkW1oqcy6CGDndHl5StOlJ1IF9aGh0gGkx5SRrV7HOGvapR60RphKrR5zQbFFka99kvSQgOZqSB3CGDEQGHv8dXKXIFlzX78jjWDOBT67vA/M9BK9FS2iNnBF5x6shJ9SU5IK4ySxq8qvN7Us8emkN3pyO8yqgsSOzzJT1JmWUAx0tZWG/BwKcFBHfceAPQl6pwxx28TM3BTBRYdzPJLTkAy48y6iXW6UYdfAPlShy79IYjQtEThTuIiEzdzgYdros0x3PDniuAP0KOKMgbikr0gRa6zahPjf0qqBnHeLB6nHAfaVzI0aNbhOg2bdOueE1FX0x48sjKqjOpjlIfq4WeZp9REr2YHEsoLFOBfgId5P3BPtpBQ== yubikey5" +"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPsu3vNsvBb/G+wALpstD/DnoRZ3fipAs00jtl8rzDuv96RlS7AJr4aNvG6Pt2D9SYn2wVLaiw+76mz2gOycH9/N+VCvL4/0MN9uqj+7XIcxNRo0gHVOblmi2bOXcmGKh3eRwHj1xyDwRxo9WIuBEP2bPpDPz75OXRtEdlTgvky7siSguQxJu03cb0p9hNAYhUoohNXyWW2CjDCLUQVE1+QRVUzsKq3KkPy0cHYgmZC1gRSMQyKpMt72L5tayLz3Tp/zrshucc+QO5IJeZdqMxsNAcvALsysT1J5EqxZoYH9VpWLRhSgVD6Nvn853pycJAlXQxgOCpSD3/v/JbgUe5NE+ci0o7NMy5IiHUv2gQMRIEhwBHlRGwokUPL9upx0lsjaEiPya5xQqqDKRom87xytM778ANS5CuMdQMWg9qVbpHZUHMjA0QmNkjPgq71pUDXHk5L4mZuS8wVjyjnvlw68yIJuHEc8P7QiLcjvRHFS2L9Ck8NRmPDTQXlQi9kk6LmMyu6fdevR/kZL21b+xO1e2DMyxBbNDTot8luppiiL8adgUDMwptpIne7JCWB1o9NFCbXUVgwuCCYBif6pOGSc6bGo1JTAKMflRlcy6Mi3t5H0mR2lj/sCSTWwTlP5FM4aPIq08NvW6PeuK1bFJY9fIgTwVsUnbAKOhmsMt62w== cardno:12 078 454" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII74JrgGsDQ6r7tD7+k3ykxXV7DpeeFRscPMxrBsDPhz kat@goliath" ]; shell = pkgs.zsh; diff --git a/flake.lock b/flake.lock index 0cafe089..683b536d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,13 @@ { "nodes": { - "anicca": { - "flake": false, - "locked": { - "lastModified": 1630289335, - "narHash": "sha256-4qkDeukQTwRsctM+VkQb8svxCsY03dZgBI6bHWr6xpo=", - "owner": "kittywitch", - "repo": "anicca", - "rev": "c890bd08f4e34a655ef5ff7561aa74cdc8d85a0a", - "type": "github" - }, - "original": { - "owner": "kittywitch", - "ref": "main", - "repo": "anicca", - "type": "github" - } - }, "arcexprs": { "flake": false, "locked": { - "lastModified": 1654126673, - "narHash": "sha256-SxNpS14YUuwsSkd6PBfSTdzC191U6W36F3NQ0fJVr6U=", + "lastModified": 1654705662, + "narHash": "sha256-+vgMNuehEQqtXmtwq0w0sGDy8b6bShFiS2ZbBtUDw6k=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "979321a3a55274c7eef9b85d74169b79e5a17824", + "rev": "727f8eb7aaf542b675aaa9141a5027ccb961539e", "type": "github" }, "original": { @@ -113,11 +96,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1654170097, - "narHash": "sha256-byrZN3k78pwg15puULonJUzTSEDjf8/YCkdUm/abla8=", + "lastModified": 1655893294, + "narHash": "sha256-ICpY7sKldeWDIJ1gnIyyLDv2xNKqkczxTy7Xjz2b8s0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "489651e2927fdf356b68123ed6f8c7910bfa7f7d", + "rev": "e0d8cd1477216ece946d472c51e15a27cacf6664", "type": "github" }, "original": { @@ -239,6 +222,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1653893745, @@ -277,16 +276,20 @@ }, "home-manager-darwin": { "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs-darwin" - ] + ], + "nmd": "nmd", + "nmt": "nmt", + "utils": "utils" }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1655858799, + "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18", "type": "github" }, "original": { @@ -295,22 +298,6 @@ "type": "github" } }, - "impermanence": { - "locked": { - "lastModified": 1646131459, - "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "impermanence", - "type": "github" - } - }, "nix-dns": { "inputs": { "flake-utils": [ @@ -396,8 +383,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-erVj41IcCPDWdt8CwT60ygD+SY/uhqip3RXwiESOCVk=", - "path": "/nix/store/3q18gxqzw5qzyd9n64nyi1kgb66qi8ac-source", + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "path": "/nix/store/3ds4cwrnkgfvpjgf80vr2dbw9yfrrnsv-source", "type": "path" }, "original": { @@ -407,11 +394,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1654115789, - "narHash": "sha256-k9Qr8dLrmgEn+xIVbneJdQgCYG8FbbqOrTVaExUrLFI=", + "lastModified": 1655415671, + "narHash": "sha256-WD7HxxW1m8D/fkV1QlCYlZvnE5gQdg7ckq3myI4gPtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bce6d15455f8c15c9ef511368947e7ef789c5316", + "rev": "f96729212602f15a6a226d2f27f5de70492ad095", "type": "github" }, "original": { @@ -423,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1655624069, + "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", "type": "github" }, "original": { @@ -437,6 +424,38 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1653339422, + "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", + "owner": "rycee", + "repo": "nmd", + "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nose": { "flake": false, "locked": { @@ -455,11 +474,11 @@ }, "nur": { "locked": { - "lastModified": 1654172430, - "narHash": "sha256-6Y3ahiBZtqAYG0Mror5BdegviwWmhd5hcMhF/B/Nfng=", + "lastModified": 1655884594, + "narHash": "sha256-ZwmYvED9P9RmMvQkV+PeZ5vGQyDDaR5y8A5vuRnrac0=", "owner": "nix-community", "repo": "nur", - "rev": "edb5c94d7640890a39325351825cc39fb1c014b1", + "rev": "4a38042992499ce141a38e7dc5a105c31fd77b98", "type": "github" }, "original": { @@ -567,7 +586,6 @@ }, "root": { "inputs": { - "anicca": "anicca", "arcexprs": "arcexprs", "ci": "ci", "darwin": "darwin", @@ -576,7 +594,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "home-manager-darwin": "home-manager-darwin", - "impermanence": "impermanence", "nix-dns": "nix-dns", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", @@ -621,11 +638,11 @@ "tf-nix": { "flake": false, "locked": { - "lastModified": 1652202366, - "narHash": "sha256-CFNcYVwth9GdDO6o602UjLGKBy2Zsv/X00G3kofXRi8=", + "lastModified": 1655220817, + "narHash": "sha256-5eYqmPN1KuBz8ZNnIJPpRDeQDMOuS/kFpLGNld2G0is=", "owner": "arcnmx", "repo": "tf-nix", - "rev": "d45eb5ed2311f8d18d0ceaf93e544abbf48167fa", + "rev": "cd7c31d794a2d6992394ce4fa8b1157f8a88c349", "type": "github" }, "original": { @@ -647,6 +664,21 @@ "path": "./empty/.", "type": "path" } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5ceda98c..b3f5d945 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ url = "github:kittywitch/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + nur.url = "github:nix-community/nur/master"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-21.11-darwin"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs-darwin"; diff --git a/outputs.nix b/outputs.nix index 1aa865c6..3a0e12cf 100644 --- a/outputs.nix +++ b/outputs.nix @@ -14,8 +14,6 @@ functor = { enable = true; external = [ - (import (inputs.impermanence + "/nixos.nix")) - (import inputs.anicca).modules.nixos (inputs.tf-nix + "/modules/nixos/secrets.nix") (inputs.tf-nix + "/modules/nixos/secrets-users.nix") ] ++ (with (import (inputs.arcexprs + "/modules")).nixos; [ @@ -48,8 +46,6 @@ enable = true; external = [ (import (inputs.arcexprs + "/modules")).home-manager - (import (inputs.impermanence + "/home-manager.nix")) - (import inputs.anicca).modules.home (inputs.tf-nix + "/modules/home/secrets.nix") ]; }; diff --git a/trusted/flake.lock b/trusted/flake.lock index c0cb293b..e9353cf6 100644 --- a/trusted/flake.lock +++ b/trusted/flake.lock @@ -1,30 +1,13 @@ { "nodes": { - "anicca": { - "flake": false, - "locked": { - "lastModified": 1630289335, - "narHash": "sha256-4qkDeukQTwRsctM+VkQb8svxCsY03dZgBI6bHWr6xpo=", - "owner": "kittywitch", - "repo": "anicca", - "rev": "c890bd08f4e34a655ef5ff7561aa74cdc8d85a0a", - "type": "github" - }, - "original": { - "owner": "kittywitch", - "ref": "main", - "repo": "anicca", - "type": "github" - } - }, "arcexprs": { "flake": false, "locked": { - "lastModified": 1654126673, - "narHash": "sha256-SxNpS14YUuwsSkd6PBfSTdzC191U6W36F3NQ0fJVr6U=", + "lastModified": 1654705662, + "narHash": "sha256-+vgMNuehEQqtXmtwq0w0sGDy8b6bShFiS2ZbBtUDw6k=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "979321a3a55274c7eef9b85d74169b79e5a17824", + "rev": "727f8eb7aaf542b675aaa9141a5027ccb961539e", "type": "github" }, "original": { @@ -115,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1654170097, - "narHash": "sha256-byrZN3k78pwg15puULonJUzTSEDjf8/YCkdUm/abla8=", + "lastModified": 1655893294, + "narHash": "sha256-ICpY7sKldeWDIJ1gnIyyLDv2xNKqkczxTy7Xjz2b8s0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "489651e2927fdf356b68123ed6f8c7910bfa7f7d", + "rev": "e0d8cd1477216ece946d472c51e15a27cacf6664", "type": "github" }, "original": { @@ -241,6 +224,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1653893745, @@ -280,17 +279,21 @@ }, "home-manager-darwin": { "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixfiles", "nixpkgs-darwin" - ] + ], + "nmd": "nmd", + "nmt": "nmt", + "utils": "utils" }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1655858799, + "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18", "type": "github" }, "original": { @@ -299,22 +302,6 @@ "type": "github" } }, - "impermanence": { - "locked": { - "lastModified": 1646131459, - "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "impermanence", - "type": "github" - } - }, "nix-dns": { "inputs": { "flake-utils": [ @@ -403,7 +390,6 @@ }, "nixfiles": { "inputs": { - "anicca": "anicca", "arcexprs": "arcexprs", "ci": "ci", "darwin": "darwin", @@ -412,7 +398,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "home-manager-darwin": "home-manager-darwin", - "impermanence": "impermanence", "nix-dns": "nix-dns", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", @@ -425,20 +410,20 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-+q+B/uo3InU/vpaOfhceGg+J6TeW4hsgGxwSEsdBZe8=", - "path": "/nix/store/q2cgdly4k8zfxmi5mikwjh8wn1lwxfjl-source", + "narHash": "sha256-1ONY+sSEL6WFP84sQJfQbzEggBGaf90OIoQdJOwcPBQ=", + "path": "/nix/store/dh3ims692vc79wrdn6nx5dpn5sp7ap9q-source", "type": "path" }, "original": { - "path": "/nix/store/q2cgdly4k8zfxmi5mikwjh8wn1lwxfjl-source", + "path": "/nix/store/dh3ims692vc79wrdn6nx5dpn5sp7ap9q-source", "type": "path" } }, "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-erVj41IcCPDWdt8CwT60ygD+SY/uhqip3RXwiESOCVk=", - "path": "/nix/store/3q18gxqzw5qzyd9n64nyi1kgb66qi8ac-source", + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "path": "/nix/store/3ds4cwrnkgfvpjgf80vr2dbw9yfrrnsv-source", "type": "path" }, "original": { @@ -448,11 +433,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1654115789, - "narHash": "sha256-k9Qr8dLrmgEn+xIVbneJdQgCYG8FbbqOrTVaExUrLFI=", + "lastModified": 1655415671, + "narHash": "sha256-WD7HxxW1m8D/fkV1QlCYlZvnE5gQdg7ckq3myI4gPtE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bce6d15455f8c15c9ef511368947e7ef789c5316", + "rev": "f96729212602f15a6a226d2f27f5de70492ad095", "type": "github" }, "original": { @@ -464,11 +449,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1655624069, + "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", "type": "github" }, "original": { @@ -478,6 +463,38 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1653339422, + "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", + "owner": "rycee", + "repo": "nmd", + "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nose": { "flake": false, "locked": { @@ -496,11 +513,11 @@ }, "nur": { "locked": { - "lastModified": 1654172430, - "narHash": "sha256-6Y3ahiBZtqAYG0Mror5BdegviwWmhd5hcMhF/B/Nfng=", + "lastModified": 1655884594, + "narHash": "sha256-ZwmYvED9P9RmMvQkV+PeZ5vGQyDDaR5y8A5vuRnrac0=", "owner": "nix-community", "repo": "nur", - "rev": "edb5c94d7640890a39325351825cc39fb1c014b1", + "rev": "4a38042992499ce141a38e7dc5a105c31fd77b98", "type": "github" }, "original": { @@ -647,11 +664,11 @@ "tf-nix": { "flake": false, "locked": { - "lastModified": 1652202366, - "narHash": "sha256-CFNcYVwth9GdDO6o602UjLGKBy2Zsv/X00G3kofXRi8=", + "lastModified": 1655220817, + "narHash": "sha256-5eYqmPN1KuBz8ZNnIJPpRDeQDMOuS/kFpLGNld2G0is=", "owner": "arcnmx", "repo": "tf-nix", - "rev": "d45eb5ed2311f8d18d0ceaf93e544abbf48167fa", + "rev": "cd7c31d794a2d6992394ce4fa8b1157f8a88c349", "type": "github" }, "original": { @@ -677,6 +694,21 @@ "type": "git", "url": "ssh://git@github.com/kittywitch/nixfiles-trusted" } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root",