diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix
index 158b087..62ed003 100644
--- a/home/david/configurations/Tytonidae/niri.nix
+++ b/home/david/configurations/Tytonidae/niri.nix
@@ -6,6 +6,12 @@
   cfg = config.david.programs.niri;
 in {
   david.programs.niri = lib.mkIf cfg.enable {
+    waybar.settings = let
+      cfg = config.david.programs.niri.waybar;
+    in [
+      (cfg.template // (cfg.helper.mkBacklight "ddcci13") // {output = "DP-1";})
+      (cfg.template // (cfg.helper.mkBacklight "nvidia_0") // {output = "eDP-2";})
+    ];
     wluma.extraSettings = {
       output = {
         backlight = [
diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix
index e5eb353..3e7d6b0 100644
--- a/home/david/modules/programs/niri/default.nix
+++ b/home/david/modules/programs/niri/default.nix
@@ -41,6 +41,21 @@ in {
       wluma.extraSettings = lib.mkOption {
         inherit (options.david.programs.wluma.extraSettings) type;
       };
+      waybar = {
+        template = lib.mkOption {
+          readOnly = true;
+          type = lib.types.anything;
+          default = config.david.programs.waybar.template;
+        };
+        helper = lib.mkOption {
+          readOnly = true;
+          type = lib.types.anything;
+          default = config.david.programs.waybar.helper;
+        };
+        settings = lib.mkOption {
+          inherit (options.david.programs.waybar.settings) type;
+        };
+      };
     };
   };
   config = lib.mkMerge [
diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix
index 38eff2b..637e812 100644
--- a/home/modules/programs/git.nix
+++ b/home/modules/programs/git.nix
@@ -45,11 +45,8 @@
           };
           git = {
             enable = true;
-            settings = {
-              alias.patch = "push rad HEAD:refs/patches";
-              user = {
-                inherit (cfg) email name;
-              };
+            settings.user = {
+              inherit (cfg) email name;
             };
             lfs.enable = true;
           };
diff --git a/home/modules/programs/jujutsu.nix b/home/modules/programs/jujutsu.nix
index e744681..7a33b9c 100644
--- a/home/modules/programs/jujutsu.nix
+++ b/home/modules/programs/jujutsu.nix
@@ -42,12 +42,6 @@ in {
         enable = true;
         settings = {
           "$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json";
-          aliases = {
-            dlog = ["log" "-r"];
-            l = ["log" "-r" "(trunk()..@):: | (trunk()..@)-"];
-            fresh = ["new" "trunk()"];
-            tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"];
-          };
           snapshot = {
             auto-track = "true";
             max-new-file-size = 0;
@@ -83,18 +77,8 @@ in {
             "format_short_signature(signature)" = "signature";
           };
           revset-aliases = {
-            "closest_bookmark(to)" = "heads(::to & bookmarks())";
-            "closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:\"\") & (~empty() | merges()))";
-            "desc(x)" = "description(x)";
-            "pending()" = ".. ~ ::tags() ~ ::remote_bookmarks() ~ @ ~ private()";
-            "private()" = ''
-              description(glob:'wip:*') |
-              description(glob:'private:*') |
-              description(glob:'WIP:*') |
-              description(glob:'PRIVATE:*') |
-              conflicts() |
-              (empty() ~ merges()) |
-              description(substring-i:"DO NOT NAIL")
+            "immutable_heads()" = ''
+              builtin_immutable_heads() | (trunk().. & ~mine())
             '';
           };
           git = {