diff --git a/LICENSE b/LICENSE
index b7bd853a..e3fe2f78 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Eric Tossell
+Copyright (c) 2024 Eric Tossell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/flake.lock b/flake.lock
index 5736611f..90022761 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,6 +45,31 @@
         "type": "github"
       }
     },
+    "eriixpkgs": {
+      "inputs": {
+        "eriixvim": "eriixvim",
+        "flake-utils": "flake-utils_3",
+        "go-time": "go-time",
+        "homepage-nix": "homepage-nix",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "russh": "russh"
+      },
+      "locked": {
+        "lastModified": 1705889360,
+        "narHash": "sha256-ObgJyzzL6oAJSRz6F5Cjo0mUuKwbFpthkdUdR4u9ZK8=",
+        "owner": "erictossell",
+        "repo": "eriixpkgs",
+        "rev": "47baa97d7928a5e331f50835712fb814c5851dd2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "erictossell",
+        "repo": "eriixpkgs",
+        "type": "github"
+      }
+    },
     "eriixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -118,6 +143,7 @@
     "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "nixpkgs"
@@ -173,9 +199,28 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "pre-commit-hooks",
@@ -238,6 +283,7 @@
     "home-manager_2": {
       "inputs": {
         "nixpkgs": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "nixpkgs"
@@ -300,8 +346,8 @@
     "hyprland": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": "nixpkgs_6",
-        "systems": "systems_5",
+        "nixpkgs": "nixpkgs_8",
+        "systems": "systems_7",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
@@ -387,7 +433,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1698420672,
@@ -407,6 +453,7 @@
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "nixpkgs"
@@ -523,62 +570,62 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1705133751,
-        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
+        "lastModified": 1705697961,
+        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
+        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1705677747,
-        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
+        "lastModified": 1705697961,
+        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
+        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1705697961,
-        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
+        "lastModified": 1705133751,
+        "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1705697961,
-        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
+        "lastModified": 1705677747,
+        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
+        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -611,11 +658,13 @@
         "flake-utils": "flake-utils_2",
         "gitignore": "gitignore",
         "nixpkgs": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "nixpkgs"
         ],
         "nixpkgs-stable": [
+          "eriixpkgs",
           "eriixvim",
           "nixvim",
           "nixpkgs"
@@ -639,19 +688,16 @@
       "inputs": {
         "NixOS-WSL": "NixOS-WSL",
         "agenix": "agenix",
-        "eriixvim": "eriixvim",
-        "go-time": "go-time",
+        "eriixpkgs": "eriixpkgs",
         "home-manager": "home-manager_3",
-        "homepage-nix": "homepage-nix",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_7",
-        "russh": "russh"
+        "nixpkgs": "nixpkgs_9"
       }
     },
     "russh": {
       "inputs": {
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_7",
         "utils": "utils_2"
       },
       "locked": {
@@ -730,16 +776,16 @@
     },
     "systems_5": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -758,9 +804,24 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "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"
+      }
+    },
     "utils": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1705309234,
diff --git a/flake.nix b/flake.nix
index 3a3781b4..a08995fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,20 +19,9 @@
       url = "github:hyprwm/hyprland";
     };
 
-    eriixvim = {
-      url = "github:erictossell/eriixvim";
-    };
-
-    russh = {
-      url = "github:erictossell/russh";
-    };
-
-    go-time = {
-      url = "github:erictossell/go-time";
-    };
-
-    homepage-nix = {
-      url = "github:erictossell/homepage-nix";
+    eriixpkgs = {
+      url = "github:erictossell/eriixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     NixOS-WSL = {
diff --git a/modules/core/terminal/nvim/default.nix b/modules/core/terminal/nvim/default.nix
index 54d1c47f..714df2f2 100644
--- a/modules/core/terminal/nvim/default.nix
+++ b/modules/core/terminal/nvim/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, eriixvim, system, ... }:
+{ eriixpkgs, system, ... }:
 {
   environment.variables.EDITOR = "nvim";
-  environment.systemPackages = with pkgs; [
-    eriixvim.packages.${system}.default
+  environment.systemPackages = [
+    eriixpkgs.packages.${system}.eriixvim
   ];
 }
diff --git a/modules/custom/go-time/default.nix b/modules/custom/go-time/default.nix
deleted file mode 100644
index 934b7d67..00000000
--- a/modules/custom/go-time/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, go-time, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    go-time.packages.${system}.default
-  ];
-}
diff --git a/modules/custom/russh/default.nix b/modules/custom/russh/default.nix
deleted file mode 100644
index afa37e3c..00000000
--- a/modules/custom/russh/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, russh, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    russh.packages.${system}.default
-  ];
-}
diff --git a/modules/default.nix b/modules/default.nix
index 06c786f8..493437fc 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,7 +3,7 @@
     ./agenix
     ./apps
     ./core
-    ./custom
+    ./eriixpkgs
     ./hardware
     ./hyprland
   ];
diff --git a/modules/custom/default.nix b/modules/eriixpkgs/default.nix
similarity index 100%
rename from modules/custom/default.nix
rename to modules/eriixpkgs/default.nix
diff --git a/modules/eriixpkgs/go-time/default.nix b/modules/eriixpkgs/go-time/default.nix
new file mode 100644
index 00000000..bfff1225
--- /dev/null
+++ b/modules/eriixpkgs/go-time/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, eriixpkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    eriixpkgs.packages.${system}.go-time
+  ];
+}
diff --git a/modules/custom/homepage-nix/default.nix b/modules/eriixpkgs/homepage-nix/default.nix
similarity index 62%
rename from modules/custom/homepage-nix/default.nix
rename to modules/eriixpkgs/homepage-nix/default.nix
index 52816ee2..957466be 100644
--- a/modules/custom/homepage-nix/default.nix
+++ b/modules/eriixpkgs/homepage-nix/default.nix
@@ -1,7 +1,7 @@
-{ homepage-nix, system, username, ... }:
+{ eriixpkgs, system, username, ... }:
 {
   imports = [
-    homepage-nix.nixosModules.${system}.default
+    eriixpkgs.nixosModules.${system}.homepage-nix
   ];
 
   services.homepage-nix = {
diff --git a/modules/eriixpkgs/russh/default.nix b/modules/eriixpkgs/russh/default.nix
new file mode 100644
index 00000000..6f17b2fa
--- /dev/null
+++ b/modules/eriixpkgs/russh/default.nix
@@ -0,0 +1,6 @@
+{ eriixpkgs, system, ... }:
+{
+  environment.systemPackages = [
+    eriixpkgs.packages.${system}.russh
+  ];
+}