WIP: ADD NOTE FOR FUTURE SELF

home: jujutsu: set 'ui.merge-editor'
Same reason as `ui.diff-editor`.
2025-12-04 14:01:00 +00:00 · 2025-12-04 14:00:55 +00:00 · 2025-12-04 14:00:23 +00:00 · 2025-12-04 13:59:52 +00:00 · 2025-12-04 13:59:52 +00:00 · 2025-12-04 13:59:52 +00:00
2 changed files with 4 additions and 9 deletions
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@ -51,8 +51,12 @@ in
        ui = {
          # Stop nagging me about it, though I am not a fan of its UI.
          diff-editor = ":builtin";
+          # I don't like word-diff
+          diff-formatter = ":git";
          # Stop nagging me about it, though I am not a fan of its UI.
          merge-editor = ":builtin";
+          # Does not honor `$PAGER` (anymore)
+          pager = lib.mkDefault config.home.sessionVariables.PAGER;
        };

        # FIXME: git equivalents
--- a/modules/nixos/hardware/graphics/default.nix
+++ b/modules/nixos/hardware/graphics/default.nix
@ -15,8 +15,6 @@ in

    amd = {
      enableKernelModule = lib.my.mkDisableOption "Kernel driver module";
-
-      amdvlk = lib.mkEnableOption "Use AMDVLK instead of Mesa RADV driver";
    };

    intel = {
@ -35,13 +33,6 @@ in
    (lib.mkIf (cfg.gpuFlavor == "amd") {
      hardware.amdgpu = {
        initrd.enable = cfg.amd.enableKernelModule;
-        # Vulkan
-        amdvlk = lib.mkIf cfg.amd.amdvlk {
-          enable = true;
-          support32Bit = {
-            enable = true;
-          };
-        };
      };

      hardware.graphics = {
Author	SHA1	Message	Date
Bruno BELANYI	af7280187a	WIP: ADD NOTE FOR FUTURE SELF All checks were successful ci/woodpecker/push/check Pipeline was successful Details	2025-12-04 14:01:00 +00:00
Bruno BELANYI	ef525a09ca	home: jujutsu: set 'ui.merge-editor' Same reason as `ui.diff-editor`.	2025-12-04 14:00:55 +00:00
Bruno BELANYI	7e2da79de3	home: jujutsu: set 'ui.diff-editor' Otherwise it keeps nagging me with a hint to set it. I'm not a big fan of this UI, I wish I add something closer to Git's patch interface.	2025-12-04 14:00:23 +00:00
Bruno BELANYI	b93167c6af	homes: mousqueton: use system jujutsu They have a custom `jj` with Piper CitC integration.	2025-12-04 13:59:52 +00:00
Bruno BELANYI	712411afdb	homes: bazin: use system jujutsu They have a custom `jj` with Piper CitC integration.	2025-12-04 13:59:52 +00:00
Bruno BELANYI	5fd02826be	home: jujutsu: simplify 'jj jj' alias	2025-12-04 13:59:52 +00:00
Bruno BELANYI	e2ae52f2f6	home: jujutsu: explicitly create 'conf.d' This is to serve as a reminder of _how_ to add a local configuration file.	2025-12-04 13:59:52 +00:00
Bruno BELANYI	8836f0f3ec	home: jj: use verbose draft commit messages	2025-12-04 13:59:48 +00:00
Bruno BELANYI	6ba4dcf324	home: jujutsu: set 'ui.pager' The v0.36 release stopped honoring `$PAGER`. So enforce it in the configuration (as I don't like their default pager settings). Ideally this would be `mkIf`ed behind `my.home.pager.enable`, however it looks like this does not work with the TOML type (does not seem to do any `mkMerge`-ish logic).	2025-12-04 13:59:15 +00:00
Bruno BELANYI	f16195cc99	home: jujutsu: set 'ui.diff-formatter' I still don't really like the built-in formatting, but it's more about its highlighting than its syntax. Given that I default to using `delta` anyways, it doesn't _really_ matter as I don't see the default output.	2025-12-04 13:58:20 +00:00
Bruno BELANYI	1fb09cdb0d	home: delta: add 'jujutsu.enable'	2025-12-02 12:35:32 +00:00
Bruno BELANYI	1b0e1a4692	home: add jujutsu This is a very basic configuration, still missing most bells and whistles.	2025-12-02 12:35:32 +00:00
Bruno BELANYI	92d9f37ef2	pkgs: diff-flake: rename 'host' to 'nixos' To avoid mixing them up with Nix-Darwin and System Manager hosts.	2025-12-02 12:35:32 +00:00
Bruno BELANYI	cc27fe0198	pkgs: diff-flake: add system-manager support	2025-12-02 12:35:32 +00:00
Bruno BELANYI	d21fdfb227	pkgs: diff-flake: add nix-darwin support	2025-12-02 12:35:32 +00:00
Bruno BELANYI	a1d08876a8	nixos: hardware: graphics: remove 'amdvlk' It's been fully deprecated, the package was removed.	2025-12-02 12:35:32 +00:00