Compare commits
5 Commits
340f181c58
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e559f6dd01 | ||
|
|
6646ac30a3 | ||
|
|
e74848204c | ||
|
|
31f6307b4a | ||
|
|
94020b6df9 |
@@ -37,6 +37,7 @@
|
||||
"hytale" = mkFolder "/home/bug/.local/share/Hytale/UserData/Saves";
|
||||
"ssh" = mkFolder "/home/bug/.ssh";
|
||||
"cloudflared" = mkFolder "/home/bug/.cloudflared";
|
||||
"copyparty" = mkFolder "/home/bug/copyparty";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
# sish
|
||||
vscode-server
|
||||
gitea
|
||||
omnisearch
|
||||
# omnisearch
|
||||
|
||||
catppuccin
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
ollama
|
||||
|
||||
alc897
|
||||
|
||||
cad
|
||||
];
|
||||
|
||||
nixos = {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
accounts = {
|
||||
bug = {
|
||||
passwordFile = "/home/bug/mailserver/bug.passwd";
|
||||
passwordFile = "/home/bug/copyparty/bug.passwd";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -32,11 +32,11 @@
|
||||
|
||||
volumes = {
|
||||
"/" = {
|
||||
path = "/home/copyparty";
|
||||
path = "/home/bug/copyparty/public/";
|
||||
|
||||
access = {
|
||||
r = "*";
|
||||
rw = [ "bug" ];
|
||||
rwda = [ "bug" ];
|
||||
};
|
||||
|
||||
flags = {
|
||||
@@ -45,12 +45,33 @@
|
||||
};
|
||||
};
|
||||
|
||||
"/music" = {
|
||||
"/nix" = {
|
||||
path = "/home/bug/nix/";
|
||||
|
||||
access = {
|
||||
r = "*";
|
||||
};
|
||||
|
||||
flags = {
|
||||
fk = 4;
|
||||
scan = 60;
|
||||
};
|
||||
};
|
||||
|
||||
"/box" = {
|
||||
path = "/";
|
||||
|
||||
access = {
|
||||
rwda = [ "bug" ];
|
||||
};
|
||||
};
|
||||
|
||||
"/Music" = {
|
||||
path = "/home/bug/Music/";
|
||||
|
||||
access = {
|
||||
r = "*";
|
||||
rw = [ "bug" ];
|
||||
rwda = [ "bug" ];
|
||||
};
|
||||
|
||||
flags = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ den, ... }: {
|
||||
{
|
||||
den.aspects.gitea = {
|
||||
# includes = [ den.aspects.gitea-mirrors ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ den, lib, ... }: {
|
||||
{ lib, ... }: {
|
||||
den.aspects.invidious = {
|
||||
nixos = { pkgs, config, ... }: let
|
||||
companionPort = 8282;
|
||||
@@ -12,48 +12,48 @@
|
||||
virtualisation.oci-containers.backend = lib.mkDefault "podman";
|
||||
|
||||
virtualisation.oci-containers.containers.invidious-companion = {
|
||||
image = "quay.io/invidious/invidious-companion:latest";
|
||||
extraOptions = [ "--network=host" "--pull=always" ];
|
||||
image = "quay.io/invidious/invidious-companion:latest";
|
||||
extraOptions = [ "--network=host" "--pull=always" ];
|
||||
|
||||
environment = {
|
||||
SERVER_SECRET_KEY = companionKey;
|
||||
HOST = "127.0.0.1";
|
||||
PORT = toString companionPort;
|
||||
SERVER_BASE_URL = "http://127.0.0.1:${toString companionPort}";
|
||||
environment = {
|
||||
SERVER_SECRET_KEY = companionKey;
|
||||
HOST = "127.0.0.1";
|
||||
PORT = toString companionPort;
|
||||
SERVER_BASE_URL = "http://127.0.0.1:${toString companionPort}";
|
||||
|
||||
# HTTP_PROXY = "http://proxy.example:3128";
|
||||
# HTTPS_PROXY = "http://proxy.example:3128";
|
||||
# NO_PROXY = "127.0.0.1,localhost";
|
||||
};
|
||||
# HTTP_PROXY = "http://proxy.example:3128";
|
||||
# HTTPS_PROXY = "http://proxy.example:3128";
|
||||
# NO_PROXY = "127.0.0.1,localhost";
|
||||
};
|
||||
};
|
||||
|
||||
services.invidious = {
|
||||
enable = true;
|
||||
package = pkgs.invidious;
|
||||
enable = true;
|
||||
package = pkgs.invidious;
|
||||
|
||||
address = "127.0.0.1";
|
||||
port = port;
|
||||
address = "127.0.0.1";
|
||||
port = port;
|
||||
|
||||
nginx.enable = false;
|
||||
sig-helper.enable = false;
|
||||
nginx.enable = false;
|
||||
sig-helper.enable = false;
|
||||
|
||||
settings = {
|
||||
domain = "tube.bug.tools";
|
||||
https_only = false;
|
||||
external_port = port;
|
||||
settings = {
|
||||
domain = "tube.bug.tools";
|
||||
https_only = false;
|
||||
external_port = port;
|
||||
|
||||
invidious_companion = [
|
||||
{ private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; }
|
||||
];
|
||||
invidious_companion = [
|
||||
{ private_url = "http://127.0.0.1:${toString companionPort}${companionPath}"; }
|
||||
];
|
||||
|
||||
invidious_companion_key = companionKey;
|
||||
};
|
||||
invidious_companion_key = companionKey;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.invidious = let dep = "podman-invidious-companion.service"; in {
|
||||
wants = [ dep ];
|
||||
after = [ dep ];
|
||||
requires = [ dep ];
|
||||
wants = [ dep ];
|
||||
after = [ dep ];
|
||||
requires = [ dep ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
imports = [
|
||||
(fetchTarball {
|
||||
url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz";
|
||||
sha256 = "0bw68h902j6cz4nshzd9iy2c6slg91026l3gydkgj4d7amsjvmg4";
|
||||
sha256 = "0mfc8xkpy6hrfwyhjjnfna8b54s2h01lzsw4mw3yym6ccacc75r8";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -44,14 +44,17 @@
|
||||
"fc2@bug.tools"
|
||||
"counter@bug.tools"
|
||||
"claude@bug.tools"
|
||||
"bitcraft@bug.tools"
|
||||
|
||||
"rumble@bug.tools"
|
||||
];
|
||||
};
|
||||
|
||||
"pare@bug.tools" = {
|
||||
hashedPasswordFile = "/home/bug/mailserver/pare.passwd";
|
||||
};
|
||||
|
||||
"poop@bug.tools" = {
|
||||
hashedPasswordFile = "/home/bug/mailserver/pare.passwd";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
1
modules/services/minecraft-server.nix
Normal file
1
modules/services/minecraft-server.nix
Normal file
@@ -0,0 +1 @@
|
||||
{}
|
||||
@@ -3,8 +3,8 @@
|
||||
nixos = {
|
||||
environment.systemPackages = let
|
||||
nix-alien = import (
|
||||
builtins.fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
|
||||
) { };
|
||||
fetchTarball "https://github.com/thiagokokada/nix-alien/tarball/master"
|
||||
){};
|
||||
in [
|
||||
nix-alien.nix-alien
|
||||
];
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,119 @@
|
||||
{ inputs, ... }: {
|
||||
den.aspects.minecraft = {
|
||||
nixos = { pkgs, ... }: {
|
||||
imports = [
|
||||
#inputs.minecraft.nixosModules.default
|
||||
#inputs.minecraft-metadata.nixosModules.default
|
||||
];
|
||||
nixos = { pkgs, ... }: let
|
||||
inherit (pkgs) fetchurl symlinkJoin makeWrapper;
|
||||
|
||||
users.users.bug.packages = with pkgs; [
|
||||
prismlauncher
|
||||
];
|
||||
base = (inputs.minecraft.legacyPackages.${pkgs.stdenv.hostPlatform.system}.v1_21_11.fabric.client.withConfig [{
|
||||
mods = [
|
||||
(fetchurl {
|
||||
name = "fabric-api.jar";
|
||||
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/i5tSkVBH/fabric-api-0.141.3+1.21.11.jar";
|
||||
sha256 = "sha256:1xgfpy6zj1nwwfrhr346firm8zw6lw63pl4parvjwrirc6l57i46";
|
||||
})
|
||||
|
||||
(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 = "modmenu.jar";
|
||||
url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/Tyk71iSw/modmenu-17.0.0.jar";
|
||||
sha256 = "sha256:0a2i5hl77bcw33m1h51y1dxrk7bbkj8fv0rp8w6y78d43ibwkwlm";
|
||||
})
|
||||
|
||||
(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 = "iris.jar";
|
||||
url = "https://cdn.modrinth.com/data/YL57xq9U/versions/fDpuVzVr/iris-fabric-1.10.7+mc1.21.11.jar";
|
||||
sha256 = "sha256:06fb6r22gnsxnv2w0sgvfnsj6fk3a7jcxls7z14imjc9h6hmviaq";
|
||||
})
|
||||
|
||||
(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";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "lithium.jar";
|
||||
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/Ow7wA0kG/lithium-fabric-0.21.4+mc1.21.11.jar";
|
||||
sha256 = "sha256:12y704i98rf0xb438f72hi0aqhsi35jxwjs2575vsg5lllfw8dai";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "immediatelyfast.jar";
|
||||
url = "https://cdn.modrinth.com/data/5ZwdcRci/versions/QwkfUKSj/ImmediatelyFast-Fabric-1.14.2+1.21.11.jar";
|
||||
sha256 = "sha256:1248yg69f5d232qn138xlcsdmbs2yj3gdjx9zl53v19c1j326pgb";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "entity-culling.jar";
|
||||
url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/SK12FGQf/entityculling-fabric-1.10.0-mc1.21.11.jar";
|
||||
sha256 = "sha256:0iws5ql4k542lr4psrcw9hj5z4zz81218ywnpsl77zj8wnwm4l1d";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "ferrite-core.jar";
|
||||
url = "https://cdn.modrinth.com/data/uXXizFIs/versions/Ii0gP3D8/ferritecore-8.2.0-fabric.jar";
|
||||
sha256 = "sha256:05f7q9jac16syfnahd6r4kx3aqm4i580y623gk6810plrdhdfszp";
|
||||
})
|
||||
|
||||
(fetchurl {
|
||||
name = "dynamic-fps.jar";
|
||||
url = "https://cdn.modrinth.com/data/LQ3K71Q1/versions/PUe5Asxs/dynamic-fps-3.11.4+minecraft-1.21.11-fabric.jar";
|
||||
sha256 = "sha256:13dh0226f6j70ak752fj8s00hmrx175v9607plf4rhia9plqy3kx";
|
||||
})
|
||||
|
||||
# (fetchurl {
|
||||
# name = "removing-loading-screens.jar";
|
||||
# url = "https://cdn.modrinth.com/data/ZP7xHXtw/versions/TCSbq6jC/rrlsFabric-5.1.15+mc.1.21.11.jar";
|
||||
# sha256 = "sha256:16dkj8baa6xn47n9alzy4104wz6z4zp719dxwv5wm96g2wkp1z57";
|
||||
# })
|
||||
];
|
||||
}]).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";
|
||||
})
|
||||
];
|
||||
|
||||
shaderPacks = [
|
||||
(fetchurl {
|
||||
name = "complementary-shaders.zip";
|
||||
url = "https://cdn.modrinth.com/data/HVnmMxH1/versions/836bPNGo/ComplementaryReimagined_r5.7.1.zip";
|
||||
sha256 = "sha256:1w33kyknwc0qsi6l0saww906iwi9d3hkn0nm7hnl4bc3lws0d8i4";
|
||||
})
|
||||
];
|
||||
|
||||
appArgs = [ "--gameDir" "/home/bug/.local/share/minecraft" ];
|
||||
};
|
||||
|
||||
minecraft = symlinkJoin {
|
||||
name = "minecraft-wrapped";
|
||||
paths = [ base ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/minecraft \
|
||||
--set XDG_DATA_HOME "/home/bug/.local/share/minecraft"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
users.users.bug.packages = [ minecraft ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user