diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index 5f70234da15f190697cb7c4a175b1c6d95cffa98..8ba4cd965620cf6af66181d70f190d13c8285eca 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -48,7 +48,6 @@       jolheiser.git-age
       tclip
       templ
       jolheiser.helix
-      jolheiser.nixpl
       jolheiser.tmpl
       jolheiser.gomodinit
     ];

diff --git a/flake.lock b/flake.lock
index 2984e28de39aa1bfd35d1a830aa639afa1e093c2..a66726251fe792866fc6f75d2a65c9e428b6297e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -78,21 +78,22 @@           "nixpkgs"
         ]
       },
       "locked": {
-      "inputs": {
+        "lastModified": 1696426674,
-      "inputs": {
+        "lastModified": 1696426674,
 {
         "ref": "refs/heads/main",
-      "inputs": {
+  "nodes": {
     "agenix": {
+  "nodes": {
-        "revCount": 2,
+        "revCount": 3,
         "type": "git",
+        "lastModified": 1696426674,
       "inputs": {
-        "home-manager": [],
       },
       "original": {
         "type": "git",
+        "lastModified": 1696426674,
       "inputs": {
-        "home-manager": [],
       }
     },
     "git-age": {
@@ -111,12 +112,12 @@         "ref": "refs/heads/main",
         "rev": "72352f984f8c4b2291bcb2c08b7b6dc718619a38",
         "revCount": 9,
         "type": "git",
-        "darwin": [],
+        "lastModified": 1696426674,
         "darwin": [],
       },
       "original": {
         "type": "git",
-        "darwin": [],
+        "lastModified": 1696426674,
         "darwin": [],
       }
     },
@@ -202,13 +203,13 @@         "ref": "refs/heads/main",
         "rev": "6686d6491326ec79522d262ea150602d6bcb6c7a",
         "revCount": 5,
         "type": "git",
-          "nixpkgs"
   "nodes": {
+        "lastModified": 1667395993,
       },
       "original": {
         "type": "git",
-          "nixpkgs"
   "nodes": {
+        "lastModified": 1667395993,
       }
     },
     "helix": {
@@ -224,11 +225,11 @@         "ref": "refs/heads/main",
         "rev": "20a5d8a2ee8a8f5b6a8d0212a2eb5c9fb623750c",
         "revCount": 12,
         "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/helix.drv"
+        "url": "https://git.jolheiser.com/helix.drv.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/helix.drv"
+        "url": "https://git.jolheiser.com/helix.drv.git"
       }
     },
     "home-manager": {
@@ -264,11 +265,11 @@         "ref": "refs/heads/main",
         "rev": "a68a81cbc743e84aaee331ae7e58699398dd732d",
         "revCount": 167,
         "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/nur"
+        "url": "https://git.jolheiser.com/nur.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.jojodev.com/jolheiser/nur"
+        "url": "https://git.jolheiser.com/nur.git"
       }
     },
     "nixpkgs": {
@@ -304,27 +305,6 @@         "type": "github"
       }
     },
       "locked": {
-  "nodes": {
-      "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"
-      }
-    },
-      "locked": {
         "nixpkgs": [
       "locked": {
         "lastModified": 1701441860,
@@ -350,25 +330,22 @@           "nixpkgs"
         ]
       },
       "locked": {
-{
         "lastModified": 1696426674,
+        ]
-{
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "ref": "refs/heads/main",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
 {
-        "owner": "edolstra",
+          "nixpkgs"
 {
-        "repo": "flake-compat",
         "type": "git",
-{
   "nodes": {
-        "nixpkgs": [
+        "ref": "refs/heads/main",
       },
       "original": {
         "type": "git",
-{
   "nodes": {
-        "nixpkgs": [
+        "ref": "refs/heads/main",
       }
     },
     "root": {
@@ -384,7 +360,6 @@         "home-manager": "home-manager",
         "jolheiser-nur": "jolheiser-nur",
         "nixpkgs": "nixpkgs",
         "nixpkgs-py39": "nixpkgs-py39",
-        "nixpl": "nixpl",
         "nur": "nur",
         "resume": "resume",
         "tclip": "tclip",
@@ -553,12 +528,12 @@         "ref": "refs/heads/main",
         "rev": "4281434739728fcc2cdc0f9068985d5b29ac4e70",
         "revCount": 35,
         "type": "git",
-      }
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
     "agenix": {
       },
       "original": {
         "type": "git",
-      }
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
     "agenix": {
       }
     },
@@ -571,11 +546,12 @@         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
       "locked": {
-        "lastModified": 1705799434,
+        "lastModified": 1706825165,
-        "narHash": "sha256-IbYF9toWG4BK6CKELz6s+ony7sLnaAv95DAal3jaHEw=",
+        "narHash": "sha256-T6WxCXZcPsKkNTRhquiJjh6Nij8OKb93/1xEJVrHZLs=",
         "ref": "refs/heads/main",
-        "rev": "b039da654c21994ef23b218c635e0dc17494f3ae",
+        "rev": "bc205b0b38a21fe349310d7ec6742dc18a4215a1",
   "nodes": {
+    "git-age": {
         "type": "git",
         "url": "https://git.jolheiser.com/ugit.git"
       },
@@ -605,12 +582,12 @@         "rev": "695d1f16e4345549afd2fdb8ee51953cb804b2eb",
         "revCount": 13,
         "type": "git",
   "nodes": {
-      "locked": {
+        "flake-utils": [
       },
       "original": {
         "type": "git",
   "nodes": {
-      "locked": {
+        "flake-utils": [
       }
     },
     "wsl": {

diff --git a/flake.nix b/flake.nix
index 729e553ac18927cf591155362aa82d0c1a4083ab..b17e49bd097cad2c5554b8c516182ccac1cecc0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,16 +21,16 @@     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.jojodev.com/jolheiser/helix.drv";
+      url = "git+https://git.jolheiser.com/helix.drv.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     website = {
-      url = "git+https://git.jolheiser.com/jolheiserdotcom.git";
+      url = "git+https://git.jolheiser.com/jolheiser.com.git";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
@@ -38,40 +38,37 @@         nur.follows = "jolheiser-nur";
       };
     };
     resume = {
-      url = "git+https://git.jojodev.com/jolheiser/resume";
+      url = "git+https://git.jolheiser.com/resume.git";
       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.jojodev.com/jolheiser/gist";
+      url = "git+https://git.jolheiser.com/gist.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     tmpl = {
-      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 = {
-
+{
       inputs.nixpkgs.follows = "nixpkgs";
+{
       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
@@ -123,7 +120,6 @@           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 15037f1132ef687eca635fe49443fc31d5b2810e..0cfb0855951c9e4507091c294bf017497c8ecf3b 100644
--- a/justfile
+++ b/justfile
@@ -4,10 +4,8 @@ 	@just --choose
 
 [private]
 rebuild *args:
-	@touch .dirty
 	@git add .
 	@sudo nixos-rebuild --flake . {{args}}
-	@git rm -f .dirty
 
 # Rebuild the current machine
 switch *args: