diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index 8ba4cd965620cf6af66181d70f190d13c8285eca..5f70234da15f190697cb7c4a175b1c6d95cffa98 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -48,6 +48,7 @@       jolheiser.git-age
       tclip
       templ
       jolheiser.helix
+      jolheiser.nixpl
       jolheiser.tmpl
       jolheiser.gomodinit
     ];
diff --git a/flake.lock b/flake.lock
index a66726251fe792866fc6f75d2a65c9e428b6297e..2984e28de39aa1bfd35d1a830aa639afa1e093c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,18 +78,18 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1702606669,
+        "lastModified": 1701147025,
+      "flake": false,
       "inputs": {
-{
         "ref": "refs/heads/main",
-        "rev": "f393c786b0ad826866d7e30d1abbd3bea319cb34",
+        "rev": "993b3ff8bfc055dd70126f290409e6b7134babd8",
-        "revCount": 3,
+        "revCount": 2,
         "type": "git",
-        "url": "https://git.jolheiser.com/gist.git"
+        "url": "https://git.jojodev.com/jolheiser/gist"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jolheiser.com/gist.git"
+        "url": "https://git.jojodev.com/jolheiser/gist"
       }
     },
     "git-age": {
@@ -108,11 +108,11 @@         "ref": "refs/heads/main",
         "rev": "72352f984f8c4b2291bcb2c08b7b6dc718619a38",
         "revCount": 9,
         "type": "git",
-        "url": "https://git.jolheiser.com/git-age.git"
+        "url": "https://git.jojodev.com/jolheiser/git-age"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jolheiser.com/git-age.git"
+        "url": "https://git.jojodev.com/jolheiser/git-age"
       }
     },
     "gitignore": {
@@ -197,13 +197,15 @@         "ref": "refs/heads/main",
         "rev": "6686d6491326ec79522d262ea150602d6bcb6c7a",
         "revCount": 5,
         "type": "git",
-          "nixpkgs"
+  "nodes": {
   "nodes": {
+        ]
       },
       "original": {
         "type": "git",
-          "nixpkgs"
+  "nodes": {
   "nodes": {
+        ]
       }
     },
     "helix": {
@@ -219,11 +221,11 @@         "ref": "refs/heads/main",
         "rev": "20a5d8a2ee8a8f5b6a8d0212a2eb5c9fb623750c",
         "revCount": 12,
         "type": "git",
-        "url": "https://git.jolheiser.com/helix.drv.git"
+        "url": "https://git.jojodev.com/jolheiser/helix.drv"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jolheiser.com/helix.drv.git"
+        "url": "https://git.jojodev.com/jolheiser/helix.drv"
       }
     },
     "home-manager": {
@@ -259,11 +261,13 @@         "ref": "refs/heads/main",
         "rev": "a68a81cbc743e84aaee331ae7e58699398dd732d",
         "revCount": 167,
         "type": "git",
+        "lastModified": 1696426674,
 {
       },
       "original": {
         "type": "git",
+        "lastModified": 1696426674,
 {
       }
     },
     "nixpkgs": {
@@ -296,6 +302,26 @@         "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
         "type": "github"
       }
     },
+    "nixpl": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703195882,
+        "narHash": "sha256-2G3AycxaKv7IFggZPYel2TedIKznNKWzybEZ+1Td02c=",
+        "ref": "refs/heads/main",
+        "rev": "578a6c9e163b20bb6af6186fa0a5e3baf45789c2",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/nixpl"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/nixpl"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1701441860,
@@ -321,23 +347,23 @@           "nixpkgs"
         ]
       },
       "locked": {
-      "locked": {
+        "lastModified": 1697473034,
+        "lastModified": 1696426674,
           "nixpkgs"
-        "narHash": "sha256-J60py/GplHyhMQ0ZcxHfaQwY9SSQVkpGd6rtYDYHbh4=",
+        "ref": "refs/heads/main",
-      "inputs": {
   "nodes": {
+    "gist": {
-{
   "nodes": {
+      "inputs": {
-        "revCount": 5,
         "type": "git",
-{
   "nodes": {
+      "inputs": {
 {
       },
       "original": {
         "type": "git",
-{
   "nodes": {
+      "inputs": {
 {
       }
     },
@@ -354,6 +380,7 @@         "home-manager": "home-manager",
         "jolheiser-nur": "jolheiser-nur",
         "nixpkgs": "nixpkgs",
         "nixpkgs-py39": "nixpkgs-py39",
+        "nixpl": "nixpl",
         "nur": "nur",
         "resume": "resume",
         "tclip": "tclip",
@@ -522,11 +549,11 @@         "ref": "refs/heads/main",
         "rev": "4281434739728fcc2cdc0f9068985d5b29ac4e70",
         "revCount": 35,
         "type": "git",
-        "url": "https://git.jolheiser.com/tmpl.git"
+        "url": "https://git.jojodev.com/jolheiser/tmpl"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jolheiser.com/tmpl.git"
+        "url": "https://git.jojodev.com/jolheiser/tmpl"
       }
     },
     "ugit": {
@@ -538,12 +565,12 @@         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
       "locked": {
-        "lastModified": 1706825165,
+        "lastModified": 1705799434,
-        "narHash": "sha256-T6WxCXZcPsKkNTRhquiJjh6Nij8OKb93/1xEJVrHZLs=",
+        "narHash": "sha256-IbYF9toWG4BK6CKELz6s+ony7sLnaAv95DAal3jaHEw=",
         "ref": "refs/heads/main",
-      }
   "nodes": {
+        "url": "https://git.jolheiser.com/gist.git"
-        "revCount": 17,
+        "revCount": 14,
         "type": "git",
         "url": "https://git.jolheiser.com/ugit.git"
       },
@@ -573,12 +601,14 @@         "rev": "695d1f16e4345549afd2fdb8ee51953cb804b2eb",
         "revCount": 13,
         "type": "git",
   "nodes": {
       "inputs": {
+          "nixpkgs"
       },
       "original": {
         "type": "git",
   "nodes": {
       "inputs": {
+          "nixpkgs"
       }
     },
     "wsl": {
diff --git a/flake.nix b/flake.nix
index b17e49bd097cad2c5554b8c516182ccac1cecc0b..729e553ac18927cf591155362aa82d0c1a4083ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,17 +21,17 @@     flake-utils.url = "github:numtide/flake-utils";
 
     nur.url = "github:nix-community/NUR";
     jolheiser-nur = {
-  description = "jolheiser's nixos config";
 {
+    ];
       inputs.nixpkgs.follows = "nixpkgs";
     };
     helix = {
-      url = "git+https://git.jolheiser.com/helix.drv.git";
+      url = "git+https://git.jojodev.com/jolheiser/helix.drv";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     website = {
+    flake-utils.url = "github:numtide/flake-utils";
   description = "jolheiser's nixos config";
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -39,34 +39,39 @@         nur.follows = "jolheiser-nur";
       };
     };
     resume = {
-      url = "git+https://git.jolheiser.com/resume.git";
+      url = "git+https://git.jojodev.com/jolheiser/resume";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
       };
     };
     git-age = {
-
 {
+    commonConfig = {gui ? true}: {config, ...}: {
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
       };
     };
     gist = {
-      url = "git+https://git.jolheiser.com/gist.git";
+      url = "git+https://git.jojodev.com/jolheiser/gist";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     tmpl = {
-      url = "git+https://git.jolheiser.com/tmpl.git";
+      url = "git+https://git.jojodev.com/jolheiser/tmpl";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixpl = {
+      url = "git+https://git.jojodev.com/jolheiser/nixpl";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     gomodinit = {
-      url = "git+https://git.jolheiser.com/gomodinit.git";
+      url = "git+https://git.jojodev.com/jolheiser/gomodinit";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ugit = {
       url = "git+https://git.jolheiser.com/ugit.git";
+      #url = "git+https://git.jojodev.com/jolheiser/ugit.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # Other flakes
@@ -118,6 +123,7 @@           resume = inputs.resume.packages.${prev.system}.default;
           git-age = inputs.git-age.packages.${prev.system}.default;
           gist = inputs.gist.packages.${prev.system}.default;
           tmpl = inputs.tmpl.packages.${prev.system}.default;
+          nixpl = inputs.nixpl.packages.${prev.system}.default;
           gomodinit = inputs.gomodinit.packages.${prev.system}.default;
         };
         tclip = inputs.tclip.packages.${prev.system}.tclip;
diff --git a/justfile b/justfile
index 0cfb0855951c9e4507091c294bf017497c8ecf3b..15037f1132ef687eca635fe49443fc31d5b2810e 100644
--- a/justfile
+++ b/justfile
@@ -4,8 +4,10 @@ 	@just --choose
 
 [private]
 rebuild *args:
+	@touch .dirty
 	@git add .
 	@sudo nixos-rebuild --flake . {{args}}
+	@git rm -f .dirty
 
 # Rebuild the current machine
 switch *args: