From 1ea5aeab926470c75d7f5d680eaafc77ec131fc7 Mon Sep 17 00:00:00 2001 From: Henri Dohmen Date: Sat, 4 Apr 2026 15:00:10 +0200 Subject: [PATCH] minor improvements --- flake.nix | 8 +------- host/roam/networking.nix | 2 +- host/roam/torrent.nix | 2 +- mod/desktop/default.nix | 2 +- mod/desktop/syncthing.nix | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index a9ad015..7c93e1f 100644 --- a/flake.nix +++ b/flake.nix @@ -101,13 +101,7 @@ }; }; in - lib.listToAttrs ( - map mkDesktop [ - "solo" - "c2" - "fw" - ] - ) + lib.listToAttrs (map mkDesktop var.desktops) // { "test-vm" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/host/roam/networking.nix b/host/roam/networking.nix index 8b780e8..483c161 100644 --- a/host/roam/networking.nix +++ b/host/roam/networking.nix @@ -55,7 +55,7 @@ in firewall.allowedUDPPorts = [ wireguard-port ]; localCommands = '' - ip route add default dev mullvad table 1000 + ip route replace default dev mullvad table 1000 ''; wireguard = { diff --git a/host/roam/torrent.nix b/host/roam/torrent.nix index 35e28df..aec9f08 100644 --- a/host/roam/torrent.nix +++ b/host/roam/torrent.nix @@ -24,7 +24,7 @@ in services.nginx.privateVirtualHosts."qbt.lan" = { locations."/" = { - proxyPass = "http://192.168.100.11:8080"; + proxyPass = "http://${containerIp}:8080"; }; }; diff --git a/mod/desktop/default.nix b/mod/desktop/default.nix index 60bdfe6..1d75064 100644 --- a/mod/desktop/default.nix +++ b/mod/desktop/default.nix @@ -10,7 +10,7 @@ let mkOption { type = types.bool; default = of; - description = "Enables" ++ name; + description = "Enables " + name; }; mkDesktopOption = mkSubOption config.hd.desktop.enable; in diff --git a/mod/desktop/syncthing.nix b/mod/desktop/syncthing.nix index 0275847..b390325 100644 --- a/mod/desktop/syncthing.nix +++ b/mod/desktop/syncthing.nix @@ -13,7 +13,7 @@ lib.mkIf config.hd.desktop.syncthing.enable { path = "/home/hd/Sync"; type = "sendreceive"; }; - supernote-note = rec { + supernote-note = { id = "supernote-note"; path = "/home/hd/Sync/Dokumente/Supernote/Notizen"; type = "sendreceive";