Compare commits

..

13 commits

Author SHA1 Message Date
ccf222eb9c WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-12-01 12:25:10 +00:00
a008c9b73b home: jujutsu: set 'ui.merge-editor'
Same reason as `ui.diff-editor`.
2025-12-01 12:25:10 +00:00
50f95ce1e1 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-01 12:25:10 +00:00
15687fc8b0 homes: mousqueton: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-12-01 12:25:10 +00:00
2a7957efea homes: bazin: use system jujutsu
They have a custom `jj` with Piper CitC integration.
2025-12-01 12:25:10 +00:00
ae21b93424 home: jujutsu: simplify 'jj jj' alias 2025-12-01 12:25:10 +00:00
7a406520e1 home: jujutsu: explicitly create 'conf.d'
This is to serve as a reminder of _how_ to add a local configuration
file.
2025-12-01 12:25:10 +00:00
21a5705631 home: jj: use verbose draft commit messages 2025-12-01 12:25:10 +00:00
0ba3d37813 home: delta: add 'jujutsu.enable' 2025-12-01 12:25:10 +00:00
5d511a029c home: add jujutsu
This is a very basic configuration, still missing most bells and
whistles.
2025-12-01 12:25:09 +00:00
e72a8b3f0f pkgs: diff-flake: rename 'host' to 'nixos'
To avoid mixing them up with Nix-Darwin and System Manager hosts.
2025-12-01 12:22:09 +00:00
fae47faaff pkgs: diff-flake: add system-manager support 2025-12-01 12:22:09 +00:00
eb59aa14e8 pkgs: diff-flake: add nix-darwin support 2025-12-01 12:22:09 +00:00
2 changed files with 9 additions and 4 deletions

View file

@ -51,12 +51,8 @@ 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

View file

@ -15,6 +15,8 @@ in
amd = {
enableKernelModule = lib.my.mkDisableOption "Kernel driver module";
amdvlk = lib.mkEnableOption "Use AMDVLK instead of Mesa RADV driver";
};
intel = {
@ -33,6 +35,13 @@ 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 = {