From af56559632f93a3d1a7aa6201080c8348691f094 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 27 Mar 2026 16:33:58 -0400 Subject: [PATCH] more cobblemon --- systems/artemision/programs.nix | 2 - systems/palatine-hill/docker/minecraft.nix | 46 ++++++++++++++++++++++ systems/selinunte/programs.nix | 2 - users/alice/home.nix | 1 - users/alice/non-server.nix | 20 +++++++++- 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index e5ebcb6..72ef9f5 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -82,8 +82,6 @@ # signal in tray? siji simple-mtpfs - skaffold - slack slurp smartmontools snyk diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index 8004927..a54a5bd 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -13,6 +13,8 @@ let arcanum-institute = "arcanum.alicehuston.xyz"; meits = "meits.alicehuston.xyz"; cobblemon-overclocked = "mco.alicehuston.xyz"; + cobblemon-plus = "mcp.alicehuston.xyz"; + cobblemon-essentials = "mce.alicehuston.xyz"; # bcg-plus = "bcg.alicehuston.xyz"; pii = "pii.alicehuston.xyz"; }; @@ -103,6 +105,50 @@ in log-driver = "local"; environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; }; + cobblemon-plus = { + image = "itzg/minecraft-server:java21"; + volumes = [ + "${minecraft_path}/cobblemon-plus/modpacks:/modpacks:ro" + "${minecraft_path}/cobblemon-plus/data:/data" + ]; + hostname = "cobblemon-plus"; + environment = defaultEnv // { + VERSION = "1.21.1"; + CF_SLUG = "modified-cobblemon-plus"; + CF_FILENAME_MATCHER = "1.11.2"; + USE_AIKAR_FLAGS = "false"; + USE_MEOWICE_FLAGS = "true"; + DIFFICULTY = "peaceful"; + ENABLE_COMMAND_BLOCK = "true"; + INIT_MEMORY = "4G"; + MAX_MEMORY = "12G"; + }; + extraOptions = defaultOptions; + log-driver = "local"; + environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + }; + cobblemon-essentials = { + image = "itzg/minecraft-server:java21"; + volumes = [ + "${minecraft_path}/cobblemon-essentials/modpacks:/modpacks:ro" + "${minecraft_path}/cobblemon-essentials/data:/data" + ]; + hostname = "cobblemon-essentials"; + environment = defaultEnv // { + VERSION = "1.21.1"; + CF_SLUG = "cobblemon-essentials"; + CF_FILENAME_MATCHER = "1.11.2"; + USE_AIKAR_FLAGS = "false"; + USE_MEOWICE_FLAGS = "true"; + DIFFICULTY = "peaceful"; + ENABLE_COMMAND_BLOCK = "true"; + INIT_MEMORY = "4G"; + MAX_MEMORY = "12G"; + }; + extraOptions = defaultOptions; + log-driver = "local"; + environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + }; }; sops = { diff --git a/systems/selinunte/programs.nix b/systems/selinunte/programs.nix index 7f220cd..dfc8255 100644 --- a/systems/selinunte/programs.nix +++ b/systems/selinunte/programs.nix @@ -78,8 +78,6 @@ # signal in tray? siji simple-mtpfs - skaffold - slack slurp smartmontools snyk diff --git a/users/alice/home.nix b/users/alice/home.nix index 38d3bf2..b1be011 100644 --- a/users/alice/home.nix +++ b/users/alice/home.nix @@ -66,7 +66,6 @@ cargo-update diesel-cli tealdeer - helix ripunzip # nix specific packages diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix index 4ac4292..575adc0 100644 --- a/users/alice/non-server.nix +++ b/users/alice/non-server.nix @@ -1,5 +1,20 @@ { pkgs, ... }: - +let + tex = pkgs.texlive.combine { + inherit (pkgs.texlive) + scheme-medium + preprint + titlesec + enumitem + sourcesanspro + xifthen + ifmtarg + framed + paralist + fontawesome7 + ; + }; +in { programs = { emacs = { @@ -241,7 +256,8 @@ languagetool # latex - texlive.combined.scheme-medium + tex + poppler-utils # dependencies for nix-dotfiles/hydra-check-action nodejs_20 -- 2.53.0