base/gui-programs.nix

@@ -78,7 +78,7 @@ in {
         zathura
         ;
 
-      inherit (pkgs.kdePackages) okular;
+      inherit (pkgs.libsForQt5) okular;
     };
 
     networking.networkmanager.enable = true;

base/programs.nix

@@ -36,7 +36,6 @@
       gnumake
       gnupg
       python3
-      shellcheck
       vim
       # terminal utilities
       htop

flake.lock

@@ -234,11 +234,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1741792691,
+        "lastModified": 1740646007,
-        "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
+        "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e1f12151258b12c567f456d8248e4694e9390613",
+        "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
         "type": "github"
       },
       "original": {
@@ -298,11 +298,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1741862977,
+        "lastModified": 1741048562,
-        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
+        "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
+        "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f",
         "type": "github"
       },
       "original": {

home/gtk.nix

@@ -20,11 +20,7 @@ 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 = {

home/jj/config.toml

@@ -46,31 +46,15 @@ coalesce(
       if(current_working_copy, "@"),
       if(immutable, "◆"),
       if(conflict, "×"),
-      if(description.starts_with("wip:"), "!"),
+      if(description.starts_with("wip:"), "🔒"),
-      if(description.starts_with("private:"), "!"),
+      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/"]

home/tridactylrc

@@ -33,8 +33,6 @@ 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

hosts/talos/home.nix

@@ -49,8 +49,6 @@ in {
         (pkgs)
         ansel
         chromium # some websites only work there :(
-        font-awesome # for pretty icons
-        gnome-solanum
         nwg-displays
         shikane # output autoconfig
         swaybg

todo.org

@@ -3,6 +3,3 @@
 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