diff --git a/flake.nix b/flake.nix index ec06ff4..058b3ab 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,11 @@ flake = false; }; + osuchan = { + url = "git+file:///home/h7x4/git/osuchan-line-bot"; + # inputs.nixpkgs.follows = "nixpkgs"; + }; + website = { url = "git+https://git.nani.wtf/h7x4/nani.wtf?ref=main"; # url = "path:/home/h7x4/git/nani.wtf"; @@ -65,6 +70,7 @@ vscode-server, secrets, fonts, + osuchan, maunium-stickerpicker, dotfiles, website @@ -79,7 +85,7 @@ android_sdk.accept_license = true; }; - # overlays = [ self.overlays.lib ]; + overlays = [ osuchan.overlays.default ]; }; pkgs = import nixpkgs pkgs-config; @@ -126,6 +132,7 @@ "${vscode-server}/default.nix" secrets.outputs.nixos-config + osuchan.outputs.nixosModules.default { config._module.args = { diff --git a/hosts/tsuki/configuration.nix b/hosts/tsuki/configuration.nix index 55a4085..9b2ff6e 100644 --- a/hosts/tsuki/configuration.nix +++ b/hosts/tsuki/configuration.nix @@ -13,6 +13,7 @@ # ./services/keycloak.nix ./services/matrix ./services/nginx + ./services/osuchan.nix ./services/plex.nix ./services/postgres.nix ./services/vscode-server.nix diff --git a/hosts/tsuki/services/nginx/default.nix b/hosts/tsuki/services/nginx/default.nix index cace7b0..c1059cc 100644 --- a/hosts/tsuki/services/nginx/default.nix +++ b/hosts/tsuki/services/nginx/default.nix @@ -107,6 +107,7 @@ (proxy ["py"] "http://localhost:${s ports.jupyterhub}" { locations."/".proxyWebsockets = true; }) + (proxy ["osu"] "http://localhost:${s ports.osuchan}" {}) # (host ["vpn"] "" {}) (proxy ["hydra"] "http://localhost:${s ports.hydra}" {}) ] ++ (let diff --git a/hosts/tsuki/services/osuchan.nix b/hosts/tsuki/services/osuchan.nix new file mode 100644 index 0000000..4c25dd9 --- /dev/null +++ b/hosts/tsuki/services/osuchan.nix @@ -0,0 +1,8 @@ +{ secrets, config, ... }: +{ + services.osuchan = { + enable = true; + port = secrets.ports.osuchan; + secretFile = "${config.machineVars.dataDrives.default}/keys/osuchan/envfile"; + }; +}