Smol improvements

This commit is contained in:
Geoffrey Frogeye 2024-01-04 23:18:06 +01:00
parent 241ec71350
commit 5b70c2f448
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8

View file

@ -58,8 +58,6 @@ in
commonShellAliases = { commonShellAliases = {
# Completion for existing commands # Completion for existing commands
ls = "lsd"; ls = "lsd";
ll = "lsd -l";
la = "lsd -la";
mkdir = "mkdir -v"; mkdir = "mkdir -v";
# cp = "cp -i"; # Disabled because conflicts with the ZSH/Bash one. This separation is confusing I swear. # cp = "cp -i"; # Disabled because conflicts with the ZSH/Bash one. This separation is confusing I swear.
mv = "mv -iv"; mv = "mv -iv";
@ -68,7 +66,9 @@ in
ffmpeg = "ffmpeg -hide_banner"; ffmpeg = "ffmpeg -hide_banner";
ffprobe = "ffprobe -hide_banner"; ffprobe = "ffprobe -hide_banner";
ffplay = "ffplay -hide_banner"; ffplay = "ffplay -hide_banner";
# TODO Add ipython --no-confirm-exit --pdb numbat = "numbat --intro-banner off";
insect = "numbat";
ipython = "ipython --no-confirm-exit --pdb";
# Frequent mistakes # Frequent mistakes
sl = "ls"; sl = "ls";
@ -78,8 +78,8 @@ in
please = "sudo"; please = "sudo";
# Shortcuts for commonly used commands # Shortcuts for commonly used commands
# ll = "ls -l"; # Disabled because would overwrite the colored one ll = "lsd -l";
# la = "ls -la"; # Eh maybe it's not that bad, but for now let's keep compatibility la = "lsd -la";
s = "sudo -s -E"; s = "sudo -s -E";
@ -156,6 +156,13 @@ in
sessionVariables = commonSessionVariables; sessionVariables = commonSessionVariables;
shellAliases = commonShellAliases // config.frogeye.shellAliases; shellAliases = commonShellAliases // config.frogeye.shellAliases;
}; };
bat = {
enable = true;
config = {
theme = "base16";
style = "full";
};
};
lsd.enable = true; lsd.enable = true;
dircolors = { dircolors = {
enable = true; enable = true;
@ -215,10 +222,11 @@ in
enableZshIntegration = true; enableZshIntegration = true;
defaultOptions = [ "--height 40%" "--layout=default" ]; defaultOptions = [ "--height 40%" "--layout=default" ];
fileWidgetOptions = [ "--preview '[[ -d {} ]] && ${pkgs.coreutils}/bin/ls -l --color=always {} || [[ \$(${pkgs.file}/bin/file --mime {}) =~ binary ]] && ${pkgs.file}/bin/file --brief {} || (${pkgs.highlight}/bin/highlight -O ansi -l {} || coderay {} || rougify {} || ${pkgs.coreutils}/bin/cat {}) 2> /dev/null | head -500'" ]; fileWidgetOptions = [ "--preview '[[ -d {} ]] && ${pkgs.coreutils}/bin/ls -l --color=always {} || [[ \$(${pkgs.file}/bin/file --mime {}) =~ binary ]] && ${pkgs.file}/bin/file --brief {} || (${pkgs.highlight}/bin/highlight -O ansi -l {} || coderay {} || rougify {} || ${pkgs.coreutils}/bin/cat {}) 2> /dev/null | head -500'" ];
# TODO Above not working... not really used either?
# file and friends are not in PATH by default... so here we want aboslute paths, which means those won't get reloaded. Meh. # file and friends are not in PATH by default... so here we want aboslute paths, which means those won't get reloaded. Meh.
}; };
# TODO highlight or bat
nix-index = { nix-index = {
# For non-NixOS systems
enable = false; # TODO Index is impossible to generate, should use https://github.com/nix-community/nix-index-database enable = false; # TODO Index is impossible to generate, should use https://github.com/nix-community/nix-index-database
# but got no luck without flakes # but got no luck without flakes
enableZshIntegration = true; enableZshIntegration = true;
@ -237,6 +245,13 @@ in
"tags" "tags"
".mypy_cache" ".mypy_cache"
]; ];
delta = {
enable = true;
options = {
line-numbers = true;
syntax-theme = "base16";
};
};
lfs.enable = true; lfs.enable = true;
userEmail = lib.mkDefault "geoffrey@frogeye.fr"; userEmail = lib.mkDefault "geoffrey@frogeye.fr";
userName = lib.mkDefault "Geoffrey Frogeye"; userName = lib.mkDefault "Geoffrey Frogeye";
@ -256,7 +271,6 @@ in
"difftool \"meld\"".cmd = "${pkgs.meld}/bin/meld \"$LOCAL\" \"$REMOTE\""; "difftool \"meld\"".cmd = "${pkgs.meld}/bin/meld \"$LOCAL\" \"$REMOTE\"";
# This escapes quotes, which isn't the case in the original, hoping this isn't an issue. # This escapes quotes, which isn't the case in the original, hoping this isn't an issue.
}; };
# TODO Delta syntax highlighter... and other cool-looking options?
}; };
readline = { readline = {
enable = true; enable = true;
@ -316,14 +330,12 @@ in
}; };
services = { services = {
gpg-agent = { gpg-agent = {
enable = true; # TODO Consider not enabling it when not having any private key
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
pinentryFlavor = "gtk2"; # Falls back to curses when needed
}; };
# TODO Syncs a bit too often, also constantly asks for passphrase, which is annoying.
git-sync = { git-sync = {
enable = false; enable = false; # The real thing syncs too quickly and asks for passphrase, which is annoying
# So for now it's just a way to park config which will be reused by git-sync-* commands
repositories = { repositories = {
dotfiles = { dotfiles = {
path = "${config.xdg.configHome}/dotfiles"; path = "${config.xdg.configHome}/dotfiles";
@ -432,9 +444,10 @@ in
progress progress
speedtest-cli speedtest-cli
# multimedia toolbox # toolbox
sox sox
imagemagick imagemagick
numbat
# password # password
pwgen pwgen
@ -467,12 +480,6 @@ in
khard khard
khal khal
todoman todoman
# TODO Lots of redundancy with other way things are defined here
] ++ lib.optionals pkgs.stdenv.isx86_64 [
nodePackages.insect
# TODO Use whatever replaces insect, hopefully that works on aarch64
]; ];
sessionVariables = { sessionVariables = {
# Favourite commands # Favourite commands