From 4012b36afce7681eed0be02f5fbcd45f477fba1a Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 22 Oct 2024 03:22:05 -0400 Subject: [PATCH 1/2] Add Chaotic Nyx, and put Firefly on sway-git. My flickering is finally solved. --- flake.lock | 107 ++++++++++++++++++++++++++++++- flake.nix | 7 ++ hosts/firefly/system/default.nix | 7 +- 3 files changed, 119 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 6290c339..418f8b01 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,30 @@ "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": [ @@ -123,6 +147,20 @@ "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" @@ -198,6 +236,27 @@ } }, "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" @@ -218,6 +277,28 @@ "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", @@ -288,6 +369,29 @@ "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, @@ -424,8 +528,9 @@ "root": { "inputs": { "blender-bin": "blender-bin", + "chaotic": "chaotic", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "mailserver": "mailserver", "minecraft": "minecraft", diff --git a/flake.nix b/flake.nix index e130a7d1..b8c07ca2 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ }; 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"; @@ -26,6 +31,7 @@ unstable, home-manager, nur, + chaotic, blender-bin, hardware, lanzaboote, @@ -39,6 +45,7 @@ specialArgs = { inherit unstable + chaotic hardware lanzaboote mailserver diff --git a/hosts/firefly/system/default.nix b/hosts/firefly/system/default.nix index 7b72d035..6511ff1f 100644 --- a/hosts/firefly/system/default.nix +++ b/hosts/firefly/system/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ chaotic, pkgs, ... }: { imports = [ ./hardware @@ -23,8 +23,13 @@ # Misc ../../../overlays ../../../variables + + # Imports + chaotic.homeManagerModules.default ]; + programs.sway.package = pkgs.sway_git; + networking.hostName = "firefly"; # Force Electron to use Wayland From 951fee17e1ddd540af91941ff6630bf06867e481 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 22 Oct 2024 07:51:39 -0400 Subject: [PATCH 2/2] Reformatted the server, pray everything still works --- hosts/cyberspark/system/hardware/default.nix | 42 ++++++++++++++----- modules/system/services/server/default.nix | 1 - .../server/minecraft/common/default.nix | 4 +- .../services/server/minecraft/default.nix | 4 +- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix index c2f740c6..35d2138a 100644 --- a/hosts/cyberspark/system/hardware/default.nix +++ b/hosts/cyberspark/system/hardware/default.nix @@ -7,7 +7,7 @@ boot = { blacklistedKernelModules = [ "pcspkr" - ]; + ]; initrd = { availableKernelModules = [ "xhci_pci" @@ -28,15 +28,36 @@ }; }; - # Mounting options fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/8f81cab7-9381-4950-b77f-b85c5fdbad16"; - fsType = "ext4"; + "/" = { + device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287"; + 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" = { - device = "/dev/disk/by-uuid/2034-754A"; + device = "/dev/disk/by-uuid/CD94-1D3F"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; "/export/JimboNFS" = { device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51"; @@ -60,8 +81,8 @@ fsType = "none"; options = [ "bind" ]; }; - "/var/lib/gitea" = { - device = "/export/JimboNFS/System/var/lib/gitea"; + "/var/lib/forgejo" = { + device = "/export/JimboNFS/System/var/lib/forgejo"; fsType = "none"; options = [ "bind" ]; }; @@ -98,11 +119,10 @@ }; 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; - 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; } diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix index c99b72b1..8c79ef22 100644 --- a/modules/system/services/server/default.nix +++ b/modules/system/services/server/default.nix @@ -6,7 +6,6 @@ ./fileserver ./forgejo ./icecast - ./mailserver ./minecraft ./misc ./mysql diff --git a/modules/system/services/server/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix index 25282321..0e903566 100644 --- a/modules/system/services/server/minecraft/common/default.nix +++ b/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/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar"; - sha256 = "16krc7pyav4khnaxkyg27i5yxsgcdkildrn4nm5bhzh1f0ngqv2s"; + url = "https://ci.dmulloy2.net/job/ProtocolLib/733/artifact/build/libs/ProtocolLib.jar"; + sha256 = "1gslh24kk7dcqiqxphzy8x2nrqa58f8gl5ah0iyg1ndx3pvr4z9m"; }; "plugins/Vault.jar" = builtins.fetchurl { url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar"; diff --git a/modules/system/services/server/minecraft/default.nix b/modules/system/services/server/minecraft/default.nix index fb7912d3..22ca6900 100644 --- a/modules/system/services/server/minecraft/default.nix +++ b/modules/system/services/server/minecraft/default.nix @@ -6,8 +6,8 @@ ./servers/dewdemolisher ./servers/johnside ./servers/roguecraft - ./servers/blockworld - ./servers/uberbeta + #./servers/blockworld + #./servers/uberbeta ]; nixpkgs.overlays = [ minecraft.overlay ];