prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

Tweak a bunch of shimmeringmoon stuff

Browse source
This commit is contained in:
prescientmoon 2025-04-08 21:50:06 +02:00
parent 9864f85c40
commit 902a8e9e7b
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
10 changed files with 36 additions and 76 deletions

38
flake.lock
View file

@ -1316,11 +1316,11 @@
]
},
"locked": {
"lastModified": 1741037664,
"narHash": "sha256-1XnBCxVwI+ma9bMkcTxXvk2dp1EUeN0Wi4ey/K/fGCc=",
"lastModified": 1742938953,
"narHash": "sha256-QZkI/dEti25oMW/DmbX7P7Q065O2t+sbNb0pozGWedI=",
"ref": "refs/heads/main",
"rev": "ff605ada27e33b6150af94f3d402afe69e67d3b9",
"revCount": 23,
"rev": "d0aa99d03e6d4d4d9b9826c046a43a7e4e6517dd",
"revCount": 46,
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/moonythm.git"
},
@ -1946,7 +1946,7 @@
"nixpkgs-unstable": "nixpkgs-unstable",
"shimmeringdarkness": "shimmeringdarkness",
"shimmeringmoon": "shimmeringmoon",
"shimmeringvoid": "shimmeringvoid_2",
"shimmeringvoid": "shimmeringvoid",
"smos": "smos",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
@ -2058,14 +2058,16 @@
"shimmeringdarkness": [
"shimmeringdarkness"
],
"shimmeringvoid": "shimmeringvoid"
"shimmeringvoid": [
"shimmeringvoid"
]
},
"locked": {
"lastModified": 1741011314,
"narHash": "sha256-uAWNpwlZhVJOr63imogFsNHOJMtsq0xZCwQLUMeS21M=",
"lastModified": 1741183050,
"narHash": "sha256-ms1p1WG7DnKR85Og/FVaxG+AbS0npCZD/Tzee0/nXqk=",
"ref": "refs/heads/main",
"rev": "1e860105c03a36f863aa9f7faf8124b7495b6c87",
"revCount": 82,
"rev": "24d86478fc92c57f3e24f5134c2038cdaf01ca60",
"revCount": 90,
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git"
},
@ -2090,22 +2092,6 @@
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
}
},
"shimmeringvoid_2": {
"flake": false,
"locked": {
"lastModified": 1741011219,
"narHash": "sha256-nzelIlNadrnMfAWqlF4FwSAjp/Lr7Szehz2X28E/3cM=",
"ref": "refs/heads/main",
"rev": "d9785a503d59f709e4d0a02fa5f1cfee893bf78d",
"revCount": 8,
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
},
"original": {
"type": "git",
"url": "ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git"
}
},
"slimlock": {
"inputs": {
"nixpkgs": [

10
flake.nix
View file

@ -58,12 +58,8 @@
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
shimmeringdarkness.flake = false;
shimmeringdarkness.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringdarkness.git";
shimmeringvoid.flake = false;
shimmeringvoid.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringvoid.git";
shimmeringmoon.inputs.nixpkgs.follows = "nixpkgs";
shimmeringmoon.inputs.shimmeringvoid.follows = "shimmeringvoid";
shimmeringmoon.inputs.shimmeringdarkness.follows = "shimmeringdarkness";
shimmeringmoon.url = "git+ssh://forgejo@ssh.git.moonythm.dev/prescientmoon/shimmeringmoon.git";
@ -137,7 +133,9 @@
# }}}
# {{{ Overlays and modules
# Custom packages and modifications, exported as overlays
overlays = import ./overlays;
overlays = import ./overlays // {
shimmeringmoon = inputs.shimmeringmoon.overlays.default;
};
# Reusable nixos modules
nixosModules = import ./modules/nixos // import ./modules/common;

10
hosts/nixos/lapetus/default.nix
View file

@ -1,4 +1,4 @@
{ config, ... }:
{ config, pkgs, ... }:
{
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.05";
@ -76,6 +76,14 @@
config.users.users.pilot.openssh.authorizedKeys.keyFiles;
services.fail2ban.enable = false;
# }}}
# {{{ Misc packages
environment.systemPackages = [
pkgs.sqlite
pkgs.git
pkgs.bat
pkgs.yazi
];
# }}}
boot.loader.systemd-boot.enable = true;
}

4
hosts/nixos/lapetus/services/glass-server/default.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, ... }:
{ pkgs, config, ... }:
{
imports = [ ./module.nix ];
@ -25,7 +25,7 @@
owner = config.services.glass-server.user;
group = config.services.glass-server.user;
content = builtins.toJSON {
CONTENT_BUNDLE_FOLDER_PATH = "${inputs.shimmeringvoid}/bundles";
CONTENT_BUNDLE_FOLDER_PATH = "${pkgs.shimmeringextra}/bundles";
SECRET_KEY = "${config.sops.placeholder.glass_server_secret_key}";
PASSWORD = "${config.sops.placeholder.glass_server_admin_password}";
API_TOKEN = "${config.sops.placeholder.glass_server_admin_token}";

7
hosts/nixos/lapetus/services/moonythm.nix
View file

@ -7,9 +7,12 @@ let
dir = inputs.moonythm.packages.${pkgs.system}.moonythm;
in
{
satellite.cloudflared.at."".port = 8080;
satellite.cloudflared.at."".port = 80;
services.nginx.virtualHosts."moonythm.dev".extraConfig = ''
gzip on;
charset utf-8;
override_charset on;
services.nginx.virtualHosts."".extraConfig = ''
root ${dir};
error_page 404 /404.html;

4
hosts/nixos/lapetus/services/shimmeringmoon.nix
View file

@ -1,12 +1,10 @@
{
config,
inputs,
pkgs,
...
}:
let
user = config.services.glass-server.user;
pkg = inputs.shimmeringmoon.packages.${pkgs.system}.default;
dataDir = "/persist/state/var/lib/shimmeringmoon";
in
{
@ -18,7 +16,7 @@ in
serviceConfig = {
User = user;
Group = user;
ExecStart = "${pkg}/bin/shimmering-discord-bot";
ExecStart = "${pkgs.shimmeringmoon}/bin/shimmering-discord-bot";
Restart = "on-failure";
LogsDirectory = "shimmeringmoon";

7
hosts/nixos/tethys/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }:
{ config, ... }:
{
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "22.11";
@ -37,11 +37,6 @@
programs.kdeconnect.enable = true;
programs.firejail.enable = true;
services.mullvad-vpn.enable = true;
services.mysql = {
enable = true;
package = pkgs.mysql80;
};
# }}}
# {{{ Ad-hoc stylix targets
stylix.targets.gtk.enable = true;

1
pkgs/default.nix
View file

@ -14,5 +14,4 @@ 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) { };
}

27
pkgs/glass-bundler.nix
View file

@ -1,27 +0,0 @@
{
pkgs ? import <nixpkgs> { },
}:
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
'';
}

4
pkgs/glass-server.nix
View file

@ -17,8 +17,8 @@ pkgs.stdenv.mkDerivation {
src = pkgs.fetchFromGitHub {
owner = "starlitcanopy";
repo = "ArcaeaServerFork";
rev = "bd91ebe73db27e82f5dc937381e6824f3ae07f3b";
sha256 = "XJ9APmtN3NOb1YW9exdTVRWQxahhhrqlGP83tYpzEAg=";
rev = "2ee761f49462eabd6e26d2951cdd32205808261c";
sha256 = "i0h3lXo1k99h0h1P4VIFoYvugOtcY4vZZx9+8L//z1A=";
};
buildPhase = ''