diff --git a/workstation/home.nix b/workstation/home.nix index 678d806..a11fa33 100644 --- a/workstation/home.nix +++ b/workstation/home.nix @@ -6,14 +6,11 @@ home.homeDirectory = "/home/don"; home.stateVersion = "22.11"; home.shellAliases = { - x = "myX"; - mroe = "more"; - moer = "more"; ls = "ls -hCF"; l = "ls -l"; df = "df -h -x squashfs"; du = "du -h" ; - dotdrop = "\$\{HOME\}/.local/bin/dotdrop -c ~/.dotfiles/config.yaml"; + dotdrop = "~/.local/bin/dotdrop -c ~/.dotfiles/config.yaml"; t = "task"; ttoday = "task +TODAY or +OVERDUE -BLOCKED"; ttom = "task +OVERDUE or +TOMORROW -BLOCKED"; @@ -123,6 +120,7 @@ export GOPATH="~/go" export PROMPT_COMMAND='history -a' export EDITOR="nvim" + export PATH="$PATH:~/bin:~/.local/bin" set bell-style visible set nobeep set -o noclobber @@ -130,14 +128,24 @@ umask 0007 export PAGER=less export LESS="-s" - . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" - if [ -d ~/.bash_completion.d ]; then - for i in $(ls -1 ~/.bash_completion.d/*.sh); do . $i; done + if [ -f "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" ] + then + . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" + if [ -d ~/.bash_completion.d ]; then + for i in $(ls -1 ~/.bash_completion.d/*.sh); do . $i; done + fi fi export HOSTNAME_SHORT=$(hostname -s) - test -f "~/.bash_$(hostname -s)" && . ~/.bash_$(hostname -s) - test -f ~/.liquidprompt/liquidprompt && . ~/.liquidprompt/liquidprompt - test -f "~/.bash_functions" && . "~/.bash_functions" + test -f ~/.bash_$(hostname -s) && . ~/.bash_$(hostname -s) + [[ $- == *i* ]] && test -f ~/.liquidprompt/liquidprompt && . ~/.liquidprompt/liquidprompt + test -f ~/.bash_functions && . ~/.bash_functions + export TZ=America/Chicago + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/podman/podman.sock" + export LESS="-FrSsUWX -z-3" + headset-setup + + if [ $( tty | grep -v -q pts ) ]; then setterm --blank 1; fi + export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4' ''; profileExtra = ''