more cobblemon

systems/artemision/programs.nix

@@ -82,8 +82,6 @@
     # signal in tray?
     siji
     simple-mtpfs
-    skaffold
-    slack
     slurp
     smartmontools
     snyk

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 = {

systems/selinunte/programs.nix

@@ -78,8 +78,6 @@
     # signal in tray?
     siji
     simple-mtpfs
-    skaffold
-    slack
     slurp
     smartmontools
     snyk

users/alice/home.nix

@@ -66,7 +66,6 @@
       cargo-update
       diesel-cli
       tealdeer
-      helix
       ripunzip
 
       # nix specific packages

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