@@ -2,3 +2,4 @@ prompt/prompt
 result
 config/nvim/init.vim
 .luarc.json
+.direnv

@@ -16,6 +16,46 @@ "repo": "advisory-db",
         "type": "github"
       }
     },
+    "chaotic": {
+      "inputs": {
+        "compare-to": "compare-to",
+        "fenix": "fenix",
+        "flake-schemas": "flake-schemas",
+        "home-manager": "home-manager",
+        "jovian": "jovian",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems",
+        "yafas": "yafas"
+      },
+      "locked": {
+        "lastModified": 1724534339,
+        "narHash": "sha256-IA/Y0WSx4s1X6O6FkY06IEnafR8fUe3jSFA0Zopiwbs=",
+        "owner": "chaotic-cx",
+        "repo": "nyx",
+        "rev": "c99c254d336cacb8c7a622cac675ea6c7768dc73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "chaotic-cx",
+        "ref": "nyxpkgs-unstable",
+        "repo": "nyx",
+        "type": "github"
+      }
+    },
+    "compare-to": {
+      "locked": {
+        "lastModified": 1695341185,
+        "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=",
+        "rev": "98b8e330823a3570d328720f87a1153f8a7f2224",
+        "revCount": 2,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
+      }
+    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -58,6 +98,28 @@ "repo": "nix-darwin",
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "chaotic",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1724394478,
+        "narHash": "sha256-JSiv2uwI4UJo/4pxt4255BfzWCiEberJmBC6pCxnzas=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "2e7bcdc4ef73aa56abd2f970e5a8b9c0cc87e614",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -95,9 +157,44 @@ "repo": "flake-parts",
         "type": "github"
       }
     },
+    "flake-schemas": {
+      "locked": {
+        "lastModified": 1693491534,
+        "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=",
+        "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279",
+        "revCount": 21,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
+          "chaotic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724412708,
+        "narHash": "sha256-tLr1k+UZLVumyqXRU8E5lBtLjsvHSy8e2NiamfkjpYg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "b18f3ebc4029c22d437e3424014c8597a8b459a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
           "nixpkgs"
         ]
       },
@@ -115,6 +212,51 @@ "repo": "home-manager",
         "type": "github"
       }
     },
+    "jovian": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "chaotic",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724304322,
+        "narHash": "sha256-/nrlMDubg9oG2VNANRBxsas5RbcJtB6IIDPZC3yHLW8=",
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "rev": "924a18ea8df89a39166dd202f3e73cd022825768",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jovian-Experiments",
+        "repo": "Jovian-NixOS",
+        "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"
+      }
+    },
     "nix-snapshotter": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -144,7 +286,7 @@ "crane": "crane",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1717612968,
@@ -177,11 +319,11 @@ }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723175592,
-        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -193,11 +335,11 @@ }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1722529375,
-        "narHash": "sha256-6VqFbYgyCespG3QM6Joz7CaL9kYRl/BXpsGtLQua//g=",
+        "lastModified": 1723367213,
+        "narHash": "sha256-IlYqW8+RbIYjZ/BlAgTb4aOat/JWB6AoOXK+zPQCorg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fc27807b85986bb26a8f28e590e01fae742e6b53",
+        "rev": "96ab19d228e7e5a14675412e0d464852717b5793",
         "type": "github"
       },
       "original": {
@@ -207,6 +349,22 @@ "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "prompt": {
       "inputs": {
         "nixpkgs": [
@@ -229,18 +387,51 @@ }
     },
     "root": {
       "inputs": {
+        "chaotic": "chaotic",
         "darwin": "darwin",
-        "home-manager": "home-manager",
+        "home-manager": "home-manager_2",
         "nix-snapshotter": "nix-snapshotter",
         "nix-your-shell": "nix-your-shell",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-master": "nixpkgs-master",
         "prompt": "prompt"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1724345276,
+        "narHash": "sha256-MKvjkqVL/RJ3QXOA8tSUoK7HHXVGSB2AL+vKxU4Cf+c=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "9b724459b5900c2424f5069023d6596a8617284b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
@@ -251,6 +442,31 @@ },
       "original": {
         "owner": "nix-systems",
         "repo": "default",
+        "type": "github"
+      }
+    },
+    "yafas": {
+      "inputs": {
+        "flake-schemas": [
+          "chaotic",
+          "flake-schemas"
+        ],
+        "systems": [
+          "chaotic",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695926485,
+        "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=",
+        "owner": "UbiqueLambda",
+        "repo": "yafas",
+        "rev": "7772afd6686458ca0ddbc599a52cf5d337367653",
+        "type": "github"
+      },
+      "original": {
+        "owner": "UbiqueLambda",
+        "repo": "yafas",
         "type": "github"
       }
     }

@@ -12,6 +12,7 @@ url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     darwin = {
       url = "github:lnl7/nix-darwin/master";
@@ -41,17 +42,21 @@ , nixpkgs-master
     , nixos-hardware
     , nix-snapshotter
     , nix-your-shell
+    , chaotic
     , home-manager
     , prompt
     , darwin
     , ...
-    } @ inputs: {
+    } @ inputs:
+
+    let
+      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+    in
+    {
 
       overlays = {
         prompt = prompt.overlay;
-        customPkgs = final: prev: {
-          zed-editor = inputs.nixpkgs-master.legacyPackages.${prev.system}.zed-editor;
-        };
       };
 
       darwinConfigurations = {
@@ -85,7 +90,7 @@ modules = [
             {
               imports = [ ./hosts/wyndle/configuration.nix ];
               _module.args.self = self;
-              nixpkgs.overlays = [ nix-your-shell.overlays.default ];
+              nixpkgs.overlays = [ nix-your-shell.overlays.default chaotic.overlays.default ];
             }
             home-manager.nixosModules.home-manager
             {
@@ -148,5 +153,19 @@ }
           ];
         };
       };
+
+      devShells = forAllSystems (system:
+        let
+          nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
+          pkgs = nixpkgsFor.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              nixd
+              nixfmt-rfc-style
+            ];
+          };
+        });
     };
 }

@@ -24,48 +24,48 @@ home.username = "icy";
   home.homeDirectory = "/home/icy";
   home.extraOutputsToInstall = [ "man" ];
 
-  home.packages = with pkgs; [
+  home.packages = [
+    pkgs.git
+    pkgs.unzip
+    pkgs.curl
+    pkgs.tmux
+    pkgs.ripgrep
+    pkgs.fd
+    pkgs.imagemagick
+    pkgs.ffmpeg
+    pkgs.wget
+    pkgs.tree
+    pkgs.mpv
+    pkgs.noto-fonts-cjk
+    pkgs.noto-fonts-emoji
+    pkgs.jq
+    pkgs.yq-go
+    pkgs.fzy
+    pkgs.nixpkgs-fmt
+    pkgs.libnotify
+    pkgs.signal-desktop-beta
+    pkgs.calibre
+    pkgs.pinentry
+    pkgs.libreoffice
+    pkgs.go
+    pkgs.dconf
+    pkgs.chromium
+    pkgs.nix-your-shell
+    pkgs.geary
+    pkgs.pass
+    pkgs.newsflash
+    pkgs.errands
+    pkgs.wl-clipboard
+    pkgs.nvtop
 
-    git
-    unzip
-    curl
-    tmux
-    ripgrep
-    fd
-    imagemagick
-    ffmpeg
-    wget
-    tree
-    mpv
-    noto-fonts-cjk
-    noto-fonts-emoji
-    jq
-    yq-go
-    fzy
-    nixpkgs-fmt
-    libnotify
-    signal-desktop-beta
-    calibre
-    pinentry
-    libreoffice
-    go
-    dconf
-    chromium
-    evolution
-    nix-your-shell
-    pass
-    newsflash
-    errands
-    wl-clipboard
-    zed-editor
-    nvtop
+    pkgs.gnome3.gnome-tweaks
+    pkgs.gnome3.gnome-shell-extensions
+    pkgs.gnomeExtensions.appindicator
+    pkgs.gnomeExtensions.dash-to-dock
+    pkgs.gnomeExtensions.search-light
+    pkgs.gnomeExtensions.hide-top-bar
 
-    gnome3.gnome-tweaks
-    gnome3.gnome-shell-extensions
-    gnomeExtensions.appindicator
-    gnomeExtensions.dash-to-dock
-    gnomeExtensions.search-light
-    gnomeExtensions.hide-top-bar
+    pkgs.zed-editor_git
 
   ] ++ (import ./bin { inherit pkgs host; });
 

@@ -45,14 +45,13 @@ "steam-original"
       "steam-runtime"
     ];
     chromium = {
-      commandLineArgs = "--ozone-platform=wayland";
+      commandLineArgs = "--ozone-platform=wayland --enable-features=TouchpadOverscrollHistoryNavigation";
     };
     firefox.enablePlasmaBrowserIntegration = true;
   };
 
   nixpkgs.overlays = with self.overlays; [
     prompt
-    customPkgs
   ];
 
   environment = {
@@ -113,6 +112,7 @@ logitech.wireless = {
       enable = true;
       enableGraphical = true;
     };
+    graphics.extraPackages = [ pkgs.amdvlk ];
   };
 
   services = {

@@ -1,6 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 let
+  isDarwin = lib.strings.hasSuffix "darwin" pkgs.stdenv.hostPlatform.system;
   zedSettings = {
     telemetry = {
       diagnostics = false;
@@ -9,9 +10,9 @@ };
     base_keymap = "VSCode";
     buffer_font_size = 15;
     theme = "Icy Light";
-    buffer_font_family = "SF Mono";
+    buffer_font_family = if isDarwin then "SF Mono" else "Input";
     buffer_font_weight = 500;
-    ui_font_family = "System Font";
+    ui_font_family = if isDarwin then "System Font" else "Inter";
     ui_font_size = 18;
     vim_mode = true;
     vim = {