diff --git a/README.md b/README.md index f8496c7..9172fc5 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,6 @@ - `thinkpad` - Thinkpad T480, i5 8350U, 16GB RAM, 256GB NVME - `homelab` - i7 8700T, 32GB RAM, 512GB NVME, 1TB 2.5" SATA -## Todo -- Automatic backups to external drives. -- Better documentation and code structure. -- Use NixOS modules system. - ## Credits - [orangc's flake](https://git.orangc.net/c/dots) - [vimjoyer's tutorials](https://www.youtube.com/@vimjoyer) diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix index 2544f90..db30c7a 100644 --- a/modules/system/homelab/git.nix +++ b/modules/system/homelab/git.nix @@ -45,7 +45,7 @@ url = "http://localhost:5080"; #"https://git.proxy.${homelab.domain}"; tokenFile = "/mnt/data/apps/forgejo/token-runner"; labels = [ "self-hosted:host" ]; - hostPackages = with pkgs; [ bash coreutils git nix openssh bun ]; + hostPackages = with pkgs; [ bash coreutils git nix openssh nodejs ]; }; }; systemd.services = { diff --git a/modules/system/homelab/mc.nix b/modules/system/homelab/mc.nix index 90e2e76..2084d2e 100644 --- a/modules/system/homelab/mc.nix +++ b/modules/system/homelab/mc.nix @@ -1,13 +1,11 @@ { inputs, lib, pkgs, ... }: let - production = true; ram-allocation-mb = 12288; rcon-pass = "howdy"; modpack = let commit = "8523f89493ace13087eb68cd9fe3b5eb4f669440"; - path = if production then "commit/${commit}" else "branch/main"; in pkgs.fetchPackwizModpack { packHash = "sha256-xB9Oc/aneogSQ9r7L42vyVM6xwq+QkoTaXYNuUzeo6M="; - url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml"; + url = "https://git.satr14.my.id/satr14/server-modpack/raw/commit/${commit}/pack.toml"; }; in { @@ -34,25 +32,14 @@ in { enable = true; autoStart = true; restart = "always"; - enableReload = production; - # extraReload = '' - # function rcon() { - # ${pkgs.rcon-cli}/bin/rcon-cli -p ${rcon-pass} $@ - # } - - # rcon "gamerule locator_bar false" - # rcon "gamerule mob_explosion_drop_decay false" - # rcon "gamerule reduced_debug_info false" - # rcon "gamerule global_sound_events false" - # ''; + enableReload = false; - operators = lib.mkIf (!production) { - "satr14" = { - uuid = "54441a30-fe73-46e7-adca-c476bd4fc6d2"; - bypassesPlayerLimit = true; - level = 4; - }; + operators."satr14" = { + uuid = "54441a30-fe73-46e7-adca-c476bd4fc6d2"; + bypassesPlayerLimit = true; + level = 4; }; + # ^^ DISABLE ON PROD serverProperties = { # server-ip = "localhost";