Merge branch 'master' of github.com:DustVoice/dotfiles

This commit is contained in:
David Holland 2019-10-24 00:09:02 +00:00
commit 3da0ba36ba
Signed by: DustVoice
GPG key ID: 47068995A14EDCA9
9 changed files with 78 additions and 2 deletions

View file

@ -1,5 +1,5 @@
# some more ls aliases
alias ll='ls -alF'
alias ll='ls -alhF'
alias la='ls -A'
alias l='ls -CF'

View file

@ -118,6 +118,7 @@ fi
export SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh"
export GPG_TTY=$(tty)
gpg-connect-agent updatestartuptty /bye
export EDITOR=nvim
export TERMINAL=gnome-terminal

17
.config/fish/config.fish Normal file
View file

@ -0,0 +1,17 @@
set fish_prompt_pwd_dir_length 0
set -x SSH_AUTH_SOCK (gpgconf --list-dir socketdir)'/S.gpg-agent.ssh'
set -x GPG_TTY (tty)
gpg-connect-agent updatestartuptty /bye > /dev/null
set -x EDITOR 'nvim'
set -x TERMINAL 'gnome-terminal'
set -x PATH "$HOME/bin" "$HOME/.local/bin" "$HOME/JUCE" $PATH
set -x JUCE_PATH "$HOME/JUCE"
set -x FRUT_PATH "$HOME/FRUT"
set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH
set -x CXXFLAGS '-std=c++14'
set -x LIBGL_ALWAYS_INDIRECT 1

View file

@ -0,0 +1,36 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR fish_color_autosuggestion:969896
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:b294bb
SETUVAR fish_color_comment:f0c674
SETUVAR fish_color_cwd:green
SETUVAR fish_color_cwd_root:red
SETUVAR fish_color_end:b294bb
SETUVAR fish_color_error:cc6666
SETUVAR fish_color_escape:00a6b2
SETUVAR fish_color_history_current:\x2d\x2dbold
SETUVAR fish_color_host:normal
SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
SETUVAR fish_color_normal:normal
SETUVAR fish_color_operator:00a6b2
SETUVAR fish_color_param:81a2be
SETUVAR fish_color_quote:b5bd68
SETUVAR fish_color_redirection:8abeb7
SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
SETUVAR fish_color_status:red
SETUVAR fish_color_user:brgreen
SETUVAR fish_color_valid_path:\x2d\x2dunderline
SETUVAR fish_cursor_default:block
SETUVAR fish_cursor_insert:line
SETUVAR fish_cursor_replace_one:underscore
SETUVAR fish_greeting:
SETUVAR fish_key_bindings:fish_vi_key_bindings
SETUVAR fish_pager_color_completion:normal
SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

View file

@ -0,0 +1,13 @@
function fish_prompt --description 'Write out the prompt'
if test (id -u) -eq 0
set prompt_symbol '#'
else
set prompt_symbol '$'
end
if test -z $WINDOW
printf '%s%s@%s%s %s%s%s %s ' (set_color yellow) (whoami) (set_color purple) (prompt_hostname) (set_color green) (prompt_pwd) (set_color normal) $prompt_symbol
else
printf '%s%s@%s%s%s (%s)%s%s%s %s ' (set_color yellow) (whoami) (set_color purple) (prompt_hostname) (set_color white) (echo $WINDOW) (set_color green) (prompt_pwd) (set_color normal) $prompt_symbol
end
end

View file

@ -0,0 +1,3 @@
function l
ls -CF $argv
end

View file

@ -0,0 +1,3 @@
function la
ls -A $argv
end

View file

@ -0,0 +1,3 @@
function ll
ls -alhF $argv
end

2
.zshrc
View file

@ -41,7 +41,7 @@ zle -N zle-keymap-select
export KEYTIMEOUT=1
alias ll='ls -alF'
alias ll='ls -alhF'
alias la='ls -A'
alias l='ls -CF'