diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index 6148c06..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, inputs, system }:
-{
-  dark-mode-notify = callPackage ./dark-mode-notify.nix {
-    sdkVersion = "14.1";
-    inherit (inputs) dark-mode-notify-src;
-  };
-  ia-writer-family = callPackage ./ia-writer-family.nix { inherit (inputs) ia-writer-family-src; };
-  helix-flake = inputs.helix.packages.${system}.default;
-  yubiswitch = callPackage ./yubiswitch.nix { };
-}
diff --git a/pkgs/flake.lock b/pkgs/flake.lock
new file mode 100644
index 0000000..906f114
--- /dev/null
+++ b/pkgs/flake.lock
@@ -0,0 +1,291 @@
+{
+  "nodes": {
+    "crane": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1661875961,
+        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "dark-mode-notify-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1658150829,
+        "narHash": "sha256-LsAQ5v5jgJw7KsJnQ3Mh6+LNj1EMHICMoD5WzF3hRmU=",
+        "owner": "bouk",
+        "repo": "dark-mode-notify",
+        "rev": "4d7fe211f81c5b67402fad4bed44995344a260d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bouk",
+        "repo": "dark-mode-notify",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1667210711,
+        "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "dream2nix": {
+      "inputs": {
+        "alejandra": [
+          "helix",
+          "nci"
+        ],
+        "all-cabal-json": [
+          "helix",
+          "nci"
+        ],
+        "crane": "crane",
+        "devshell": [
+          "helix",
+          "nci",
+          "devshell"
+        ],
+        "flake-utils-pre-commit": [
+          "helix",
+          "nci"
+        ],
+        "ghc-utils": [
+          "helix",
+          "nci"
+        ],
+        "gomod2nix": [
+          "helix",
+          "nci"
+        ],
+        "mach-nix": [
+          "helix",
+          "nci"
+        ],
+        "nixpkgs": [
+          "helix",
+          "nci",
+          "nixpkgs"
+        ],
+        "poetry2nix": [
+          "helix",
+          "nci"
+        ],
+        "pre-commit-hooks": [
+          "helix",
+          "nci"
+        ]
+      },
+      "locked": {
+        "lastModified": 1668851003,
+        "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "dream2nix",
+        "type": "github"
+      }
+    },
+    "fisher-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1665682222,
+        "narHash": "sha256-q9Yi6ZlHNFnPN05RpO+u4B5wNR1O3JGIn2AJ3AEl4xs=",
+        "owner": "jorgebucaran",
+        "repo": "fisher",
+        "rev": "36810b39401536650d7a1018c8f3832f51741950",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jorgebucaran",
+        "repo": "fisher",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "helix": {
+      "inputs": {
+        "nci": "nci",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1671307145,
+        "narHash": "sha256-1kRwUoJHLaTs8Y1nH7L3B2ecfcLoXzPMC5rTvL4FEns=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "ba3c24aa0268735ac57321442d458ab6a1ac662c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
+    "ia-writer-family-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1663752357,
+        "narHash": "sha256-sgYsOn6iXE9f0hlDZX1uA3WnTAY1zc5/U9JOcjn5uGw=",
+        "owner": "iaolo",
+        "repo": "iA-Fonts",
+        "rev": "8548eea983611993db2d6f65bd3ae1609f62dcbd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "iaolo",
+        "repo": "iA-Fonts",
+        "type": "github"
+      }
+    },
+    "kitty-icon": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1659349637,
+        "narHash": "sha256-Vy+iLGnysrJMSLfkaYq15pb/wG4kIbfsXRrPgSc3OFs=",
+        "owner": "DinkDonk",
+        "repo": "kitty-icon",
+        "rev": "269c0f0bd1c792cebc7821f299ce9250ed9bcd67",
+        "type": "github"
+      },
+      "original": {
+        "owner": "DinkDonk",
+        "repo": "kitty-icon",
+        "type": "github"
+      }
+    },
+    "kitty-themes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1669518372,
+        "narHash": "sha256-PGV/iPg7nFW8RMEMJbt1oGcAzTaS3u6I+sCpIDrx7ic=",
+        "owner": "kovidgoyal",
+        "repo": "kitty-themes",
+        "rev": "4d309e984b81dd120d7a697abe4f817da6f3cfe5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kovidgoyal",
+        "repo": "kitty-themes",
+        "type": "github"
+      }
+    },
+    "nci": {
+      "inputs": {
+        "devshell": "devshell",
+        "dream2nix": "dream2nix",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "helix",
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669011203,
+        "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yusdacra",
+        "repo": "nix-cargo-integration",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1671387159,
+        "narHash": "sha256-o4uayLVZZo8eorRSxB4VnGU0pNZqXHOP2U+oKocbuX8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9622fb43338ca1b77962d3be8731bbae069e7e72",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "dark-mode-notify-src": "dark-mode-notify-src",
+        "fisher-src": "fisher-src",
+        "helix": "helix",
+        "ia-writer-family-src": "ia-writer-family-src",
+        "kitty-icon": "kitty-icon",
+        "kitty-themes": "kitty-themes",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1668998422,
+        "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/pkgs/flake.nix b/pkgs/flake.nix
new file mode 100644
index 0000000..1d0f7bf
--- /dev/null
+++ b/pkgs/flake.nix
@@ -0,0 +1,52 @@
+{
+  description = "mat's extra nix pkgs";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+    helix.url = "github:helix-editor/helix";
+    helix.inputs.nixpkgs.follows = "nixpkgs";
+    dark-mode-notify-src.url = "github:bouk/dark-mode-notify";
+    dark-mode-notify-src.flake = false;
+    ia-writer-family-src.url = "github:iaolo/iA-Fonts";
+    ia-writer-family-src.flake = false;
+    kitty-icon.url = "github:DinkDonk/kitty-icon";
+    kitty-icon.flake = false;
+    kitty-themes.url = "github:kovidgoyal/kitty-themes";
+    kitty-themes.flake = false;
+    fisher-src.url = "github:jorgebucaran/fisher";
+    fisher-src.flake = false;
+  };
+
+  outputs =
+    { fisher-src, helix, kitty-icon, kitty-themes, ... }@inputs: {
+      overlays =
+        let
+          overlay = _: prev:
+            let
+              mkPkg = name: extras: prev.callPackage (./. + name + ".nix")
+                {
+                  "${name}-src" = inputs."${name}-src";
+                } // extras;
+            in
+            {
+              inherit kitty-icon kitty-themes;
+              helix = helix.packages.${prev.system}.default;
+              fishPlugins.fisher = {
+                name = "fisher";
+                src = fisher-src;
+              };
+            } // prev.mapAttrs mkPkg {
+              dark-mode-notify = {
+                sdkVersion = "14.1";
+              };
+              ia-writer-family = { };
+              yubiswitch = { };
+            };
+        in
+        {
+          default = overlay;
+          extra-pkgs = overlay;
+        };
+    };
+}