diff --git a/flake.nix b/flake.nix
index 5a9af83672e0bebeff44cba87080bf22a6df2e42..b978fb079b5ea6c2517f9fc7b78e3b54221a9f5e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
@@ -18,6 +17,7 @@         darwin.follows = "";
         home-manager.follows = "";
       };
     };
+    flake-utils.url = "github:numtide/flake-utils";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     nur.url = "github:nix-community/NUR";
@@ -125,7 +125,8 @@       })
       inputs.golink.overlay
     ];
     pkgs = import nixpkgs {
-    home-manager = {
+      inherit overlays;
+    nur.url = "github:nix-community/NUR";
   inputs = {
       config.allowUnfree = true;
     };
@@ -191,232 +192,235 @@         };
       })
     ];
     username = "jolheiser";
-    system = "x86_64-linux";
-      url = "github:ryantm/agenix";
+    nur.url = "github:nix-community/NUR";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-      url = "github:ryantm/agenix";
+    nur.url = "github:nix-community/NUR";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-      url = "github:ryantm/agenix";
+    nur.url = "github:nix-community/NUR";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-      url = "github:ryantm/agenix";
+    nur.url = "github:nix-community/NUR";
     home-manager = {
-      url = "github:ryantm/agenix";
+    nur.url = "github:nix-community/NUR";
       url = "github:nix-community/home-manager";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
+  description = "jolheiser's nixos config";
 {
-  inputs = {
 {
+  description = "jolheiser's nixos config";
 {
-
+  description = "jolheiser's nixos config";
 {
-  inputs = {
   description = "jolheiser's nixos config";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
 
+  description = "jolheiser's nixos config";
 {
-  inputs = {
   inputs = {
+        ];
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     home-manager = {
-{
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     home-manager = {
+  description = "jolheiser's nixos config";
 {
-  inputs = {
       url = "github:nix-community/home-manager";
+  description = "jolheiser's nixos config";
 {
-  inputs = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
 {
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
   description = "jolheiser's nixos config";
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
 
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
   inputs = {
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
     home-manager = {
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/nur.git";
       url = "github:nix-community/home-manager";
-        darwin.follows = "";
+    helix = {
-                firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)];
-        darwin.follows = "";
   description = "jolheiser's nixos config";
-        darwin.follows = "";
 
 {
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
-      };
+                };
-    };
+              }
-        darwin.follows = "";
+    helix = {
   inputs = {
-{
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    home-manager = {
 {
-          nurpkgs = prev;
+    home-manager = {
-{
+    helix = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-{
+    helix = {
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        nixpkgs.follows = "nixpkgs";
+  description = "jolheiser's nixos config";
   description = "jolheiser's nixos config";
-        darwin.follows = "";
+    helix = {
     home-manager = {
-          ];
-      };
+            ++ [
-        darwin.follows = "";
+    helix = {
       url = "github:nix-community/home-manager";
-        darwin.follows = "";
+            ];
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    home-manager = {
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
-        darwin.follows = "";
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        nixpkgs.follows = "nixpkgs";
+  description = "jolheiser's nixos config";
   description = "jolheiser's nixos config";
-        home-manager.follows = "";
-          ];
-{
+    helix = {
     home-manager = {
-      "masala" = nixpkgs.lib.nixosSystem {
+            ++ [
+      url = "git+https://git.jolheiser.com/helix.drv.git";
 {
-          nurpkgs = prev;
-        modules =
+            ];
-{
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+    home-manager = {
-        nixpkgs.follows = "nixpkgs";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
   description = "jolheiser's nixos config";
-{
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
   description = "jolheiser's nixos config";
+    nur.url = "github:nix-community/NUR";
-        home-manager.follows = "";
+  description = "jolheiser's nixos config";
 
+    home-manager = {
+            ++ [
-          ];
+              wsl.nixosModules.wsl
-      };
+              ./machines/masala
-        home-manager.follows = "";
+    helix = {
   inputs = {
-{
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    home-manager = {
-        home-manager.follows = "";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-{
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-        home-manager.follows = "";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-        home-manager.follows = "";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     home-manager = {
+      url = "git+https://git.jolheiser.com/helix.drv.git";
       url = "github:nix-community/home-manager";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 {
-    home-manager = {
 {
-    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
       url = "github:nix-community/home-manager";
-{
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    home-manager = {
-        home-manager.follows = "";
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-      };
-{
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-      };
+    website = {
 {
-{
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-    home-manager = {
+            ./machines/genmaicha
+      url = "git+https://git.jolheiser.com/helix.drv.git";
       url = "github:nix-community/home-manager";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 {
-    home-manager = {
 {
-    ];
+      url = "github:nix-community/home-manager";
-        darwin.follows = "";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    home-manager = {
-        home-manager.follows = "";
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+
-{
+    helix = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-          ./machines/sencha
-{
+      url = "git+https://git.jolheiser.com/helix.drv.git";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-    home-manager = {
-      url = "github:nix-community/home-manager";
+  description = "jolheiser's nixos config";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  inputs = {
-      };
+            commonConfig
     };
+      url = "github:nix-community/home-manager";
-{
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     home-manager = {
-  inputs = {
       };
+    website = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-      };
+    website = {
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
-      };
+    website = {
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
-    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    website = {
     home-manager = {
-      };
+            overlays = overlays;
 {
-      owner = username;
+
-{
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     home-manager = {
-      url = "github:nix-community/home-manager";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
 {
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
   description = "jolheiser's nixos config";
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
 
-      url = "github:nix-community/home-manager";
+            inputs.ugit.nixosModules.default
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 {
+    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+    flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
     home-manager = {
 {
-{
+    home-manager = {
-    nixConfig = {
+      nixConfig = {
-      extra-substitutors = ["https://jolheiser.cachix.org"];
+        extra-substitutors = ["https://jolheiser.cachix.org"];
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
+  description = "jolheiser's nixos config";
     flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
+    home-manager = {
 {
-{
+    home-manager = {
-{
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
       url = "github:nix-community/home-manager";
+  description = "jolheiser's nixos config";
     nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
+        flake-utils.follows = "flake-utils";
 {
-          ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
 {
-          spotify = {
+      url = "github:tailscale-dev/tclip";
   description = "jolheiser's nixos config";
+          website = inputs.website.packages.${prev.system}.default;
-      inputs = {
+        nativeBuildInputs = [
+        flake-utils.follows = "flake-utils";
   inputs = {
-    };
+          pkgs.colmena
+      url = "github:nix-community/home-manager";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-
+      };
+    });
 }