wanderer/ git.oat.zone--dark-firepit--dotfiles
1
0
Fork 0
mirror of https://git.oat.zone/dark-firepit/dotfiles synced 2024-05-08 21:36:10 +02:00
Code Issues Releases Activity

Compare commits

base: wanderer:623d4040a5d54e8056aa019d0d973c3b5517408e
Branches Tags
wanderer:main
wanderer:nixos-23
wanderer:lucent-firepit-crystal-gauntlet
...
compare: wanderer:cf64285cc1b0accded9a6c22ac68acbed10ad69e
Branches Tags
wanderer:main
wanderer:nixos-23
wanderer:lucent-firepit-crystal-gauntlet

10 Commits
623d4040a5 ... cf64285cc1

Author SHA1 Message Date
Jill "oatmealine" Monoids cf64285cc1 chore: weekly flake update 2023-07-13 18:26:31 +02:00
Jill "oatmealine" Monoids 176370a814 chore: weekly flake update 2023-07-06 22:36:10 +02:00
Jill "oatmealine" Monoids 972e627b5d ipv6 attempt 2023-07-06 21:43:00 +02:00
Jill "oatmealine" Monoids 358992dd25 chore: weekly flake update 2023-06-29 18:04:03 +02:00
Jill "oatmealine" Monoids 16bd68fdd0 add gh actions token to remote 2023-06-29 18:00:49 +02:00
Jill "oatmealine" Monoids 56f3fb72c2 + femboy.industries 2023-06-28 17:36:20 +02:00
Jill "oatmealine" Monoids a79fc22f57 get rid of tac.yugoslavia.best 2023-06-22 11:25:00 +02:00
Jill "oatmealine" Monoids 90c8a0c450 no more winter 2023-06-22 11:24:13 +02:00
Jill "oatmealine" Monoids f741de6ceb chore: weekly flake update 2023-06-22 11:23:18 +02:00
Jill "oatmealine" Monoids b99c047395 swap jmusicbot to gmusicbot 2023-06-22 11:15:08 +02:00
6 changed files with 169 additions and 88 deletions
Show Stats Expand all files Collapse all files

92
flake.lock
View File

@ -68,11 +68,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1686248256,
"narHash": "sha256-KMryj3D1VtiXt9V8iNYS9NpWQE6U/sJDvixvAjH0uCA=",
"lastModified": 1689245342,
"narHash": "sha256-pRFDRHpa654j8TkVrQBcRf6c6/VQXt6TCLbBPwkphJs=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "8f642115041750e13a82d3bc841bf38a814b9bc4",
"rev": "3fbcace5b46e8b75d45314914f0ac58cc680ab81",
"type": "github"
},
"original": {
@ -120,11 +120,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@ -195,11 +195,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1685599623,
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"lastModified": 1687871164,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github"
},
"original": {
@ -217,11 +217,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1686161919,
"narHash": "sha256-1OUIOJRZwVFvVoCnU2mHl4b+jMZIYT021jdqKv6YgHY=",
"lastModified": 1689264334,
"narHash": "sha256-CJv3Qi00et2dFBWXTx9ysYdYauFtxxs+3pXr0gq/UX0=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "7f753cab9a8044651753524da1725d4fbe2555a7",
"rev": "f8def68e7e761e33dd51c197ac89194a51fcb60f",
"type": "github"
},
"original": {
@ -256,11 +256,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1685950944,
"narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=",
"lastModified": 1687552413,
"narHash": "sha256-mTOKGRi8mJVzJEnTaHpni5Whi1ohoWguLaD6Hs+ruZE=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a",
"rev": "a1d9ab7584485fe0b4a992abf19486a72179d4b2",
"type": "github"
},
"original": {
@ -274,11 +274,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1685380198,
"narHash": "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk=",
"lastModified": 1687865626,
"narHash": "sha256-loVzVNxrWwRKSqya2Ucfn8zcPgl19Li6q6Px4nDqpW4=",
"owner": "hyprwm",
"repo": "hyprpicker",
"rev": "deaca6a4d8e307d90b1f5b1033a8ea6c83b9b260",
"rev": "0889bd5f6f47847de50be021437775542ef2e91c",
"type": "github"
},
"original": {
@ -294,11 +294,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1686189348,
"narHash": "sha256-j0uOAKvHBIRZ49RLHfqFAzDyUMRCBspmNqLLn9z4gR4=",
"lastModified": 1689213567,
"narHash": "sha256-dYQ+2m7Ap7wF+UYhSPhqXvqQUO5zoTz+k6ZevI6X3wg=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "5a4c8a39344a06b188e6a7991b41f6b999c0d381",
"rev": "efb633320e840d89cfc5f7b8e190aae2076e733a",
"type": "github"
},
"original": {
@ -309,11 +309,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1686217350,
"narHash": "sha256-Nb9b3m/GEK8jyFsYfUkXGsqj6rH05GgJ2QWcNNbK7dw=",
"lastModified": 1689060619,
"narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "e4b34b90f27696ec3965fa15dcbacc351293dc67",
"rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c",
"type": "github"
},
"original": {
@ -340,11 +340,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1686059680,
"narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
"lastModified": 1689137672,
"narHash": "sha256-QZoHxr0a73x6rQcAo5CiwYpysHbSnk7lAR8/16um7mM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
"rev": "98da3dd0de6660d4abed7bb74e748694bd803413",
"type": "github"
},
"original": {
@ -356,11 +356,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1686135559,
"narHash": "sha256-pY8waAV8K/sbHBdLn5diPFnQKpNg0YS9w03MrD2lUGE=",
"lastModified": 1689192006,
"narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "381e92a35e2d196fdd6077680dca0cd0197e75cb",
"rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
"type": "github"
},
"original": {
@ -401,11 +401,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1686135559,
"narHash": "sha256-pY8waAV8K/sbHBdLn5diPFnQKpNg0YS9w03MrD2lUGE=",
"lastModified": 1689192006,
"narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "381e92a35e2d196fdd6077680dca0cd0197e75cb",
"rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
"type": "github"
},
"original": {
@ -417,27 +417,27 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1684570954,
"narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
"lastModified": 1687466461,
"narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
"rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1685655444,
"narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
"lastModified": 1688500189,
"narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
"rev": "78419edadf0fabbe5618643bd850b2f2198ed060",
"type": "github"
},
"original": {
@ -497,11 +497,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1686059680,
"narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
"lastModified": 1689209875,
"narHash": "sha256-8AVcBV1DiszaZzHFd5iLc8HSLfxRAuqcU0QdfBEF3Ag=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
"rev": "fcc147b1e9358a8386b2c4368bd928e1f63a7df2",
"type": "github"
},
"original": {
@ -609,11 +609,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1685803001,
"narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=",
"lastModified": 1686753331,
"narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "b61d5922f1d0910a848deb100570ad8587aea38d",
"rev": "7e7633abf09b362d0bad9e3fc650fd692369291d",
"type": "gitlab"
},
"original": {

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

@ -101,17 +101,17 @@ in {
};
};
winter = {
conf = {
packages = with pkgs; [ micro ];
shell = pkgs.unstable.fish;
extraGroups = [ "wheel" "nix-users" "dotfiles" ];
initialHashedPassword = "!";
openssh.authorizedKeys.keys = fetchSSHKeys [
"lilith@bms-cab"
];
};
};
#winter = {
# conf = {
# packages = with pkgs; [ micro ];
# shell = pkgs.unstable.fish;
# extraGroups = [ "wheel" "nix-users" "dotfiles" ];
# initialHashedPassword = "!";
# openssh.authorizedKeys.keys = fetchSSHKeys [
# "lilith@bms-cab"
# ];
# };
#};
};
keyboard = {
@ -134,6 +134,7 @@ in {
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBKMXTLBJ5iIPiO9jiN+AHWxpgG1kcdI0h23+G1FLMnK+xhkmaP9Vjr9QbqQ4mmRqfGERfJW5H2/OvTEUXnrkAp1Jc8oPrc14/auwKivtbMC5tsWzioDMbcAYKrcP37D3Kw1P7nzSyAz3QsRXBRx26OE5NeTo4YfGl/TOkQnoBCDTt8kcziWEvUVeOgnHf3hnszs2H4P6RAyOqjuOH6BWhtbKsCHThTHaAadLgeH5nB1WXLYqG2N1KEzAhj8WBBzPmeZcMMRr5xkqYVj14cd+9syEaenV+wXapoPyDtOb6YtOKArN9RkT0OOqQk17OzxvGqHUEXQ4eGmNgc8BLsGJn rsa-key-20230402"
#fetchSSH "oatmealine@void-defragmented"
#fetchSSH "oatmealine@beppy-phone"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAIphRdy+g7zfj+KxfONoD24lzk+/mGhQ0EnOe8QGf8 oatmealine@disroot.org" # gh actions
];
packages = with pkgs; [ tmux micro ];
shell = pkgs.unstable.fish;
@ -192,13 +193,15 @@ in {
forceskip = [ "fs" ];
movetrack = [ "move" "m" ];
};
queuetype = "REGULAR";
};
in {
enable = true;
instances = {
"jomble" = {
enable = true;
package = pkgs.unstable.jmusicbot;
package = pkgs._.gmusicbot;
options = baseOptions // {
token = lib.removeSuffix "\n" (builtins.readFile /etc/jomble_token);
@ -207,7 +210,7 @@ in {
};
"jillo" = {
enable = true;
package = pkgs.unstable.jmusicbot;
package = pkgs._.gmusicbot;
options = baseOptions // {
token = lib.removeSuffix "\n" (builtins.readFile /etc/jillo_token);
@ -239,35 +242,33 @@ in {
# https://nixos.org/manual/nixos/stable/options.html#opt-networking.enableB43Firmware
# temporarily disabled
enableIPv6 = false;
# enableIPv6 = true;
usePredictableInterfaceNames = false;
interfaces.eth0.ipv4.addresses = [
{ address = "46.4.96.113";
interfaces.eth0 = {
ipv4.addresses = [{
address = "46.4.96.113";
# prefixLength = 27;
prefixLength = 24;
}
];
}];
/*
ipv6.addresses = [{
address = "2a01:4f8:140::1";
prefixLength = 64;
}];
*/
};
defaultGateway = "46.4.96.97";
/*
defaultGateway6 = {
address = "fe80::1";
interface = "eth0";
};
*/
nameservers = [ "8.8.8.8" "1.1.1.1" ];
#interfaces.eno1.ipv6.addresses = [
# { address = "2001:41d0:0700:3308::";
# prefixLength = 64;
# }
#
# { address = "2001:41d0:0700:33ff::";
# prefixLength = 64;
# }
#];
#defaultGateway6 = {
# address = "2001:41d0:0700:33ff:00ff:00ff:00ff:00ff";
# address = "33ff::1";
# address = "2001::1";
# interface = "eno1";
#};
firewall.allowPing = true;
# minecraft proximity voice chat
firewall.allowedTCPPorts = [ 24454 24464 25567 25577 4499 21025 ];

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

@ -69,16 +69,16 @@ in {
"educationmath.oat.zone".auth = { twh = builtins.readFile /etc/proxy_twh; };
"rivervalleychocolate.com".dataDir = "/var/www/rivervalleychocolate.com";
"rivervalleychocolate.com".php = true;
"tac.yugoslavia.best".dataDir = "/var/www/tac.yugoslavia.best/public";
"tac.yugoslavia.best".php = true;
"tac.yugoslavia.best".phpHandlePathing = true;
#"tac.yugoslavia.best".dataDir = "/var/www/tac.yugoslavia.best/public";
#"tac.yugoslavia.best".php = true;
#"tac.yugoslavia.best".phpHandlePathing = true;
"pjsk.oat.zone".dataDir = "/var/www/pjsk.oat.zone";
"mayf.pink".dataDir = "/var/www/mayf.pink";
"mayf.pink".php = true;
"mayf.pink".phpHandlePathing = true;
"mayf.pink".forceSSL = false;
"wint0r.zone".dataDir = "/var/www/wint0r.zone";
"puzzle.wint0r.zone".dataDir = "/var/www/puzzle.wint0r.zone";
#"wint0r.zone".dataDir = "/var/www/wint0r.zone";
#"puzzle.wint0r.zone".dataDir = "/var/www/puzzle.wint0r.zone";
"femboy.industries".dataDir = "/var/www/femboy.industries";
};
nitter = {

12
modules/services/jmusicbot.nix
View File

@ -270,6 +270,16 @@ in {
};
};
queuetype = mkOption {
type = types.enum ["FAIR" "REGULAR"];
description = ''
Sets the queue type
FAIR: Each user gets a fair chance at the queue by rearranging it such that no user can fill it up entirely
REGULAR: Queue works as first-come, first-served
'';
default = "FAIR";
};
eval = mkOption {
type = types.bool;
description = ''
@ -359,4 +369,4 @@ in {
}
) cfg.instances;
};
}
}

38
packages/gmusicbot.maven.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, pkgs }:
let
shade_1_5 = map (obj: pkgs.javaPackages.fetchMaven {
version = "1.5";
artifactId = "maven-shade-plugin";
groupId = "org.apache.maven.plugins";
sha512 = obj.sha512;
type = obj.type;
}) [
{ type = "jar"; sha512 = "sha512-AoBtMzmqWMiOz5CSzl6ucYXK2iPtYbSlbsa2f8gCeP9ZtZfM+LkrEVzF9JcWsn+qbA9zC84O0fUyt7fJl8ZrBg=="; }
{ type = "pom"; sha512 = "sha512-YJTFhsAs3hV26L0+fAStwY6AHnPx6+cCo6yP/ZJTOUZvrlNTA1qxP/aBYjhPX3IvQ+UhagwdrSbA4uIS3w5sUw=="; }
];
in pkgs.javaPackages.mavenbuild rec {
version = "2023-05-19";
name = "gmusicbot-${version}";
mavenDeps = [
shade_1_5
];
m2Path = "/jmusicbot/jmusicbot/${version}";
src = pkgs.fetchFromGitea {
domain = "git.oat.zone";
owner = "oat";
repo = "GMusicBot";
rev = "master";
sha256 = "sha256-+sH5LI7PUN25rR1DM529Ly0WPHB4/JIQAPxWi0IlsZ4=";
};
meta = with pkgs.lib; {
description = "Discord music bot that's easy to set up and run yourself";
homepage = "https://git.oat.zone/oat/GMusicBot";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
inherit (pkgs.jre_headless.meta) platforms;
};
}

32
packages/gmusicbot.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
stdenv.mkDerivation rec {
pname = "GMusicBot";
version = "2023-05-19";
src = fetchurl {
url = "https://oat.zone/f/GMusicBot-2023-05-19.jar?v=3";
sha256 = "sha256-5c36did0kkaeu4Yi9vGIhlqRoeUBBRWKdihbaW9lwk4=";
};
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/lib
cp $src $out/lib/GMusicBot
makeWrapper ${jre_headless}/bin/java $out/bin/GMusicBot \
--add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/GMusicBot"
'';
meta = with lib; {
description = "Discord music bot that's easy to set up and run yourself";
homepage = "https://git.oat.zone/oat/GMusicBot";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = with maintainers; [ SuperSandro2000 ];
inherit (jre_headless.meta) platforms;
};
}