flake.lock

@@ -33,30 +33,6 @@
         "type": "gitlab"
       }
     },
-    "chaotic": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "home-manager": "home-manager",
-        "jovian": "jovian",
-        "nixpkgs": [
-          "unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729510449,
-        "narHash": "sha256-/EwjBMYBZ3/2ROT+4M/6tLomgJEgZBpKosWhqtYZkDI=",
-        "owner": "chaotic-cx",
-        "repo": "nyx",
-        "rev": "4e03e8d762623ca925c604800aa18f109cd3bd97",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chaotic-cx",
-        "ref": "nyxpkgs-unstable",
-        "repo": "nyx",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -147,20 +123,6 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1721999734,
-        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
-        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
-        "revCount": 75,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -236,27 +198,6 @@
       }
     },
     "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729414726,
-        "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "fe56302339bb28e3471632379d733547caec8103",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -277,28 +218,6 @@
         "type": "github"
       }
     },
-    "jovian": {
-      "inputs": {
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729177642,
-        "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "bb69165ff372ddbd3228a03513922acd783040e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -369,29 +288,6 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "jovian",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690328911,
-        "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
-        "owner": "zhaofengli",
-        "repo": "nix-github-actions",
-        "rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "ref": "matrix-name",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1722221733,
@@ -528,9 +424,8 @@
     "root": {
       "inputs": {
         "blender-bin": "blender-bin",
-        "chaotic": "chaotic",
         "hardware": "hardware",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "mailserver": "mailserver",
         "minecraft": "minecraft",

flake.nix

@@ -9,11 +9,6 @@
     };
 
     nur.url = "github:nix-community/NUR";
-    chaotic = {
-      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-      inputs.nixpkgs.follows = "unstable";
-    };
-
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
     hardware.url = "github:nixos/nixos-hardware/master";
 
@@ -31,7 +26,6 @@
     unstable,
     home-manager,
     nur,
-    chaotic,
     blender-bin,
     hardware,
     lanzaboote,
@@ -45,7 +39,6 @@
       specialArgs = {
         inherit
           unstable
-	  chaotic
           hardware
           lanzaboote
           mailserver

hosts/cyberspark/system/hardware/default.nix

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

hosts/firefly/system/default.nix

@@ -1,4 +1,4 @@
-{ chaotic, pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./hardware
@@ -23,13 +23,8 @@
     # Misc
     ../../../overlays
     ../../../variables
-
-    # Imports
-    chaotic.homeManagerModules.default
   ];
 
-  programs.sway.package = pkgs.sway_git;
-
   networking.hostName = "firefly";
 
   # Force Electron to use Wayland

modules/system/services/server/default.nix

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

modules/system/services/server/minecraft/common/default.nix

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

modules/system/services/server/minecraft/default.nix

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