aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschererleander <leander@schererleander.de>2025-10-04 02:52:10 +0200
committerschererleander <leander@schererleander.de>2025-10-04 02:52:10 +0200
commit4bbd2fb3fa1e885ff983a4894eefaa5a557f56bf (patch)
tree277239e65e364f9650dc8b23edaf877e0bb1ac94
parent4f90ea891b4058d3b987540e031fa3d1c716a690 (diff)
feat: add site flake for personal website and setup
-rw-r--r--flake.lock205
-rw-r--r--flake.nix5
-rw-r--r--hosts/sachiel/configuration.nix21
3 files changed, 199 insertions, 32 deletions
diff --git a/flake.lock b/flake.lock
index 9385b2f..53294f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
{
"nodes": {
+ "agenix": {
+ "inputs": {
+ "darwin": "darwin",
+ "home-manager": "home-manager",
+ "nixpkgs": "nixpkgs",
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1754433428,
+ "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+ "owner": "ryantm",
+ "repo": "agenix",
+ "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ryantm",
+ "repo": "agenix",
+ "type": "github"
+ }
+ },
"cl-nix-lite": {
"locked": {
"lastModified": 1728174978,
@@ -15,9 +36,31 @@
"type": "github"
}
},
+ "darwin": {
+ "inputs": {
+ "nixpkgs": [
+ "agenix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1744478979,
+ "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+ "owner": "lnl7",
+ "repo": "nix-darwin",
+ "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "lnl7",
+ "ref": "master",
+ "repo": "nix-darwin",
+ "type": "github"
+ }
+ },
"firefox-addons": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"dir": "pkgs/firefox-addons",
@@ -178,6 +221,24 @@
"type": "indirect"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_3"
+ },
+ "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"
+ }
+ },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
@@ -248,6 +309,27 @@
"home-manager": {
"inputs": {
"nixpkgs": [
+ "agenix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1745494811,
+ "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
"nixpkgs"
]
},
@@ -271,8 +353,8 @@
"cl-nix-lite": "cl-nix-lite",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs_2",
- "systems": "systems"
+ "nixpkgs": "nixpkgs_3",
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1742156590,
@@ -295,7 +377,7 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@@ -353,7 +435,7 @@
"inputs": {
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1753754010,
@@ -371,16 +453,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1744536153,
- "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
- "owner": "nixos",
+ "lastModified": 1754028485,
+ "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+ "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixpkgs-unstable",
+ "owner": "NixOS",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -402,6 +484,22 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1744536153,
+ "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1732617236,
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
"owner": "NixOS",
@@ -416,7 +514,7 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1753432016,
"narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
@@ -432,7 +530,7 @@
"type": "github"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1749494155,
"narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
@@ -448,7 +546,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1753749649,
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
@@ -464,7 +562,23 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
+ "locked": {
+ "lastModified": 1759381078,
+ "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_8": {
"locked": {
"lastModified": 1753429684,
"narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
@@ -482,20 +596,41 @@
},
"root": {
"inputs": {
+ "agenix": "agenix",
"firefox-addons": "firefox-addons",
- "home-manager": "home-manager",
+ "home-manager": "home-manager_2",
"mac-app-util": "mac-app-util",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-darwin": "nix-darwin",
"nixcord": "nixcord",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_6",
+ "site": "site",
"spicetify-nix": "spicetify-nix"
}
},
+ "site": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_7"
+ },
+ "locked": {
+ "lastModified": 1759538668,
+ "narHash": "sha256-dZvMSF8wxUle6qePxYGPzKDyWGjybxHWFVMEY0FiuBw=",
+ "owner": "schererleander",
+ "repo": "site",
+ "rev": "81bdbc1677b318b1b53caaabaa3a44e685af5b66",
+ "type": "github"
+ },
+ "original": {
+ "owner": "schererleander",
+ "repo": "site",
+ "type": "github"
+ }
+ },
"spicetify-nix": {
"inputs": {
- "nixpkgs": "nixpkgs_6",
- "systems": "systems_2"
+ "nixpkgs": "nixpkgs_8",
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1753591727,
@@ -513,6 +648,21 @@
},
"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": 1689347925,
"narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=",
"owner": "nix-systems",
@@ -526,7 +676,22 @@
"type": "github"
}
},
- "systems_2": {
+ "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=",
diff --git a/flake.nix b/flake.nix
index 73ce540..2cbf628 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,8 @@
home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
+ site.url = "github:schererleander/site";
+
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
@@ -48,6 +50,9 @@
host = "sachiel";
username = "administrator";
system = linux-system;
+ extraModules = [
+ inputs.site.nixosModules.default
+ ];
};
};
darwinConfigurations.lilith = lib.mkSystem {
diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix
index 9c46eb1..9ceda91 100644
--- a/hosts/sachiel/configuration.nix
+++ b/hosts/sachiel/configuration.nix
@@ -107,23 +107,20 @@
add_header X-Content-Type-Options nosniff;
'';
- virtualHosts."schererleander.de" = {
- root = "/var/www/site";
- default = true;
- forceSSL = true;
- enableACME = true;
- locations = {
- "/" = {
- tryFiles = "$uri $uri/ /index.html";
- };
- };
- };
virtualHosts."cloud.schererleander.de" = {
forceSSL = true;
- enableACME = true;
+ sslCertificate = "/etc/ssl/schererleander.de/fullchain.pem";
+ sslCertificateKey = "/etc/ssl/schererleander.de/privkey.key";
};
};
+ services.site = {
+ enable = true;
+ domain = "schererleander.de";
+ sslCertificate = "/etc/ssl/schererleander.de/fullchain.pem";
+ sslCertificateKey = "/etc/ssl/schererleander.de/privkey.key";
+ };
+
services.nextcloud = {
enable = true;
package = pkgs.nextcloud31;