feat(shell): migrate to fish
This commit is contained in:
@@ -14,104 +14,54 @@ lib.my.makeSwitch {
|
||||
"zsh"
|
||||
];
|
||||
config' = {
|
||||
my.persist.homeDirs = [ ".local/share/zoxide" ];
|
||||
my.hm =
|
||||
let
|
||||
stateHome = config.my.hm.xdg.stateHome;
|
||||
zsh-syntax-highlighting = pkgs.fetchFromGitHub {
|
||||
owner = "zsh-users";
|
||||
repo = "zsh-syntax-highlighting";
|
||||
rev = "0.8.0";
|
||||
hash = "sha256-iJdWopZwHpSyYl5/FQXEW7gl/SrKaYDEtTH9cGP7iPo=";
|
||||
my.hm = {
|
||||
home.packages = with pkgs; [
|
||||
fzf
|
||||
];
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.my.hm.xdg.configHome}/zsh";
|
||||
history = {
|
||||
path = "${config.my.hm.xdg.stateHome}/zsh_history";
|
||||
ignorePatterns = [
|
||||
"la"
|
||||
];
|
||||
};
|
||||
fzf-tab = pkgs.fetchFromGitHub {
|
||||
owner = "Aloxaf";
|
||||
repo = "fzf-tab";
|
||||
rev = "v1.2.0";
|
||||
hash = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
|
||||
};
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
fzf
|
||||
zoxide
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
plugins = [
|
||||
{
|
||||
name = "fzf-tab";
|
||||
src = pkgs.zsh-fzf-tab;
|
||||
file = "share/fzf-tab/fzf-tab.plugin.zsh";
|
||||
}
|
||||
];
|
||||
programs.starship = {
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
settings = lib.recursiveUpdate (with builtins; fromTOML (readFile ./starship-preset.toml)) {
|
||||
add_newline = false;
|
||||
custom = {
|
||||
jj = {
|
||||
ignore_timeout = true;
|
||||
description = "The current jj status";
|
||||
when = true;
|
||||
command = ''
|
||||
jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '
|
||||
separate(" ",
|
||||
" ",
|
||||
change_id.shortest(4),
|
||||
bookmarks,
|
||||
"|",
|
||||
concat(
|
||||
if(conflict, "💥"),
|
||||
if(divergent, "🚧"),
|
||||
if(hidden, "👻"),
|
||||
if(immutable, "🔒"),
|
||||
),
|
||||
raw_escape_sequence("\x1b[1;32m") ++ if(empty, "(empty)"),
|
||||
raw_escape_sequence("\x1b[1;32m") ++ coalesce(
|
||||
truncate_end(29, description.first_line(), "…"),
|
||||
"(no description set)",
|
||||
) ++ raw_escape_sequence("\x1b[0m"),
|
||||
)
|
||||
' || (starship module git_branch && starship module git_status)
|
||||
'';
|
||||
};
|
||||
};
|
||||
git_state.disabled = true;
|
||||
git_commit.disabled = true;
|
||||
git_metrics.disabled = true;
|
||||
git_branch.disabled = true;
|
||||
git_status.disabled = true;
|
||||
nix_shell.disabled = true;
|
||||
};
|
||||
theme = "gentoo";
|
||||
plugins = [
|
||||
"git"
|
||||
"git-extras"
|
||||
"extract"
|
||||
"sudo"
|
||||
];
|
||||
};
|
||||
shellAliases = {
|
||||
x = "extract";
|
||||
ls = "lsd";
|
||||
svim = "sudoedit";
|
||||
nf = "fastfetch";
|
||||
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = "${config.my.hm.xdg.configHome}/zsh";
|
||||
history = {
|
||||
path = "${stateHome}/zsh_history";
|
||||
ignorePatterns = [
|
||||
"la"
|
||||
];
|
||||
};
|
||||
initContent = lib.mkAfter ''
|
||||
source ${fzf-tab}/fzf-tab.plugin.zsh
|
||||
|
||||
eval "$(zoxide init zsh)"
|
||||
source ${zsh-syntax-highlighting}/zsh-syntax-highlighting.plugin.zsh
|
||||
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
'';
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
theme = "gentoo";
|
||||
plugins = [
|
||||
"git"
|
||||
"git-extras"
|
||||
"extract"
|
||||
"sudo"
|
||||
"dotenv"
|
||||
];
|
||||
};
|
||||
shellAliases = {
|
||||
x = "extract";
|
||||
ls = "lsd";
|
||||
svim = "sudoedit";
|
||||
nf = "fastfetch";
|
||||
tmux = "tmux -T RGB,focus,overline,mouse,clipboard,usstyle";
|
||||
pastart = "pasuspender true";
|
||||
};
|
||||
};
|
||||
# https://wiki.nixos.org/wiki/Fish#Setting_fish_as_default_shell
|
||||
initContent = lib.mkBefore ''
|
||||
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" ]]
|
||||
then
|
||||
exec fish -l
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user