diff --git a/bash-scripts b/bash-scripts index 5180bc8..283ef04 160000 --- a/bash-scripts +++ b/bash-scripts @@ -1 +1 @@ -Subproject commit 5180bc805ca9f138ec1a6a539d0eb92218794d8b +Subproject commit 283ef0417bc223103d188b4cd5e0cee88080675c diff --git a/config/media.nix b/config/media.nix index 0ba13f0..ef5e718 100644 --- a/config/media.nix +++ b/config/media.nix @@ -147,15 +147,15 @@ # Kiwix "kiwix.randomctf.com" = { - enableACME = true; - forceSSL = true; - extraConfig = '' access_log /var/log/nginx/access.kiwix.log; ''; locations."/".extraConfig = '' - allow 192.168.100.0/24; + allow 192.168.0.0/16; + allow 10.0.0.0/8; + allow 172.16.0.0/12; + allow 127.0.0.1; deny all; proxy_buffering off; diff --git a/flake.lock b/flake.lock index f3b2400..6700125 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -79,16 +79,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764604385, + "narHash": "sha256-ssKbRa5FLDX/Kc0dQFUWFRt35UfdNDQD6GxvamdhGQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "93488aad5d24df9131cbc0a25aa533dc866af473", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e731d6f..a52634b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "Configuration flake for RandomCTF"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; home = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -67,7 +67,7 @@ r330-media = mkNixosConfig "r330-media" [ ./config/media.nix ]; sampledb-dev = mkNixosConfig "sampledb-dev" [ ./config/sampledb.nix ]; r330-logging = mkNixosConfig "r330-logging" [ ./config/logging.nix ]; - mindforge = mkNixosUnstableConfig "mindforge" [ ./config/ai.nix ]; + mindforge = mkNixosConfig "mindforge" [ ./config/ai.nix ]; }; # Home-Manager Configurations @@ -86,7 +86,7 @@ media = mkHomeConfig "media" [ ./home/headless-nixos.nix ]; logging = mkHomeConfig "logging" [ ./home/headless-nixos.nix ]; - mindforge = mkHomeUnstableConfig "mindforge" [ ./home/headless-nixos.nix ]; + mindforge = mkHomeConfig "mindforge" [ ./home/headless-nixos.nix ]; }; }; }