Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
Conversation 0 Commits 101 Files changed 306 +35 -16
4 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 951fee17e1 - Show all commits

42
hosts/cyberspark/system/hardware/default.nix
View file

@ -7,7 +7,7 @@
boot = { boot = {
blacklistedKernelModules = [ blacklistedKernelModules = [
"pcspkr" "pcspkr"
]; ];
initrd = { initrd = {
availableKernelModules = [ availableKernelModules = [
"xhci_pci" "xhci_pci"
@ -28,15 +28,36 @@
}; };
}; };
# Mounting options
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/8f81cab7-9381-4950-b77f-b85c5fdbad16"; device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
fsType = "ext4"; fsType = "btrfs";
options = [ "subvol=@" ];
};
"/home" = {
device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
fsType = "btrfs";
options = [ "subvol=@home" ];
};
"/nix" = {
device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
fsType = "btrfs";
options = [ "subvol=@nix" ];
};
"/var" = {
device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
fsType = "btrfs";
options = [ "subvol=@var" ];
};
"/.snapshots" = {
device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
fsType = "btrfs";
options = [ "subvol=@snapshots" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/2034-754A"; device = "/dev/disk/by-uuid/CD94-1D3F";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
"/export/JimboNFS" = { "/export/JimboNFS" = {
device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51"; device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51";
@ -60,8 +81,8 @@
fsType = "none"; fsType = "none";
options = [ "bind" ]; options = [ "bind" ];
}; };
"/var/lib/gitea" = { "/var/lib/forgejo" = {
device = "/export/JimboNFS/System/var/lib/gitea"; device = "/export/JimboNFS/System/var/lib/forgejo";
fsType = "none"; fsType = "none";
options = [ "bind" ]; options = [ "bind" ];
}; };
@ -98,11 +119,10 @@
}; };
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/ec422cad-bf93-4b15-b989-2c807f1073a4"; } { device = "/dev/disk/by-uuid/57178cfc-3e71-4d35-8c7f-e355f9dc84df"; }
]; ];
# Hardware settings
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

1
modules/system/services/server/default.nix
View file

@ -6,7 +6,6 @@
./fileserver ./fileserver
./forgejo ./forgejo
./icecast ./icecast
./mailserver
./minecraft ./minecraft
./misc ./misc
./mysql ./mysql

4
modules/system/services/server/minecraft/common/default.nix
View file

@ -48,8 +48,8 @@
sha256 = "02ad0dl34vdk6b1wyflqa6wq440xrh5w7yf3z3w1x1g089myddw4"; sha256 = "02ad0dl34vdk6b1wyflqa6wq440xrh5w7yf3z3w1x1g089myddw4";
}; };
"plugins/ProtocolLib.jar" = builtins.fetchurl { "plugins/ProtocolLib.jar" = builtins.fetchurl {
url = "https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar"; url = "https://ci.dmulloy2.net/job/ProtocolLib/733/artifact/build/libs/ProtocolLib.jar";
sha256 = "16krc7pyav4khnaxkyg27i5yxsgcdkildrn4nm5bhzh1f0ngqv2s"; sha256 = "1gslh24kk7dcqiqxphzy8x2nrqa58f8gl5ah0iyg1ndx3pvr4z9m";
}; };
"plugins/Vault.jar" = builtins.fetchurl { "plugins/Vault.jar" = builtins.fetchurl {
url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar"; url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar";

4
modules/system/services/server/minecraft/default.nix
View file

@ -6,8 +6,8 @@
./servers/dewdemolisher ./servers/dewdemolisher
./servers/johnside ./servers/johnside
./servers/roguecraft ./servers/roguecraft
./servers/blockworld #./servers/blockworld
./servers/uberbeta #./servers/uberbeta
]; ];
nixpkgs.overlays = [ minecraft.overlay ]; nixpkgs.overlays = [ minecraft.overlay ];