Compare commits

..

No commits in common. "5d083d863fdd8b625710de071b618b75d1836ddb" and "68f73418ccb8a2fc520061b9c82e72bc0c05323b" have entirely different histories.

9 changed files with 44 additions and 46 deletions

View File

@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1720042825,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728726232, "lastModified": 1724435763,
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1724576102,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728729581, "lastModified": 1724878143,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +318,11 @@
}, },
"nixpkgs-2405": { "nixpkgs-2405": {
"locked": { "locked": {
"lastModified": 1728627514, "lastModified": 1724727824,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
}, },
"nixpkgs-edge": { "nixpkgs-edge": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1724479785,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +402,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345710, "lastModified": 1723501126,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +425,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345710, "lastModified": 1723501126,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345710, "lastModified": 1723501126,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345710, "lastModified": 1723501126,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -36,6 +36,7 @@
../../profiles/desktop/waydroid.nix ../../profiles/desktop/waydroid.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
#../../profiles/autossh-reverse-tunnels
]; ];
time.timeZone = null; # allows imperative configuring time.timeZone = null; # allows imperative configuring

View File

@ -23,6 +23,7 @@
../../profiles/domeneshop-dyndns.nix ../../profiles/domeneshop-dyndns.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
#../../profiles/autossh-reverse-tunnels
]; ];
services.domeneshop-updater.targets = [ config.networking.fqdn ]; services.domeneshop-updater.targets = [ config.networking.fqdn ];

View File

@ -24,6 +24,7 @@
../../profiles/domeneshop-dyndns.nix ../../profiles/domeneshop-dyndns.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
#../../profiles/autossh-reverse-tunnels
]; ];
services.domeneshop-updater.targets = [ config.networking.fqdn ]; services.domeneshop-updater.targets = [ config.networking.fqdn ];

View File

@ -41,6 +41,7 @@
../../profiles/desktop/flatpak.nix ../../profiles/desktop/flatpak.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
#../../profiles/autossh-reverse-tunnels
#../../profiles/domeneshop-dyndns.nix # handled by noximilien #../../profiles/domeneshop-dyndns.nix # handled by noximilien
]; ];

View File

@ -11,6 +11,7 @@
#./yt-dlp-archive.nix #./yt-dlp-archive.nix
#../../profiles/vpn-pbsds/headscale.nix # opens port 3478 # TODO: move outside of home net? #../../profiles/vpn-pbsds/headscale.nix # opens port 3478 # TODO: move outside of home net?
../../users/pbsds ../../users/pbsds
@ -80,7 +81,6 @@
../../profiles/http/docs/yagcd.nix ../../profiles/http/docs/yagcd.nix
/**/ /**/
# TODO: make flake inputs
#../../profiles/http/sites/linktree-pbsds.nix # github bby!! TODO: remove #../../profiles/http/sites/linktree-pbsds.nix # github bby!! TODO: remove
../../profiles/http/sites/refleksjon-no.nix ../../profiles/http/sites/refleksjon-no.nix
../../profiles/http/sites/roroslyd-no.nix ../../profiles/http/sites/roroslyd-no.nix
@ -91,7 +91,7 @@
#../../profiles/code-remote # TODO: move into web? services? #../../profiles/code-remote # TODO: move into web? services?
../../profiles/domeneshop-dyndns.nix ../../profiles/domeneshop-dyndns.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
/* ../../profiles/autossh-reverse-tunnels */ ../../profiles/autossh-reverse-tunnels
#../../profiles/xrdp #../../profiles/xrdp
]; ];
services.domeneshop-updater.targets = [ services.domeneshop-updater.targets = [

View File

@ -50,6 +50,7 @@
../../profiles/desktop/flatpak.nix ../../profiles/desktop/flatpak.nix
../../profiles/known-hosts.nix ../../profiles/known-hosts.nix
#../../profiles/autossh-reverse-tunnels
#../../profiles/domeneshop-dyndns.nix # handled by noximilien #../../profiles/domeneshop-dyndns.nix # handled by noximilien
]; ];

View File

@ -11,13 +11,13 @@ lib.mkIf pkgs.unstable.cinny.meta.available # no CVE's thank you
enableACME = true; #useACMEHost = acmeDomain; enableACME = true; #useACMEHost = acmeDomain;
# TODO: the override causes a rebuild which fails on low-RAM systems # TODO: the override causes a rebuild which fails on low-RAM systems
root = pkgs.unstable.cinny.override { root = pkgs.unstable.cinny.override {
conf = { #conf = {
defaultHomeserver = 0; # defaultHomeserver = 0;
homeserverList = [ # homeserverList = [
"pvv.ntnu.no" # "pvv.ntnu.no"
"matrix.org" # "matrix.org"
]; # ];
}; #};
}; };
}; };

View File

@ -7,11 +7,4 @@
# non legacy-mount # non legacy-mount
systemd.services.zfs-mount.enable = true; # default systemd.services.zfs-mount.enable = true; # default
boot.zfs.extraPools = [ "Panorama" ]; # import on boot boot.zfs.extraPools = [ "Panorama" ]; # import on boot
# todo: tailscale nfs mount
# todo: zrepl
# https://search.nixos.org/options?channel=unstable&query=services.zrepl
# https://github.com/NixOS/infra/blob/8be4953d68ce81455787cd60e82086022855a3c2/build/haumea/zrepl.nix#L20
} }