From b17195c0cf0b520f87e24df10031843eda64e43d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 01/10] talos: home: include font-awesome Since this was removed when disabling the i3bar module in the previous commit, enable locally. --- hosts/talos/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 6c666ad..f9e9f06 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -49,6 +49,7 @@ in { (pkgs) ansel chromium # some websites only work there :( + font-awesome # for pretty icons nwg-displays shikane # output autoconfig swaybg From f083325b4a048e54b6f19c966f577aac113dbc59 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 02/10] home: jj: drop fancy icon from log This messes with the graph formatting when history is not linear because the fancy icon's width is non-standard --- home/jj/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/jj/config.toml b/home/jj/config.toml index 730916e..c407a1e 100644 --- a/home/jj/config.toml +++ b/home/jj/config.toml @@ -46,8 +46,8 @@ 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:"), "!"), "○", ) ) From 95c5fe1b49d5d336d491b47071b18cdf602ec89d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 03/10] home: jj: add better commit draft templates --- home/jj/config.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/home/jj/config.toml b/home/jj/config.toml index c407a1e..71d50e7 100644 --- a/home/jj/config.toml +++ b/home/jj/config.toml @@ -54,7 +54,23 @@ coalesce( ) ''' +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/"] From c42ed3a2d1fd633d72eb982e8faba49f3a777916 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 6 Mar 2025 16:33:45 +0100 Subject: [PATCH 04/10] base: gui: use Qt6 Okular --- base/gui-programs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 5fd40cdc6c538e9303b5ddca69c73abc09c2a713 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 15:59:35 +0100 Subject: [PATCH 05/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27) → 'github:NixOS/nixos-hardware/e1f12151258b12c567f456d8248e4694e9390613' (2025-03-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04) → 'github:NixOS/nixpkgs/cdd2ef009676ac92b715ff26630164bb88fec4e0' (2025-03-13) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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": { From 93e1e226ee1dfdd532d91972182291f6bd8c46a2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 16:14:40 +0100 Subject: [PATCH 06/10] base: add shellcheck to base programs --- base/programs.nix | 1 + 1 file changed, 1 insertion(+) 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 From c5c41c89f74643337e83b97d307cb552945f08f4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 16:14:40 +0100 Subject: [PATCH 07/10] home: tridactyl: add typing websites to blackist --- home/tridactylrc | 2 ++ 1 file changed, 2 insertions(+) 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 From 90a09cc82b1d55f302e84603bba6252f86c203a4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 16:14:40 +0100 Subject: [PATCH 08/10] home: leave gtkrc 2.0 in its default location --- home/gtk.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 = { From cd29dc0aa8ea3f7d841adc18ce782d04b631c711 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 16:14:40 +0100 Subject: [PATCH 09/10] talos: add gnome-solanum to home packages This is a Pomodoro timer. --- hosts/talos/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index f9e9f06..9513e08 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -50,6 +50,7 @@ in { ansel chromium # some websites only work there :( font-awesome # for pretty icons + gnome-solanum nwg-displays shikane # output autoconfig swaybg From bac6d9c7fbc1f498a003be7512894906a4fb1746 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Mar 2025 16:14:40 +0100 Subject: [PATCH 10/10] todo: add current wishlist --- todo.org | 3 +++ 1 file changed, 3 insertions(+) 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