diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index 498ad0b..9c86270 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -16,7 +16,7 @@ # sish vscode-server gitea - omnisearch + # omnisearch catppuccin diff --git a/modules/services/copyparty.nix b/modules/services/copyparty.nix index 2af790c..3441fac 100644 --- a/modules/services/copyparty.nix +++ b/modules/services/copyparty.nix @@ -45,7 +45,7 @@ }; }; - "/music" = { + "/Music" = { path = "/home/bug/Music/"; access = { diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index 433d191..bb73a1b 100644 --- a/modules/services/mailserver.nix +++ b/modules/services/mailserver.nix @@ -4,7 +4,7 @@ imports = [ (fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz"; - sha256 = "0bw68h902j6cz4nshzd9iy2c6slg91026l3gydkgj4d7amsjvmg4"; + sha256 = "0mfc8xkpy6hrfwyhjjnfna8b54s2h01lzsw4mw3yym6ccacc75r8"; }) ]; @@ -52,6 +52,10 @@ "pare@bug.tools" = { hashedPasswordFile = "/home/bug/mailserver/pare.passwd"; }; + + "poop@bug.tools" = { + hashedPasswordFile = "/home/bug/mailserver/pare.passwd"; + }; }; }; }; diff --git a/modules/services/minecraft-server.nix b/modules/services/minecraft-server.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/modules/services/minecraft-server.nix @@ -0,0 +1 @@ +{} diff --git a/modules/software/gaming/gaming.nix b/modules/software/gaming/gaming.nix index 8e7e317..67c7f4a 100644 --- a/modules/software/gaming/gaming.nix +++ b/modules/software/gaming/gaming.nix @@ -1,5 +1,5 @@ { den, ... }: { den.aspects.gaming = { - includes = with den.aspects; [ steam roblox hytale polytoria game-tools emulators star-citizen minecraft ]; + includes = with den.aspects; [ steam roblox polytoria game-tools emulators star-citizen minecraft ]; }; } diff --git a/modules/software/gaming/minecraft.nix b/modules/software/gaming/minecraft.nix index a04ea52..ef5c3e8 100644 --- a/modules/software/gaming/minecraft.nix +++ b/modules/software/gaming/minecraft.nix @@ -1,14 +1,45 @@ { inputs, ... }: { den.aspects.minecraft = { - nixos = { pkgs, ... }: { - imports = [ - #inputs.minecraft.nixosModules.default - #inputs.minecraft-metadata.nixosModules.default - ]; + nixos = { pkgs, ... }: let + inherit (pkgs) fetchurl; - users.users.bug.packages = with pkgs; [ - prismlauncher - ]; + minecraft = (inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig [{ + mods = [ + (fetchurl { + name = "meteor-client.jar"; + url = "https://meteorclient.com/api/download"; + sha256 = "sha256:0d5l2c41b3d1nadzaavdx8pjciskj6i3h65k4pmhvhz3mg6njwvl"; + }) + + (fetchurl { + name = "baritone.jar"; + url = "https://www.meteorclient.com/api/downloadBaritone"; + sha256 = "sha256:0g5xl90xphqy2c7xwlvjm71dn4l7c35yg8hwf7w4h0bwdfw7m31y"; + }) + + (fetchurl { + name = "distant-horizons.jar"; + url = "https://cdn.modrinth.com/data/uCdwusMi/versions/GT3Bm3GN/DistantHorizons-2.4.5-b-1.21.11-fabric-neoforge.jar"; + sha256 = "sha256:0gxwhvji4k0xnzidwrvlndh81r64n6i24v253grbxxamgshwg53n"; + }) + + (fetchurl { + name = "sodium.jar"; + url = "https://cdn.modrinth.com/data/AANobbMI/versions/UddlN6L4/sodium-fabric-0.8.7+mc1.21.11.jar"; + sha256 = "sha256:10rrqnyn8mb14b1k3ks84g6033zkkn94fwvyyflaiajhnf3ax3y0"; + }) + ]; + }]).withConfig { + resourcePacks = [ + (fetchurl { + name = "unique-dark.zip"; + url = "https://cdn.modrinth.com/data/BaY1UdGV/versions/UjQJb5zE/Unique%20Dark%20-%20Lite%20-%201.20.2-26.x.zip"; + sha256 = "sha256:19cv5q8pnvxkf96lazg8angbfqwkxag8qsxk31cv487jq99kl621"; + }) + ]; + }; + in { + users.users.bug.packages = [ minecraft]; }; }; }