From 2ab01629577c6eb31b2b3ff2cf120d217a6768fe Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 25 Apr 2026 21:16:15 +0000 Subject: server updates --- flake.lock | 34 +++++----------------- flake.nix | 12 ++++---- host/Rory-ovh/configuration.nix | 4 +-- .../containers/spacebar/services/spacebar.nix | 7 ++++- modules/base-server.nix | 8 ++--- modules/users/Rory.nix | 16 +++++----- prebuild.sh | 2 +- 7 files changed, 34 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 00eec75..4abd3ad 100644 --- a/flake.lock +++ b/flake.lock @@ -215,26 +215,6 @@ "type": "github" } }, - "drasl": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775253339, - "narHash": "sha256-uP07QbRBILuQjXjaAwAE10LjC9T7CbKWk6P40aU1dV0=", - "owner": "unmojang", - "repo": "drasl", - "rev": "671d2a90775e5ec369b36eaca89ad68ff1a606ae", - "type": "github" - }, - "original": { - "owner": "unmojang", - "repo": "drasl", - "type": "github" - } - }, "draupnirSrc": { "flake": false, "locked": { @@ -1312,11 +1292,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1774709743, - "narHash": "sha256-iwwgwHv32WRB4+Ol5S3acFkwA/u4Cx80sTKOve6j1P8=", + "lastModified": 1776079297, + "narHash": "sha256-kUKhT6+oxoiohdhyBfxvDOjRZiEnLCkdFXyoXSD14CU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73f0991bf391b257e98125272bf3f43ea6aec1c7", + "rev": "716b412aad3f828ffa0634e392e3edf9b36a070f", "type": "github" }, "original": { @@ -1564,7 +1544,6 @@ "botcore-v4": "botcore-v4", "cgit-magenta": "cgit-magenta", "conduit": "conduit", - "drasl": "drasl", "draupnirSrc": "draupnirSrc", "flake-utils": "flake-utils_3", "grapevine": "grapevine", @@ -1646,15 +1625,16 @@ "pion-webrtc": "pion-webrtc" }, "locked": { - "lastModified": 1774987951, - "narHash": "sha256-0wfYV5mAskVGC2gVVpBKPJGiGdAkm+PDKDct4NC3A9Y=", + "lastModified": 1776514794, + "narHash": "sha256-NEOdlVsORdi4jrzgeV2Ah66Kypr5IKD2uUS4CAtsIc8=", "owner": "spacebarchat", "repo": "server", - "rev": "12422e9a9afb1e3ce22243cbd80fec715d4dcc39", + "rev": "53dbce30d6090d8803a6898442ede5156cf15aef", "type": "github" }, "original": { "owner": "spacebarchat", + "ref": "dev/bigint-pk", "repo": "server", "type": "github" } diff --git a/flake.nix b/flake.nix index 54d0908..f2a4cd8 100755 --- a/flake.nix +++ b/flake.nix @@ -46,10 +46,10 @@ # Packages grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery"; conduit.url = "gitlab:famedly/conduit/next"; - drasl = { - url = "github:unmojang/drasl"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #drasl = { + # url = "github:unmojang/drasl"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; # - AUR imports # aur-visual-paradigm = { # url = "git+https://aur.archlinux.org/visual-paradigm.git"; @@ -156,7 +156,7 @@ home-manager.nixosModules.home-manager lix-module.nixosModules.default grapevine.nixosModules.default - drasl.nixosModules.drasl + #drasl.nixosModules.drasl ooye.modules.default ( @@ -487,7 +487,7 @@ inherit (oldAttrs) src; inherit patches; name = "${oldAttrs.pname}-${oldAttrs.version}"; - hash = "sha256-nB7gLPDK8sB65xZkTn5W4MCqx4QwWKDUr8hB8KIu0qY="; + hash = "sha256-RSBaRHtE0UVN5lt0iE7xywWa8bMJ202wtbReCH8wP+4="; }; #doInstallCheck = false; diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix index 0ea717d..0d7ef0e 100755 --- a/host/Rory-ovh/configuration.nix +++ b/host/Rory-ovh/configuration.nix @@ -27,9 +27,9 @@ ./services/matrix/ooye.nix ./services/email/root.nix ./services/drasl.nix - ./services/prosody.nix + #./services/prosody.nix #./services/wireguard/wireguard.nix - ../../modules/software-templates/devenv/dotnet.nix + #../../modules/software-templates/devenv/dotnet.nix ]; users.groups.ocp = { }; diff --git a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix index ec98d4b..228bf69 100644 --- a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix +++ b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix @@ -1,7 +1,7 @@ { spacebar, lib, ... }: let - sb = import "${spacebar}/nix/modules/default/lib.nix"; + sb = import "${spacebar}/nix/lib/mkEndpoint.nix"; in { imports = [ spacebar.nixosModules.default ]; @@ -179,6 +179,11 @@ in enableAbuseIpDb = true; enableIpData = false; # 1500req/d, needed by gateway }; + embeds = { + youtube = { + userAgent = "Mozilla/5.0 (compatible; Discordbot/2.0; +https://discordapp.com)"; + }; + }; }; extraEnvironment = { DATABASE = "postgres://spacebar:spacebar@192.168.100.1/spacebar"; diff --git a/modules/base-server.nix b/modules/base-server.nix index 91d01c5..46f0c97 100755 --- a/modules/base-server.nix +++ b/modules/base-server.nix @@ -27,10 +27,10 @@ }; }; - sleep.extraConfig = '' - AllowSuspend=no - AllowHibernation=no - ''; + sleep.settings.Sleep = { + AllowSuspend = "no"; + AllowHibernation = "no"; + }; }; #systemd.services.NetworkManager-wait-online.enable = false; diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix index fd382e5..05745fc 100755 --- a/modules/users/Rory.nix +++ b/modules/users/Rory.nix @@ -77,6 +77,7 @@ user.email = "root@rory.gay"; safe.directory = "/"; advice.defaultBranchName = false; + signing.format = "openpgp"; }; }; zsh = { @@ -112,8 +113,7 @@ export DISABLE_AUTO_UPDATE=true COMPLETION_WAITING_DOTS="true" - ''; - initExtra = '' + # at the end? alias mv='mv -v' alias pre='npx prettier -w' alias git-commit='git commit --signoff --sign' @@ -193,12 +193,12 @@ POWERLEVEL9K_MODE = "nerdfont-complete"; POWERLEVEL9K_ICON_PADDING = "none"; POWERLEVEL9K_PROMPT_ADD_NEWLINE = "false"; - POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR = "\uE0B1"; - POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR = "\uE0B3"; - POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR = "\uE0B0"; - POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR = "\uE0B2"; - POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL = "\uE0B0"; - POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL = "\uE0B2"; + POWERLEVEL9K_LEFT_SUBSEGMENT_SEPARATOR = "\\uE0B1"; + POWERLEVEL9K_RIGHT_SUBSEGMENT_SEPARATOR = "\\uE0B3"; + POWERLEVEL9K_LEFT_SEGMENT_SEPARATOR = "\\uE0B0"; + POWERLEVEL9K_RIGHT_SEGMENT_SEPARATOR = "\\uE0B2"; + POWERLEVEL9K_LEFT_PROMPT_LAST_SEGMENT_END_SYMBOL = "\\uE0B0"; + POWERLEVEL9K_RIGHT_PROMPT_FIRST_SEGMENT_START_SYMBOL = "\\uE0B2"; POWERLEVEL9K_PROMPT_CHAR_OVERWRITE_STATE = true; }; }; diff --git a/prebuild.sh b/prebuild.sh index 74357cf..b3a3e99 100755 --- a/prebuild.sh +++ b/prebuild.sh @@ -11,7 +11,7 @@ fi CONFIG=$1 DERIVATION=".#nixosConfigurations.${CONFIG}.config.system.build.toplevel" -EXTRA_NIX_FLAGS="-vL --accept-flake-config --keep-going --show-trace --option allow-import-from-derivation false" +EXTRA_NIX_FLAGS="-vL --accept-flake-config --keep-going --show-trace --option allow-import-from-derivation false -j 128" EXTRA_NIXOS_REBUILD_FLAGS="--sudo --no-reexec --offline" # legacy: --use-remote-sudo --fast [ -f "host/${CONFIG}/hooks/pre-rebuild.sh" ] && echo "<=== RUNNING PRE-REBUILD HOOK AT host/${CONFIG}/hooks/pre-rebuild.sh ===>" && host/${CONFIG}/hooks/pre-rebuild.sh -- cgit 1.5.1