From cccd44df3ff0b874bdb7e1a162bfae68afe773b1 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 5 Jan 2024 07:05:34 +0800 Subject: [PATCH] hosts/mistral: mcmmo --- README.org | 8 ++++---- hosts/mistral/configuration.nix | 6 ++++++ modules/shared/home-manager/default.nix | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.org b/README.org index 981edfc..f8a3251 100644 --- a/README.org +++ b/README.org @@ -4,7 +4,7 @@ [[assets/nixos-official-logo.png]] -[[https://github.com/nixos/nixpkgs][file:https://img.shields.io/badge/NixOS-23.11-informational?style=flat.svg]] +[[https://github.com/nixos/nixpkgs][file:https://img.shields.io/badge/NixOS-24.05-informational?style=flat.svg]] [[https://github.com/fortuneteller2k/nix-config/actions/workflows/check.yml][https://github.com/fortuneteller2k/nix-config/actions/workflows/check.yml/badge.svg]] [[https://github.com/fortuneteller2k/nix-config/actions/workflows/statix.yml][https://github.com/fortuneteller2k/nix-config/actions/workflows/statix.yml/badge.svg]] [[https://github.com/fortuneteller2k/nix-config/actions/workflows/format.yml][https://github.com/fortuneteller2k/nix-config/actions/workflows/format.yml/badge.svg]] @@ -13,7 +13,7 @@ (I highly recommend making your own configuration and copy snippets from mine, but anyway...) -Get the latest NixOS 23.05 image [[https://releases.nixos.org/?prefix=nixos/unstable/][here]], do your partitions (root must be mounted at =/mnt=), then run the following commands: +Get the latest NixOS 24.05 image [[https://releases.nixos.org/?prefix=nixos/unstable/][here]], do your partitions (root must be mounted at =/mnt=), then run the following commands: #+begin_src sh # move the output file of this to hosts/*/hardware-configuration.nix nixos-generate-config @@ -24,7 +24,7 @@ Get the latest NixOS 23.05 image [[https://releases.nixos.org/?prefix=nixos/unst sudo nixos-install --flake .#starcruiser # After rebooting - home-manager switch --flake .#moni + home-manager switch --flake .#moni@starcruiser #+end_src For WSL, follow the [[https://github.com/nix-community/NixOS-WSL#quick-start][quickstart guide]], then run the following commands: @@ -33,7 +33,7 @@ For WSL, follow the [[https://github.com/nix-community/NixOS-WSL#quick-start][qu git clone https://github.com/fortuneteller2k/nix-config ~ cd ~/nix-config sudo nixos-rebuild switch --flake .#turncoat - home-manager switch --flake .#zero + home-manager switch --flake .#zero@turncoat #+end_src *** Caveats diff --git a/hosts/mistral/configuration.nix b/hosts/mistral/configuration.nix index a24ad9f..d9838bf 100644 --- a/hosts/mistral/configuration.nix +++ b/hosts/mistral/configuration.nix @@ -171,6 +171,12 @@ hash = "sha256-FJkS5kzCfET7eObqEnVW5K5ziNnp5B3baxPjQgMRL6s="; }; + "plugins/mcmmo.jar" = pkgs.requireFile { + url = "https://mcmmo.org"; + name = "mcMMO-2.1.225.jar"; + hash = "sha256-PoVKTcIxQEzn8OCNM1herUG7+ojD1JmVRY3xrQ2I1uQ="; + }; + "bukkit.yml" = ./config/bukkit.yml; "spigot.yml" = ./config/spigot.yml; "config/paper-global.yml" = ./config/paper-global.yml; diff --git a/modules/shared/home-manager/default.nix b/modules/shared/home-manager/default.nix index 6e423b7..22a2efb 100644 --- a/modules/shared/home-manager/default.nix +++ b/modules/shared/home-manager/default.nix @@ -83,7 +83,7 @@ url = "https://raw.githubusercontent.com/rose-pine/helix/main/rose_pine.toml"; sha256 = "sha256-Jrn8jjZ8RoRf7dLEHWoPNQslX+EKK4oBP76RjFVV5hA="; })); - + rose-pine-moon = fromTOML (__readFile (__fetchurl { url = "https://raw.githubusercontent.com/rose-pine/helix/main/rose_pine_moon.toml"; sha256 = "sha256-6okdImytU6EU10UuiOdWE5OP7t0pWf5wx/bFK43DDgk=";