Enable brotli

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>

configuration.nix

@@ -1,67 +1,148 @@
-{ pkgs, system, builders, ... }: {
+{ pkgs, system, blog, web-files, Scylla, ... }:
-  imports = [
+let
-    ./hardware-configuration.nix
+  productionSite = blog.english {
-    ./networking.nix # generated at runtime by nixos-infect
+    ssl = true;
-    ./goaccess.nix
+    host = "danilafe.com";
-  ];
-
-  nix = {
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
   };
-
+  draftSite = blog.english {
-  environment.systemPackages = with pkgs; [
+    drafts = true;
-    git
+    host = "drafts.danilafe.com";
-  ];
-
-  boot.cleanTmpDir = true;
-  networking.hostName = "nixos-droplet-v2";
-  networking.firewall.allowPing = true;
-  networking.firewall.allowedTCPPorts = [ 22 80 443 ];
-
-  services.openssh.enable = true;
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXYJZfEOgccfCa3uQV9z2rHvGn4AuVnXbIDXv27HgEk vanilla@arch-xps" 
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOzk0SnRBJhpfNpPBgkReQoDpul2Egl2yJhRw7ldYEzF NixOS" 
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAoyFSuik6XRU2b+O4v9C1bc7rKJyjKgzUeaBaVNQKN6 vanilla-pinebook"
-  ];
-
-  users.groups.www = {};
-  services.nginx.group = "www";
-
-  services.goaccess = {
-    enable = false;
-    user = "goaccess";
-    group = "www";
-    dir = "/var/www/goaccess";
-    host = "dash.danilafe.com";
   };
-
+  webFiles = {
-  services.danilafe-blog = {
+    "static.danilafe.com" = {
-    enable = true;
+      root = web-files;
-    challengePath = "/var/www/challenges";
+      forceSSL = true;
-    sites = [
+      enableACME = true;
-      (builders.english {
+      locations."/" = {
-        ssl = true;
+        extraConfig = ''
-        host = "danilafe.com";
+          add_header 'Access-Control-Allow-Origin' '*';
-      })
+	'';
-      (builders.english {
+      };
-        drafts = true;
+    };
-        host = "drafts.danilafe.com";
+  };
-      })
+  gitea = {
-      (builders.russian {
+    "dev.danilafe.com" = {
-        drafts = true;
+      forceSSL = true;
-        host = "drafts.ru.danilafe.com";
+      enableACME = true;
-      })
+      locations."/".proxyPass = "http://localhost:3000/";
+    };
+  };
+  scylla = {
+    "scylla.danilafe.com" = {
+      root = Scylla;
+      addSSL = true;
+      enableACME = true;
+      locations."/static/" = {
+        tryFiles = "$uri =404";
+      };
+      locations."/" = {
+        tryFiles = "$uri $uri/ /index.html";
+      };
+    };
+  };
+  allVirtualHosts = [scylla gitea webFiles] ++ map blog.virtualHostFor [productionSite draftSite];
+in
+  {
+    imports = [
+      ./hardware-configuration.nix
+      ./networking.nix # generated at runtime by nixos-infect
     ];
-  };
 
-  users.defaultUserShell = pkgs.zsh;
+    system.stateVersion = "24.05";
-  programs.zsh.enable = true;
+
-  programs.zsh.ohMyZsh = {
+    nix = {
-    enable = true;
+      package = pkgs.nixVersions.latest;
-    plugins = [ "git" ];
+      extraOptions = ''
-  };
+        experimental-features = nix-command flakes
-}
+      '';
+    };
+
+    environment.systemPackages = with pkgs; [
+      git
+    ];
+
+    boot.tmp.cleanOnBoot = true;
+    networking.hostName = "nixos-droplet-v2";
+    networking.firewall.allowPing = true;
+    networking.firewall.allowedTCPPorts = [ 22 80 443 ];
+
+    users.groups.daniel = {};
+    users.users.daniel = {
+      isNormalUser = true;
+      group = "daniel";
+      extraGroups = [ "wheel" ];
+      packages = with pkgs; [
+        neovim
+      ];
+    };
+    security.sudo.wheelNeedsPassword = false;
+
+    services.openssh.enable = true;
+    users.users.daniel.openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXYJZfEOgccfCa3uQV9z2rHvGn4AuVnXbIDXv27HgEk vanilla@arch-xps" 
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOzk0SnRBJhpfNpPBgkReQoDpul2Egl2yJhRw7ldYEzF NixOS" 
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAoyFSuik6XRU2b+O4v9C1bc7rKJyjKgzUeaBaVNQKN6 vanilla-pinebook"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjTgUFIwo/mtoB1kyj1zJ4QxAwLAgdvvePGXmLqjeY1 vanilla@Daniels-MBP.home"
+    ];
+
+    security.acme = {
+      defaults.email = "danila.fedorin@gmail.com";
+      acceptTerms = true;
+    };
+
+    users.groups.www = {};
+    services.nginx = {
+      enable = true;
+      recommendedGzipSettings = true;
+      recommendedBrotliSettings = true;
+      recommendedProxySettings = true;
+      virtualHosts = pkgs.lib.mkMerge allVirtualHosts;
+    };
+
+    users.groups.gitea = {};
+    users.users.gitea = {
+      group = "gitea";
+      isSystemUser = true;
+    };
+    services.gitea = {
+      enable = true;
+      appName = "Daniel's Tiny Cup Of Tea";
+      stateDir = "/var/lib/gitea";
+
+      # Default database settings (sqlite3, 127.0.0.1, path) all what we want
+      database = {};
+
+      # Default server settings are fine, except we need to customize domain etc.
+      settings.server = {
+        DOMAIN = "dev.danilafe.com";
+        ROOT_URL = "https://dev.danilafe.com";
+        OFFLINE_MODE = false;
+	# STATIC_ROOT_PATH = "/var/lib/gitea/data";
+      };
+
+      settings.service = {
+        DISABLE_REGISTRATION = true;
+      };
+
+      # NixOS service overrides cookies to insecure, but Gitea default is secure
+      settings.session = {
+        COOKIE_SECURE = true;
+        PROVIDER = "file";
+      };
+
+      settings.security = {
+        INSTALL_LOCK = true;
+      };
+
+      settings.indexer = {
+        REPO_INDEXER_ENABLED = true;
+      };
+    };
+
+    users.defaultUserShell = pkgs.zsh;
+    programs.zsh.enable = true;
+    programs.zsh.ohMyZsh = {
+      enable = true;
+      plugins = [ "git" ];
+    };
+  }

flake.lock

@@ -1,35 +1,105 @@
 {
   "nodes": {
-    "blog": {
+    "Scylla": {
       "inputs": {
-        "blog-source": "blog-source",
-        "blog-source-localized": "blog-source-localized",
         "flake-utils": "flake-utils",
-        "katex-html": "katex-html",
+        "nixpkgs": [
-        "nixpkgs": "nixpkgs_3"
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1648508788,
+        "lastModified": 1766862133,
-        "narHash": "sha256-zjrJmIagGjSoYTTwH2MaqiEusblZ9C+dDC7Hwb9gYq8=",
+        "narHash": "sha256-//tElNDA44kTCRNS8MzBdXA4uCwEfLHI/NVw9PtmLDs=",
-        "ref": "master",
+        "ref": "refs/heads/master",
-        "rev": "f2bb36b862b7c730c42abb0b759ddd3c1c4f3d4b",
+        "rev": "38968c3247945ba99718d7564163f8bf685756c5",
-        "revCount": 102,
+        "revCount": 168,
         "type": "git",
-        "url": "https://dev.danilafe.com/DanilaFe/blog-static-flake"
+        "url": "https://dev.danilafe.com/Matrix-Programs/Scylla.git"
       },
       "original": {
         "type": "git",
-        "url": "https://dev.danilafe.com/DanilaFe/blog-static-flake"
+        "url": "https://dev.danilafe.com/Matrix-Programs/Scylla.git"
+      }
+    },
+    "bergamot-elm": {
+      "inputs": {
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": [
+          "blog",
+          "web-files",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766788208,
+        "narHash": "sha256-/P3uz+VNeNOFzI2qSIijy53MpnejO1sWgB+gMqcI2z0=",
+        "ref": "main",
+        "rev": "ceca48840efe668fb033b47bc6e415ea4cf9ae85",
+        "revCount": 97,
+        "type": "git",
+        "url": "https://dev.danilafe.com/Everything-I-Know-About-Types/bergamot-elm.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://dev.danilafe.com/Everything-I-Know-About-Types/bergamot-elm.git"
+      }
+    },
+    "bergamot-elm_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": [
+          "web-files",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766788208,
+        "narHash": "sha256-/P3uz+VNeNOFzI2qSIijy53MpnejO1sWgB+gMqcI2z0=",
+        "ref": "main",
+        "rev": "ceca48840efe668fb033b47bc6e415ea4cf9ae85",
+        "revCount": 97,
+        "type": "git",
+        "url": "https://dev.danilafe.com/Everything-I-Know-About-Types/bergamot-elm.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://dev.danilafe.com/Everything-I-Know-About-Types/bergamot-elm.git"
+      }
+    },
+    "blog": {
+      "inputs": {
+        "blog-source": "blog-source",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "resume": "resume",
+        "web-files": "web-files"
+      },
+      "locked": {
+        "lastModified": 1767492562,
+        "narHash": "sha256-kmiIK8DybOUh9IQUFWIimGBogoouNDIUsgSF4m88Giw=",
+        "ref": "refs/heads/master",
+        "rev": "b469d78d1abb031d6ee710481c8591e037d2b44b",
+        "revCount": 225,
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/blog-static-flake.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/blog-static-flake.git"
       }
     },
     "blog-source": {
       "flake": false,
       "locked": {
-        "lastModified": 1648508215,
+        "lastModified": 1767492531,
-        "narHash": "sha256-H8rF4vpzeNw6Pg/hMtF45UFSm/cHN9HIalDrz+mfpC8=",
+        "narHash": "sha256-129XwekGf9FULizZzS/HfxF12QQHrGeCWYGeCx3uZOg=",
-        "ref": "master",
+        "ref": "refs/heads/master",
-        "rev": "f044082fa53b72a5b8386e42a200ddb8072c7a90",
+        "rev": "a6f3cd3f9ad58c73585dce0fda50e60d8e2194dc",
-        "revCount": 560,
+        "revCount": 925,
         "submodules": true,
         "type": "git",
         "url": "https://dev.danilafe.com/Web-Projects/blog-static.git"
@@ -40,32 +110,16 @@
         "url": "https://dev.danilafe.com/Web-Projects/blog-static.git"
       }
     },
-    "blog-source-localized": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1599463261,
-        "narHash": "sha256-n6e4uRiOsWuOL7DSzbuP9X8cZNLnKOD/2/eOT0aB+Io=",
-        "ref": "localization",
-        "rev": "0b5748cc5a19b5d1d78bfcfa58d4027cc10524dd",
-        "revCount": 367,
-        "submodules": true,
-        "type": "git",
-        "url": "https://dev.danilafe.com/Web-Projects/blog-static.git"
-      },
-      "original": {
-        "ref": "localization",
-        "submodules": true,
-        "type": "git",
-        "url": "https://dev.danilafe.com/Web-Projects/blog-static.git"
-      }
-    },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1648297722,
+        "lastModified": 1731533236,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -75,12 +129,15 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1648297722,
+        "lastModified": 1731533236,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -90,12 +147,15 @@
       }
     },
     "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
       "locked": {
-        "lastModified": 1648297722,
+        "lastModified": 1731533236,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -104,110 +164,272 @@
         "type": "github"
       }
     },
-    "katex-html": {
+    "flake-utils_4": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "systems": "systems_4"
-        "katex-server": "katex-server",
-        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1648445866,
+        "lastModified": 1731533236,
-        "narHash": "sha256-kLqnZXRxmlk3cSx8fA6dvrAVrqOGLzxboPnP5zQ7SQU=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "ref": "master",
+        "owner": "numtide",
-        "rev": "dfc582d367ebda79649d339d1edc5476eb0cf954",
+        "repo": "flake-utils",
-        "revCount": 13,
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "git",
+        "type": "github"
-        "url": "https://dev.danilafe.com/Nix-Configs/katex-html"
       },
       "original": {
-        "type": "git",
+        "owner": "numtide",
-        "url": "https://dev.danilafe.com/Nix-Configs/katex-html"
+        "repo": "flake-utils",
+        "type": "github"
       }
     },
-    "katex-server": {
+    "flake-utils_5": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "systems": "systems_5"
-        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1648445837,
+        "lastModified": 1731533236,
-        "narHash": "sha256-llpVUGpy4RQo33B48U3RIz0HBFf2Wqb4SoK1lbeqOjs=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "ref": "master",
+        "owner": "numtide",
-        "rev": "2925bd0b2bc5d980eb7b8f79feac28b377a0de13",
+        "repo": "flake-utils",
-        "revCount": 6,
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "git",
+        "type": "github"
-        "url": "https://dev.danilafe.com/Nix-Configs/katex-server"
       },
       "original": {
-        "type": "git",
+        "owner": "numtide",
-        "url": "https://dev.danilafe.com/Nix-Configs/katex-server"
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_6": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_7": {
+      "inputs": {
+        "systems": "systems_7"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1648444094,
+        "lastModified": 1766736597,
-        "narHash": "sha256-2liapKh7WXPHELuzLvYK+464g4w9tr9DbNxGuz8XZ98=",
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "87c74b8120980461a9d4ce8f341551ce0fb50728",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "resume": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "blog",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1648444094,
+        "lastModified": 1766794825,
-        "narHash": "sha256-2liapKh7WXPHELuzLvYK+464g4w9tr9DbNxGuz8XZ98=",
+        "narHash": "sha256-+Fabo0uQF9srEXdi9TB1wjB+PHaU9htXj/fjnvUFNAs=",
-        "owner": "nixos",
+        "ref": "refs/heads/master",
-        "repo": "nixpkgs",
+        "rev": "f22cb5b79580020079ba7223346e612b41eb7d42",
-        "rev": "87c74b8120980461a9d4ce8f341551ce0fb50728",
+        "revCount": 74,
-        "type": "github"
+        "type": "git",
+        "url": "https://dev.danilafe.com/DanilaFe/resume"
       },
       "original": {
-        "owner": "nixos",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://dev.danilafe.com/DanilaFe/resume"
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1648444094,
-        "narHash": "sha256-2liapKh7WXPHELuzLvYK+464g4w9tr9DbNxGuz8XZ98=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "87c74b8120980461a9d4ce8f341551ce0fb50728",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1648069223,
-        "narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "root": {
       "inputs": {
+        "Scylla": "Scylla",
         "blog": "blog",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs",
+        "web-files": "web-files_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "web-files": {
+      "inputs": {
+        "bergamot-elm": "bergamot-elm",
+        "flake-utils": "flake-utils_5",
+        "nixpkgs": [
+          "blog",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766788330,
+        "narHash": "sha256-7Dx1g0fM/glKCBzo2ZgIwXyp5ASyG/Y7S5OPcltb3Os=",
+        "ref": "refs/heads/master",
+        "rev": "407b087a1d0042e04bbcc9333097decd9e776270",
+        "revCount": 14,
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/web-files.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/web-files.git"
+      }
+    },
+    "web-files_2": {
+      "inputs": {
+        "bergamot-elm": "bergamot-elm_2",
+        "flake-utils": "flake-utils_7",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766788330,
+        "narHash": "sha256-7Dx1g0fM/glKCBzo2ZgIwXyp5ASyG/Y7S5OPcltb3Os=",
+        "ref": "refs/heads/master",
+        "rev": "407b087a1d0042e04bbcc9333097decd9e776270",
+        "revCount": 14,
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/web-files.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://dev.danilafe.com/Nix-Configs/web-files.git"
       }
     }
   },

flake.nix

@@ -1,18 +1,27 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-    blog.url = "git+https://dev.danilafe.com/DanilaFe/blog-static-flake";
+    blog.url = "git+https://dev.danilafe.com/Nix-Configs/blog-static-flake.git";
+    blog.inputs.nixpkgs.follows = "nixpkgs";
+    web-files.url = "git+https://dev.danilafe.com/Nix-Configs/web-files.git";
+    web-files.inputs.nixpkgs.follows = "nixpkgs";
+    Scylla.url = "git+https://dev.danilafe.com/Matrix-Programs/Scylla.git";
+    Scylla.inputs.nixpkgs.follows = "nixpkgs";
   };
-  outputs = { self, nixpkgs, blog }:
+  outputs = { self, nixpkgs, blog, web-files, Scylla }:
     let
       system = "x86_64-linux";
-      builders = blog.buildersFor system;
     in  
       {
         nixosConfigurations.nixos-droplet-v2 = nixpkgs.lib.nixosSystem {
-	  inherit system;
+          inherit system;
-          specialArgs = { inherit system builders; };
+          specialArgs = {
-          modules = [ ./configuration.nix blog.nixosModule ];
+            inherit system;
+            blog = blog.lib."${system}";
+            web-files = web-files.defaultPackage."${system}";
+            Scylla = Scylla.defaultPackage."${system}";
+          };
+          modules = [ ./configuration.nix ];
         };
       };
 }

goaccess.nix

@@ -1,49 +0,0 @@
-{ pkgs, config, lib, ... }:
-with lib;
-let
-  cfg = config.services.goaccess;
-in {
-  options.services.goaccess = {
-    enable = mkEnableOption "GoAccess dashboard";
-    group = mkOption {
-      type = types.str;
-    };
-    user = mkOption {
-      type = types.str;
-    };
-    dir = mkOption {
-      type = types.str;
-    };
-    host = mkOption {
-      type = types.str;
-    };
-  };
-  config = mkIf cfg.enable {
-    systemd.services.goaccess = {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      description = "GoAccess live dashboard";
-      serviceConfig = {
-        Type = "forking";
-        User = cfg.user;
-        ExecStart = "${pkgs.goaccess}/bin/goaccess  --ignore-crawlers -f /var/log/nginx/access.log --enable-panel=REFERRERS --enable-panel=KEYPHRASES --log-format COMBINED -o ${cfg.dir}/report.html --real-time-html";
-        Restart = "on-failure";
-      };
-    };
-    users.users."${cfg.user}" = {
-      isSystemUser = true;
-      description = "GoAccess runner";
-      group = cfg.group;
-    };
-
-    systemd.tmpfiles.rules = [
-      "d ${cfg.dir} 0755 ${cfg.user} ${cfg.group}"
-    ];
-
-    services.nginx.virtualHosts."${cfg.host}" = {
-      addSSL = true;
-      enableACME = true;
-      root = cfg.dir;
-    };
-  };
-}

hardware-configuration.nix

@@ -3,4 +3,10 @@
   imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
   boot.loader.grub.device = "/dev/vda";
   fileSystems."/" = { device = "/dev/vda1"; fsType = "ext4"; };
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 2*1024;
+    }
+  ];
 }