From 4012b36afce7681eed0be02f5fbcd45f477fba1a Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@jimbosfiles.com>
Date: Tue, 22 Oct 2024 03:22:05 -0400
Subject: [PATCH] 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 6290c33..418f8b0 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 e130a7d..b8c07ca 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 7b72d03..6511ff1 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