diff --git a/flake.nix b/flake.nix index c7afbeb..c987dbf 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ useGlobalPkgs = true; useUserPackages = true; users = { - nixos = import ./home/nixos/home.nix; + katkak = import ./home/katkak/home.nix; }; }; } @@ -62,7 +62,7 @@ useGlobalPkgs = true; useUserPackages = true; users = { - nixos = import ./home/nixos/home.nix; + katkak = import ./home/katkak/home.nix; }; }; } diff --git a/home/nixos/home.nix b/home/katkak/home.nix similarity index 100% rename from home/nixos/home.nix rename to home/katkak/home.nix diff --git a/hosts/shared/default.nix b/hosts/shared/default.nix index 4ceec56..d34405f 100644 --- a/hosts/shared/default.nix +++ b/hosts/shared/default.nix @@ -18,7 +18,7 @@ tmux ]; - users.users."nixos" = { + users.users."katkak" = { isNormalUser = true; extraGroups = [ "wheel" ]; }; @@ -34,8 +34,6 @@ networking = { firewall = { enable = true; - - allowedTCPPorts = [ 22 ]; }; }; @@ -52,6 +50,8 @@ "nix-command" "flakes" ]; + + trusted-users = [ "katkak" ]; }; gc = { diff --git a/hosts/wsl/configuration.nix b/hosts/wsl/configuration.nix index 45bc997..264103d 100644 --- a/hosts/wsl/configuration.nix +++ b/hosts/wsl/configuration.nix @@ -14,6 +14,6 @@ wsl = { enable = true; - defaultUser = "nixos"; + defaultUser = "katkak"; }; } diff --git a/modules/fail2ban/default.nix b/modules/fail2ban/default.nix index da31c9b..146c4d3 100644 --- a/modules/fail2ban/default.nix +++ b/modules/fail2ban/default.nix @@ -2,6 +2,10 @@ { services.fail2ban = { enable = true; + + ignoreIP = [ + "192.168.0.0/16" + ]; }; } diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 9aa69d3..95638dc 100644 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -9,7 +9,7 @@ ''; locations."/" = { - proxyPass = "http://${toString config.services.forgejo.settings.server.ROOT_URL}:${toString config.services.forgejo.settings.server.HTTP_PORT}"; + proxyPass = "http://localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}"; proxyWebsockets = true; @@ -29,7 +29,7 @@ settings = { server = { DOMAIN = "git.katkak.dev"; - ROOT_URL = "127.0.0.1"; + ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}/"; HTTP_PORT = 3000; };