structural-rework #1

Merged
ghoscht merged 44 commits from structural-rework into main 2023-12-29 10:35:45 +01:00
Showing only changes of commit 56af3a2118 - Show all commits

View file

@ -8,7 +8,6 @@
hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages;
hasRipgrep = hasPackage "ripgrep"; hasRipgrep = hasPackage "ripgrep";
hasExa = hasPackage "eza"; hasExa = hasPackage "eza";
hasNeovim = config.programs.neovim.enable;
hasLazygit = config.programs.lazygit.enable; hasLazygit = config.programs.lazygit.enable;
hasLazydocker = hasPackage "lazydocker"; hasLazydocker = hasPackage "lazydocker";
hasNixYourShell = hasPackage "nix-your-shell"; hasNixYourShell = hasPackage "nix-your-shell";
@ -53,6 +52,7 @@ in {
hx = "~/Documents/heliox-cli/target/debug/heliox-cli --mode"; hx = "~/Documents/heliox-cli/target/debug/heliox-cli --mode";
slp = "systemctl suspend"; slp = "systemctl suspend";
sdn = "shutdown 0"; sdn = "shutdown 0";
nrs = "nh os switch ~/.setup";
}; };
shellAbbrs = rec { shellAbbrs = rec {
jqless = "jq -C | less -r"; jqless = "jq -C | less -r";
@ -65,41 +65,14 @@ in {
nbn = "nix build nixpkgs#"; nbn = "nix build nixpkgs#";
nf = "nix flake"; 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";
ls = mkIf hasExa "eza"; ls = mkIf hasExa "eza";
exa = mkIf hasExa "eza"; exa = mkIf hasExa "eza";
vim = mkIf hasNeovim "nvim";
vi = vim;
v = vim;
}; };
functions = { functions = {
# Disable greeting # Disable greeting
fish_greeting = ""; fish_greeting = "";
fish_init_custom = '' fish_init_custom = ''
#Variable names: https://github.com/IlanCosman/tide/blob/main/functions/tide/configure/configs/rainbow.fish
#Tide base
tide configure --auto --style=Rainbow --prompt_colors='True color' --show_time=No --rainbow_prompt_separators=Vertical --powerline_prompt_heads=Slanted --powerline_prompt_tails=Flat --powerline_prompt_style='Two lines, frame' --prompt_connection=Solid --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Compact --icons='Many icons' --transient=Yes tide configure --auto --style=Rainbow --prompt_colors='True color' --show_time=No --rainbow_prompt_separators=Vertical --powerline_prompt_heads=Slanted --powerline_prompt_tails=Flat --powerline_prompt_style='Two lines, frame' --prompt_connection=Solid --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Compact --icons='Many icons' --transient=Yes
#OS module
set tide_os_bg_color ${config.colorScheme.colors.base07}
#PWD module
set tide_pwd_bg_color ${config.colorScheme.colors.base0D}
set tide_pwd_color_dirs ${config.colorScheme.colors.base02}
set tide_pwd_color_truncated_dirs ${config.colorScheme.colors.base04}
set tide_pwd_color_anchors ${config.colorScheme.colors.base02}
#Git module
set tide_git_bg_color ${config.colorScheme.colors.base0B}
set tide_git_bg_color_unstable ${config.colorScheme.colors.base0A}
set tide_git_bg_color_urgent ${config.colorScheme.colors.base08}
''; '';
}; };
}; };