diff --git a/machines/solis/configuration.nix b/machines/solis/configuration.nix index 1bd1566..b16590f 100644 --- a/machines/solis/configuration.nix +++ b/machines/solis/configuration.nix @@ -8,4 +8,6 @@ horseman.stateVersion = "24.11"; networking.hostName = "solis"; + + networking.firewall.allowedTCPPorts = [3000 3001]; } diff --git a/modules/containers/forgejo.nix b/modules/containers/forgejo.nix index 41da5bd..51bdb1a 100644 --- a/modules/containers/forgejo.nix +++ b/modules/containers/forgejo.nix @@ -1,4 +1,6 @@ { + inputs, + outputs, lib, config, pkgs, @@ -21,7 +23,7 @@ in { }; sshPort = mkOption { - default = 16718; + default = 34916; type = types.int; }; diff --git a/modules/containers/nginx.nix b/modules/containers/nginx.nix index fe9283d..4a2d81b 100644 --- a/modules/containers/nginx.nix +++ b/modules/containers/nginx.nix @@ -27,14 +27,10 @@ in { services.nginx = { enable = true; - # forwards SSH traffic to the git instance - streamConfig = let - port = toString config.horseman.containers.forgejo.sshPort; - addr = config.containers.forgejo.localAddress; - in '' + streamConfig = '' server { - listen ${port}; - proxy_pass ${addr}:${port}; + listen ${toString config.horseman.containers.forgejo.sshPort}; + proxy_pass ${config.containers.forgejo.localAddress}:${toString config.horseman.containers.forgejo.sshPort}; } ''; diff --git a/modules/wm/hyprland/waybar.nix b/modules/wm/hyprland/waybar.nix index a5db4ac..4a822ea 100644 --- a/modules/wm/hyprland/waybar.nix +++ b/modules/wm/hyprland/waybar.nix @@ -88,12 +88,12 @@ in { }; "cpu" = { - interval = 1; + interval = 3; on-click = "kitty btop &"; }; "memory" = { - interval = 1; + interval = 3; on-click = "kitty btop &"; }; @@ -102,7 +102,7 @@ in { }; "network" = { - interval = 1; + interval = 3; tooltip-format = " {bandwidthDownBits} , {bandwidthDownBits} "; tooltip-format-wifi = "{essid}:  {bandwidthDownBits} , {bandwidthDownBits} "; @@ -110,7 +110,7 @@ in { }; "battery" = { - interval = 1; + interval = 3; format-icons = ["󰁻" "󰁽" "󰁿" "󰂁" "󰁹"]; states = { critical = 15;