Compare commits

...

4 commits

Author SHA1 Message Date
Natsu Kagami 167d1dddb8
Update youmubot 2024-08-05 13:44:55 +02:00
Natsu Kagami 472daa8e59
Migrate gitea 2024-08-05 13:31:59 +02:00
Natsu Kagami d18a5ca503
Update youmubot 2024-08-04 23:14:01 +02:00
Natsu Kagami f164a27290
Update nixpkgs 2024-08-04 22:50:17 +02:00
3 changed files with 32 additions and 34 deletions

View file

@ -1063,11 +1063,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1722415718, "lastModified": 1722640603,
"narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1223,11 +1223,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1722087241, "lastModified": 1722651103,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1634,11 +1634,11 @@
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1721672434, "lastModified": 1722858068,
"narHash": "sha256-g4+2bR/jWcRdykeHwZ2jteDF521wgi9QWtghDlTaK7Y=", "narHash": "sha256-Y23vnGczMUfuK9W72eYtJzTNR1JkfRirCJ+mHXFL7Y0=",
"owner": "natsukagami", "owner": "natsukagami",
"repo": "youmubot", "repo": "youmubot",
"rev": "2ecc5b32fd8bf6a8290cc6f8758cbd0b21433d36", "rev": "e77930c8dba9d41413e60d3eac57c25969ea34d8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,28 +1,28 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
# osu-pkg = pkgs.unstable.osu-lazer-bin; osu-pkg = pkgs.unstable.osu-lazer-bin;
osu-pkg = with pkgs; with lib; # osu-pkg = with pkgs; with lib;
appimageTools.wrapType2 rec { # appimageTools.wrapType2 rec {
pname = "osu-lazer-bin"; # pname = "osu-lazer-bin";
version = "2024.731.0"; # version = "2024.731.0";
src = fetchurl { # src = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; # url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM="; # hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM=";
}; # };
extraPkgs = pkgs: with pkgs; [ icu ]; # extraPkgs = pkgs: with pkgs; [ icu ];
extraInstallCommands = # extraInstallCommands =
let contents = appimageTools.extract { inherit pname version src; }; # let contents = appimageTools.extract { inherit pname version src; };
in # in
'' # ''
mv -v $out/bin/${pname} $out/bin/osu\! # mv -v $out/bin/${pname} $out/bin/osu\!
install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications # install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
for i in 16 32 48 64 96 128 256 512 1024; do # for i in 16 32 48 64 96 128 256 512 1024; do
install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png # install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
done # done
''; # '';
}; # };
in in
{ {
home.packages = [ osu-pkg ]; home.packages = [ osu-pkg ];

View file

@ -114,8 +114,6 @@ in
inherit user; inherit user;
appName = "DTTHgit";
settings = { settings = {
server = { server = {
DOMAIN = host; DOMAIN = host;
@ -136,7 +134,7 @@ in
}; };
"repository.signing" = { "repository.signing" = {
SIGNING_KEY = signingKey; SIGNING_KEY = signingKey;
SIGNING_NAME = "DTTHGit"; SIGNING_NAME = "DTTHgit";
SIGNING_EMAIL = "dtth-gitea@nkagami.me"; SIGNING_EMAIL = "dtth-gitea@nkagami.me";
}; };
ui.THEMES = default-themes + "," + themes; ui.THEMES = default-themes + "," + themes;
@ -177,7 +175,7 @@ in
}; };
federation.ENABLED = true; federation.ENABLED = true;
DEFAULT.APP_NAME = "DTTHGit";
}; };
stateDir = "/mnt/data/gitea"; stateDir = "/mnt/data/gitea";