diff --git a/flake.lock b/flake.lock index 3c349d1..282a739 100644 --- a/flake.lock +++ b/flake.lock @@ -82,6 +82,25 @@ "type": "github" } }, + "dtth-phanpy": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1689515451, + "narHash": "sha256-nwLuyZAlDI3OWLJjr8WfuE+tAfApXjElNlxEtiwg9Ao=", + "ref": "refs/heads/main", + "rev": "5d804c6899f44e5f782020e16fc4941636360985", + "revCount": 1444, + "type": "git", + "url": "ssh://gitea@git.dtth.ch/nki/phanpy" + }, + "original": { + "type": "git", + "url": "ssh://gitea@git.dtth.ch/nki/phanpy" + } + }, "flake-compat": { "flake": false, "locked": { @@ -182,12 +201,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -212,6 +234,21 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -226,7 +263,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -312,7 +349,7 @@ }, "mpd-mpris": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -461,6 +498,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1689413807, + "narHash": "sha256-exuzOvOhGAEKWQKwDuZAL4N8a1I837hH5eocaTcIbLc=", + "owner": "nixOS", + "repo": "nixpkgs", + "rev": "46ed466081b9cad1125b11f11a2af5cc40b942c7", + "type": "github" + }, + "original": { + "owner": "nixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1689326639, "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=", @@ -476,7 +529,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -492,7 +545,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1685533922, "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", @@ -526,7 +579,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -549,13 +602,14 @@ "crane": "crane", "darwin": "darwin", "deploy-rs": "deploy-rs", - "flake-utils": "flake-utils_2", + "dtth-phanpy": "dtth-phanpy", + "flake-utils": "flake-utils_3", "home-manager": "home-manager", "kak-lsp": "kak-lsp", "kakoune": "kakoune", "mpd-mpris": "mpd-mpris", "nixos-m1": "nixos-m1", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rnix-lsp": "rnix-lsp", @@ -608,7 +662,7 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1686133200, @@ -668,6 +722,21 @@ "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" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -700,9 +769,9 @@ }, "youmubot": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "naersk": "naersk_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1687432552, diff --git a/flake.nix b/flake.nix index 8fce055..ec43ea8 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,7 @@ url = github:natsukagami/mpd-mpris/nix; inputs.nixpkgs.follows = "nixpkgs"; }; + dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki/phanpy"; # --- Sources kakoune.url = github:mawww/kakoune; diff --git a/nki-personal-do/configuration.nix b/nki-personal-do/configuration.nix index adfd52a..a8ea6f3 100644 --- a/nki-personal-do/configuration.nix +++ b/nki-personal-do/configuration.nix @@ -19,6 +19,7 @@ ./miniflux.nix ./writefreely.nix ./synapse.nix + ./phanpy.nix ]; common.linux.enable = false; # Don't enable the "common linux" module, this is a special machine. diff --git a/nki-personal-do/phanpy.nix b/nki-personal-do/phanpy.nix new file mode 100644 index 0000000..b2c1438 --- /dev/null +++ b/nki-personal-do/phanpy.nix @@ -0,0 +1,16 @@ +{ config, pkgs, lib, ... }: +let + host = "social.dtth.ch"; + port = 61010; +in +{ + cloud.traefik.hosts.phanpy = { inherit host port; }; + services.nginx.virtualHosts.phanpy = { + listen = [{ + inherit port; + addr = "127.0.0.1"; + }]; + root = "${pkgs.dtth-phanpy}/lib/phanpy"; + }; +} + diff --git a/overlay.nix b/overlay.nix index eab4ead..868b5bf 100644 --- a/overlay.nix +++ b/overlay.nix @@ -22,6 +22,7 @@ let rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}"; sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; }; deploy-rs = inputs.deploy-rs.packages.default; + dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default; # A list of source-style inputs. sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;