diff --git a/.gitmodules b/.gitmodules index ff7087c..60a8291 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "modules/priv"] path = modules/priv - url = ssh://forgejo@git.killuaa.dev:5858/roufpup/nix-priv.git + url = git-puppy@git.awoo.ren:priv-repos/priv-dots diff --git a/hive.nix b/hive.nix index 78ef20b..0fb9e1a 100644 --- a/hive.nix +++ b/hive.nix @@ -25,7 +25,7 @@ let ./patches/forgejo.patch (pkgs.fetchpatch2 { url = "https://github.com/NixOS/nixpkgs/pull/483203.patch"; - sha256 = "sha256-IltHn1AVUUefDI2tluzomXBsroK6a1NVTt+IBqx2Dc8="; + sha256 = "sha256-2czzH6Pe013jKtbs1DFwJKh8Jlc00CPmyOjOpPdYHw4="; }) ]; }; diff --git a/hosts/vulpes/infra/caddy.nix b/hosts/vulpes/infra/caddy.nix index c9092c7..7e64fb2 100644 --- a/hosts/vulpes/infra/caddy.nix +++ b/hosts/vulpes/infra/caddy.nix @@ -23,7 +23,7 @@ in enable = true; package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/rfc2136@v1.0.0" ]; - hash = "sha256-S078bVfUolEa6icL2hJgTTzZ8r7+j+D9lfyOc5SCvzQ="; + hash = "sha256-S4cYVNHUhgtRSgz+Vl/+LkHnA4kYmmLIPU7q1DBD2jg="; }; email = "pup@awoo.ren"; logFormat = lib.mkForce "level DEBUG"; diff --git a/hosts/vulpes/infra/dns.nix b/hosts/vulpes/infra/dns.nix index 82806fc..66592da 100644 --- a/hosts/vulpes/infra/dns.nix +++ b/hosts/vulpes/infra/dns.nix @@ -32,7 +32,6 @@ in enabled = true; description = "Hagezi Ultimate"; url = "https://cdn.jsdelivr.net/gh/hagezi/dns-blocklists@latest/adblock/ultimate.txt"; - type = "block"; } ]; }; diff --git a/hosts/vulpes/infra/git.nix b/hosts/vulpes/infra/git.nix index b3bc3df..fd39cf6 100644 --- a/hosts/vulpes/infra/git.nix +++ b/hosts/vulpes/infra/git.nix @@ -1,23 +1,22 @@ { args, pkgs, - config, ... }: -let - tangled = args.pins.tangled_core; - interFonts = pkgs.fetchzip { - url = "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"; - stripRoot = false; - sha256 = "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ="; - }; - appviewStaticFiles = tangled.packages.x86_64-linux.appview-static-files.override { - inter-fonts-src = interFonts; - }; - appview = tangled.packages.x86_64-linux.appview.override { - appview-static-files = appviewStaticFiles; - }; -in +# let +# tangled = args.pins.tangled_core; +# interFonts = pkgs.fetchzip { +# url = "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"; +# stripRoot = false; +# sha256 = "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ="; +# }; +# appviewStaticFiles = tangled.packages.x86_64-linux.appview-static-files.override { +# inter-fonts-src = interFonts; +# }; +# appview = tangled.packages.x86_64-linux.appview.override { +# appview-static-files = appviewStaticFiles; +# }; +# in { imports = [ args.pins.tangled_core.nixosModules.knot @@ -25,22 +24,22 @@ in ]; services.tangled = { - appview = { - enable = true; - package = appview; - port = 5656; - appviewHost = "git.awoo.ren"; - resend = { - sentFrom = "noreply@notify.awoo.ren"; - }; - pds = { - host = "https://pds.awoo.ren"; - }; - avatar = { - host = ""; - }; - environmentFile = config.sops.secrets.tangled_env.path; - }; + # appview = { + # enable = true; + # package = appview; + # port = 5656; + # appviewHost = "git.awoo.ren"; + # resend = { + # sentFrom = "noreply@notify.awoo.ren"; + # }; + # pds = { + # host = "https://pds.awoo.ren"; + # }; + # avatar = { + # host = ""; + # }; + # environmentFile = config.sops.secrets.tangled_env.path; + # }; knot = { enable = true; openFirewall = false; @@ -53,4 +52,29 @@ in }; }; }; + + systemd.tmpfiles.rules = [ "d /var/lib/tangled/priv-repos 0755 git-puppy git-puppy -" ]; + + system.activationScripts = { + privateGitRepos = { + deps = [ "users" ]; + text = + let + repo_folder = "/var/lib/tangled/priv-repos/$repo"; + in + '' + for repo in priv-dots; do + if [ ! -d "${repo_folder}" ]; then + ${pkgs.git}/bin/git init --bare ${repo_folder} + chown -R git-puppy:git-puppy ${repo_folder} + fi + done + ''; + }; + }; + + users.users.git-puppy.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkUMYuTCjDCIldnrQlA8M5gPkEUZ/oXxD5+B7nNeoM3 openpgp:0x13D59319" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKSHU9Y8jXAJtm2+K30zOr9LabGjvU/d42I8ZzMr6pcQ" + ]; } diff --git a/npins/sources.json b/npins/sources.json index 3b50803..85d2972 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -64,9 +64,9 @@ }, "branch": "master", "submodules": false, - "revision": "e90541d0904593bec70fadd6383659ec42cd610b", - "url": "https://github.com/amaanq/helium-flake/archive/e90541d0904593bec70fadd6383659ec42cd610b.tar.gz", - "hash": "sha256-6FDLz9ydI32uoOJa2qsPpaxQ3T0DB/7Lw/Meos6NjRo=" + "revision": "9dce150ececbf2996d356b96d90fe8468cca8871", + "url": "https://github.com/amaanq/helium-flake/archive/9dce150ececbf2996d356b96d90fe8468cca8871.tar.gz", + "hash": "sha256-2c5vpl2WUUvXR4VPMjzKnGxdnVfkjblmd06Le0s/pMI=" }, "helix-nix": { "type": "Git", @@ -114,9 +114,9 @@ }, "branch": "master", "submodules": false, - "revision": "d21013305ef39e1d9d2d06b161c3785ffad82281", - "url": "https://github.com/nix-community/lanzaboote/archive/d21013305ef39e1d9d2d06b161c3785ffad82281.tar.gz", - "hash": "sha256-JSsXufJy2zdg5XS5pRGlkwF1dqN+sWPmCgrvJsnhEzg=" + "revision": "1e7ee8915a87c0675aa4532d70eb1a26e9b94cd8", + "url": "https://github.com/nix-community/lanzaboote/archive/1e7ee8915a87c0675aa4532d70eb1a26e9b94cd8.tar.gz", + "hash": "sha256-wFeQPKZfSSVv7BAYpRK31UBy1V9/pPJ9/hLaLJIgIp0=" }, "nix-index": { "type": "Git", @@ -152,9 +152,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", - "url": "https://github.com/NixOS/nixpkgs/archive/b40629efe5d6ec48dd1efba650c797ddbd39ace0.tar.gz", - "hash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=" + "revision": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "url": "https://github.com/NixOS/nixpkgs/archive/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9.tar.gz", + "hash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=" }, "nixpkgs-master": { "type": "Git", @@ -165,9 +165,9 @@ }, "branch": "master", "submodules": false, - "revision": "5150456e7f59a515b80c5ddca4f96176e3b5a95d", - "url": "https://github.com/NixOS/nixpkgs/archive/5150456e7f59a515b80c5ddca4f96176e3b5a95d.tar.gz", - "hash": "sha256-vBOtNu9CH9ssBAAAgJVxf66kHkT5mBNsV1gPJzk1Qco=" + "revision": "b78d8a6a0b6931439e702e615c66b1c621d8e77f", + "url": "https://github.com/NixOS/nixpkgs/archive/b78d8a6a0b6931439e702e615c66b1c621d8e77f.tar.gz", + "hash": "sha256-5qwLP+jNRzAOTCscnbFLMeZubiXbi39fewPQUVZLEsI=" }, "nixpkgs-xr": { "type": "Git", @@ -178,9 +178,9 @@ }, "branch": "main", "submodules": false, - "revision": "fee92ac11baf9e129100c7eb489c512179d657b4", - "url": "https://github.com/nix-community/nixpkgs-xr/archive/fee92ac11baf9e129100c7eb489c512179d657b4.tar.gz", - "hash": "sha256-hJXqAMkRmRibAwQg0LBErmo2h1Ej5rwsNSqSLu4WBbM=" + "revision": "82adacd2ac84b353b98e9462be1e8af969a5c1f7", + "url": "https://github.com/nix-community/nixpkgs-xr/archive/82adacd2ac84b353b98e9462be1e8af969a5c1f7.tar.gz", + "hash": "sha256-/figgEf9bJgifAotR2z+KqAUSKriOL17DGkgwJqlI6w=" }, "nur": { "type": "Git", @@ -191,9 +191,9 @@ }, "branch": "main", "submodules": false, - "revision": "f056738c4a176279dc993430bd4d72dbe73f1116", - "url": "https://github.com/nix-community/NUR/archive/f056738c4a176279dc993430bd4d72dbe73f1116.tar.gz", - "hash": "sha256-hbkhKx3KD4VAWqYchTI2Jhi7EyWa4A0o88251tutfsU=" + "revision": "9d2f7035c503731019118616bfa27bcf1ca26deb", + "url": "https://github.com/nix-community/NUR/archive/9d2f7035c503731019118616bfa27bcf1ca26deb.tar.gz", + "hash": "sha256-ddhwjQMJTUx5+hYBVcfRVxIvkrNm9XOkyD195k7VHfo=" }, "rust-overlay": { "type": "Git", @@ -204,9 +204,9 @@ }, "branch": "master", "submodules": false, - "revision": "6a031966eab3bfaa19be9e261eed5b8a79c04b18", - "url": "https://github.com/oxalica/rust-overlay/archive/6a031966eab3bfaa19be9e261eed5b8a79c04b18.tar.gz", - "hash": "sha256-SYp8NyzwfCO3Guqmu9hPRHR1hwESlQia5nNz3lYo2qA=" + "revision": "d6471ee5a8f470251e6e5b83a20a182eb6c46c9b", + "url": "https://github.com/oxalica/rust-overlay/archive/d6471ee5a8f470251e6e5b83a20a182eb6c46c9b.tar.gz", + "hash": "sha256-Jn9d9r85dmf3gTMnSRt6t+DP2nQ5uJns/MMXg2FpzfM=" }, "sops-nix": { "type": "Git", @@ -217,9 +217,9 @@ }, "branch": "master", "submodules": false, - "revision": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", - "url": "https://github.com/Mic92/sops-nix/archive/3e0d543e6ba6c0c48117a81614e90c6d8c425170.tar.gz", - "hash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=" + "revision": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "url": "https://github.com/Mic92/sops-nix/archive/614e256310e0a4f8a9ccae3fa80c11844fba7042.tar.gz", + "hash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=" }, "stash": { "type": "Git", @@ -243,9 +243,9 @@ }, "branch": "master", "submodules": false, - "revision": "053117e52dfed49fe255b7211bda04d1d9e68bb5", + "revision": "233111b316b5faf365bcd0ee1bc1632460fab552", "url": null, - "hash": "sha256-j+VnqtEOFo4POZJoxy9nsuQ0b6pTBLFMapdUvVbSHZ0=" + "hash": "sha256-mlcZC2INHi8DRV4YHY9i+d7NNdrfwpWShf9lYeLpyao=" }, "tranquil_pds": { "type": "Git", @@ -255,9 +255,9 @@ }, "branch": "main", "submodules": false, - "revision": "f07bcb82f77b5f6fbe2d1db9f5b75355cb0201ec", + "revision": "696940f7328db1b7daa884a9c249eaec4eb4db9b", "url": null, - "hash": "sha256-lj+RDUlGpsndDfS372uGwMkiqdao4mmFrlA6CkpTXas=" + "hash": "sha256-+PUoJzSMxC5VNUvpKfaC+6q50Teji1g/Xju68Oa7b7I=" }, "wire": { "type": "Git",