adding gate + trying static hosting

kolyma-labs · Sep 19, 2024 · 463f1c5 · 463f1c5
1 parent 352f9e8
commit 463f1c5
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 67 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,6 +25,9 @@
 
     # Flake utils for eachSystem
     flake-utils.url = "github:numtide/flake-utils";
+
+    # Main homepage website
+    gate.url = "github:kolyma-labs/gate";
   };
 
   # In this context, outputs are mostly about getting home-manager what it
@@ -35,29 +38,34 @@
     , nixpkgs-unstable
     , home-manager
     , flake-utils
+    , gate
     , ...
     } @ inputs:
     let
       # Self instance pointer
       outputs = self;
 
-      afes = flake-utils.lib.eachDefaultSystem (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        # Nixpkgs packages for the current system
-        {
-          # Your custom packages
-          # Acessible through 'nix build', 'nix shell', etc
-          packages = import ./pkgs { inherit pkgs; };
-
-          # Formatter for your nix files, available through 'nix fmt'
-          # Other options beside 'alejandra' include 'nixpkgs-fmt'
-          formatter = pkgs.nixpkgs-fmt;
-
-          # Development shells
-          devShells.default = import ./shell.nix { inherit pkgs; };
-        });
+      afes = flake-utils.lib.eachDefaultSystem
+        (system:
+          let
+            # Packages for the current <arch>
+            pkgs = nixpkgs.legacyPackages.${system};
+          in
+          # Nixpkgs packages for the current system
+          {
+            # Your custom packages
+            # Acessible through 'nix build', 'nix shell', etc
+            packages = import ./pkgs {
+              inherit pkgs;
+            };
+
+            # Formatter for your nix files, available through 'nix fmt'
+            # Other options beside 'alejandra' include 'nixpkgs-fmt'
+            formatter = pkgs.nixpkgs-fmt;
+
+            # Development shells
+            devShells.default = import ./shell.nix { inherit pkgs; };
+          });
 
       afse = {
         # Nixpkgs and Home-Manager helpful functions

diff --git a/modules/home/nixpkgs/default.nix b/modules/home/nixpkgs/default.nix
@@ -7,6 +7,7 @@
         outputs.overlays.additions
         outputs.overlays.modifications
         outputs.overlays.unstable-packages
+        outputs.overlays.personal-packages
 
         # You can also add overlays exported from other flakes:
         # neovim-nightly-overlay.overlays.default

diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix
@@ -13,6 +13,7 @@
         outputs.overlays.additions
         outputs.overlays.modifications
         outputs.overlays.unstable-packages
+        outputs.overlays.personal-packages
 
         # You can also add overlays exported from other flakes:
         # neovim-nightly-overlay.overlays.default

diff --git a/modules/server/caddy/kolyma-1.nix b/modules/server/caddy/kolyma-1.nix
@@ -1,6 +1,7 @@
 { config
 , lib
 , pkgs
+, inputs
 , ...
 }: {
   config = {
@@ -19,7 +20,8 @@
             "http://2a01:4f8:161:714c::"
           ];
           extraConfig = ''
-            reverse_proxy 127.0.0.1:8440
+            root * ${pkgs.personal.gate}/www
+            file_server
           '';
         };
 

diff --git a/modules/server/container/kolyma-1.nix b/modules/server/container/kolyma-1.nix
@@ -9,16 +9,6 @@
   ];
 
   virtualisation.oci-containers.containers = {
-    #  _       __     __         _ __
-    # | |     / /__  / /_  _____(_) /____
-    # | | /| / / _ \/ __ \/ ___/ / __/ _ \
-    # | |/ |/ /  __/ /_/ (__  ) / /_/  __/
-    # |__/|__/\___/_.___/____/_/\__/\___/
-    website = {
-      image = "ghcr.io/kolyma-labs/gate:3014ffb25d3e15351d5c70afe0ef2f00242cc14c294aaf0facc2741041de30fb";
-      ports = [ "8440:80" ];
-    };
-
     #    _______ __     ____
     #   / ____(_) /_   / __ \__  ______  ____  ___  _____
     #  / / __/ / __/  / /_/ / / / / __ \/ __ \/ _ \/ ___/

diff --git a/modules/server/container/kolyma-2.nix b/modules/server/container/kolyma-2.nix
@@ -9,16 +9,6 @@
   ];
 
   virtualisation.oci-containers.containers = {
-    #  _       __     __         _ __
-    # | |     / /__  / /_  _____(_) /____
-    # | | /| / / _ \/ __ \/ ___/ / __/ _ \
-    # | |/ |/ /  __/ /_/ (__  ) / /_/  __/
-    # |__/|__/\___/_.___/____/_/\__/\___/
-    website = {
-      image = "ghcr.io/kolyma-labs/gate:3014ffb25d3e15351d5c70afe0ef2f00242cc14c294aaf0facc2741041de30fb";
-      ports = [ "8440:80" ];
-    };
-
     #    _______ __  __          __
     #   / ____(_) /_/ /   ____ _/ /_
     #  / / __/ / __/ /   / __ `/ __ \

diff --git a/modules/server/container/kolyma-3.nix b/modules/server/container/kolyma-3.nix
@@ -9,16 +9,6 @@
   ];
 
   virtualisation.oci-containers.containers = {
-    #  _       __     __         _ __
-    # | |     / /__  / /_  _____(_) /____
-    # | | /| / / _ \/ __ \/ ___/ / __/ _ \
-    # | |/ |/ /  __/ /_/ (__  ) / /_/  __/
-    # |__/|__/\___/_.___/____/_/\__/\___/
-    website = {
-      image = "ghcr.io/kolyma-labs/gate@sha256:3014ffb25d3e15351d5c70afe0ef2f00242cc14c294aaf0facc2741041de30fb";
-      ports = [ "8440:80" ];
-    };
-
     khakimovs = {
       image = "ghcr.io/khakimovs/website@sha256:87827e103623f301dff0b55dfea34ee9a841c5a5718a065b777a1e2d730db494";
       ports = [ "8441:3000" ];

diff --git a/modules/server/container/kolyma-4.nix b/modules/server/container/kolyma-4.nix
@@ -8,21 +8,9 @@
     outputs.nixosModules.docker
   ];
 
-  virtualisation.oci-containers.containers = {
-    #  _       __     __         _ __
-    # | |     / /__  / /_  _____(_) /____
-    # | | /| / / _ \/ __ \/ ___/ / __/ _ \
-    # | |/ |/ /  __/ /_/ (__  ) / /_/  __/
-    # |__/|__/\___/_.___/____/_/\__/\___/
-    website = {
-      image = "ghcr.io/kolyma-labs/gate@sha256:3014ffb25d3e15351d5c70afe0ef2f00242cc14c294aaf0facc2741041de30fb";
-      ports = [ "8440:80" ];
-    };
-  };
+  virtualisation.oci-containers.containers = { };
 
   # Necessary firewall rules for docker containers
-  # networking.firewall.allowedUDPPorts = [
-  # ];
-  # networking.firewall.allowedTCPPorts = [
-  # ];
+  networking.firewall.allowedUDPPorts = [ ];
+  networking.firewall.allowedTCPPorts = [ ];
 }
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -3,6 +3,13 @@
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: _prev: import ../pkgs { pkgs = final; };
 
+  # Make input added packages accesible via pkgs
+  personal-packages = final: _prev: rec {
+    personal = {
+      gate = inputs.gate.packages."${final.system}".default;
+    };
+  };
+
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays