diff --git a/agenix/hosts/tanker/config.nix b/agenix/hosts/tanker/config.nix
index 5b5ba7b..c2930c1 100644
--- a/agenix/hosts/tanker/config.nix
+++ b/agenix/hosts/tanker/config.nix
@@ -28,8 +28,6 @@
 
     fedifetcher-config = {
       file = ./fedifetcher/config.age;
-      symlink = false;
-      path = "/var/lib/fedifetcher/config.json";
     };
 
     linkding-environment = {
diff --git a/agenix/hosts/tanker/fedifetcher/config.age b/agenix/hosts/tanker/fedifetcher/config.age
index 967c12b..101a145 100644
Binary files a/agenix/hosts/tanker/fedifetcher/config.age and b/agenix/hosts/tanker/fedifetcher/config.age differ
diff --git a/flake.lock b/flake.lock
index b5da849..d1fe0c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -276,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1688552611,
-        "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=",
+        "lastModified": 1688731042,
+        "narHash": "sha256-D1p/LLP1SpDYjutt9W+O5Ek+XGdszsjYjvL30ad++OY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85",
+        "rev": "34db2f05219bcb0e41cc85490e4c338e2405546c",
         "type": "github"
       },
       "original": {
@@ -389,11 +389,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1688718598,
-        "narHash": "sha256-brBQ6kgCYQM1Xbtt84um96q5jptvTn+VGFKXNKL5Zkc=",
+        "lastModified": 1688749462,
+        "narHash": "sha256-/rC/KqMMUyVEcEkvQp9Y20rscU3RbrWtzUrK2RcqsoA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "54303b65ef01f701d3a727b0df9feba5ce0a0495",
+        "rev": "93d6f73da121e49bafe04dc1be5e6cf04b18a8d5",
         "type": "github"
       },
       "original": {
diff --git a/home/config/nvim/nifoc/statuscolumn.fnl b/home/config/nvim/nifoc/statuscolumn.fnl
index f4064f9..2852158 100644
--- a/home/config/nvim/nifoc/statuscolumn.fnl
+++ b/home/config/nvim/nifoc/statuscolumn.fnl
@@ -66,12 +66,16 @@
                 :callback #(update-cache-gitsigns $1.buf)
                 :group augroup
                 :desc "Update cached gitsigns signs"})
-  (aucmd [:BufWipeout :BufWritePre]
+  (aucmd :BufWipeout
          {:callback (fn [args]
                       (tset cache :diagnostics args.buf nil)
                       (tset cache :gitsigns args.buf nil))
           :group augroup
           :desc "Clear sign cache for current buffer"})
+  (aucmd :BufWritePre
+         {:callback #(tset cache :diagnostics $1.buf nil)
+          :group augroup
+          :desc "Reset diagnostic signs on save"})
   ;; Line Number
   (set mod.line-number {:condition #(or (o.number:get) (o.relativenumber:get))
                         1 statusline.push-right
diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl
index 6fe46f1..d46849d 100644
--- a/home/config/nvim/plugins/lsp.fnl
+++ b/home/config/nvim/plugins/lsp.fnl
@@ -47,8 +47,10 @@
     ;; Custom
     (lsp.elixirls.setup (->> {:cmd [:elixir-ls]}
                              (vim.tbl_extend :force default-config)))
-    (lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}
-                           (vim.tbl_extend :force default-config)))
+    ;(lsp.nil_ls.setup (->> {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}
+    ;                       (vim.tbl_extend :force default-config)))
+    (lsp.nixd.setup (->> {:settings {:formatting {:command [:nixpkgs-fmt]}}}
+                         (vim.tbl_extend :force default-config)))
     (let [inlay-hints {:includeInlayParameterNameHints :all
                        :includeInlayParameterNameHintsWhenArgumentMatchesName false
                        :includeInlayFunctionParameterTypeHints true
diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix
index bdd1f2f..68e08b1 100644
--- a/home/hosts/Styx.nix
+++ b/home/hosts/Styx.nix
@@ -61,6 +61,7 @@ args@{ pkgs, config, lib, ... }:
       hyperfine
       lnav
       mtr
+      nix-tree
       nix-output-monitor
       nurl
       parallel
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index 069c0b1..3e5feb2 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -26,6 +26,7 @@ in
 
       # LSP
       fennel-ls
+      lua-language-server
       nil
       nodePackages.bash-language-server
       nodePackages.dockerfile-language-server-nodejs
@@ -33,7 +34,7 @@ in
       nodePackages.typescript-language-server
       nodePackages.vscode-langservers-extracted
       nodePackages.yaml-language-server
-      lua-language-server
+      nixd
       taplo-lsp
 
       # Diagnostic Tools
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index 43da133..3bd0545 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -499,8 +499,8 @@ in
     src = fetchFromGitHub {
       owner = "lukas-reineke";
       repo = "indent-blankline.nvim";
-      rev = "fedad189e6ab1037939b79d32b7acaf05a0d4fb0";
-      sha256 = "0v29jg8hm388r9w537ij1r96n4i8zh1y7yipdr875xdkdfrvia20";
+      rev = "4541d690816cb99a7fc248f1486aa87f3abce91c";
+      sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr";
       fetchSubmodules = false;
     };
   };
diff --git a/system/nixos/fedifetcher.nix b/system/nixos/fedifetcher.nix
index 0a865f4..fa0f03e 100644
--- a/system/nixos/fedifetcher.nix
+++ b/system/nixos/fedifetcher.nix
@@ -1,14 +1,6 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 
-let
-  podman = config.virtualisation.podman.package;
-  image = "ghcr.io/nanos/fedifetcher:latest";
-in
 {
-  systemd.tmpfiles.rules = [
-    "d /var/lib/fedifetcher 0744 root root"
-  ];
-
   systemd.services.fedifetcher = {
     description = "FediFetcher";
     wants = [ "mastodon-web.service" "mastodon-wait-for-available.service" ];
@@ -16,23 +8,12 @@ in
     # wantedBy = [ "multi-user.target" ];
     startAt = "*:0/25";
 
-    serviceConfig =
-      let
-        data = "/var/lib/fedifetcher:/app/artifacts";
-      in
-      {
-        Type = "oneshot";
-        ExecStart = "${podman}/bin/podman run --name fedifetcher -v ${data} --rm ${image} --config=/app/artifacts/config.json";
-      };
-  };
-
-  systemd.services.fedifetcher-updater = {
-    description = "FediFetcher Updater";
-    startAt = "daily";
-
     serviceConfig = {
       Type = "oneshot";
-      ExecStart = "${podman}/bin/podman pull ${image}";
+      DynamicUser = true;
+      StateDirectory = "fedifetcher";
+      LoadCredential = "config.json:${config.age.secrets.fedifetcher-config.path}";
+      ExecStart = "${pkgs.fedifetcher}/bin/fedifetcher --config=%d/config.json";
     };
   };
 }