order in zshrc to prevent ls alias overwrite
This commit is contained in:
parent
11173367e5
commit
9834d4f970
@ -10,6 +10,7 @@ let
|
|||||||
email = "olaf@xolx.nl";
|
email = "olaf@xolx.nl";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
# Shared shell configuration
|
# Shared shell configuration
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -18,55 +19,67 @@ in
|
|||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ ];
|
plugins = [ ];
|
||||||
# theme = "agnoster";
|
# theme = "fishy";
|
||||||
theme = "ys";
|
# theme = "ys";
|
||||||
|
theme = "mrtazz";
|
||||||
};
|
};
|
||||||
plugins = [
|
# plugins = [ ];
|
||||||
|
|
||||||
];
|
initContent =
|
||||||
initExtraFirst = ''
|
let
|
||||||
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
|
zshConfigEarlyInit = lib.mkOrder 500 ''
|
||||||
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
|
||||||
. /nix/var/nix/profiles/default/etc/profile.d/nix.sh
|
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||||
fi
|
. /nix/var/nix/profiles/default/etc/profile.d/nix.sh
|
||||||
|
fi
|
||||||
|
|
||||||
# Define variables for directories
|
# Define variables for directories
|
||||||
export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH
|
export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH
|
||||||
export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH
|
export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH
|
||||||
export PATH=$HOME/.local/share/bin:$PATH
|
export PATH=$HOME/.local/share/bin:$PATH
|
||||||
|
|
||||||
# Remove history data we don't want to see
|
# Remove history data we don't want to see
|
||||||
export HISTIGNORE="pwd:ls:cd"
|
export HISTIGNORE="pwd:ls:cd"
|
||||||
|
|
||||||
# Ripgrep alias
|
# Ripgrep alias
|
||||||
alias search=rg -p --glob '!node_modules/*' $@
|
alias search=rg -p --glob '!node_modules/*' $@
|
||||||
|
|
||||||
# Emacs is my editor
|
# Emacs is my editor
|
||||||
export ALTERNATE_EDITOR=""
|
export ALTERNATE_EDITOR=""
|
||||||
export EDITOR="emacsclient -t"
|
export EDITOR="emacsclient -t"
|
||||||
export VISUAL="emacsclient -c -a emacs"
|
export VISUAL="emacsclient -c -a emacs"
|
||||||
|
|
||||||
e() {
|
e() {
|
||||||
emacsclient -t "$@"
|
emacsclient -t "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# nix shortcuts
|
# nix shortcuts
|
||||||
shell() {
|
shell() {
|
||||||
nix-shell '<nixpkgs>' -A "$1"
|
nix-shell '<nixpkgs>' -A "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
# pnpm is a javascript package manager
|
# pnpm is a javascript package manager
|
||||||
alias pn=pnpm
|
alias pn=pnpm
|
||||||
alias px=pnpx
|
alias px=pnpx
|
||||||
|
|
||||||
# Use difftastic, syntax-aware diffing
|
# Use difftastic, syntax-aware diffing
|
||||||
alias diff=difft
|
alias diff=difft
|
||||||
|
|
||||||
# Always color ls and group directories
|
|
||||||
alias ls='ls --color=auto'
|
|
||||||
|
|
||||||
|
|
||||||
'';
|
|
||||||
|
|
||||||
|
'';
|
||||||
|
zshConfigLastInit = lib.mkOrder 1500 ''
|
||||||
|
# Always color ls and group directories
|
||||||
|
alias ls='ls --color=auto'
|
||||||
|
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
lib.mkMerge [
|
||||||
|
zshConfigEarlyInit
|
||||||
|
zshConfigLastInit
|
||||||
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
git = {
|
git = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user