Andromeda/server-configuration
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

blog ig idfk

Browse Source
This commit is contained in:
mtgmonkey
2025-08-28 05:09:43 +00:00
parent 7cef5d8798
commit 6e30000ce5
5 changed files with 259 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
flake.lock generated
View File

@@ -1,34 +1,15 @@
{ {
"nodes": { "nodes": {
"best-blog": { "blog": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"rust-http-server": "rust-http-server"
}, },
"locked": { "locked": {
"lastModified": 1750341141, "lastModified": 1756357572,
"narHash": "sha256-6aVmNXmX+cDh+bCAPBOTfeSm/UI3/iRY6xA9ZQdUdQg=", "narHash": "sha256-P6T94sif/tjPXdA6MISmnwot57+4FzJ0iHe83KAdOlI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "50c9b7fbfa6862ded556d178b8234332f6fc3f9e", "rev": "c1b05feb4a851d2d8ea57ccac8d6482c850ccc6e",
"revCount": 8, "revCount": 48,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/best-blog.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/best-blog.git"
}
},
"elmskell-blog": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1749494299,
"narHash": "sha256-I6/TSz5ciJTEZNFCyrCXWRYqBkNIh3fZy67UErIw3fk=",
"ref": "refs/heads/master",
"rev": "596af4a7318d60816ee995526d571643e21744b5",
"revCount": 11,
"type": "git", "type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/blog.git" "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
}, },
@@ -57,7 +38,7 @@
}, },
"jank-client": { "jank-client": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1749606892, "lastModified": 1749606892,
@@ -75,7 +56,7 @@
}, },
"math-project": { "math-project": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1750258769, "lastModified": 1750258769,
@@ -92,36 +73,6 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1750134718,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1749143949, "lastModified": 1749143949,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
@@ -136,7 +87,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749285348, "lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
@@ -151,7 +102,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_5": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1748889542, "lastModified": 1748889542,
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
@@ -166,13 +117,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1750134718, "lastModified": 1754214453,
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -181,7 +132,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
@@ -197,7 +148,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1746141548,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
@@ -215,7 +166,7 @@
}, },
"noshell": { "noshell": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1717396029, "lastModified": 1717396029,
@@ -233,37 +184,18 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"best-blog": "best-blog", "blog": "blog",
"elmskell-blog": "elmskell-blog",
"jank-client": "jank-client", "jank-client": "jank-client",
"math-project": "math-project", "math-project": "math-project",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_4",
"noshell": "noshell", "noshell": "noshell",
"spacebar-server": "spacebar-server" "spacebar-server": "spacebar-server"
} }
}, },
"rust-http-server": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1750341039,
"narHash": "sha256-iT6qEBuHJMEAFDnRNUydh6eJu7LX4OklUy0CpOtz/tg=",
"ref": "refs/heads/master",
"rev": "d214b0bf8646ee7f2f0792bbf3b96db8dacc2468",
"revCount": 3,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/rust-http-server.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/rust-http-server.git"
}
},
"spacebar-server": { "spacebar-server": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1748414795, "lastModified": 1748414795,

232
flake.lock.bak Normal file
View File

@@ -0,0 +1,232 @@
{
"nodes": {
"blog": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1754950153,
"narHash": "sha256-puOP2m2ixs9nzId8CnxHvteU/iMLRJtveigb2njjrPE=",
"ref": "refs/heads/master",
"rev": "ea162211d17489133552c12cee9ffae2b4c11e5e",
"revCount": 30,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/blog.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/blog.git"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"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"
}
},
"jank-client": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1749606892,
"narHash": "sha256-ZGUUWNORko3QFy9p/2mc4voJ65/11Joy6Au79+TwxPw=",
"ref": "refs/heads/main",
"rev": "0e59a339c813bcf1e9969344d8b50ed380231552",
"revCount": 1179,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
}
},
"math-project": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1750258769,
"narHash": "sha256-BazJgo04yFqFfp2AA0Tfba+nBAeaNddQJBdLghVJskk=",
"ref": "refs/heads/master",
"rev": "fa0e8ca47dd5341d24d8aae90a0bc28a689c3d46",
"revCount": 6,
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
},
"original": {
"type": "git",
"url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1749143949,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1748889542,
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-25.05",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1754214453,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1746141548,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"noshell": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1717396029,
"narHash": "sha256-NPIhvnTYkJZqTY+aabbZ6CAaMAgG6IISvh7GZo1MTfQ=",
"owner": "viperML",
"repo": "noshell",
"rev": "4d194d838a50ea106cd0e47c024e47afc154ab42",
"type": "github"
},
"original": {
"owner": "viperML",
"repo": "noshell",
"type": "github"
}
},
"root": {
"inputs": {
"blog": "blog",
"jank-client": "jank-client",
"math-project": "math-project",
"nixpkgs": "nixpkgs_4",
"noshell": "noshell",
"spacebar-server": "spacebar-server"
}
},
"spacebar-server": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1748414795,
"narHash": "sha256-nClmjajuaMVV02Rn7xqZWy5pwLmGw7/MF3RDGkYDuYQ=",
"owner": "spacebarchat",
"repo": "server",
"rev": "f03c6209a42ae3e922bdb86954de04f1ae6daaa8",
"type": "github"
},
"original": {
"owner": "spacebarchat",
"repo": "server",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

7
flake.nix
View File

@@ -5,10 +5,9 @@
noshell.url = "github:viperML/noshell"; noshell.url = "github:viperML/noshell";
spacebar-server.url = "github:spacebarchat/server"; spacebar-server.url = "github:spacebarchat/server";
elmskell-blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git"; blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git";
jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"; jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git";
math-project.url = "git+https://git.mtgmonkey.net/Andromeda/math-project.git"; math-project.url = "git+https://git.mtgmonkey.net/Andromeda/math-project.git";
best-blog.url = "git+https://git.mtgmonkey.net/Andromeda/best-blog.git";
}; };
outputs = { outputs = {
@@ -18,7 +17,7 @@
spacebar-server, spacebar-server,
jank-client, jank-client,
math-project, math-project,
best-blog, blog,
... ...
}: let }: let
system = "x86_64-linux"; system = "x86_64-linux";
@@ -30,7 +29,7 @@
inherit system; inherit system;
inherit spacebar-server; inherit spacebar-server;
inherit math-project; inherit math-project;
inherit best-blog; inherit blog;
ssh-pub-keys = import ./ssh-pub-keys.nix; ssh-pub-keys = import ./ssh-pub-keys.nix;
}; };
modules = [ modules = [

4
services/blog.nix
View File

@@ -1,5 +1,5 @@
{ {
best-blog, blog,
lib, lib,
pkgs, pkgs,
... ...
@@ -40,7 +40,7 @@ in {
systemd.services.blog = { systemd.services.blog = {
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "${lib.getExe best-blog.packages.x86_64-linux.default}"; ExecStart = "${lib.getExe pkgs.http-server} ${blog.packages.x86_64-linux.default}/wwwroot -p 9345";
RemainAfterExit = true; RemainAfterExit = true;
Restart = "always"; Restart = "always";
RestartMaxDelaySec = "1m"; RestartMaxDelaySec = "1m";

2
services/gitea.nix
View File

@@ -6,7 +6,7 @@
systemd.services.gitea = { systemd.services.gitea = {
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
ExecStart = "${lib.getExe pkgs.forgejo} -c /etc/gitea/config.ini"; ExecStart = "${lib.getExe pkgs.gitea} -c /etc/gitea/config.ini";
RemainAfterExit = true; RemainAfterExit = true;
Restart = "always"; Restart = "always";
RestartMaxDelaySec = "1m"; RestartMaxDelaySec = "1m";