Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).

flake: remove overlay usage in modules, fix appview module and minor formatting

Users of the knotserver module not using `nixos-unstable` faces the error linked below when rebuilding their system. Removing the usage of overlays, and instead using the existing `self.packages` functionality allow packages to be less dependent on the user's configuration, avoids a pitfall like this and is thus more reproducible.

This patch also fixes the appview module referencing a non-existent package.

This patch also removes redundant usages of `with final;` and includes some minor formatting done by alejandra.

Minimum example: https://akyuu.soopy.moe/dGNHld.nix
Example build failure with master branch tip: https://akyuu.soopy.moe/4aNh8c.txt

+28 -31
+28 -31
flake.nix
··· 55 55 env.CGO_ENABLED = 0; 56 56 }; 57 57 in { 58 - indigo-lexgen = with final; 59 - final.buildGoModule { 60 - pname = "indigo-lexgen"; 61 - version = "0.1.0"; 62 - src = indigo; 63 - subPackages = ["cmd/lexgen"]; 64 - vendorHash = "sha256-pGc29fgJFq8LP7n/pY1cv6ExZl88PAeFqIbFEhB3xXs="; 65 - doCheck = false; 66 - }; 58 + indigo-lexgen = final.buildGoModule { 59 + pname = "indigo-lexgen"; 60 + version = "0.1.0"; 61 + src = indigo; 62 + subPackages = ["cmd/lexgen"]; 63 + vendorHash = "sha256-pGc29fgJFq8LP7n/pY1cv6ExZl88PAeFqIbFEhB3xXs="; 64 + doCheck = false; 65 + }; 67 66 68 67 appview = with final; 69 68 final.pkgsStatic.buildGoModule { ··· 107 108 ''; 108 109 env.CGO_ENABLED = 1; 109 110 }; 110 - knotserver-unwrapped = with final; 111 - final.pkgsStatic.buildGoModule { 112 - pname = "knotserver"; 113 - version = "0.1.0"; 114 - src = gitignoreSource ./.; 115 - subPackages = ["cmd/knotserver"]; 116 - vendorHash = goModHash; 117 - env.CGO_ENABLED = 1; 118 - }; 111 + knotserver-unwrapped = final.pkgsStatic.buildGoModule { 112 + pname = "knotserver"; 113 + version = "0.1.0"; 114 + src = gitignoreSource ./.; 115 + subPackages = ["cmd/knotserver"]; 116 + vendorHash = goModHash; 117 + env.CGO_ENABLED = 1; 118 + }; 119 119 repoguard = buildCmdPackage "repoguard"; 120 120 keyfetch = buildCmdPackage "keyfetch"; 121 121 }; ··· 206 208 }; 207 209 208 210 config = mkIf config.services.tangled-appview.enable { 209 - nixpkgs.overlays = [self.overlays.default]; 210 211 systemd.services.tangled-appview = { 211 212 description = "tangled appview service"; 212 213 wantedBy = ["multi-user.target"]; 213 214 214 215 serviceConfig = { 215 216 ListenStream = "0.0.0.0:${toString config.services.tangled-appview.port}"; 216 - ExecStart = "${pkgs.tangled-appview}/bin/tangled-appview"; 217 + ExecStart = "${self.packages.${pkgs.system}.appview}/bin/appview"; 217 218 Restart = "always"; 218 219 }; 219 220 ··· 306 309 }; 307 310 308 311 config = mkIf config.services.tangled-knotserver.enable { 309 - nixpkgs.overlays = [self.overlays.default]; 310 - 311 312 environment.systemPackages = with pkgs; [git]; 312 313 313 314 system.activationScripts.gitConfig = '' 314 - mkdir -p /home/git/.config/git 315 - cat > /home/git/.config/git/config << EOF 316 - [user] 317 - name = Git User 318 - email = git@example.com 319 - EOF 320 - chown -R git:git /home/git/.config 315 + mkdir -p /home/git/.config/git 316 + cat > /home/git/.config/git/config << EOF 317 + [user] 318 + name = Git User 319 + email = git@example.com 320 + EOF 321 + chown -R git:git /home/git/.config 321 322 ''; 322 323 323 324 users.users.git = { ··· 341 346 mode = "0555"; 342 347 text = '' 343 348 #!${pkgs.stdenv.shell} 344 - ${pkgs.keyfetch}/bin/keyfetch -repoguard-path ${pkgs.repoguard}/bin/repoguard -log-path /tmp/repoguard.log 349 + ${self.packages.${pkgs.system}.keyfetch}/bin/keyfetch \ 350 + -repoguard-path ${self.packages.${pkgs.system}.repoguard}/bin/repoguard \ 351 + -log-path /tmp/repoguard.log 345 352 ''; 346 353 }; 347 354 ··· 362 365 "KNOT_SERVER_SECRET=${config.services.tangled-knotserver.server.secret}" 363 366 "KNOT_SERVER_HOSTNAME=${config.services.tangled-knotserver.server.hostname}" 364 367 ]; 365 - ExecStart = "${pkgs.knotserver}/bin/knotserver"; 368 + ExecStart = "${self.packages.${pkgs.system}.knotserver}/bin/knotserver"; 366 369 Restart = "always"; 367 370 }; 368 371 };