diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 0a0e47c..7057c85 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -78,7 +78,7 @@ in {
         zathura
         ;
 
-      inherit (pkgs.libsForQt5) okular;
+      inherit (pkgs.kdePackages) okular;
     };
 
     networking.networkmanager.enable = true;
diff --git a/base/programs.nix b/base/programs.nix
index 3655de8..064c3e1 100644
--- a/base/programs.nix
+++ b/base/programs.nix
@@ -36,6 +36,7 @@
       gnumake
       gnupg
       python3
+      shellcheck
       vim
       # terminal utilities
       htop
diff --git a/flake.lock b/flake.lock
index 5d4fe9d..aa9e3f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -234,11 +234,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1740646007,
-        "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
+        "lastModified": 1741792691,
+        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
+        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
         "type": "github"
       },
       "original": {
@@ -298,11 +298,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1741048562,
-        "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=",
+        "lastModified": 1741862977,
+        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f",
+        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
         "type": "github"
       },
       "original": {
diff --git a/home/gtk.nix b/home/gtk.nix
index a0738f4..7be7d77 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -20,7 +20,11 @@ in {
 
     gtk2 = {
       # No garbage polluting my $HOME
-      configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+      #
+      # I had this enabled but some program somehow couldn't find my
+      # configuration there. I think it was nm-applet.
+      #
+      #configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
     };
 
     iconTheme = {
diff --git a/home/jj/config.toml b/home/jj/config.toml
index 730916e..71d50e7 100644
--- a/home/jj/config.toml
+++ b/home/jj/config.toml
@@ -46,15 +46,31 @@ coalesce(
       if(current_working_copy, "@"),
       if(immutable, "◆"),
       if(conflict, "×"),
-      if(description.starts_with("wip:"), "🔒"),
-      if(description.starts_with("private:"), "🔒"),
+      if(description.starts_with("wip:"), "!"),
+      if(description.starts_with("private:"), "!"),
       "○",
     )
   )
 )
 '''
 
+draft_commit_description = "commit_description_verbose(self)"
+
 [template-aliases]
+"commit_description_verbose(commit)" = '''
+concat(
+  commit_description(commit),
+  "JJ: ignore-rest\n",
+  diff.git(),
+)
+'''
+"commit_description(commit)" = '''
+concat(
+  commit.description(), "\n",
+  "JJ: This commit contains the following changes:\n",
+  indent("JJ:    ", diff.stat(72)),
+)
+'''
 
 [[--scope]]
 --when.repositories = ["~/work/lrde/"]
diff --git a/home/tridactylrc b/home/tridactylrc
index bad4eaa..9e0442c 100644
--- a/home/tridactylrc
+++ b/home/tridactylrc
@@ -33,6 +33,8 @@ set editorcmd emacsclient -c
 set yankto both
 
 blacklistadd calendar.google.com
+blacklistadd keybr.com
+blacklistadd ergol.org
 blacklistadd jellyfin.alarsyo.net
 blacklistadd localhost
 blacklistadd netflix.com
diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix
index 6c666ad..9513e08 100644
--- a/hosts/talos/home.nix
+++ b/hosts/talos/home.nix
@@ -49,6 +49,8 @@ in {
         (pkgs)
         ansel
         chromium # some websites only work there :(
+        font-awesome # for pretty icons
+        gnome-solanum
         nwg-displays
         shikane # output autoconfig
         swaybg
diff --git a/todo.org b/todo.org
index 814009b..d1a045d 100644
--- a/todo.org
+++ b/todo.org
@@ -3,3 +3,6 @@
 https://github.com/quexten/goldwarden
 
 * TODO Setup sway correctly
+** TODO This includes moving it to a proper module
+
+* TODO Create an adwaita package with symlinks for nm-applet icons