diff --git a/configuration.nix b/configuration.nix index 87e011d..df0f4e0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,12 +5,11 @@ { config, pkgs, ... }: { - imports = - [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ./modules/ - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ./modules + ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -73,7 +72,10 @@ users.users.greg = { isNormalUser = true; description = "Greg Hellings"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + ]; packages = with pkgs; [ firefox # thunderbird diff --git a/hosts/icdm-root/wiki.nix b/hosts/icdm-root/wiki.nix index 719f20a..e6a793a 100644 --- a/hosts/icdm-root/wiki.nix +++ b/hosts/icdm-root/wiki.nix @@ -1,11 +1,7 @@ -{ pkgs, ... }: +{ ... }: let wikiHost = "wiki.icdm.lan"; kiwixport = 8080; - dependents = with pkgs; [ - enwiki-dump - transmission - ]; in { services.kiwix-serve = { @@ -14,18 +10,6 @@ in path = "/srv/zims/*.zim"; }; - services.transmission = { - enable = true; - settings = { - download-dir = "/srv"; - incomplete-dir = "/srv/incomplete"; - rpc-bind-address = "0.0.0.0"; - rpc-whitelist = "10.42.*,127.*,localhost"; - }; - }; - greg.proxies."${wikiHost}".target = "http://localhost:${toString kiwixport}"; networking.firewall.allowedTCPPorts = [ 80 ]; - - environment.systemPackages = dependents; } diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index 8a546aa..44b1300 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -47,7 +47,7 @@ [ # for Immersed cudatoolkit - immersed-vr + immersed libva ] [ diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix index e6babe1..928ffcf 100644 --- a/hosts/myself/container-git.nix +++ b/hosts/myself/container-git.nix @@ -216,6 +216,7 @@ in systemd.services = { nginx = rec { after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; wants = after; serviceConfig = { RestartMaxDelaySec = "30s"; diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index 29633af..c5b2c7e 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -45,7 +45,10 @@ in age.secrets.runner-reg.file = ../../secrets/gitlab/myself-podman-runner-reg.age; age.secrets.docker-auth.file = ../../secrets/gitlab/docker-auth.age; age.secrets.runner-qemu.file = ../../secrets/gitlab/myself-qemu-runner-reg.age; - systemd.services.gitlab-runner.after = [ "network-online.target" ]; + systemd.services.gitlab-runner = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + }; services.gitlab-runner = { enable = true; settings = { @@ -54,7 +57,7 @@ in services = { default = { executor = "docker"; - registrationConfigFile = config.age.secrets.runner-reg.path; + authenticationTokenConfigFile = config.age.secrets.runner-reg.path; dockerImage = "gitlab.shire-zebra.ts.net:5000/greg/ci-images/fedora:latest"; dockerAllowedImages = [ "alpine:*" @@ -81,7 +84,7 @@ in qemu = { executor = "shell"; limit = 5; - registrationConfigFile = config.age.secrets.runner-qemu.path; + authenticationTokenConfigFile = config.age.secrets.runner-qemu.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; STORAGE_URL = "http://s3.thehellings.lan:9000"; diff --git a/pkgs/zim/updater.go b/pkgs/zim/updater.go index 9eb4688..3a71293 100644 --- a/pkgs/zim/updater.go +++ b/pkgs/zim/updater.go @@ -23,6 +23,7 @@ func getTypes() []string { "wikibooks", "gutenberg", "phet", + "ted", } } diff --git a/shells.nix b/shells.nix index 56ff6bf..19e103f 100644 --- a/shells.nix +++ b/shells.nix @@ -1,12 +1,19 @@ -{ self', pkgs, nixvimunstable, ... }: +{ + self', + pkgs, + nixvimunstable, + ... +}: let system = pkgs.system; - vim = (nixvimunstable.legacyPackages.${system}.makeNixvim - (import ./home/modules/baseline/vim/config.nix { - inherit pkgs; - inherit (pkgs) lib; - config.nixpkgs.config.allowUnfree = false; # I have tried to allow it, but I don't seem able to do so - }) + vim = ( + nixvimunstable.legacyPackages.${system}.makeNixvim ( + import ./home/modules/baseline/vim/config.nix { + inherit pkgs; + inherit (pkgs) lib; + config.nixpkgs.config.allowUnfree = false; # I have tried to allow it, but I don't seem able to do so + } + ) ); in {