+3 -3

docs/hacking.md

reviewed

··· 52 52 did:key:zDnaeUBxtG6Xuv3ATJE4GaWeyXM3jyamJsZw3bSPpxx4bNXDR 53 53 54 54 # the secret key from above 55 55 - export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..." 55 55 + export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..." 56 56 57 57 # run redis in at a new shell to store oauth sessions 58 58 redis-server ··· 168 168 169 169 If for any reason you wish to disable either one of the 170 170 services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set 171 171 - `services.tangled-spindle.enable` (or 172 172 - `services.tangled-knot.enable`) to `false`. 171 171 + `services.tangled.spindle.enable` (or 172 172 + `services.tangled.knot.enable`) to `false`.

+1 -1

docs/migrations.md

reviewed

··· 49 49 latest revision, and change your config block like so: 50 50 51 51 ```diff 52 52 - services.tangled-knot = { 52 52 + services.tangled.knot = { 53 53 enable = true; 54 54 server = { 55 55 - secretFile = /path/to/secret;

+3 -3

flake.nix

reviewed

··· 283 283 }: { 284 284 imports = [./nix/modules/appview.nix]; 285 285 286 286 - services.tangled-appview.package = lib.mkDefault self.packages.${pkgs.system}.appview; 286 286 + services.tangled.appview.package = lib.mkDefault self.packages.${pkgs.system}.appview; 287 287 }; 288 288 nixosModules.knot = { 289 289 lib, ··· 292 292 }: { 293 293 imports = [./nix/modules/knot.nix]; 294 294 295 295 - services.tangled-knot.package = lib.mkDefault self.packages.${pkgs.system}.knot; 295 295 + services.tangled.knot.package = lib.mkDefault self.packages.${pkgs.system}.knot; 296 296 }; 297 297 nixosModules.spindle = { 298 298 lib, ··· 301 301 }: { 302 302 imports = [./nix/modules/spindle.nix]; 303 303 304 304 - services.tangled-spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle; 304 304 + services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.system}.spindle; 305 305 }; 306 306 }; 307 307 }

+4 -4

nix/modules/appview.nix

reviewed

··· 3 3 lib, 4 4 ... 5 5 }: let 6 6 - cfg = config.services.tangled-appview; 6 6 + cfg = config.services.tangled.appview; 7 7 in 8 8 with lib; { 9 9 options = { 10 10 - services.tangled-appview = { 10 10 + services.tangled.appview = { 11 11 enable = mkOption { 12 12 type = types.bool; 13 13 default = false; ··· 25 25 environmentFile = mkOption { 26 26 type = with types; nullOr path; 27 27 default = null; 28 28 - example = "/etc/tangled-appview.env"; 28 28 + example = "/etc-/appview.env"; 29 29 description = '' 30 30 Additional environment file as defined in {manpage}`systemd.exec(5)`. 31 31 ··· 39 39 }; 40 40 41 41 config = mkIf cfg.enable { 42 42 - systemd.services.tangled-appview = { 42 42 + systemd.services.tangled.appview = { 43 43 description = "tangled appview service"; 44 44 wantedBy = ["multi-user.target"]; 45 45

+2 -2

nix/modules/knot.nix

reviewed

··· 4 4 lib, 5 5 ... 6 6 }: let 7 7 - cfg = config.services.tangled-knot; 7 7 + cfg = config.services.tangled.knot; 8 8 in 9 9 with lib; { 10 10 options = { 11 11 - services.tangled-knot = { 11 11 + services.tangled.knot = { 12 12 enable = mkOption { 13 13 type = types.bool; 14 14 default = false;

+2 -2

nix/modules/spindle.nix

reviewed

··· 3 3 lib, 4 4 ... 5 5 }: let 6 6 - cfg = config.services.tangled-spindle; 6 6 + cfg = config.services.tangled.spindle; 7 7 in 8 8 with lib; { 9 9 options = { 10 10 - services.tangled-spindle = { 10 10 + services.tangled.spindle = { 11 11 enable = mkOption { 12 12 type = types.bool; 13 13 default = false;

+6 -6

nix/vm.nix

reviewed

··· 73 73 time.timeZone = "Europe/London"; 74 74 services.getty.autologinUser = "root"; 75 75 environment.systemPackages = with pkgs; [curl vim git sqlite litecli]; 76 76 - services.tangled-knot = { 76 76 + services.tangled.knot = { 77 77 enable = true; 78 78 motd = "Welcome to the development knot!\n"; 79 79 server = { ··· 82 82 listenAddr = "0.0.0.0:6000"; 83 83 }; 84 84 }; 85 85 - services.tangled-spindle = { 85 85 + services.tangled.spindle = { 86 86 enable = true; 87 87 server = { 88 88 owner = envVar "TANGLED_VM_SPINDLE_OWNER"; ··· 99 99 users = { 100 100 # So we don't have to deal with permission clashing between 101 101 # blank disk VMs and existing state 102 102 - users.${config.services.tangled-knot.gitUser}.uid = 666; 103 103 - groups.${config.services.tangled-knot.gitUser}.gid = 666; 102 102 + users.${config.services.tangled.knot.gitUser}.uid = 666; 103 103 + groups.${config.services.tangled.knot.gitUser}.gid = 666; 104 104 105 105 # TODO: separate spindle user 106 106 }; ··· 120 120 serviceConfig.PermissionsStartOnly = true; 121 121 }; 122 122 in { 123 123 - knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled-knot.stateDir; 124 124 - spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled-spindle.server.dbPath); 123 123 + knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled.knot.stateDir; 124 124 + spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled.spindle.server.dbPath); 125 125 }; 126 126 }) 127 127 ];