Compare commits
2 commits
3d99f57043
...
52452fccb5
Author | SHA1 | Date | |
---|---|---|---|
52452fccb5 | |||
c3060dd767 |
3 changed files with 39 additions and 9 deletions
|
@ -25,7 +25,6 @@
|
||||||
#useXkbConfig = true; # use xkbOptions in tty.
|
#useXkbConfig = true; # use xkbOptions in tty.
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
|
|
|
@ -24,10 +24,20 @@
|
||||||
specialArgs = attrs;
|
specialArgs = attrs;
|
||||||
modules = [
|
modules = [
|
||||||
({ ... }: {
|
({ ... }: {
|
||||||
nix.registry = {
|
nix = {
|
||||||
nixpkgs.flake = self.inputs.nixpkgs;
|
# Edit nix.conf
|
||||||
|
settings = {
|
||||||
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
keep-outputs = true;
|
||||||
|
auto-optimise-store = true;
|
||||||
|
warn-dirty = false;
|
||||||
|
};
|
||||||
|
|
||||||
# Minimize dowloads of indirect nixpkgs flakes
|
# Minimize dowloads of indirect nixpkgs flakes
|
||||||
nixpkgs.exact = false;
|
registry = {
|
||||||
|
nixpkgs.flake = self.inputs.nixpkgs;
|
||||||
|
nixpkgs.exact = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
vi = "nvim";
|
vi = "nvim";
|
||||||
vim = "nvim";
|
vim = "nvim";
|
||||||
nivm = "nvim";
|
nivm = "nvim";
|
||||||
|
nivim = "nvim";
|
||||||
|
|
||||||
tmux = "tmux -2";
|
tmux = "tmux -2";
|
||||||
ls = "ls -lah --color=auto";
|
ls = "ls -lah --color=auto";
|
||||||
|
@ -62,12 +63,32 @@
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
'';
|
'';
|
||||||
bashrcExtra = ''
|
bashrcExtra = ''
|
||||||
PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
|
# PS1
|
||||||
[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
|
USER_COLOR="\[\033[01;32m\]"
|
||||||
|
HOST_COLOR="\[\033[01;38;5;183m\]"
|
||||||
|
WHITE="\[\033[00m\]"
|
||||||
|
PURPLE="\[\033[01;34m\]"
|
||||||
|
RED="\[\033[38;5;124m\]"
|
||||||
|
FAILED="$RED⛔$WHITE"
|
||||||
|
|
||||||
USER_COLOR="01;32m"
|
set_prompt() {
|
||||||
HOST_COLOR="183m"
|
BRANCH=$(git symbolic-ref -q --short HEAD 2>/dev/null)
|
||||||
PS1="\[\033[$USER_COLOR\]\u\[\033[01;38;5;$HOST_COLOR\]@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ "
|
if [ -n "$BRANCH" ]; then
|
||||||
|
BRANCH="$RED($WHITE$BRANCH$RED)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$1" == 0 ]; then
|
||||||
|
STATUS=""
|
||||||
|
else
|
||||||
|
STATUS="$FAILED"
|
||||||
|
fi
|
||||||
|
|
||||||
|
PS1="╭╴$USER_COLOR\u$HOST_COLOR@\h$BRANCH$WHITE:$PURPLE\w$WHITE $STATUS\n╰╴$ "
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT_COMMAND="set_prompt \$?; history -a"
|
||||||
|
|
||||||
|
[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
|
||||||
|
|
||||||
# source: https://stackoverflow.com/a/44232192
|
# source: https://stackoverflow.com/a/44232192
|
||||||
PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')"
|
PATH="$(perl -e 'print join(":", grep { not $seen{$_}++ } split(/:/, $ENV{PATH}))')"
|
||||||
|
|
Loading…
Reference in a new issue