diff --git a/home.nix b/home.nix index dc6654c..cb12ee6 100644 --- a/home.nix +++ b/home.nix @@ -23,6 +23,7 @@ luajit nodejs node2nix + cloudflared ] else []); file = {}; diff --git a/main.nix b/main.nix index 672ff12..20a45e6 100644 --- a/main.nix +++ b/main.nix @@ -14,6 +14,7 @@ ./modules/vscode-server.nix ./modules/copyparty.nix ./modules/searxng.nix + ./modules/cloudflared.nix ({ pkgs, ... }: { environment.systemPackages = with pkgs; [ @@ -27,7 +28,6 @@ ./modules/audio.nix ./modules/swap.nix ./modules/virtualisation.nix - ./modules/sshfs.nix #./modules/firefox.nix ]) ++ (if device == "laptop" then [ diff --git a/modules/cloudflared.nix b/modules/cloudflared.nix new file mode 100644 index 0000000..602e2ca --- /dev/null +++ b/modules/cloudflared.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: + +let + TUNNEL_UUID = "4118935e-359b-4dd2-95bd-eb27f7b0c5bb"; +in +{ + environment.systemPackages = [ pkgs.cloudflared ]; + + services.cloudflared = { + enable = true; + + tunnels."${TUNNEL_UUID}" = { + credentialsFile = "/home/bug/.cloudflared/${TUNNEL_UUID}.json"; + default = "http_status:404"; + + ingress = { + #"tv.bug.tools" = "http://127.0.0.1:8080"; + #"search.bug.tools" = "http://127.0.0.1:3000"; + "files2.bug.tools" = "http://127.0.0.1:3210"; + }; + }; + }; +} diff --git a/modules/cloudflare.nix b/modules/invidious.nix similarity index 100% rename from modules/cloudflare.nix rename to modules/invidious.nix diff --git a/modules/pihole.nix b/modules/pihole.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/sshfs.nix b/modules/sshfs.nix deleted file mode 100644 index 72de790..0000000 --- a/modules/sshfs.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, ... }: - -{ - boot.supportedFilesystems = [ "fuse.sshfs" ]; - environment.systemPackages = [ pkgs.sshfs ]; - - systemd.tmpfiles.rules = [ - "d /mnt/box 0755 root root -" - ]; - - fileSystems."/mnt/box" = { - device = "bug@box.bug.tools:/"; - fsType = "fuse.sshfs"; - options = [ - "identityfile=/home/bug/.ssh/id_ed25519" - "allow_other" - "x-systemd.automount" - "noauto" - "reconnect" - "ServerAliveInterval=15" - ]; - }; -} \ No newline at end of file diff --git a/modules/syncthing.nix b/modules/syncthing.nix index 3109c7f..9cd528d 100644 --- a/modules/syncthing.nix +++ b/modules/syncthing.nix @@ -57,6 +57,11 @@ path = "/home/bug/.ssh"; devices = ["desktop" "laptop" "server"]; }; + + "cloudflared" = { + path = "/home/bug/.cloudflared"; + devices = ["desktop" "laptop" "server"]; + }; }; }; };