diff --git a/apps/default.nix b/apps/default.nix
index d957bcbd1210b83c20ba04ffc4c3a6a93cfb161d..6a0619f71fb1017f051bfa0f5703e0d0facc6e1a 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -43,6 +43,9 @@       nixfmt
 
       # IDEs
       jetbrains.goland
+
+      # Personal NUR
+      nur.repos.jolheiser.tmpl
     ];
     stateVersion = "22.11";
   };

diff --git a/flake.lock b/flake.lock
index d7f6729b3d72e22f971806ae3982110b08e6badd..0d64841c7bacf9cbca9c7272df57b8c66c85a69e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1687969886,
-        "narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=",
+        "lastModified": 1688552611,
+        "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9",
+        "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85",
         "type": "github"
       },
       "original": {
@@ -20,13 +20,47 @@         "repo": "home-manager",
         "type": "github"
       }
     },
+    "jolheiser-nur": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1688586089,
+        "narHash": "sha256-k9UncsfiA1bBzlrLJKQ/USRb19Qbqmyp3CtKy6cQ5Mg=",
+        "ref": "refs/heads/main",
+        "rev": "04bf865f3a1608241ddb24dd8272a8bd3c9027db",
+        "revCount": 139,
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/nur"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/nur"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687977148,
-        "narHash": "sha256-gUcXiU2GgjYIc65GOIemdBJZ+lkQxuyIh7OkR9j0gCo=",
+        "lastModified": 1624561540,
+        "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1688556768,
+        "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "60a783e00517fce85c42c8c53fe0ed05ded5b2a4",
+        "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de",
         "type": "github"
       },
       "original": {
@@ -38,11 +72,11 @@       }
     },
     "nur": {
       "locked": {
-        "lastModified": 1688125565,
-        "narHash": "sha256-QRk4rycseCsCLKpC5KImw+3ypG6wRRBuytU1jLAKvT8=",
+        "lastModified": 1688586288,
+        "narHash": "sha256-ERZMdOsoOiP/643IMwq1SBA92JBcJzHUAHgIYq8t7J4=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "57b0c0f3b43b869d3fe5356062e29fd061013ea7",
+        "rev": "3645cae8032682e662c1723dab52fdbfd1f4aad1",
         "type": "github"
       },
       "original": {
@@ -54,7 +88,8 @@     },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "jolheiser-nur": "jolheiser-nur",
+        "nixpkgs": "nixpkgs_2",
         "nur": "nur"
       }
     }

diff --git a/flake.nix b/flake.nix
index 9f4a60f34240280c47fa493cc338f7dcda2302a1..03ef6932e24f04d4f03a0f76a3276a3bcfdc55b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,20 @@     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nur.url = "github:nix-community/nur";
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
   };
 
   nixConfig = { warn-dirty = false; };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, jolheiser-nur, ... }@inputs:
     let
       overlays = final: prev: {
         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
+          repoOverrides = {
+            jolheiser = import jolheiser-nur { pkgs = prev; };
+          };
         };
       };
       commonConfig = { username }:

diff --git a/justfile b/justfile
index 46416552bee55451eb67a5e071b02d50ec1ea066..6468d4b7449e2fe7e8e52d7a09904b5be7dcf106 100644
--- a/justfile
+++ b/justfile
@@ -8,8 +8,8 @@ 	@git add .
 	@sudo nixos-rebuild --flake . {{args}}
 
 # Rebuild the current machine
-switch:
-	@just rebuild switch
+switch *args:
+	@just rebuild switch {{args}}
 
 # Update the flake
 update: