diff --git a/flake.lock b/flake.lock index 412927b..c95dd39 100644 --- a/flake.lock +++ b/flake.lock @@ -1774,7 +1774,8 @@ "snowfall-lib": "snowfall-lib_3", "sops-nix": "sops-nix", "stylix": "stylix", - "unstable": "unstable" + "unstable": "unstable", + "website": "website" } }, "rose-pine-hyprcursor": { @@ -2294,6 +2295,26 @@ "type": "github" } }, + "website": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761154225, + "narHash": "sha256-4lCcz/jeGzhvnH3LAv3Y2EEili9JCYQ+Gn7DFpv/tpE=", + "ref": "refs/heads/master", + "rev": "2018d7aab68e79a4a3eaf1fe7288b8966d91b2db", + "revCount": 9, + "type": "git", + "url": "https://git.kylekrein.com/kylekrein/website.git" + }, + "original": { + "type": "git", + "url": "https://git.kylekrein.com/kylekrein/website.git" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 764782f..1fabe49 100644 --- a/flake.nix +++ b/flake.nix @@ -99,6 +99,10 @@ url = "github:Sveske-Juice/declarative-jellyfin"; inputs.nixpkgs.follows = "nixpkgs"; }; + website = { + url = "git+https://git.kylekrein.com/kylekrein/website.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: let diff --git a/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw-arch.png b/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw-arch.png new file mode 100644 index 0000000..2c9944d Binary files /dev/null and b/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw-arch.png differ diff --git a/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw.png b/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw.png new file mode 100644 index 0000000..1d9aeb8 Binary files /dev/null and b/homes/x86_64-linux/kylekrein/niri/wallpapers/i-use-nixos-btw.png differ diff --git a/systems/x86_64-linux/stargate/services/adguardhome.nix b/systems/x86_64-linux/stargate/services/adguardhome.nix index a39cfe7..fbddcf9 100644 --- a/systems/x86_64-linux/stargate/services/adguardhome.nix +++ b/systems/x86_64-linux/stargate/services/adguardhome.nix @@ -51,6 +51,7 @@ in { }) [ "kylekrein.com" "*.kylekrein.com" + "alexanderlebedev.com" ]; }; diff --git a/systems/x86_64-linux/stargate/services/nginx.nix b/systems/x86_64-linux/stargate/services/nginx.nix index f1d71a0..c611bab 100644 --- a/systems/x86_64-linux/stargate/services/nginx.nix +++ b/systems/x86_64-linux/stargate/services/nginx.nix @@ -2,6 +2,7 @@ lib, pkgs, config, + inputs, ... }: let matrixLocations = { @@ -94,6 +95,20 @@ in { proxyWebsockets = true; }; }; + + "alexanderlebedev.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + root = inputs.website.packages.${pkgs.system}.website; + extraConfig = '' + if ($request_uri ~ ^/(.*)\\.html(\?|$)) { + return 302 /$1$is_args$args; + } + try_files $uri $uri.html $uri/ =404; + ''; + }; + }; # https://github.com/NixOS/nixpkgs/issues/218878#issuecomment-2471223335 "collabora.kylekrein.com" = { enableACME = true;