Compare commits
2 commits
736ac13144
...
08d4c0e771
Author | SHA1 | Date | |
---|---|---|---|
chayleaf | 08d4c0e771 | ||
chayleaf | 11907ede0c |
|
@ -77,6 +77,10 @@
|
||||||
# i only use this as a login shell
|
# i only use this as a login shell
|
||||||
bash = {
|
bash = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
initExtra = ''
|
||||||
|
bind -x '"\C-r": __atuin_history'
|
||||||
|
export ATUIN_NOBIND=true
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -71,6 +71,8 @@ in {
|
||||||
};
|
};
|
||||||
programs.urxvt = {
|
programs.urxvt = {
|
||||||
# default shell can't be changed... I can create a wrapper, but fuck that
|
# default shell can't be changed... I can create a wrapper, but fuck that
|
||||||
|
# symbols nerd font mono doesnt seem to work anyway, so theres no point
|
||||||
|
# in switching from bash to zsh in this case
|
||||||
enable = supportTerminal "urxvt";
|
enable = supportTerminal "urxvt";
|
||||||
package = pkgs.rxvt-unicode-emoji;
|
package = pkgs.rxvt-unicode-emoji;
|
||||||
keybindings = {
|
keybindings = {
|
||||||
|
@ -82,7 +84,10 @@ in {
|
||||||
inheritPixmap = true;
|
inheritPixmap = true;
|
||||||
};
|
};
|
||||||
scroll.bar.enable = false;
|
scroll.bar.enable = false;
|
||||||
fonts = [ "xft:Noto Sans Mono:size=16" "xft:Symbols Nerd Font Mono:size=16" ];
|
fonts = [
|
||||||
|
"xft:Noto Sans Mono:size=16"
|
||||||
|
"xft:Symbols Nerd Font Mono:size=16"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
programs.foot = {
|
programs.foot = {
|
||||||
enable = supportTerminal "foot";
|
enable = supportTerminal "foot";
|
||||||
|
|
|
@ -12,6 +12,26 @@
|
||||||
history.path = "${config.xdg.dataHome}/zsh/zsh_history";
|
history.path = "${config.xdg.dataHome}/zsh/zsh_history";
|
||||||
shellAliases.s = "sudo -A";
|
shellAliases.s = "sudo -A";
|
||||||
shellAliases.se = "sudo -AE";
|
shellAliases.se = "sudo -AE";
|
||||||
|
# I dont want to remap the up key, so only map this, setting ATUIN_NOBIND to true
|
||||||
|
initExtra = ''
|
||||||
|
up-line-or-local-history() {
|
||||||
|
zle set-local-history 1
|
||||||
|
zle up-line-or-history
|
||||||
|
zle set-local-history 0
|
||||||
|
}
|
||||||
|
zle -N up-line-or-local-history
|
||||||
|
down-line-or-local-history() {
|
||||||
|
zle set-local-history 1
|
||||||
|
zle down-line-or-history
|
||||||
|
zle set-local-history 0
|
||||||
|
}
|
||||||
|
zle -N down-line-or-local-history
|
||||||
|
bindkey '^[[A' up-line-or-local-history
|
||||||
|
bindkey '^[OA' up-line-or-local-history
|
||||||
|
bindkey '^[[B' down-line-or-local-history
|
||||||
|
bindkey '^[OB' down-line-or-local-history
|
||||||
|
bindkey '^r' _atuin_search_widget
|
||||||
|
'';
|
||||||
localVariables = {
|
localVariables = {
|
||||||
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS = [
|
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS = [
|
||||||
# "os_icon" # os identifier
|
# "os_icon" # os identifier
|
||||||
|
@ -101,6 +121,9 @@
|
||||||
POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND = "3";
|
POWERLEVEL9K_COMMAND_EXECUTION_TIME_BACKGROUND = "3";
|
||||||
POWERLEVEL9K_NIX_SHELL_FOREGROUND = "15";
|
POWERLEVEL9K_NIX_SHELL_FOREGROUND = "15";
|
||||||
SHELL = "zsh";
|
SHELL = "zsh";
|
||||||
|
ATUIN_NOBIND = "true";
|
||||||
|
# to allow rebinding ^r
|
||||||
|
ZVM_INIT_MODE = "sourcing";
|
||||||
};
|
};
|
||||||
plugins = with pkgs; [
|
plugins = with pkgs; [
|
||||||
{ name = "zsh-vi-mode";
|
{ name = "zsh-vi-mode";
|
||||||
|
|
Loading…
Reference in a new issue