Compare commits

...

5 commits

4 changed files with 30 additions and 14 deletions

View file

@ -5,6 +5,9 @@ deployhome:
# Impure is required for NixGL with proprietary Nvidia drivers :( # Impure is required for NixGL with proprietary Nvidia drivers :(
home-manager switch --impure -b bak --flake . home-manager switch --impure -b bak --flake .
deployhomefr:
home-manager switch --refresh --impure -b bak --flake .
update: update:
nix flake update nix flake update

View file

@ -14,7 +14,7 @@
SUDO_EDITOR = "${EDITOR}"; SUDO_EDITOR = "${EDITOR}";
}; };
shellAliases = { shellAbbrs = {
c = "clear"; c = "clear";
e = "${config.home.sessionVariables.EDITOR}"; e = "${config.home.sessionVariables.EDITOR}";
v = "${config.home.sessionVariables.EDITOR}"; v = "${config.home.sessionVariables.EDITOR}";

View file

@ -1,4 +1,12 @@
{ lib, config, ... }: { lib, config, ... }:
let
has-ripgrep = config.programs.ripgrep.enable;
has-fd = config.programs.fd.enable;
has-eza = config.programs.eza.enable;
has-bat = config.programs.bat.enable;
has-tmux = config.programs.tmux.enable;
has-delta = config.programs.git.delta.enable;
in
{ {
programs.fzf = { programs.fzf = {
enable = true; enable = true;
@ -15,23 +23,22 @@
"--preview-window='border-sharp'" "--preview-window='border-sharp'"
]; ];
# TODO: Check that rg is installed. defaultCommand = lib.mkIf has-ripgrep "rg --files --hidden --glob \"!.git\"";
defaultCommand = "rg --files --hidden --glob \"!.git\"";
# TODO: Check that fd is installed. changeDirWidgetCommand = lib.mkIf has-fd "fd --type d";
changeDirWidgetCommand = "fd --type d"; changeDirWidgetOptions = lib.mkIf has-eza [
changeDirWidgetOptions = lib.mkIf config.programs.eza.enable [
"--preview 'eza --all --color=always --sort=name --group-directories-first --level=3 {}'" "--preview 'eza --all --color=always --sort=name --group-directories-first --level=3 {}'"
]; ];
# TODO: Check that fd is installed. fileWidgetCommand = lib.mkIf has-fd "fd --type f";
fileWidgetCommand = "fd --type f"; fileWidgetOptions = lib.mkIf has-bat [
fileWidgetOptions = lib.mkIf config.programs.bat.enable [
"--preview 'bat {}'" "--preview 'bat {}'"
]; ];
tmux.enableShellIntegration = lib.mkIf config.programs.tmux.enable true; tmux.enableShellIntegration = lib.mkIf has-tmux true;
}; };
home.sessionVariables.fzf_diff_highlighter = "delta --paging=never --features=arctic-fox"; home.sessionVariables = lib.mkIf has-delta {
fzf_diff_highlighter = "delta --paging=never --features=arctic-fox";
};
} }

View file

@ -1,4 +1,7 @@
{ ... }: { config, lib, ... }:
let
has-delta = config.programs.git.delta.enable;
in
{ {
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
@ -8,11 +11,14 @@
git.paging = { git.paging = {
colorArg = "always"; colorArg = "always";
# TODO: only set this if delta is installed pager = lib.mkIf has-delta "delta --paging=never --features=arctic-fox";
pager = "delta --paging=never --features=arctic-fox";
}; };
os.editPreset = "nvim-remote"; os.editPreset = "nvim-remote";
}; };
}; };
home.shellAbbrs = {
lzg = "lazygit";
};
} }