diff --git a/flake.lock b/flake.lock index 9f49e47..baa0e2f 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1689377011, - "narHash": "sha256-fXNZxuqzhtU+Ig0yX+T+64YOZCS/bwaJLXZOn9kvjm0=", + "lastModified": 1689697423, + "narHash": "sha256-VR1bSuCsbtfyCWQhKXeTw93KOgeoRvZZevYEVHEPkF4=", "ref": "refs/heads/master", - "rev": "3f250d4ed3b9d543678280ff4aaa7a93cbf77955", - "revCount": 77, + "rev": "eda545da2e9b476efb5e2c3270c4b00b5ff582c0", + "revCount": 79, "type": "git", "url": "https://git.gaze.systems/dusk/website.git" }, @@ -211,6 +211,30 @@ } }, "crane_4": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "limbusart", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_5": { "flake": false, "locked": { "lastModified": 1670900067, @@ -401,13 +425,13 @@ "musikquad", "nci" ], - "crane": "crane_4", + "crane": "crane_5", "devshell": [ "musikquad", "nci" ], "drv-parts": "drv-parts_2", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": [ "musikquad", "nci", @@ -638,6 +662,22 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -672,6 +712,42 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -686,7 +762,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -779,6 +855,28 @@ "url": "https://git.gaze.systems/dusk/html.nix.git" } }, + "limbusart": { + "inputs": { + "crane": "crane_4", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690281789, + "narHash": "sha256-XSm4b38ZwPxS3LhtLHZYvcktyKf/rVijDLR3UCpLZqM=", + "ref": "refs/heads/master", + "rev": "afe5d44223a5f686a7bd452a174beb87284105a7", + "revCount": 11, + "type": "git", + "url": "https://git.gaze.systems/dusk/limbusart.git" + }, + "original": { + "type": "git", + "url": "https://git.gaze.systems/dusk/limbusart.git" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -840,7 +938,7 @@ "nixpkgs" ], "parts": "parts_6", - "systems": "systems_2" + "systems": "systems_4" }, "locked": { "lastModified": 1683646918, @@ -932,7 +1030,7 @@ "nixpkgs" ], "parts": "parts_4", - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1681711895, @@ -950,11 +1048,11 @@ }, "nil": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1680544266, @@ -1327,6 +1425,7 @@ "conduit": "conduit", "helix": "helix", "home": "home", + "limbusart": "limbusart", "musikquad": "musikquad", "musikspider": "musikspider", "nil": "nil", @@ -1424,6 +1523,33 @@ } }, "rust-overlay_4": { + "inputs": { + "flake-utils": [ + "limbusart", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "limbusart", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { "flake": false, "locked": { "lastModified": 1681697975, @@ -1439,7 +1565,7 @@ "type": "github" } }, - "rust-overlay_5": { + "rust-overlay_6": { "inputs": { "flake-utils": [ "nil", @@ -1467,7 +1593,7 @@ "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "home-manager": [ "home" ], @@ -1506,6 +1632,36 @@ } }, "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": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1537,8 +1693,8 @@ }, "vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index d12b80e..153abef 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,9 @@ musikspider.url = "github:yusdacra/musikspider"; musikspider.inputs.nixpkgs.follows = "nixpkgs"; + limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git"; + limbusart.inputs.nixpkgs.follows = "nixpkgs"; + # needed for hyprland setup # hyprland.url = "github:hyprwm/Hyprland"; # hyprland.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/wolumonde/modules/gitea.nix b/hosts/wolumonde/modules/gitea.nix index a8aee1e..1e77711 100644 --- a/hosts/wolumonde/modules/gitea.nix +++ b/hosts/wolumonde/modules/gitea.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { services.gitea = { enable = true; domain = "git.gaze.systems"; @@ -15,8 +15,4 @@ forceSSL = true; locations."/".proxyPass = "http://localhost:3001"; }; - - networking.firewall.allowedTCPPorts = [ - config.services.gitea.httpPort - ]; } diff --git a/hosts/wolumonde/modules/limbusart.nix b/hosts/wolumonde/modules/limbusart.nix new file mode 100644 index 0000000..dcd3e7e --- /dev/null +++ b/hosts/wolumonde/modules/limbusart.nix @@ -0,0 +1,41 @@ +{ + inputs, + pkgs, + lib, + ... +}: let + pkg = inputs.limbusart.packages.${pkgs.system}.default; +in { + systemd.services.limbusart = { + description = "limbusart"; + wantedBy = ["multi-user.target"]; + after = ["network.target"]; + serviceConfig = lib.mkMerge [ + { + User = "limbusart"; + ExecStart = "${pkg}/bin/limbusart"; + Restart = "on-failure"; + RestartSec = 5; + WorkingDirectory = "/var/lib/limbusart"; + EnvironmentFile = pkgs.writeText "limbusart.conf" '' + ARTS_PATH="arts.txt" + SITE_TITLE="random pm art" + EMBED_TITLE="random pm art here!!" + EMBED_DESC="click NOW to see random pm art" + EMBED_COLOR="#bd0000" + ''; + } + ]; + }; + users.users.limbusart = { + isSystemUser = true; + group = "limbusart"; + }; + users.groups.limbusart = {}; + + services.nginx.virtualHosts."limbus.company" = { + useACMEHost = "limbus.company"; + forceSSL = true; + locations."/".proxyPass = "http://localhost:3000"; + }; +} diff --git a/hosts/wolumonde/modules/nginx.nix b/hosts/wolumonde/modules/nginx.nix index 9f7b4c1..aec3e49 100644 --- a/hosts/wolumonde/modules/nginx.nix +++ b/hosts/wolumonde/modules/nginx.nix @@ -21,5 +21,9 @@ "mq.gaze.systems" ]; }; + certs."limbus.company" = { + webroot = "/var/lib/acme/acme-challenge"; + extraDomainNames = []; + }; }; }