diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2eafe75
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.nix]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 41fbeb0..b2be92b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-**/result
+result
diff --git a/amadaluzian-neovide/0001-feat-config-add-config-flag.patch b/amadaluzian-neovide/0001-feat-config-add-config-flag.patch
deleted file mode 100644
index 82ea38c..0000000
--- a/amadaluzian-neovide/0001-feat-config-add-config-flag.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 34ef90c1f4eb33123f975b5a07497e794f5bc57a Mon Sep 17 00:00:00 2001
-From: Artur Manuel <balkenix@outlook.com>
-Date: Mon, 10 Feb 2025 03:18:21 +0000
-Subject: [PATCH] feat(config): add --config flag
-
----
- src/cmd_line.rs        |  4 ++++
- src/settings/config.rs | 11 ++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/cmd_line.rs b/src/cmd_line.rs
-index f2da7b5..7679383 100644
---- a/src/cmd_line.rs
-+++ b/src/cmd_line.rs
-@@ -53,6 +53,10 @@ pub struct CmdLineSettings {
-     #[arg(long, env = "NEOVIDE_WSL")]
-     pub wsl: bool,
- 
-+    /// Run Neovide with a config path
-+    #[arg(long, env = "NEOVIDE_CONFIG")]
-+    pub config: Option<String>,
-+
-     /// Which window decorations to use (do note that the window might not be resizable
-     /// if this is "none")
-     #[arg(long, env = "NEOVIDE_FRAME", default_value_t)]
-diff --git a/src/settings/config.rs b/src/settings/config.rs
-index 705f046..166095f 100644
---- a/src/settings/config.rs
-+++ b/src/settings/config.rs
-@@ -28,7 +28,16 @@ fn neovide_config_dir() -> PathBuf {
- }
- 
- pub fn config_path() -> PathBuf {
--    let mut config_path = neovide_config_dir();
-+    let mut config_path = match env::var("NEOVIDE_CONFIG") {
-+        Ok(val) => PathBuf::from(val),
-+        Err(e) => {
-+            if e != env::VarError::NotPresent {
-+                println!("Not a valid config path! Using default value.");
-+            }
-+
-+            neovide_config_dir()
-+        },
-+    };
-     config_path.push(CONFIG_FILE);
-     config_path
- }
--- 
-2.47.2
-
diff --git a/amadaluzian-neovide/default.nix b/amadaluzian-neovide/default.nix
deleted file mode 100644
index 215fe99..0000000
--- a/amadaluzian-neovide/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{neovide}:
-neovide.overrideAttrs (finalAttrs: {
-  patches = (finalAttrs.patches or []) ++ [
-    ./0001-feat-config-add-config-flag.patch
-  ];
-})
diff --git a/flake.lock b/flake.lock
index 34d3333..dfa8cf6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739020877,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "lastModified": 1739580444,
+        "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "8bb37161a0488b89830168b81c48aed11569cb93",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 70d56ed..d84f889 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = {
+  outputs = inputs @ {
     self,
     nixpkgs,
   }: let
@@ -14,49 +14,32 @@
         f {
           pkgs = nixpkgs.legacyPackages.${system};
         });
-  in {
-    overlays.default = final: prev: let
-      packages = {
-        amadaluzian-neovide = prev.callPackage ./amadaluzian-neovide {};
-        amadaluzian-starship = prev.callPackage ./amadaluzian-starship {};
-        amadaluzian-xonsh = prev.callPackage ./amadaluzian-xonsh {inherit (packages) amadaluzian-starship;};
-        amadaluzian-nu = prev.callPackage ./amadaluzian-nu {inherit (packages) amadaluzian-starship;};
-        fairfax = prev.callPackage ./fairfax {};
-        river-bedload = prev.callPackage ./river-bedload {};
-        tela-circle-icon-theme = prev.callPackage ./tela-circle-icon-theme-patched {};
-        nicotine-plus-libadwaita = prev.symlinkJoin {
-          name = "nicotine";
-          paths = [prev.nicotine-plus];
-          nativeBuildInputs = [prev.makeWrapper];
-          postBuild = ''
-            wrapProgram $out/bin/nicotine \
-              --set-default NICOTINE_LIBADWAITA 1
-          '';
-        };
-        colloid-icon-theme-git = prev.colloid-icon-theme.overrideAttrs (_finalAttrs: {
-          version = "master";
-          src = prev.fetchFromGitHub {
-            owner = "vinceliuice";
-            repo = "Colloid-icon-theme";
-            rev = "main";
-            hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
-          };
-        });
-        rose-pine-gtk-theme-git = prev.rose-pine-gtk-theme.overrideAttrs (_finalAttrs: {
-          version = "master";
-          src = prev.fetchFromGitHub {
-            owner = "rose-pine";
-            repo = "gtk";
-            tag = "master";
-            hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE=";
-          };
-        });
-        vesktop-electron32 = prev.vesktop.override {
-          electron = prev.electron_32;
-        };
-      };
+    filterAttrs = f: attrs: let
+      names = builtins.attrNames attrs;
+      filtered = builtins.filter (n: f n attrs.${n}) names;
     in
-      packages;
+      builtins.listToAttrs (
+        map (
+          name: {
+            inherit name;
+            value = attrs.${name};
+          }
+        )
+        filtered
+      );
+  in {
+    overlays.default = _: prev: (builtins.listToAttrs (
+      builtins.map (
+        name: {
+          inherit name;
+          value = prev.callPackage ./packages/${name} {inherit inputs;};
+        }
+      ) (builtins.attrNames (
+        filterAttrs (
+          _: v: v == "directory"
+        ) (builtins.readDir ./packages)
+      ))
+    ));
 
     packages = eachSystem ({pkgs}: self.overlays.default pkgs pkgs);
     formatter = eachSystem ({pkgs}: pkgs.alejandra);
diff --git a/packages/amadaluzian-neovide/0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch b/packages/amadaluzian-neovide/0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch
new file mode 100644
index 0000000..50a76e5
--- /dev/null
+++ b/packages/amadaluzian-neovide/0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch
@@ -0,0 +1,34 @@
+From 7973ea6a0e2e94a3b31a4c7b87834d49b7f195bb Mon Sep 17 00:00:00 2001
+From: Artur Manuel <balkenix@outlook.com>
+Date: Tue, 11 Feb 2025 16:42:07 +0000
+Subject: [PATCH] feat(env): add NEOVIDE_CONFIG env var
+
+---
+ src/settings/config.rs | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/settings/config.rs b/src/settings/config.rs
+index 705f046..bd8c764 100644
+--- a/src/settings/config.rs
++++ b/src/settings/config.rs
+@@ -28,9 +28,14 @@ fn neovide_config_dir() -> PathBuf {
+ }
+ 
+ pub fn config_path() -> PathBuf {
+-    let mut config_path = neovide_config_dir();
+-    config_path.push(CONFIG_FILE);
+-    config_path
++    env::var("NEOVIDE_CONFIG")
++        .ok()
++        .map(PathBuf::from)
++        .filter(|path| path.is_file() && path.exists())
++        .unwrap_or_else(|| {
++            eprintln!("Not a valid config path! Using XDG_CONFIG_HOME.");
++            neovide_config_dir().join("config.toml")
++        })
+ }
+ 
+ #[derive(Debug, Deserialize, Default, Clone)]
+-- 
+2.47.2
+
diff --git a/packages/amadaluzian-neovide/default.nix b/packages/amadaluzian-neovide/default.nix
new file mode 100644
index 0000000..4efbf1b
--- /dev/null
+++ b/packages/amadaluzian-neovide/default.nix
@@ -0,0 +1,8 @@
+{neovide, ...}:
+neovide.overrideAttrs (finalAttrs: {
+  patches =
+    (finalAttrs.patches or [])
+    ++ [
+      ./0001-feat-env-add-NEOVIDE_CONFIG-env-var.patch
+    ];
+})
diff --git a/packages/amadaluzian-niri/0001-ipc-_-90-180-270-Normal-90-180-270.patch b/packages/amadaluzian-niri/0001-ipc-_-90-180-270-Normal-90-180-270.patch
new file mode 100644
index 0000000..4c08158
--- /dev/null
+++ b/packages/amadaluzian-niri/0001-ipc-_-90-180-270-Normal-90-180-270.patch
@@ -0,0 +1,147 @@
+From fafce5e8cc92f11c476c1c8079f73cdd038acc54 Mon Sep 17 00:00:00 2001
+From: Artur Manuel <amad@atl.tools>
+Date: Sun, 16 Feb 2025 03:31:46 +0000
+Subject: [PATCH] ipc: _{90,180,270} => Normal{90,180,270}
+
+---
+ niri-ipc/src/lib.rs                   |  6 +++---
+ src/dbus/mutter_display_config.rs     | 12 ++++++------
+ src/ipc/client.rs                     |  6 +++---
+ src/protocols/output_management.rs    |  6 +++---
+ src/render_helpers/clipped_surface.rs |  4 ++--
+ src/utils/mod.rs                      | 12 ++++++------
+ 6 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/niri-ipc/src/lib.rs b/niri-ipc/src/lib.rs
+index 3a585eb3..a6b90d25 100644
+--- a/niri-ipc/src/lib.rs
++++ b/niri-ipc/src/lib.rs
+@@ -903,13 +903,13 @@ pub enum Transform {
+     Normal,
+     /// Rotated by 90°.
+     #[serde(rename = "90")]
+-    _90,
++    Normal90,
+     /// Rotated by 180°.
+     #[serde(rename = "180")]
+-    _180,
++    Normal180,
+     /// Rotated by 270°.
+     #[serde(rename = "270")]
+-    _270,
++    Normal270,
+     /// Flipped horizontally.
+     Flipped,
+     /// Rotated by 90° and flipped horizontally.
+diff --git a/src/dbus/mutter_display_config.rs b/src/dbus/mutter_display_config.rs
+index b8ab08f9..dd553555 100644
+--- a/src/dbus/mutter_display_config.rs
++++ b/src/dbus/mutter_display_config.rs
+@@ -136,9 +136,9 @@ impl DisplayConfig {
+             if let Some(logical) = output.logical.as_ref() {
+                 let transform = match logical.transform {
+                     niri_ipc::Transform::Normal => 0,
+-                    niri_ipc::Transform::_90 => 1,
+-                    niri_ipc::Transform::_180 => 2,
+-                    niri_ipc::Transform::_270 => 3,
++                    niri_ipc::Transform::Normal90 => 1,
++                    niri_ipc::Transform::Normal180 => 2,
++                    niri_ipc::Transform::Normal270 => 3,
+                     niri_ipc::Transform::Flipped => 4,
+                     niri_ipc::Transform::Flipped90 => 5,
+                     niri_ipc::Transform::Flipped180 => 6,
+@@ -201,9 +201,9 @@ impl DisplayConfig {
+                         scale: Some(niri_config::FloatOrInt(requested_config.scale)),
+                         transform: match requested_config.transform {
+                             0 => niri_ipc::Transform::Normal,
+-                            1 => niri_ipc::Transform::_90,
+-                            2 => niri_ipc::Transform::_180,
+-                            3 => niri_ipc::Transform::_270,
++                            1 => niri_ipc::Transform::Normal90,
++                            2 => niri_ipc::Transform::Normal180,
++                            3 => niri_ipc::Transform::Normal270,
+                             4 => niri_ipc::Transform::Flipped,
+                             5 => niri_ipc::Transform::Flipped90,
+                             6 => niri_ipc::Transform::Flipped180,
+diff --git a/src/ipc/client.rs b/src/ipc/client.rs
+index 8682d8d3..db1b614a 100644
+--- a/src/ipc/client.rs
++++ b/src/ipc/client.rs
+@@ -466,9 +466,9 @@ fn print_output(output: Output) -> anyhow::Result<()> {
+ 
+         let transform = match transform {
+             Transform::Normal => "normal",
+-            Transform::_90 => "90° counter-clockwise",
+-            Transform::_180 => "180°",
+-            Transform::_270 => "270° counter-clockwise",
++            Transform::Normal90 => "90° counter-clockwise",
++            Transform::Normal180 => "180°",
++            Transform::Normal270 => "270° counter-clockwise",
+             Transform::Flipped => "flipped horizontally",
+             Transform::Flipped90 => "90° counter-clockwise, flipped horizontally",
+             Transform::Flipped180 => "flipped vertically",
+diff --git a/src/protocols/output_management.rs b/src/protocols/output_management.rs
+index 4f1ac8c0..411e9eb6 100644
+--- a/src/protocols/output_management.rs
++++ b/src/protocols/output_management.rs
+@@ -666,9 +666,9 @@ where
+             zwlr_output_configuration_head_v1::Request::SetTransform { transform } => {
+                 let transform = match transform {
+                     WEnum::Value(WlTransform::Normal) => Transform::Normal,
+-                    WEnum::Value(WlTransform::_90) => Transform::_90,
+-                    WEnum::Value(WlTransform::_180) => Transform::_180,
+-                    WEnum::Value(WlTransform::_270) => Transform::_270,
++                    WEnum::Value(WlTransform::_90) => Transform::Normal90,
++                    WEnum::Value(WlTransform::_180) => Transform::Normal180,
++                    WEnum::Value(WlTransform::_270) => Transform::Normal270,
+                     WEnum::Value(WlTransform::Flipped) => Transform::Flipped,
+                     WEnum::Value(WlTransform::Flipped90) => Transform::Flipped90,
+                     WEnum::Value(WlTransform::Flipped180) => Transform::Flipped180,
+diff --git a/src/render_helpers/clipped_surface.rs b/src/render_helpers/clipped_surface.rs
+index f8d074e9..303b81b3 100644
+--- a/src/render_helpers/clipped_surface.rs
++++ b/src/render_helpers/clipped_surface.rs
+@@ -55,8 +55,8 @@ impl<R: NiriRenderer> ClippedSurfaceRenderElement<R> {
+         let transform = elem.transform();
+         // HACK: ??? for some reason flipped ones are fine.
+         let transform = match transform {
+-            Transform::_90 => Transform::_270,
+-            Transform::_270 => Transform::_90,
++            Transform::Normal90 => Transform::Normal270,
++            Transform::Normal270 => Transform::Normal90,
+             x => x,
+         };
+         let transform_matrix = Mat3::from_translation(Vec2::new(0.5, 0.5))
+diff --git a/src/utils/mod.rs b/src/utils/mod.rs
+index e43bad89..274e45ca 100644
+--- a/src/utils/mod.rs
++++ b/src/utils/mod.rs
+@@ -148,9 +148,9 @@ pub fn logical_output(output: &Output) -> niri_ipc::LogicalOutput {
+     let size = output_size(output);
+     let transform = match output.current_transform() {
+         Transform::Normal => niri_ipc::Transform::Normal,
+-        Transform::_90 => niri_ipc::Transform::_90,
+-        Transform::_180 => niri_ipc::Transform::_180,
+-        Transform::_270 => niri_ipc::Transform::_270,
++        Transform::Normal90 => niri_ipc::Transform::Normal90,
++        Transform::Normal180 => niri_ipc::Transform::Normal180,
++        Transform::Normal270 => niri_ipc::Transform::Normal270,
+         Transform::Flipped => niri_ipc::Transform::Flipped,
+         Transform::Flipped90 => niri_ipc::Transform::Flipped90,
+         Transform::Flipped180 => niri_ipc::Transform::Flipped180,
+@@ -169,9 +169,9 @@ pub fn logical_output(output: &Output) -> niri_ipc::LogicalOutput {
+ pub fn ipc_transform_to_smithay(transform: niri_ipc::Transform) -> Transform {
+     match transform {
+         niri_ipc::Transform::Normal => Transform::Normal,
+-        niri_ipc::Transform::_90 => Transform::_90,
+-        niri_ipc::Transform::_180 => Transform::_180,
+-        niri_ipc::Transform::_270 => Transform::_270,
++        niri_ipc::Transform::Normal90 => Transform::Normal90,
++        niri_ipc::Transform::Normal180 => Transform::Normal180,
++        niri_ipc::Transform::Normal270 => Transform::Normal270,
+         niri_ipc::Transform::Flipped => Transform::Flipped,
+         niri_ipc::Transform::Flipped90 => Transform::Flipped90,
+         niri_ipc::Transform::Flipped180 => Transform::Flipped180,
+-- 
+2.47.2
+
diff --git a/packages/amadaluzian-niri/default.nix b/packages/amadaluzian-niri/default.nix
new file mode 100644
index 0000000..7d5017b
--- /dev/null
+++ b/packages/amadaluzian-niri/default.nix
@@ -0,0 +1,19 @@
+{
+  niri,
+  fetchFromGitHub,
+  ...
+}:
+niri.overrideAttrs (finalAttrs: {
+  src = fetchFromGitHub {
+    owner = "YaLTeR";
+    repo = "niri";
+    rev = "master";
+    hash = "sha256-BVTlrmelSAq+rlxwlRvsyZxHrmcviRu3aHJYG37Yq8c=";
+  };
+  patches =
+    (finalAttrs.patches or [])
+    ++ [
+      ./0001-ipc-_-90-180-270-Normal-90-180-270.patch
+    ];
+  cargoHash = "";
+})
diff --git a/packages/amadaluzian-nu/0001-feat-config-add-NUSHELL_CONFIG_DIR-env-var.patch b/packages/amadaluzian-nu/0001-feat-config-add-NUSHELL_CONFIG_DIR-env-var.patch
new file mode 100644
index 0000000..f6724f3
--- /dev/null
+++ b/packages/amadaluzian-nu/0001-feat-config-add-NUSHELL_CONFIG_DIR-env-var.patch
@@ -0,0 +1,42 @@
+From 8c96feb6397d4a5756dbeab1aedb7d2266c9218f Mon Sep 17 00:00:00 2001
+From: Artur Manuel <balkenix@outlook.com>
+Date: Tue, 11 Feb 2025 23:22:35 +0000
+Subject: [PATCH] feat(config): add NUSHELL_CONFIG_DIR env var
+
+---
+ crates/nu-path/src/helpers.rs | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/crates/nu-path/src/helpers.rs b/crates/nu-path/src/helpers.rs
+index 931b3f9d0..cd3c07d95 100644
+--- a/crates/nu-path/src/helpers.rs
++++ b/crates/nu-path/src/helpers.rs
+@@ -1,4 +1,5 @@
+ use std::path::PathBuf;
++use std::env;
+ 
+ use crate::AbsolutePathBuf;
+ 
+@@ -18,10 +19,15 @@ pub fn cache_dir() -> Option<AbsolutePathBuf> {
+ 
+ /// Return the nushell config directory.
+ pub fn nu_config_dir() -> Option<AbsolutePathBuf> {
+-    configurable_dir_path("XDG_CONFIG_HOME", dirs::config_dir).map(|mut p| {
+-        p.push("nushell");
+-        p
+-    })
++    let NUSHELL_CONFIG_DIR: Result<String, env::VarError> = env::var("NUSHELL_CONFIG_DIR");
++
++    match NUSHELL_CONFIG_DIR {
++        Ok(val) => Some(AbsolutePathBuf::try_from(val).unwrap()),
++        Err(_) => configurable_dir_path("XDG_CONFIG_HOME", dirs::config_dir).map(|mut p| {
++            p.push("nushell");
++            p
++        })
++    }
+ }
+ 
+ fn configurable_dir_path(
+-- 
+2.47.2
+
diff --git a/amadaluzian-nu/cfg/config.nu b/packages/amadaluzian-nu/cfg/config.nu
similarity index 100%
rename from amadaluzian-nu/cfg/config.nu
rename to packages/amadaluzian-nu/cfg/config.nu
diff --git a/amadaluzian-nu/cfg/env.nu b/packages/amadaluzian-nu/cfg/env.nu
similarity index 100%
rename from amadaluzian-nu/cfg/env.nu
rename to packages/amadaluzian-nu/cfg/env.nu
diff --git a/amadaluzian-nu/default.nix b/packages/amadaluzian-nu/default.nix
similarity index 56%
rename from amadaluzian-nu/default.nix
rename to packages/amadaluzian-nu/default.nix
index e4f8c9e..e09adee 100644
--- a/amadaluzian-nu/default.nix
+++ b/packages/amadaluzian-nu/default.nix
@@ -1,16 +1,17 @@
 {
   symlinkJoin,
   nushell,
-  amadaluzian-starship,
   zoxide,
   makeWrapper,
+  system,
+  inputs,
 }:
 symlinkJoin {
   name = "nu";
 
   paths = [
     nushell
-    amadaluzian-starship
+    inputs.self.packages.${system}.amadaluzian-starship
     zoxide
   ];
 
@@ -28,10 +29,10 @@ symlinkJoin {
 
   postBuild = ''
     wrapProgram $out/bin/nu \
-      --set NU_CONFIG_DIR "${./cfg}" \
-      --add-flags '--env-config' \
-      --add-flags '$NU_CONFIG_DIR/env.nu' \
-      --add-flags '--config' \
-      --add-flags '$NU_CONFIG_DIR/config.nu' \
+      --set NUSHELL_CONFIG_DIR "${./cfg}" \
+      --add-flags "--env-config" \
+      --add-flags "${./cfg/env.nu}" \
+      --add-flags "--config" \
+      --add-flags "${./cfg/config.nu}" \
   '';
 }
diff --git a/amadaluzian-starship/default.nix b/packages/amadaluzian-starship/default.nix
similarity index 99%
rename from amadaluzian-starship/default.nix
rename to packages/amadaluzian-starship/default.nix
index bf8223e..9f43640 100644
--- a/amadaluzian-starship/default.nix
+++ b/packages/amadaluzian-starship/default.nix
@@ -3,6 +3,7 @@
   starship,
   makeWrapper,
   writers,
+  ...
 }: let
   config = writers.writeTOML "starship.toml" {
     aws = {symbol = "aws ";};
diff --git a/amadaluzian-xonsh/cfg/rc.xsh b/packages/amadaluzian-xonsh/cfg/rc.xsh
similarity index 100%
rename from amadaluzian-xonsh/cfg/rc.xsh
rename to packages/amadaluzian-xonsh/cfg/rc.xsh
diff --git a/amadaluzian-xonsh/default.nix b/packages/amadaluzian-xonsh/default.nix
similarity index 80%
rename from amadaluzian-xonsh/default.nix
rename to packages/amadaluzian-xonsh/default.nix
index 8a4752d..eeabec1 100644
--- a/amadaluzian-xonsh/default.nix
+++ b/packages/amadaluzian-xonsh/default.nix
@@ -3,24 +3,14 @@
   fetchFromGitHub,
   symlinkJoin,
   python3,
-  amadaluzian-starship,
+  inputs,
+  system,
   zoxide,
 }: let
   xonsh =
-    (python3.override {
-      packageOverrides = pyprev: _pyfinal: {
-        custom-xonsh = pyprev.xonsh.overrideAttrs (finalAttrs: {
-          src = fetchFromGitHub {
-            owner = "xonsh";
-            repo = finalAttrs.pname;
-            rev = "0292b43e64c72ef16a75128d6346ce7d3b316d66";
-            hash = "sha256-kCtn8ujD0UahOLxtV9DD81awOYl6xirgnBoW/ywZxs0=";
-          };
-        });
-      };
-    })
+    python3
     .withPackages (ps: [
-      ps.custom-xonsh
+      ps.xonsh
       (let
         pname = "xontrib-fish-completer";
         version = "0.0.1";
@@ -59,7 +49,7 @@
             ps.wheel
           ];
           dependencies = [
-            ps.custom-xonsh
+            ps.xonsh
           ];
           src = fetchFromGitHub {
             owner = "amadaluzia";
@@ -88,7 +78,7 @@ in
 
     paths = [
       xonsh
-      amadaluzian-starship
+      inputs.self.packages.${system}.amadaluzian-starship
       zoxide
     ];
 
diff --git a/packages/colloid-icon-theme-git/default.nix b/packages/colloid-icon-theme-git/default.nix
new file mode 100644
index 0000000..3482a98
--- /dev/null
+++ b/packages/colloid-icon-theme-git/default.nix
@@ -0,0 +1,14 @@
+{
+  colloid-icon-theme,
+  fetchFromGitHub,
+  ...
+}:
+colloid-icon-theme.overrideAttrs (_finalAttrs: {
+  version = "master";
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = "Colloid-icon-theme";
+    rev = "main";
+    hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
+  };
+})
diff --git a/fairfax/default.nix b/packages/fairfax/default.nix
similarity index 98%
rename from fairfax/default.nix
rename to packages/fairfax/default.nix
index cd8f2cd..0f1203a 100644
--- a/fairfax/default.nix
+++ b/packages/fairfax/default.nix
@@ -2,6 +2,7 @@
   stdenvNoCC,
   fetchzip,
   lib,
+  ...
 }:
 stdenvNoCC.mkDerivation {
   pname = "fairfax";
diff --git a/packages/nicotine-plus-libadwaita/default.nix b/packages/nicotine-plus-libadwaita/default.nix
new file mode 100644
index 0000000..fb5da36
--- /dev/null
+++ b/packages/nicotine-plus-libadwaita/default.nix
@@ -0,0 +1,15 @@
+{
+  symlinkJoin,
+  nicotine-plus,
+  makeWrapper,
+  ...
+}:
+symlinkJoin {
+  name = "nicotine";
+  paths = [nicotine-plus];
+  nativeBuildInputs = [makeWrapper];
+  postBuild = ''
+    wrapProgram $out/bin/nicotine \
+      --set-default NICOTINE_LIBADWAITA 1
+  '';
+}
diff --git a/river-bedload/build.zig.zon.nix b/packages/river-bedload/build.zig.zon.nix
similarity index 100%
rename from river-bedload/build.zig.zon.nix
rename to packages/river-bedload/build.zig.zon.nix
diff --git a/river-bedload/default.nix b/packages/river-bedload/default.nix
similarity index 99%
rename from river-bedload/default.nix
rename to packages/river-bedload/default.nix
index cbe2964..626c4e9 100644
--- a/river-bedload/default.nix
+++ b/packages/river-bedload/default.nix
@@ -7,6 +7,7 @@
   wayland-protocols,
   wayland,
   pkg-config,
+  ...
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "river-bedload";
diff --git a/packages/rose-pine-gtk-theme-git/default.nix b/packages/rose-pine-gtk-theme-git/default.nix
new file mode 100644
index 0000000..9f2d14f
--- /dev/null
+++ b/packages/rose-pine-gtk-theme-git/default.nix
@@ -0,0 +1,14 @@
+{
+  rose-pine-gtk-theme,
+  fetchFromGitHub,
+  ...
+}:
+rose-pine-gtk-theme.overrideAttrs (_finalAttrs: {
+  version = "master";
+  src = fetchFromGitHub {
+    owner = "rose-pine";
+    repo = "gtk";
+    tag = "master";
+    hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE=";
+  };
+})
diff --git a/tela-circle-icon-theme-patched/0001-fix-links-remove-symbolic-links.patch b/packages/tela-circle-icon-theme-patched/0001-fix-links-remove-symbolic-links.patch
similarity index 100%
rename from tela-circle-icon-theme-patched/0001-fix-links-remove-symbolic-links.patch
rename to packages/tela-circle-icon-theme-patched/0001-fix-links-remove-symbolic-links.patch
diff --git a/tela-circle-icon-theme-patched/default.nix b/packages/tela-circle-icon-theme-patched/default.nix
similarity index 84%
rename from tela-circle-icon-theme-patched/default.nix
rename to packages/tela-circle-icon-theme-patched/default.nix
index fcdaccc..e4b0edd 100644
--- a/tela-circle-icon-theme-patched/default.nix
+++ b/packages/tela-circle-icon-theme-patched/default.nix
@@ -1,4 +1,4 @@
-{tela-circle-icon-theme}:
+{tela-circle-icon-theme, ...}:
 tela-circle-icon-theme.overrideAttrs (finalAttrs: {
   patches =
     (finalAttrs.patches or [])
diff --git a/packages/vesktop-electron32/default.nix b/packages/vesktop-electron32/default.nix
new file mode 100644
index 0000000..facba9e
--- /dev/null
+++ b/packages/vesktop-electron32/default.nix
@@ -0,0 +1,8 @@
+{
+  vesktop,
+  electron_32,
+  ...
+}:
+vesktop.override {
+  electron = electron_32;
+}