diff --git a/hosts/nixos/lapetus/services/glass-server/module.nix b/hosts/nixos/lapetus/services/glass-server/module.nix index bd461f8..aa72b68 100644 --- a/hosts/nixos/lapetus/services/glass-server/module.nix +++ b/hosts/nixos/lapetus/services/glass-server/module.nix @@ -56,6 +56,7 @@ let WORLD_SONG_FULL_UNLOCK = false; WORLD_SCENERY_FULL_UNLOCK = false; SAVE_FULL_UNLOCK = false; + STAMINA_RECOVER_TICK = 1; # Recover stamina instantly # }}} }; diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix index 2285081..93830f5 100644 --- a/hosts/nixos/tethys/default.nix +++ b/hosts/nixos/tethys/default.nix @@ -62,4 +62,7 @@ # {{{ SSH keys users.users.pilot.openssh.authorizedKeys.keyFiles = [ ../calypso/keys/id_ed25519.pub ]; # }}} + + services.gnome.gnome-keyring.enable = true; + security.pam.services.hyprland.enableGnomeKeyring = true; } diff --git a/pkgs/default.nix b/pkgs/default.nix index f7c8f0c..861cffd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14,4 +14,5 @@ in vimclip = pkgs.callPackage (import ./vimclip.nix) { }; homer = pkgs.callPackage (import ./homer.nix) { }; glassServer = pkgs.callPackage (import ./glass-server.nix) { }; + glassBundler = pkgs.callPackage (import ./glass-bundler.nix) { }; } diff --git a/pkgs/glass-bundler.nix b/pkgs/glass-bundler.nix new file mode 100644 index 0000000..7a8d6fa --- /dev/null +++ b/pkgs/glass-bundler.nix @@ -0,0 +1,27 @@ +{ + pkgs ? import { }, +}: +pkgs.stdenv.mkDerivation { + pname = "arcaea-bundler"; + version = "unstable-2024-03-12"; + + src = pkgs.fetchFromGitHub { + owner = "Lost-MSth"; + repo = "Arcaea-Bundler"; + rev = "db1901f31407f623da161a76dde225899ce902de"; + sha256 = "0fd2yrg8g6iwzy6m1y0ijfz5aqfm5bh8n6dzhiswzpssp4znp6vz"; + }; + + buildPhase = '' + runHook preBuild + echo "#!${pkgs.python3}/bin/python" > glass-bundler + cat $src/arcaea_bundler/main.py >> glass-bundler + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 glass-bundler -t $out/bin/ + runHook postInstall + ''; +} diff --git a/pkgs/glass-server.nix b/pkgs/glass-server.nix index c91abeb..bc20d7f 100644 --- a/pkgs/glass-server.nix +++ b/pkgs/glass-server.nix @@ -17,8 +17,8 @@ pkgs.stdenv.mkDerivation { src = pkgs.fetchFromGitHub { owner = "starlitcanopy"; repo = "ArcaeaServerFork"; - rev = "ab5cea3b7b998bfa13f362571ab3252e2e02c98a"; - sha256 = "p4S79TfAB5ffTosjfZVrKiJ8FnspT/ceuIg2f1cQZ9Y="; + rev = "39e8424fbbc7fb127bbbbc3a921e55c576612a4b"; + sha256 = "QSpDHi2CY4GxzR+QGnT1skXKDe8atguohrSGWVVU1qw="; }; buildPhase = ''