refactor: rename home modules/general cleanup
This commit is contained in:
parent
16dd61d968
commit
653640b484
86 changed files with 230 additions and 322 deletions
|
|
@ -1,134 +0,0 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
cfg = config.programs.console.shell.fish;
|
||||
inherit (lib) mkIf;
|
||||
hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages;
|
||||
hasEza = hasPackage "eza";
|
||||
hasNeovim = config.programs.neovim.enable;
|
||||
hasBat = hasPackage "bat";
|
||||
hasHelix = hasPackage "helix";
|
||||
hasKitty = config.programs.kitty.enable;
|
||||
in
|
||||
{
|
||||
config = {
|
||||
programs.fish = mkIf cfg.enable {
|
||||
enable = true;
|
||||
shellAbbrs = rec {
|
||||
jqless = "jq -C | less -r";
|
||||
|
||||
n = "nix";
|
||||
nd = "nix develop -c $SHELL";
|
||||
ns = "nix shell";
|
||||
nsn = "nix shell nixpkgs#";
|
||||
nb = "nix build";
|
||||
nbn = "nix build nixpkgs#";
|
||||
nf = "nix flake";
|
||||
|
||||
nr = "nixos-rebuild --flake .";
|
||||
nrs = "nixos-rebuild --flake . switch";
|
||||
snr = "sudo nixos-rebuild --flake .";
|
||||
snrs = "sudo nixos-rebuild --flake . switch";
|
||||
hm = "home-manager --flake .";
|
||||
hms = "home-manager --flake . switch";
|
||||
|
||||
fe = mkIf hasHelix "cd $FLAKE; hx $FLAKE";
|
||||
f = "cd $FLAKE";
|
||||
|
||||
tree = mkIf hasEza "eza -T --icons --group-directories-first";
|
||||
ls = mkIf hasEza "eza -a --icons --group-directories-first";
|
||||
lsd = mkIf hasEza "eza -al --icons --group-directories-first";
|
||||
lst = mkIf hasEza "eza -T -L 5 --icons --group-directories-first";
|
||||
lsta = mkIf hasEza "eza -T --icons --group-directories-first";
|
||||
|
||||
cat = mkIf hasBat "bat";
|
||||
|
||||
vim = mkIf hasNeovim "nvim";
|
||||
|
||||
};
|
||||
functions = {
|
||||
fish_greeting = "";
|
||||
zellij_session_select = ''
|
||||
if not set -q ZELLIJ
|
||||
set -l ZJ_SESSIONS (zellij list-sessions | awk '{print $1}')
|
||||
set -l NO_SESSIONS (count $ZJ_SESSIONS)
|
||||
|
||||
if test $NO_SESSIONS -gt 0
|
||||
set -l SELECTED_SESSION (printf "%s\n" $ZJ_SESSIONS | sk --ansi)
|
||||
|
||||
if test -n "$SELECTED_SESSION"
|
||||
zellij attach -c $SELECTED_SESSION
|
||||
else
|
||||
zellij
|
||||
end
|
||||
else
|
||||
zellij
|
||||
end
|
||||
end
|
||||
|
||||
'';
|
||||
|
||||
fish_flake_edit = ''
|
||||
cd $FLAKE
|
||||
hx $FLAKE
|
||||
'';
|
||||
fish_hello_world = ''
|
||||
echo "Hello World"; string repeat -N \n --count=(math (count (fish_prompt)) - 1); commandline -f repaint
|
||||
'';
|
||||
|
||||
fish_user_key_bindings = ''
|
||||
bind --preset -M insert \cf fish_flake_edit
|
||||
bind --preset -M insert \ec skim_cd_widget
|
||||
'';
|
||||
};
|
||||
interactiveShellInit =
|
||||
# zellij auto start script
|
||||
''
|
||||
zellij_session_select
|
||||
'' +
|
||||
''
|
||||
set --global KITTY_INSTALLATION_DIR "${pkgs.kitty}/lib/kitty"
|
||||
set --global KITTY_SHELL_INTEGRATION enabled
|
||||
source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
|
||||
set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
|
||||
'' +
|
||||
# Use vim bindings and cursors
|
||||
''
|
||||
fish_vi_key_bindings
|
||||
set fish_cursor_default block blink
|
||||
set fish_cursor_insert line blink
|
||||
set fish_cursor_replace_one underscore blink
|
||||
set fish_cursor_visual block
|
||||
'' +
|
||||
# Use terminal colors
|
||||
''
|
||||
set -U fish_color_autosuggestion brblack
|
||||
set -U fish_color_cancel -r
|
||||
set -U fish_color_command brgreen
|
||||
set -U fish_color_comment brmagenta
|
||||
set -U fish_color_cwd green
|
||||
set -U fish_color_cwd_root red
|
||||
set -U fish_color_end brmagenta
|
||||
set -U fish_color_error brred
|
||||
set -U fish_color_escape brcyan
|
||||
set -U fish_color_history_current --bold
|
||||
set -U fish_color_host normal
|
||||
set -U fish_color_match --background=brblue
|
||||
set -U fish_color_normal normal
|
||||
set -U fish_color_operator cyan
|
||||
set -U fish_color_param brblue
|
||||
set -U fish_color_quote yellow
|
||||
set -U fish_color_redirection bryellow
|
||||
set -U fish_color_search_match 'bryellow' '--background=brblack'
|
||||
set -U fish_color_selection 'white' '--bold' '--background=brblack'
|
||||
set -U fish_color_status red
|
||||
set -U fish_color_user brgreen
|
||||
set -U fish_color_valid_path --underline
|
||||
set -U fish_pager_color_completion normal
|
||||
set -U fish_pager_color_description yellow
|
||||
set -U fish_pager_color_prefix 'white' '--bold' '--underline'
|
||||
set -U fish_pager_color_progress 'brwhite' '--background=cyan'
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue