dark-firepit
/
dotfiles
5
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

complete move to lucent-firepit!

This commit is contained in:
Jill 2023-04-24 23:41:20 +02:00
parent a8f93d7555
commit dc894caebc
7 changed files with 155 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
flake.lock
View File

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680281360, "lastModified": 1677969766,
"narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=", "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "e64961977f60388dd0b49572bb0fc453b871f896", "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,11 +51,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681376791, "lastModified": 1679283474,
"narHash": "sha256-vIhbKlSLiJuy3Zx5w8Pp7cPEuftLXn6fX8VPEkiEfzk=", "narHash": "sha256-vlJOZZ07XURH8ZZG6Eg/pOuUKhul5bcWkvd+nwrY0Yw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7606cc4b272b55d800c5b62adff217e5833db045", "rev": "794b5765f0dcab8a80d0875d1ee04aad9e220cb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,20 +98,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1667907331,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "ref": "release-22.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -126,11 +125,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1681395658, "lastModified": 1679277046,
"narHash": "sha256-ObDYZHUG3wmJfzISVRJ3VXqqYc8GRsOKC1qybJ/OIj0=", "narHash": "sha256-5E/Cd1PdYwN0bfR3dyyTQ2Wu5ADK3pg/Z+viAtfaP70=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "33d06fb0e5033412638edec5a8d78cbec844132a", "rev": "d23bbd1687a5413fb7f2c08b67692d4e64f8efef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +146,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681065697, "lastModified": 1671839510,
"narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681308705, "lastModified": 1678893556,
"narHash": "sha256-Iy1NVydzM04OqBLeD96zDmg1HMilUqa2vFeaOJFOp8o=", "narHash": "sha256-FHhBetkV/S7M9BMpbCzUWX/P5E7tGE4mZIpj/2m0K2M=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "10fd31a5444d25ab81c8105f2df1b4cb0cba68e5", "rev": "61961973cfd10853b32c7f904cdb88f9ab6d84dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680280900, "lastModified": 1678372307,
"narHash": "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=", "narHash": "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpicker", "repo": "hyprpicker",
"rev": "cc6b3234b2966acd61c8a2e5caae947774666601", "rev": "234c2da51a71941c0cd2ee380f42de365f90dd6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +207,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681262808, "lastModified": 1679276580,
"narHash": "sha256-A4CCPgNUDTLnu7WNdcE0GD/IhcIdV9fmNvWl6bC5f8Q=", "narHash": "sha256-3+YDy2BQuIWauD7oHZZDU0uRC2c0cOWdyRZW3ss76VY=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "2d5c4d090c759b7cf9ef6292f33d0702dab21d09", "rev": "710b88f976c522deb1306b0310429b4bef3cff39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +222,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1680876084, "lastModified": 1679224149,
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,26 +237,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681269223, "lastModified": 1679172431,
"narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=", "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "87edbd74246ccdfa64503f334ed86fa04010bab9", "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681303793, "lastModified": 1679172431,
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,21 +294,6 @@
"vscode-server": "vscode-server" "vscode-server": "vscode-server"
} }
}, },
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"vscode-server": { "vscode-server": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
@ -332,11 +316,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1680810405, "lastModified": 1677789111,
"narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", "narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", "rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -358,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681127512, "lastModified": 1673116118,
"narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -4,13 +4,13 @@
inputs = { inputs = {
# temporary forgejo workaround # temporary forgejo workaround
# TODO: remove when https://github.com/NixOS/nixpkgs/pull/218269 gets pushed to stable # TODO: remove when https://github.com/NixOS/nixpkgs/pull/218269 gets pushed to stable
nixpkgs.url = "nixpkgs/nixos-22.11"; #nixpkgs.url = "nixpkgs/nixos-22.05";
#nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
# WARNING: Where possible, prefer the stable branch of nixpkgs as nixpkgs-unstable may have incompatable or vulnerable software. # WARNING: Where possible, prefer the stable branch of nixpkgs as nixpkgs-unstable may have incompatable or vulnerable software.
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.url = "github:nix-community/home-manager/release-22.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# agenix - age-encrypted secrets # agenix - age-encrypted secrets
@ -74,7 +74,7 @@
}; };
overlays = mapModules ./overlays import; overlays = mapModules ./overlays import;
nixosModules = (mapModulesRec ./modules import) ++ [ nixosModules = (mapModulesRec ./modules import) ++ [
# hyprland.nixosModules.default #hyprland.nixosModules.default
vscode-server.nixosModule vscode-server.nixosModule
]; ];
nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; }); nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; });

55
hosts/lucent-firepit/default.nix
View File

@ -2,15 +2,14 @@
let let
keys = import ./authorizedKeys.nix; keys = import ./authorizedKeys.nix;
SSHKeys = map (pack: pack.ssh) keys;
fetchSSH = (host: lib._.getSSH host keys); fetchSSH = (host: lib._.getSSH host keys);
fetchSSHKeys = map fetchSSH; fetchSSHKeys = map fetchSSH;
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
# ./minecraft.nix ./minecraft.nix
# ./srb2k.nix ./srb2k.nix
# ./yugoslavia-best.nix ./yugoslavia-best.nix
./webapps/default.nix ./webapps/default.nix
inputs.nix-minecraft.nixosModules.minecraft-servers inputs.nix-minecraft.nixosModules.minecraft-servers
#inputs.watch-party.nixosModules.watch-party #inputs.watch-party.nixosModules.watch-party
@ -73,7 +72,6 @@ in {
}; };
}; };
}; };
# i yearn for the day this name ceases to mean # i yearn for the day this name ceases to mean
mayflower = { mayflower = {
conf = { conf = {
@ -127,6 +125,7 @@ in {
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRI9sGl0EmOkNNnh8SgRq197gkEy3XEwKZjLIr27V9PfaVOLIAcZiGcOa5q7rc5FjcCtkQ9+/twE24bZpxkK0ygrRJBEdT+HGAUmpY/kRPEn/tqjmwNu43vQqOhNSYmAAzdjJ4AuRPK5st8QQyOzKv5Pnghwy8xPAjOM3o4n9ULMLjVvAu0eTmCJMKxEvz5FUEIVZtEid/ng46k/bJ/njSh8vyGBQV4fJei6M9Ovw0HPqqzWyV/e0c3hTClG4dfLCK3Qv3hLhXQ+8I9iaL7D2wZdr3F2lbg0vS/QctPZc28f1gpkFEzVflEzAk4aFwJMMflY04IG1Dr44IfM1gJbpj rsa-key-20220423" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRI9sGl0EmOkNNnh8SgRq197gkEy3XEwKZjLIr27V9PfaVOLIAcZiGcOa5q7rc5FjcCtkQ9+/twE24bZpxkK0ygrRJBEdT+HGAUmpY/kRPEn/tqjmwNu43vQqOhNSYmAAzdjJ4AuRPK5st8QQyOzKv5Pnghwy8xPAjOM3o4n9ULMLjVvAu0eTmCJMKxEvz5FUEIVZtEid/ng46k/bJ/njSh8vyGBQV4fJei6M9Ovw0HPqqzWyV/e0c3hTClG4dfLCK3Qv3hLhXQ+8I9iaL7D2wZdr3F2lbg0vS/QctPZc28f1gpkFEzVflEzAk4aFwJMMflY04IG1Dr44IfM1gJbpj rsa-key-20220423"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCL75/Pg5bP7LaXE6uPyyv8QDRivWJC6YcH6oJJztkjqL6g+0xPPiN6I54q/bNF4nHA2BHVUktKUU9bGDEOpYIRq7kegp2/K/+FNTM1Kz6rJSrSc8e0Ogxg8vhD6maxqLU8q+D1OMhBu0UiWUB+GxXmeYfBtXPjpcE+AaJ80BPs7vwiulHPGn7UAcRuP36Z+3JJiN2BQnU2aizXWsgyU575Uy3DVvAt7eHon+SoJiTCs2//5KexJ42U6ZiE6f/oTFdiud70lpxhGgiiFvj6M9RZ0aLoxspiskW45jKLXIMJ+mO6husg9GfvCchbps3YkmH0hZ24Ii1EiFhi5HZMY0Lt mayflower" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCL75/Pg5bP7LaXE6uPyyv8QDRivWJC6YcH6oJJztkjqL6g+0xPPiN6I54q/bNF4nHA2BHVUktKUU9bGDEOpYIRq7kegp2/K/+FNTM1Kz6rJSrSc8e0Ogxg8vhD6maxqLU8q+D1OMhBu0UiWUB+GxXmeYfBtXPjpcE+AaJ80BPs7vwiulHPGn7UAcRuP36Z+3JJiN2BQnU2aizXWsgyU575Uy3DVvAt7eHon+SoJiTCs2//5KexJ42U6ZiE6f/oTFdiud70lpxhGgiiFvj6M9RZ0aLoxspiskW45jKLXIMJ+mO6husg9GfvCchbps3YkmH0hZ24Ii1EiFhi5HZMY0Lt mayflower"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrlqH2OShvXdzq1sV5IDuWQzeC9OHBVvwj0+Y0XXwi7 mayflower-thinkpad" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrlqH2OShvXdzq1sV5IDuWQzeC9OHBVvwj0+Y0XXwi7 mayflower-thinkpad"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBKMXTLBJ5iIPiO9jiN+AHWxpgG1kcdI0h23+G1FLMnK+xhkmaP9Vjr9QbqQ4mmRqfGERfJW5H2/OvTEUXnrkAp1Jc8oPrc14/auwKivtbMC5tsWzioDMbcAYKrcP37D3Kw1P7nzSyAz3QsRXBRx26OE5NeTo4YfGl/TOkQnoBCDTt8kcziWEvUVeOgnHf3hnszs2H4P6RAyOqjuOH6BWhtbKsCHThTHaAadLgeH5nB1WXLYqG2N1KEzAhj8WBBzPmeZcMMRr5xkqYVj14cd+9syEaenV+wXapoPyDtOb6YtOKArN9RkT0OOqQk17OzxvGqHUEXQ4eGmNgc8BLsGJn rsa-key-20230402"
#fetchSSH "oatmealine@void-defragmented" #fetchSSH "oatmealine@void-defragmented"
#fetchSSH "oatmealine@beppy-phone" #fetchSSH "oatmealine@beppy-phone"
]; ];
@ -139,13 +138,12 @@ in {
requirePassword = false; requirePassword = false;
}; };
postgres.enable = true;
mosh = { mosh = {
enable = true; enable = true;
}; };
/*
postgres.enable = true;
wireguard = { wireguard = {
enable = true; enable = true;
server = true; server = true;
@ -212,7 +210,6 @@ in {
}; };
}; };
}; };
*/
}; };
}; };
@ -236,7 +233,7 @@ in {
# https://nixos.org/manual/nixos/stable/options.html#opt-networking.enableB43Firmware # https://nixos.org/manual/nixos/stable/options.html#opt-networking.enableB43Firmware
# temporarily disabled # temporarily disabled
enableIPv6 = false; enableIPv6 = true;
usePredictableInterfaceNames = false; usePredictableInterfaceNames = false;
interfaces.eth0.ipv4.addresses = [ interfaces.eth0.ipv4.addresses = [
@ -248,31 +245,27 @@ in {
defaultGateway = "46.4.96.97"; defaultGateway = "46.4.96.97";
nameservers = [ "8.8.8.8" "1.1.1.1" ]; nameservers = [ "8.8.8.8" "1.1.1.1" ];
/* #interfaces.eno1.ipv6.addresses = [
interfaces.eno1.ipv6.addresses = [ # { address = "2001:41d0:0700:3308::";
{ address = "2001:41d0:0700:3308::"; # prefixLength = 64;
prefixLength = 64; # }
} #
# { address = "2001:41d0:0700:33ff::";
# prefixLength = 64;
# }
#];
{ address = "2001:41d0:0700:33ff::"; #defaultGateway6 = {
prefixLength = 64; # address = "2001:41d0:0700:33ff:00ff:00ff:00ff:00ff";
} # address = "33ff::1";
]; # address = "2001::1";
*/ # interface = "eno1";
#};
/*
defaultGateway6 = {
address = "2001:41d0:0700:33ff:00ff:00ff:00ff:00ff";
address = "33ff::1";
address = "2001::1";
interface = "eno1";
};
*/
firewall.allowPing = true; firewall.allowPing = true;
# minecraft proximity voice chat # minecraft proximity voice chat
firewall.allowedTCPPorts = [ 24454 25567 4499 ]; firewall.allowedTCPPorts = [ 24454 25567 4499 21025 ];
firewall.allowedUDPPorts = [ 24454 25567 4499 ]; firewall.allowedUDPPorts = [ 24454 25567 4499 21025 ];
}; };
# environment.etc."dhcpcd.duid".text = "d0:50:99:d4:04:68:d0:50:99:d4:04:68"; # environment.etc."dhcpcd.duid".text = "d0:50:99:d4:04:68:d0:50:99:d4:04:68";

2
hosts/lucent-firepit/hardware-configuration.nix
View File

@ -29,7 +29,7 @@
# i don't know of a cleaner way to do this, and i # i don't know of a cleaner way to do this, and i
# don't want to deal with ghost any longer than i # don't want to deal with ghost any longer than i
# already have, so This Will Do # already have, so This Will Do
#nix.settings.sandbox = false; nix.settings.sandbox = false;
modules.hardware.fs = { modules.hardware.fs = {
enable = true; enable = true;

76
hosts/lucent-firepit/minecraft.nix
View File

@ -2,6 +2,17 @@
with lib; with lib;
let let
darkFirepitWhitelist = {
oatmealine = "241d7103-4c9d-4c45-9464-83b5365ce48e";
RustyMyHabibi = "e20305fa-a44c-44c9-b62e-6918e7c779d6";
Dj_Afganistan = "1f879917-1ad4-49c3-9908-90769ee73f85";
DumbDogDoodles = "d33e5e3b-85ab-4c93-a61b-605e2673fbe8";
SuneFoxie = "82e82ef9-ea17-4794-9051-928b5b8629c1";
FuzziestRedMoth = "21e1adf8-93f7-4173-a087-b3a9c02edec5";
hewoicvewse = "98e715cf-b1a4-4d50-9ed0-7d20fbdf240e";
numpad_7 = "44e6e6d7-770d-4afc-96b1-9999b61ced1d";
_Zydra = "0af7b31f-63a5-426d-8cee-6c54385856b6";
};
in { in {
config = { config = {
modules.services.minecraft = { modules.services.minecraft = {
@ -24,17 +35,54 @@ in {
snooper-enabled = false; snooper-enabled = false;
spawn-protection = 0; spawn-protection = 0;
}; };
whitelist = { whitelist = darkFirepitWhitelist;
oatmealine = "241d7103-4c9d-4c45-9464-83b5365ce48e";
RustyMyHabibi = "e20305fa-a44c-44c9-b62e-6918e7c779d6";
Dj_Afganistan = "1f879917-1ad4-49c3-9908-90769ee73f85";
DumbDogDoodles = "d33e5e3b-85ab-4c93-a61b-605e2673fbe8";
SuneFoxie = "82e82ef9-ea17-4794-9051-928b5b8629c1";
FuzziestRedMoth = "21e1adf8-93f7-4173-a087-b3a9c02edec5";
};
package = pkgs.minecraftServers.fabric-1_19_2; package = pkgs.minecraftServers.fabric-1_19_2;
jvmOpts = "-Xmx6G"; jvmOpts = "-Xmx6G";
}; };
"gayrats" = let
packURL = "https://oat.zone/f/gayrats/pack.toml";
# https://git.sleeping.town/unascribed/unsup/releases
unsup = pkgs.fetchurl {
url = "https://git.sleeping.town/attachments/c521d178-8938-40a5-b21b-0333eef4099e";
sha256 = "c5bd49784392b651e4bc71fe57976f5b4fb14f09e0e23183ae5b94a821ae4756";
};
unsupIni = ''
version=1
preset=minecraft
source_format=packwiz
source=${packURL}
force_env=server
no_gui=true
'';
in {
enable = true;
autoStart = true;
openFirewall = true;
serverProperties = {
server-port = 25565;
gamemode = 0;
motd = "dark-firepit, 1.19.2 Fabric";
white-list = true;
max-players = 8;
allow-flight = true;
enable-command-block = true;
enforce-secure-profile = false;
snooper-enabled = false;
spawn-protection = 0;
};
symlinks = {
"unsup.ini" = pkgs.writeTextFile {
name = "unsup.ini";
text = unsupIni;
};
};
whitelist = darkFirepitWhitelist;
package = pkgs.minecraftServers.fabric-1_19_2;
jvmOpts = "-Xmx6G -javaagent:${unsup}";
};
"n3ko-test" = { "n3ko-test" = {
enable = true; enable = true;
autoStart = true; autoStart = true;
@ -79,6 +127,8 @@ in {
[flavors] [flavors]
shaders=no_shaders shaders=no_shaders
minimap=no_minimap
barrel_roll=no_barrel_roll
''; '';
in { in {
enable = true; enable = true;
@ -86,7 +136,7 @@ in {
openFirewall = true; openFirewall = true;
serverProperties = { serverProperties = {
server-port = 25535; server-port = 25535;
gamemode = 1; gamemode = "survival";
motd = "wafflecraft Real"; motd = "wafflecraft Real";
max-players = 32; max-players = 32;
allow-flight = true; allow-flight = true;
@ -106,7 +156,13 @@ in {
Tetaes = "4b149260-d56e-4835-b3f6-2dce173a92a5"; Tetaes = "4b149260-d56e-4835-b3f6-2dce173a92a5";
sorae_ = "9639d272-4c20-459d-adea-4aa89ee3cdc1"; sorae_ = "9639d272-4c20-459d-adea-4aa89ee3cdc1";
GelloISMello = "a2883a99-fe5d-454d-98b9-d65e4cec7e7e"; GelloISMello = "a2883a99-fe5d-454d-98b9-d65e4cec7e7e";
triplej2000 = "8441715c-6aef-497c-9a43-cbcfce887219"; Triplejy2k = "dced0fad-3802-4544-aaad-64d8fd12b1e8";
RAKKIIsan = "0706e583-82e3-478c-8769-1131fb9aef5d";
CyberBlue = "151bea19-3d16-45eb-8ae3-3057cde8e8f4";
numpad_7 = "44e6e6d7-770d-4afc-96b1-9999b61ced1d";
CERiNG = "8dd710ce-fd30-45a5-9252-739d3c03df19";
electr1ca = "c18dcc3b-6c11-42e9-b7d8-4b458ea7017d";
bigboyty69 = "ed735421-c22b-467a-9eac-5c08437ea3e8";
}; };
symlinks = { symlinks = {
"unsup.ini" = pkgs.writeTextFile { "unsup.ini" = pkgs.writeTextFile {

32
hosts/lucent-firepit/webapps/default.nix
View File

@ -18,21 +18,21 @@ in {
# domain = "blog.dark-firepit.cloud"; # domain = "blog.dark-firepit.cloud";
#}; #};
/*forgejo = { forgejo = {
enable = true; enable = true;
domain = "git.oat.zone"; domain = "git.oat.zone";
port = 3000; port = 3000;
};*/ };
/*matrix.conduit = { matrix.conduit = {
enable = false; enable = false;
domain = "matrix.dark-firepit.cloud"; domain = "matrix.dark-firepit.cloud";
};*/ };
/*vaultwarden = { vaultwarden = {
enable = true; enable = true;
domain = "vault.aether.gay"; domain = "vault.aether.gay";
};*/ };
# not entirely necessary but makes it so that invalid domains and/or direct ip access aborts connection # not entirely necessary but makes it so that invalid domains and/or direct ip access aborts connection
# prevents other domains from "stealing" content by settings their dns to our ip # prevents other domains from "stealing" content by settings their dns to our ip
@ -43,7 +43,7 @@ in {
}; };
staticSites = { staticSites = {
/*"aether.gay".dataDir = "/var/www/aether.gay"; "aether.gay".dataDir = "/var/www/aether.gay";
"dark-firepit.cloud".dataDir = "/var/www/dark-firepit.cloud"; "dark-firepit.cloud".dataDir = "/var/www/dark-firepit.cloud";
#"dark-firepit.oat.zone".dataDir = "/var/www/dark-firepit.oat.zone"; #"dark-firepit.oat.zone".dataDir = "/var/www/dark-firepit.oat.zone";
"va11halla.oat.zone".dataDir = "/var/www/va11halla.oat.zone"; "va11halla.oat.zone".dataDir = "/var/www/va11halla.oat.zone";
@ -51,10 +51,10 @@ in {
"modfiles.oat.zone".dataDir = "/var/www/modfiles.oat.zone"; "modfiles.oat.zone".dataDir = "/var/www/modfiles.oat.zone";
"shop.yugoslavia.best".dataDir = "/var/www/shop.yugoslavia.best"; "shop.yugoslavia.best".dataDir = "/var/www/shop.yugoslavia.best";
"tesco-underground-dev.oat.zone".dataDir = "/var/www/tesco-underground-dev.oat.zone"; "tesco-underground-dev.oat.zone".dataDir = "/var/www/tesco-underground-dev.oat.zone";
"tesco-underground-dev.oat.zone".auth = { tesco = builtins.readFile /etc/tesco; };*/ "tesco-underground-dev.oat.zone".auth = { tesco = builtins.readFile /etc/tesco; };
"oat.zone".dataDir = "/var/www/oat.zone"; "oat.zone".dataDir = "/var/www/oat.zone";
"oat.zone".php = true; "oat.zone".php = true;
/*"yugoslavia.fishing".dataDir = "/var/www/yugoslavia.fishing"; "yugoslavia.fishing".dataDir = "/var/www/yugoslavia.fishing";
"yugoslavia.fishing".php = true; "yugoslavia.fishing".php = true;
"educationmath.oat.zone".dataDir = "/var/www/proxy.oat.zone"; "educationmath.oat.zone".dataDir = "/var/www/proxy.oat.zone";
"educationmath.oat.zone".php = true; "educationmath.oat.zone".php = true;
@ -70,10 +70,10 @@ in {
"mayf.pink".phpHandlePathing = true; "mayf.pink".phpHandlePathing = true;
"mayf.pink".forceSSL = false; "mayf.pink".forceSSL = false;
"wint0r.zone".dataDir = "/var/www/wint0r.zone"; "wint0r.zone".dataDir = "/var/www/wint0r.zone";
"puzzle.wint0r.zone".dataDir = "/var/www/puzzle.wint0r.zone";*/ "puzzle.wint0r.zone".dataDir = "/var/www/puzzle.wint0r.zone";
}; };
/*nitter = { nitter = {
enable = true; enable = true;
lightweight = false; # enable if shit gets wild; check config for more info lightweight = false; # enable if shit gets wild; check config for more info
port = 3005; port = 3005;
@ -84,14 +84,14 @@ in {
enable = true; enable = true;
domain = "libreddit.oat.zone"; domain = "libreddit.oat.zone";
port = 1950; port = 1950;
};*/ };
#watch-party = { #watch-party = {
# enable = true; # enable = true;
# port = 1984; # port = 1984;
#}; #};
/*matomo = { matomo = {
enable = true; enable = true;
}; };
@ -112,7 +112,7 @@ in {
port = 1995; port = 1995;
domain = "comments.oat.zone"; domain = "comments.oat.zone";
target = "blog.oat.zone"; target = "blog.oat.zone";
};*/ };
}; };
}; };
@ -126,7 +126,7 @@ in {
error_page 404 /404.html; error_page 404 /404.html;
error_page 403 /403.html; error_page 403 /403.html;
''; '';
};/* };
# todo: move to flake # todo: move to flake
"gdpstest.oat.zone" = { "gdpstest.oat.zone" = {
enableACME = true; enableACME = true;
@ -173,7 +173,7 @@ in {
return 302 $scheme://proxy.knotty.dev$request_uri; return 302 $scheme://proxy.knotty.dev$request_uri;
} }
''; '';
};*/ };
#"git.oat.zone" = { #"git.oat.zone" = {
# forceSSL = true; # forceSSL = true;

4
packages/srb2kart/default.nix
View File

@ -21,7 +21,7 @@ releaseTag = "v1.6";
assets = fetchurl { assets = fetchurl {
url = "https://github.com/STJr/Kart-Public/releases/download/${releaseTag}/AssetsLinuxOnly.zip"; url = "https://github.com/STJr/Kart-Public/releases/download/${releaseTag}/AssetsLinuxOnly.zip";
sha256 = "sha256-A4HkxnDGQICucsJyHXYc5GCRbMP0M4NjreohhFOQarA="; sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE=";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
owner = "KartKrew"; owner = "KartKrew";
repo = "Kart-Public"; repo = "Kart-Public";
domain = "git.do.srb2.org"; domain = "git.do.srb2.org";
rev = "024a140e8d8a1f86ccf16ef3dd93e3bccbe3bd73"; rev = "v1.6";
sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
}; };