oysteikt/nix-dotfiles
1
3
Fork 0
Code Issues 143 Pull Requests Actions Activity

tsuki/osuchan: remove

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-06-05 11:06:09 +09:00
parent eb31d5282a
commit 4da85f365d
6 changed files with 9 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+4 -25
View File
@@ -205,39 +205,19 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1780243769,
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
"lastModified": 1780453794,
"narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
"rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"ref": "nixos-26.05",
"type": "indirect"
}
},
"osuchan": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1684092181,
"narHash": "sha256-Oi6G8Jx2RkEMi3UndtAnZw61hfgKGEe7l/ILdB9ump4=",
"ref": "refs/heads/master",
"rev": "028ed8774d1cf4650fc15253146cf14451eb608c",
"revCount": 43,
"type": "git",
"url": "file:///home/h7x4/git/osuchan-line-bot"
},
"original": {
"type": "git",
"url": "file:///home/h7x4/git/osuchan-line-bot"
}
},
"root": {
"inputs": {
"disko": "disko",
@@ -249,7 +229,6 @@
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-yet-unstabler": "nixpkgs-yet-unstabler",
"osuchan": "osuchan",
"sops-nix": "sops-nix"
}
},
flake.nix
-8
View File
@@ -23,11 +23,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
osuchan = {
url = "git+file:///home/h7x4/git/osuchan-line-bot";
inputs.nixpkgs.follows = "nixpkgs";
};
maunium-stickerpicker = {
url = "github:h7x4/maunium-stickerpicker-nix/0.1.0";
inputs.nixpkgs.follows = "nixpkgs";
@@ -56,7 +51,6 @@
matrix-synapse-next,
maunium-stickerpicker,
minecraft,
osuchan,
sops-nix,
# anyrun,
}: let
@@ -91,7 +85,6 @@
self.overlays.gitoxide
minecraft.overlays.default
osuchan.overlays.default
];
};
@@ -329,7 +322,6 @@
disko.nixosModules.default
matrix-synapse-next.nixosModules.default
osuchan.outputs.nixosModules.default
maunium-stickerpicker.nixosModules.default
(args: import minecraft.outputs.nixosModules.minecraft-servers (args // {
hosts/tsuki/configuration.nix
-1
View File
@@ -16,7 +16,6 @@
./services/matrix
# ./services/minecraft
./services/nginx
./services/osuchan.nix
# ./services/plex.nix
./services/postgres.nix
# ./services/samba.nix
hosts/tsuki/services/nginx/default.nix
-2
View File
@@ -60,7 +60,6 @@
# "idrac".servers."10.0.0.201" = { };
"irc-matrix-bridge-media".servers."localhost:${s srv.matrix-appservice-irc.settings.ircService.mediaProxy.bindPort}" = { };
"kanidm".servers."localhost:8300" = { };
"osuchan".servers."localhost:${s srv.osuchan.port}" = { };
# "plex".servers."localhost:32400" = { };
# "vaultwarden".servers."unix:${sa.vaultwarden.newSocketAddress}" = { };
# "vaultwarden".servers."unix:${sa.vaultwarden.newSocketAddress}" = { };
@@ -196,7 +195,6 @@
# (proxy ["idrac"] "https://idrac" {})
# (proxy ["log"] "http://grafana" enableWebsockets)
# (proxy ["map"] "http://dynmap" {})
(proxy ["osu"] "http://osuchan" {})
# (proxy ["plex"] "http://plex" enableWebsockets)
# (proxy ["vpn"] "http://headscale" {
# locations."/" = {
hosts/tsuki/services/osuchan.nix
-26
View File
@@ -1,26 +0,0 @@
{ config, ... }:
{
sops = {
secrets = {
"osuchan/env/channel_access_token" = { };
"osuchan/env/channel_id" = { };
"osuchan/env/channel_secret" = { };
};
templates."osuchan.env" = {
restartUnits = [ "osuchan.service" ];
content = let
inherit (config.sops) placeholder;
in ''
CHANNEL_ACCESS_TOKEN=${placeholder."osuchan/env/channel_access_token"}
CHANNEL_ID=${placeholder."osuchan/env/channel_id"}
CHANNEL_SECRET=${placeholder."osuchan/env/channel_secret"}
'';
};
};
services.osuchan = {
enable = true;
port = 9283;
secretFile = config.sops.templates."osuchan.env".path;
};
}
secrets/tsuki.yaml
+5 -10
View File
@@ -43,15 +43,9 @@ matrix_synapse:
oauth2_secret: ENC[AES256_GCM,data:Mxzhek6YeRg6lgGvGzrmJz9EakT4sLE5Gw0oyHzF9TjybtjjRmUK4XeEDg8yx2Nt,iv:f656nD6ziJantu7ihmfYvJzxZ1ytvbVS3hezSU75g5A=,tag:G3cwIxcWxLOVAmqmyHDVTg==,type:str]
registration_secret: ENC[AES256_GCM,data:Sc5piAESWk9HUe3ZOQ+7ZB9aCZwjTdFrfYkU+XFuXGUZ3xCkCt7QDPmDQBIs+lYOLV9Y165cObKDgMNHBaMkRQ5wXVBrd0l9js70h9LC3IGuK+BOa5tZa4u0zku4zStRuN7xCeGNeAWFOPCQ4a5rQMqbDz6iwWkMQvlHqwzBYtP7PuTuAocwkjlo+3AOnw92DjY4xODPgHR7w4rNSvoSZIUjlAIk3yyHNLV68UiTPoJ5lUqGleLznCpqjLhpxAycfEbWUXCNx8Z5oJ+czptWzhb/hhjH/SgeMvflk8KFwJAYBXxA+YgM+unlWS500OGsgYIbhPyvSzSrs1JkDQBVXA==,iv:/Q4gTEe6WU7XID2ayCFq6xmF6J5UrQw4OjmpU4dhZSA=,tag:kLTdqoanqUAlVrRcKZRxcw==,type:str]
turn_shared_secret: ENC[AES256_GCM,data:ay8VETIPaaRHmmy+DFaqsOD8svfxcrJtaf9QEB8QxqE=,iv:VzHs5zHADvl/7cl9FgwFfgQbdv9/ujPFz9rojgHsyo4=,tag:atRZGV1dj7pa1e5TycLFKg==,type:str]
osuchan:
env:
channel_access_token: ENC[AES256_GCM,data:DjE+92zPa7nOR1T2ggXSU9CWM6ruZCKQsVzj04mwacNyZcGBn7ydNnit2yaTaAWemAaFZkHCmJChvEXUtVXX02W3xjP3kuFNSod4x8KIEeAwP10SAfyaXlrYLTrhf0fhNqQDsSO9OxYaP1X/k9JFiakb3E3ZAqdhznaNfEfbRjABligAyxAFU8lm1V2bhe6BX91dZ+rwuLSpI72NLAhgkXD8AtVTdb66kEGRyw==,iv:BtVka/U9NVoSTrvSTt+4I9XGsARTkkj5DEtV8v12zy4=,tag:CrOf4CW0QNaRRh+IcxE4Gg==,type:str]
channel_id: ENC[AES256_GCM,data:qS4no9fC2EI+Bw==,iv:+2Q0ceJBZ7Il4bwtyx0+n69bLV1P7RtZxhWTaUrricM=,tag:+q9plSfQ9I6Xe+nvuG9yQg==,type:str]
channel_secret: ENC[AES256_GCM,data:p6N7AOyNs/LsmSd5J4WfyWszg4sjv60ZL/3k1IdeGZg=,iv:pSp+3gR76u1GbgROSZXcflRWSO1wYV0M4d11nEIG/k0=,tag:RO+3kpZ1ZmYU5PKaC96CFQ==,type:str]
sops:
age:
- recipient: age1ue7uv559wf6tfjsutn9dsh07vpk53sgrfkdzqy4ltg6dnxcxeg7srx800u
enc: |
- enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5VzFxUFNpUU5FZmMrYzZ6
TnVCeG1zeVBqR0lXODRjcEhXdzBtMVlEd0VNCjQrZWo1aTNLMEJrR2hhNm5jWHdy
@@ -59,8 +53,9 @@ sops:
N3ZHc2tWTEpsNFNTVTI5amtPR2RIT3MKUGszZcvd7k+62TPmQNDOFvtjGLegjyQ8
NpCYsXRuIIJ9phzcyG0Iobf3uJBdNtXm2ujBGlY9TqwfIATygwJQjQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-01-21T06:49:14Z"
mac: ENC[AES256_GCM,data:lgvjEFwzcljlLSp6SzVFLibBvUWR91DCgY5B8TPkCYP4/VSYi+13/5RjSsl8FYJvawM3mpKso+JGxBq01nE+U3TQXEcQQWUXo6HoSwVh98LbFmO8ZVi5M9WEQ6wFxMFX22krtIcr3GolCi5vcVh+vNmc10LzxXj8LExRNHZ1ZhA=,iv:fd9bzFHiExcMvBUaz7UPyRYfCr5brjH2NlsaJaFeiDs=,tag:cpO76ahWJWB7jYz96/J+bg==,type:str]
recipient: age1ue7uv559wf6tfjsutn9dsh07vpk53sgrfkdzqy4ltg6dnxcxeg7srx800u
lastmodified: "2026-06-05T02:05:55Z"
mac: ENC[AES256_GCM,data:G6R5uahswdcQGWQg285czspQIEIK8nNVO33WpMrbgpCUSD4pm0yUo/xqu6pOFUFrIhQSiKqmOtvoFjkneh68tG/ANY2AUg8BpHfSEfjs2C2Rg5G/Bqx+h6U5Nqnjx+3hkUsCVCzgeoA/sFPqoK0VDI3zlwX/1ZimJqZB7nAbI/I=,iv:9573c4WlhUgIzCVu9Jo8s4twMLT3SzFOH4IjZ0hoSd8=,tag:w+lCaXLOJXk4oqFrjJ6nng==,type:str]
pgp:
- created_at: "2025-10-24T02:47:54Z"
enc: |-
@@ -83,4 +78,4 @@ sops:
-----END PGP MESSAGE-----
fp: F7D37890228A907440E1FD4846B9228E814A2AAC
unencrypted_suffix: _unencrypted
version: 3.11.0
version: 3.13.1