diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nixfiles/common/home-manager.nix | 10 | ||||
| -rw-r--r-- | modules/nixfiles/common/nix/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixfiles/fonts.nix | 1 | ||||
| -rw-r--r-- | modules/nixfiles/games/minecraft.nix | 26 | ||||
| -rw-r--r-- | modules/nixfiles/profiles/common.nix | 3 |
5 files changed, 19 insertions, 22 deletions
diff --git a/modules/nixfiles/common/home-manager.nix b/modules/nixfiles/common/home-manager.nix index e4c5d3b..3e715bb 100644 --- a/modules/nixfiles/common/home-manager.nix +++ b/modules/nixfiles/common/home-manager.nix @@ -17,6 +17,16 @@ with lib; { useUserPackages = true; useGlobalPkgs = true; verbose = true; + + # TODO You know what to do. + users = { + root.home = { + inherit (config.system) stateVersion; + }; + ${my.username}.home = { + inherit (config.system) stateVersion; + }; + }; }; system.extraDependencies = [inputs.home-manager]; diff --git a/modules/nixfiles/common/nix/default.nix b/modules/nixfiles/common/nix/default.nix index 4213a29..4e995d3 100644 --- a/modules/nixfiles/common/nix/default.nix +++ b/modules/nixfiles/common/nix/default.nix @@ -110,6 +110,7 @@ with lib; { })) agenix.overlay emacs-overlay.overlay + nix-minecraft-servers.overlays.default nur.overlay xmonad-ng.overlays.default ]; diff --git a/modules/nixfiles/fonts.nix b/modules/nixfiles/fonts.nix index 042c0e8..18c6f52 100644 --- a/modules/nixfiles/fonts.nix +++ b/modules/nixfiles/fonts.nix @@ -81,6 +81,7 @@ in { }; config = mkMerge [ + {home-manager.users.root.fonts.fontconfig.enable = false;} (mkIf cfg.enable { hm.fonts.fontconfig.enable = true; diff --git a/modules/nixfiles/games/minecraft.nix b/modules/nixfiles/games/minecraft.nix index 3936eaa..4f3908b 100644 --- a/modules/nixfiles/games/minecraft.nix +++ b/modules/nixfiles/games/minecraft.nix @@ -25,8 +25,8 @@ in { config = mkMerge [ (mkIf cfg.client.enable { hm.home.packages = with pkgs; [ - UltimMC - jre + UltimMC # I refuse to use a Microsoft account. + jre # Unfortunately, this cannot be provided as a PATH injection to UltimMC. ]; }) (mkIf cfg.server.enable { @@ -34,32 +34,14 @@ in { enable = true; eula = true; - # TODO After the PR is merged, I need to somehow pin this. - package = (pkgsPR "187458" "sha256-kOYkuXvcmqt8Lsh0yMr8reurzU1qTrzh0Z/Tjan0IF0=").papermc; + package = pkgs.minecraftServers.purpur_1_19_2; # TODO Make PR fixing trailing whitespace on this. jvmOpts = (concatStringsSep " " [ "-Xmx${cfg.server.memory}" "-Xms${cfg.server.memory}" - # "-XX:+AlwaysPreTouch" - # "-XX:+DisableExplicitGC" - # "-XX:+ParallelRefProcEnabled" - # "-XX:+PerfDisableSharedMem" - # "-XX:+UnlockExperimentalVMOptions" - # "-XX:+UseG1GC" - # "-XX:G1HeapRegionSize=8M" - # "-XX:G1HeapWastePercent=5" - # "-XX:G1MaxNewSizePercent=40" - # "-XX:G1MixedGCCountTarget=4" - # "-XX:G1MixedGCLiveThresholdPercent=90" - # "-XX:G1NewSizePercent=30" - # "-XX:G1RSetUpdatingPauseTimePercent=5" - # "-XX:G1ReservePercent=20" - # "-XX:InitiatingHeapOccupancyPercent=15" - # "-XX:MaxGCPauseMillis=200" - # "-XX:MaxTenuringThreshold=1" - # "-XX:SurvivorRatio=32" + "--add-modules=jdk.incubator.vector" ]) + " "; diff --git a/modules/nixfiles/profiles/common.nix b/modules/nixfiles/profiles/common.nix index dd287dc..3f77da6 100644 --- a/modules/nixfiles/profiles/common.nix +++ b/modules/nixfiles/profiles/common.nix @@ -75,6 +75,9 @@ in { vim.enable = true; }; + home-manager.users.root.home.file.".bash_history".source = + config.hm.lib.file.mkOutOfStoreSymlink "/dev/null"; + hm.home.language = { collate = "C"; messages = "C"; |