Compare commits

...

4 commits

Author SHA1 Message Date
github-actions[bot]
6096cbaac6 automated: Update flake.lock
Some checks failed
Perform checks / nix_flake_check (push) Failing after 9m41s
Perform checks / formatting (push) Failing after 10m3s
Perform checks / formatting (pull_request) Failing after 10m13s
Perform checks / nix_flake_check (pull_request) Successful in 10m2s
- The following Nix Flake inputs were updated:

```
• Updated input 'home-manager':
    'github:nix-community/home-manager/fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52?narHash=sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes%3D' (2025-05-12)
  → 'github:nix-community/home-manager/863842639722dd12ae9e37ca83bcb61a63b36f6c?narHash=sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc%3D' (2025-06-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956?narHash=sha256-3e%2BAVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ%3D' (2025-05-10)
  → 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54?narHash=sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50%3D' (2025-06-19)
```

Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2025-06-21 00:11:17 +00:00
619ac933f7
feat(modules/gitTools): Add git-cliff, gitui and riffdiff`, set default branch
Some checks failed
Perform checks / formatting (push) Failing after 10m9s
Perform checks / nix_flake_check (push) Successful in 10m8s
2025-06-19 17:39:48 +02:00
ef89e9b8f6
feat(modules/default.nix): Add gitignore, git-commit and universalarchive plugins 2025-06-19 17:26:59 +02:00
8c163b6814
fix(modules/default.nix): Migrate from initExtra and initExtraFirst to initContent 2025-06-19 17:23:37 +02:00
3 changed files with 146 additions and 73 deletions

12
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1747021744,
"narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=",
"lastModified": 1750304462,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1746904237,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"type": "github"
},
"original": {

View file

@ -51,13 +51,26 @@ in {
antidote = {
enable = true;
plugins = [
#######
# OMZ #
#######
"getantidote/use-omz" # Handle OMZ dependencies
# Load lib only if things break
# "ohmyzsh/ohmyzsh path:lib" # Load OMZ's library
"ohmyzsh/ohmyzsh path:plugins/colored-man-pages" # Load OMZ plugins
# "ohmyzsh/ohmyzsh path:plugins/magic-enter"
"ohmyzsh/ohmyzsh path:plugins/command-not-found" # Provide suggested packages to be installed if a command cannot be found
"ohmyzsh/ohmyzsh path:plugins/dirhistory kind:defer" # shortcuts for navigating directory history and hierarchy
"ohmyzsh/ohmyzsh path:plugins/universalarchive kind:defer"
"ohmyzsh/ohmyzsh path:plugins/gitignore kind:defer"
"ohmyzsh/ohmyzsh path:plugins/git-commit kind:defer"
#########
# OMZ ^ #
#########
"romkatv/powerlevel10k kind:fpath" # A Zsh theme
@ -83,7 +96,8 @@ in {
];
};
initExtraFirst = ''
initContent = let
initExtraFirst = lib.mkBefore ''
# Basic auto/tab complete:
autoload -U compinit
zstyle ':completion:*' menu select
@ -159,6 +173,7 @@ in {
zprof
fi
'';
in lib.mkMerge [ initExtraFirst initExtra ];
localVariables = {
YSU_MESSAGE_POSITION = "after";

View file

@ -24,6 +24,64 @@ in {
home.packages = with pkgs; [
gh
tea
riffdiff
];
programs = {
git-cliff.enable = true;
gitui = {
enable = true;
keyConfig = lib.mkDefault ''
(
open_help: Some(( code: F(1), modifiers: "")),
move_left: Some(( code: Char('h'), modifiers: "")),
move_right: Some(( code: Char('l'), modifiers: "")),
move_up: Some(( code: Char('k'), modifiers: "")),
move_down: Some(( code: Char('j'), modifiers: "")),
popup_up: Some(( code: Char('p'), modifiers: "CONTROL")),
popup_down: Some(( code: Char('n'), modifiers: "CONTROL")),
page_up: Some(( code: Char('b'), modifiers: "CONTROL")),
page_down: Some(( code: Char('f'), modifiers: "CONTROL")),
home: Some(( code: Char('g'), modifiers: "")),
end: Some(( code: Char('G'), modifiers: "SHIFT")),
shift_up: Some(( code: Char('K'), modifiers: "SHIFT")),
shift_down: Some(( code: Char('J'), modifiers: "SHIFT")),
edit_file: Some(( code: Char('I'), modifiers: "SHIFT")),
status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
diff_reset_lines: Some(( code: Char('u'), modifiers: "")),
diff_stage_lines: Some(( code: Char('s'), modifiers: "")),
stashing_save: Some(( code: Char('w'), modifiers: "")),
stashing_toggle_index: Some(( code: Char('m'), modifiers: "")),
stash_open: Some(( code: Char('l'), modifiers: "")),
abort_merge: Some(( code: Char('M'), modifiers: "SHIFT")),
)
'';
};
git = {
enable = true;
extraConfig = {
init = {
defaultBranch = lib.mkDefault "main";
};
pager = {
diff = lib.mkDefault "riff";
show = lib.mkDefault "riff";
log = lib.mkDefault "riff";
};
interactive = {
diffFilter = lib.mkDefault "riff --color=on";
};
};
};
};
};
}