Compare commits

...

2 commits

Author SHA1 Message Date
75e6492a41 flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/18e9f9753e9ae261bcc7d3abe15745686991fd30' (2025-02-20)
  → 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/36864ed72f234b9540da4cf7a0c49e351d30d3f1' (2025-02-19)
  → 'github:NixOS/nixpkgs/f44bd8ca21e026135061a0a57dcf3d0775b67a49' (2025-02-26)
2025-02-28 14:36:27 +01:00
e758c5f215 home: add jj config and add jj to home path 2025-02-28 14:30:04 +01:00
5 changed files with 86 additions and 7 deletions

View file

@ -30,7 +30,6 @@
pciutils
usbutils
# development
jujutsu
git
git-crypt
git-lfs

12
flake.lock generated
View file

@ -232,11 +232,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1740089251,
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"lastModified": 1740646007,
"narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
"type": "github"
},
"original": {
@ -312,11 +312,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1739923778,
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"lastModified": 1740603184,
"narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49",
"type": "github"
},
"original": {

View file

@ -10,6 +10,7 @@
./flameshot.nix
./git.nix
./gtk.nix
./jj.nix
./laptop.nix
./mail.nix
./rbw.nix

8
home/jj.nix Normal file
View file

@ -0,0 +1,8 @@
{pkgs, ...}: {
home.packages = [
pkgs.jujutsu
];
xdg.configFile = {
"jj/config.toml".source = ./jj/config.toml;
};
}

71
home/jj/config.toml Normal file
View file

@ -0,0 +1,71 @@
[user]
name = "Antoine Martin"
email = "antoine@alarsyo.net"
[ui]
diff-editor = ":builtin"
paginate = "auto"
editor = "vim"
pager = "less -FRX"
default-command = "log"
[ui.movement]
edit = false
[git]
subprocess = true
[snapshot]
auto-track = "none()"
[aliases]
pdiff = ["diff", "-r", "@-"]
tug = ["bookmark", "move", "--from", "closest_bookmark(@-)", "--to", "@-"]
ll = ["log", "-T", "builtin_log_detailed"]
l = ["log", "-T", "builtin_log_compact"]
[revset-aliases]
'closest_bookmark(to)' = 'heads(::to & bookmarks())'
[templates]
log = "builtin_log_comfortable"
log_node = '''
coalesce(
if(!self, label("elided", "~")),
label(
separate(" ",
if(current_working_copy, "working_copy"),
if(immutable, "immutable"),
if(conflict, "conflict"),
if(description.starts_with("wip:"), "wip"),
if(description.starts_with("private:"), "private"),
),
coalesce(
if(current_working_copy, "@"),
if(immutable, "◆"),
if(conflict, "×"),
if(description.starts_with("wip:"), "🔒"),
if(description.starts_with("private:"), "🔒"),
"○",
)
)
)
'''
[template-aliases]
[[--scope]]
--when.repositories = ["~/work/lrde/"]
[--scope.user]
email = "amartin@lrde.epita.fr"
[[--scope]]
--when.repositories = ["~/work/prologin/"]
[--scope.user]
email = "antoine.martin@prologin.org"
[[--scope]]
--when.repositories = ["~/work/epita/"]
[--scope.user]
email = "antoine4.martin@epita.fr"