Compare commits
4 commits
dec722b6e1
...
6096cbaac6
Author | SHA1 | Date | |
---|---|---|---|
|
6096cbaac6 | ||
619ac933f7 | |||
ef89e9b8f6 | |||
8c163b6814 |
3 changed files with 146 additions and 73 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749821119,
|
"lastModified": 1750304462,
|
||||||
"narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=",
|
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "79dfd9aa295e53773aad45480b44c131da29f35b",
|
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749285348,
|
"lastModified": 1750365781,
|
||||||
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -51,13 +51,26 @@ in {
|
||||||
antidote = {
|
antidote = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [
|
plugins = [
|
||||||
|
#######
|
||||||
|
# OMZ #
|
||||||
|
#######
|
||||||
|
|
||||||
"getantidote/use-omz" # Handle OMZ dependencies
|
"getantidote/use-omz" # Handle OMZ dependencies
|
||||||
# Load lib only if things break
|
# Load lib only if things break
|
||||||
# "ohmyzsh/ohmyzsh path:lib" # Load OMZ's library
|
# "ohmyzsh/ohmyzsh path:lib" # Load OMZ's library
|
||||||
|
|
||||||
"ohmyzsh/ohmyzsh path:plugins/colored-man-pages" # Load OMZ plugins
|
"ohmyzsh/ohmyzsh path:plugins/colored-man-pages" # Load OMZ plugins
|
||||||
# "ohmyzsh/ohmyzsh path:plugins/magic-enter"
|
# "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/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/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
|
"romkatv/powerlevel10k kind:fpath" # A Zsh theme
|
||||||
|
|
||||||
|
@ -83,7 +96,8 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtraFirst = ''
|
initContent = let
|
||||||
|
initExtraFirst = lib.mkBefore ''
|
||||||
# Basic auto/tab complete:
|
# Basic auto/tab complete:
|
||||||
autoload -U compinit
|
autoload -U compinit
|
||||||
zstyle ':completion:*' menu select
|
zstyle ':completion:*' menu select
|
||||||
|
@ -159,6 +173,7 @@ in {
|
||||||
zprof
|
zprof
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
in lib.mkMerge [ initExtraFirst initExtra ];
|
||||||
|
|
||||||
localVariables = {
|
localVariables = {
|
||||||
YSU_MESSAGE_POSITION = "after";
|
YSU_MESSAGE_POSITION = "after";
|
||||||
|
|
|
@ -24,6 +24,64 @@ in {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
gh
|
gh
|
||||||
tea
|
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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue