diff options
| -rw-r--r-- | profiles/homeserver/radicale.nix | 1 | ||||
| -rw-r--r-- | profiles/homeserver/tailscale.nix | 1 | ||||
| -rw-r--r-- | profiles/homeserver/transmission.nix | 8 | ||||
| -rw-r--r-- | profiles/netboot/system.nix | 44 | ||||
| -rw-r--r-- | profiles/station/caldav.nix | 4 |
5 files changed, 36 insertions, 22 deletions
diff --git a/profiles/homeserver/radicale.nix b/profiles/homeserver/radicale.nix index 6f07245..fd2d985 100644 --- a/profiles/homeserver/radicale.nix +++ b/profiles/homeserver/radicale.nix @@ -9,5 +9,6 @@ services.radicale = { enable = true; settings.server.hosts = [ "0.0.0.0:5232" ]; + settings.storage.filesystem_folder = "/data/radicale/collections"; }; } diff --git a/profiles/homeserver/tailscale.nix b/profiles/homeserver/tailscale.nix index 0fb821f..1f47960 100644 --- a/profiles/homeserver/tailscale.nix +++ b/profiles/homeserver/tailscale.nix @@ -4,6 +4,7 @@ enable = true; useRoutingFeatures = "server"; extraUpFlags = ["--advertise-exit-node" "--advertise-routes=${builtins.head machine.ipv4}/32"]; + extraDaemonFlags = ["--statedir=/data/tailscaled"]; authKeyFile = config.secrets.tailscale.path; }; diff --git a/profiles/homeserver/transmission.nix b/profiles/homeserver/transmission.nix index 4be0d1b..7f4c031 100644 --- a/profiles/homeserver/transmission.nix +++ b/profiles/homeserver/transmission.nix @@ -45,14 +45,6 @@ "jellyfin.${my.domain}" = { locations."/" = { proxyPass = "http://127.0.0.1:8096"; }; }; }; }; - # services = { - # jellyfin = { enable = true; group = "multimedia"; }; - # sonarr = { enable = true; group = "multimedia"; }; - # radarr = { enable = true; group = "multimedia"; }; - # bazarr = { enable = true; group = "multimedia"; }; - # readarr = { enable = true; group = "multimedia"; }; - # prowlarr = { enable = true; }; - # }; virtualisation.oci-containers = { backend = "docker"; containers = { diff --git a/profiles/netboot/system.nix b/profiles/netboot/system.nix index b0e7945..7dfa6d5 100644 --- a/profiles/netboot/system.nix +++ b/profiles/netboot/system.nix @@ -1,29 +1,49 @@ +# sys: { pkgs, lib, ... }: let +# run-pixiecore = let +# build = sys.config.system.build; +# in pkgs.writeShellApplication { +# name = "run-pixiecore"; +# text = '' +# sudo ${pkgs.pixiecore}/bin/pixiecore \ +# boot kernel/bzImage initrd/initrd \ +# --cmdline "init=init/init loglevel=4" \ +# --debug --dhcp-no-bind \ +# --port 64172 --status-port 64172 "$@" +# ''; +# }; +# build-pixie = pkgs.writeShellApplication { +# name = "build-pixie"; +# text = '' +# nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel +# nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init +# nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd +# ''; +# }; +# in { +# networking.firewall.allowedUDPPorts = [ 67 69 4011 ]; +# networking.firewall.allowedTCPPorts = [ 64172 ]; +# environment.systemPackages = [ +# run-pixiecore +# build-pixie +# ]; +# } sys: { pkgs, lib, ... }: let run-pixiecore = let build = sys.config.system.build; in pkgs.writeShellApplication { name = "run-pixiecore"; text = '' - sudo ${pkgs.pixiecore}/bin/pixiecore \ - boot kernel/bzImage initrd/initrd \ - --cmdline "init=init/init loglevel=4" \ + exec ${pkgs.pixiecore}/bin/pixiecore \ + boot ${build.kernel}/bzImage ${build.netbootRamdisk}/initrd \ + --cmdline "init=${build.toplevel}/init loglevel=4" \ --debug --dhcp-no-bind \ --port 64172 --status-port 64172 "$@" ''; }; - build-pixie = pkgs.writeShellApplication { - name = "build-pixie"; - text = '' - nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel - nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init - nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd - ''; - }; in { networking.firewall.allowedUDPPorts = [ 67 69 4011 ]; networking.firewall.allowedTCPPorts = [ 64172 ]; environment.systemPackages = [ run-pixiecore - build-pixie ]; } diff --git a/profiles/station/caldav.nix b/profiles/station/caldav.nix index 98674e4..16397d6 100644 --- a/profiles/station/caldav.nix +++ b/profiles/station/caldav.nix @@ -27,7 +27,7 @@ type = "caldav"; url = "https://cal.${my.domain}"; userName = "mike"; - passwordCommand = ["echo" "''"]; + passwordCommand = ["${pkgs.bashInteractive}/bin/bash" "-c" "echo 'hi'"]; }; vdirsyncer = { enable = true; @@ -52,7 +52,7 @@ type = "carddav"; url = "https://cal.${my.domain}"; userName = "mike"; - passwordCommand = ["echo" "''"]; + passwordCommand = ["${pkgs.bashInteractive}/bin/bash" "-c" "echo 'hi'"]; }; vdirsyncer = { enable = true; |