Compare commits

..

5 commits

Author SHA1 Message Date
e191aecbaa WIP: ADD NOTE FOR FUTURE SELF
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-03-17 15:31:45 +00:00
84791cf74f home: jj: use verbose draft commit messages 2025-03-17 15:19:07 +00:00
5a43aa5df4 WIP: add jujutsu (w/ Delta) 2025-03-17 15:19:07 +00:00
89f67d6da2 home: git: extract 'delta' configuration
I want to be able to re-use it between different source control systems
(e.g: `jj`).

As a first step, extract it to a proper module so that I can have it
live in a single space.
2025-03-17 15:16:35 +00:00
dc4221fc17 flake: bump inputs
All checks were successful
ci/woodpecker/push/check Pipeline was successful
And remove the overlay for `lsp-format.nvim`, which has been fixed.

This reverts commit 92e5fbe7df.
2025-03-17 13:02:26 +00:00
5 changed files with 18 additions and 42 deletions

30
flake.lock generated
View file

@ -73,11 +73,11 @@
]
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -136,11 +136,11 @@
]
},
"locked": {
"lastModified": 1740624780,
"narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
"lastModified": 1741955947,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"type": "github"
},
"original": {
@ -152,11 +152,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1740560979,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"lastModified": 1742069588,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github"
},
"original": {
@ -177,11 +177,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1740655932,
"narHash": "sha256-BSTcgL2C74x0TgVdVEWfIz2SHkwIFMN0Dvv1lCoOhCA=",
"lastModified": 1741294988,
"narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "1ca8ff37f33a560c4a292ed83774434854f0b39a",
"rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e",
"type": "github"
},
"original": {
@ -200,11 +200,11 @@
]
},
"locked": {
"lastModified": 1737465171,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"lastModified": 1742058297,
"narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
"type": "github"
},
"original": {

View file

@ -13,7 +13,7 @@ in
};
jujutsu = {
enable = my.mkDisableOption "git integration";
enable = my.mkDisableOption "jujutsu integration";
};
};

View file

@ -28,9 +28,6 @@ in
inherit (cfg) package;
# FIXME:
# * verbose commits: https://github.com/jj-vcs/jj/issues/1946
# * including tree-sitter highlights
settings = {
# Who am I?
user = {
@ -53,16 +50,11 @@ in
# FIXME: `extraConfig` equivalents...
# FIXME: from ma_9's config, plus my own stuff
# revsets = {
# # git-style log of the entire repo by default
# log = "..@";
# }
# snapshot = {
# auto-track = "none()";
# };
#
# ui = {
# # default-command = "log"; Some "log-wip" alias instead?
# diff-editor = ":builtin"; # To silence hints
# movement = {
# edit = false;
@ -82,6 +74,8 @@ in
diff.git(),
)
'';
# FIXME: use `diff.summary()` instead? Supported by syntax highlighting
# See https://github.com/jj-vcs/jj/issues/1946#issuecomment-2572986485
"commit_description(commit)" = ''
concat(
commit.description(), "\n",

View file

@ -1,4 +0,0 @@
self: prev:
{
vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
}

View file

@ -1,14 +0,0 @@
{ fetchpatch, ... }:
_final: prev: {
lsp-format-nvim = prev.lsp-format-nvim.overrideAttrs (oa: {
patches = (oa.patches or [ ]) ++ [
# https://github.com/lukas-reineke/lsp-format.nvim/issues/94
(fetchpatch {
name = "use-effective-indentation";
url = "https://github.com/liskin/lsp-format.nvim/commit/3757ac443bdf5bd166673833794553229ee8d939.patch";
hash = "sha256-Dv+TvXrU/IrrPxz2MSPbLmRxch+qkHbI3AyFMj/ssDk=";
})
];
});
}