diff --git a/modules/nixos/apps/zen-browser/default.nix b/modules/nixos/apps/zen-browser/default.nix index 35f4905..358a2df 100644 --- a/modules/nixos/apps/zen-browser/default.nix +++ b/modules/nixos/apps/zen-browser/default.nix @@ -23,10 +23,7 @@ in zenbrowser ]; - environment.sessionVariables = { - DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; - BROWSER = "zen-beta"; - }; + environment.sessionVariables.DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; environment.etc = { "1password/custom_allowed_browsers" = { diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index a8f80d2..105641a 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -56,7 +56,7 @@ in users = [ "root" config.${namespace}.user.name - ] ++ optional config.services.hydra.enable "hydra hydra-www hydra-evaluator hydra-queue-runner"; + ] ++ optional config.services.hydra.enable "hydra hydra-evaluator hydra-queue-runner"; in { package = cfg.package; diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix index 785d616..71128ae 100644 --- a/systems/x86_64-linux/loptland/default.nix +++ b/systems/x86_64-linux/loptland/default.nix @@ -143,29 +143,12 @@ in certificateScheme = "acme-nginx"; }; - nix = { - distributedBuilds = true; - - buildMachines = [ - { - hostName = "localhost"; - protocol = null; - system = "x86_64-linux"; - supportedFeatures = [ - "kvm" - "nixos-test" - "big-parallel" - "benchmark" - ]; - } - ]; - }; - services.hydra = { enable = true; hydraURL = "http://localhost:${toString hydraPort}"; port = hydraPort; notificationSender = "hydra@localhost"; + buildMachinesFiles = [ ]; useSubstitutes = true; }; diff --git a/systems/x86_64-linux/loptland/index.html b/systems/x86_64-linux/loptland/index.html new file mode 100644 index 0000000..4b53624 --- /dev/null +++ b/systems/x86_64-linux/loptland/index.html @@ -0,0 +1,154 @@ + + + +
+ + +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +
+ +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. + Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +
+ + +