diff --git a/flake.lock b/flake.lock index 6cb0a83c..fe187ece 100644 --- a/flake.lock +++ b/flake.lock @@ -68,31 +68,12 @@ "type": "github" } }, - "blog": { - "inputs": { - "bun2nix": "bun2nix", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1780522780, - "narHash": "sha256-1gM3dJtcTx4Bmpi8sg7HSysSY1/Cv+VgdBwwsM/pW1s=", - "owner": "anotherhadi", - "repo": "blog", - "rev": "198112501a57e6a80464357118e4c864f7504d70", - "type": "github" - }, - "original": { - "owner": "anotherhadi", - "repo": "blog", - "type": "github" - } - }, "bun2nix": { "inputs": { "flake-parts": "flake-parts", "import-tree": "import-tree", "nixpkgs": [ - "blog", + "default-creds-web", "nixpkgs" ], "systems": "systems", @@ -112,31 +93,6 @@ "type": "github" } }, - "bun2nix_2": { - "inputs": { - "flake-parts": "flake-parts_2", - "import-tree": "import-tree_2", - "nixpkgs": [ - "default-creds-web", - "nixpkgs" - ], - "systems": "systems_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1770895533, - "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", - "owner": "nix-community", - "repo": "bun2nix", - "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "bun2nix", - "type": "github" - } - }, "default-creds": { "flake": false, "locked": { @@ -155,8 +111,8 @@ }, "default-creds-web": { "inputs": { - "bun2nix": "bun2nix_2", - "nixpkgs": "nixpkgs_2" + "bun2nix": "bun2nix", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1787818431, @@ -259,24 +215,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -297,7 +235,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -437,7 +375,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1769548169, @@ -468,21 +406,6 @@ "type": "github" } }, - "import-tree_2": { - "locked": { - "lastModified": 1763762820, - "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", - "owner": "vic", - "repo": "import-tree", - "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "import-tree", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1780772958, @@ -520,8 +443,8 @@ }, "nixarr": { "inputs": { - "nixpkgs": "nixpkgs_4", - "treefmt-nix": "treefmt-nix_3", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix_2", "vpnconfinement": "vpnconfinement", "website-builder": "website-builder" }, @@ -541,7 +464,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1787144466, @@ -559,11 +482,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -588,21 +511,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1787135253, @@ -620,22 +528,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -651,7 +543,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1775595990, "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", @@ -667,7 +559,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1767892417, "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", @@ -680,7 +572,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1787204541, "narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=", @@ -696,7 +588,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1784796856, "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", @@ -711,7 +603,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -759,7 +651,7 @@ "inputs": { "flake-compat": "flake-compat_2", "mnw": "mnw", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1787305329, @@ -796,7 +688,6 @@ }, "root": { "inputs": { - "blog": "blog", "default-creds": "default-creds", "default-creds-web": "default-creds-web", "disko": "disko", @@ -807,7 +698,7 @@ "nix-index-database": "nix-index-database", "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nvf": "nvf", @@ -843,13 +734,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_3", + "systems": "systems_2", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -900,21 +791,6 @@ "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" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -980,28 +856,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "blog", - "bun2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "default-creds-web", @@ -1023,7 +877,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixarr", diff --git a/flake.nix b/flake.nix index 1e411c45..423f4371 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,6 @@ # Server nixarr.url = "github:nix-media-server/nixarr"; default-creds-web.url = "github:anotherhadi/default-creds-web"; - blog.url = "github:anotherhadi/blog"; }; outputs = inputs @ { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 5f9aed74..188a32ed 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -15,7 +15,6 @@ ../../server-modules/glance ../../server-modules/adguardhome.nix ../../server-modules/arr.nix - ../../server-modules/blog.nix ../../server-modules/bentopdf.nix ../../server-modules/cyberchef.nix ../../server-modules/mazanoke.nix diff --git a/server-modules/blog.nix b/server-modules/blog.nix deleted file mode 100644 index 2a0b6101..00000000 --- a/server-modules/blog.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - config, - inputs, - lib, - ... -}: let - inherit (import ./mk-container.nix {inherit lib config;}) mkContainer; - domain = config.var.domain; -in { - imports = [ - (mkContainer { - name = "blog"; - hostIp = "10.233.3.1"; - containerIp = "10.233.3.2"; - nixosConfig = {pkgs-unstable, ...}: { - services.nginx = { - enable = true; - virtualHosts = { - "blog" = { - root = "${inputs.blog.packages.${pkgs-unstable.stdenv.hostPlatform.system}.default}/share/blog"; - listen = [ - { - addr = "0.0.0.0"; - port = 8080; - } - ]; - locations."/" = { - tryFiles = "$uri $uri/ =404"; - }; - extraConfig = '' - port_in_redirect off; - absolute_redirect off; - error_page 403 /403.html; - error_page 404 /404.html; - error_page 500 /500.html; - error_page 503 /503.html; - add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' data: https://umami.${domain}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://git.${domain}; connect-src 'self' https://umami.${domain};" always; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-Content-Type-Options "nosniff" always; - add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always; - ''; - }; - "www-redirect" = { - listen = [ - { - addr = "0.0.0.0"; - port = 8081; - } - ]; - extraConfig = "return 301 https://${domain}$request_uri;"; - }; - }; - }; - networking.firewall.allowedTCPPorts = [ - 8080 - 8081 - ]; - system.stateVersion = "24.05"; - }; - }) - ]; - - services.cloudflared.tunnels."${config.var.tunnelId}".ingress = { - "${config.var.domain}" = "http://10.233.3.2:8080"; - "www.${config.var.domain}" = "http://10.233.3.2:8081"; - }; -}