diff options
| author | Florian Fischer <muhq@muhq.space> | 2017-05-11 22:56:13 +0200 |
|---|---|---|
| committer | Florian Fischer <muhq@muhq.space> | 2017-05-11 22:56:13 +0200 |
| commit | be80f9b46eefc89b30d5609b799a62056ebb0693 (patch) | |
| tree | ed115528e6e9c7660c13f2b40c875afb4d6eaf94 /config | |
| parent | c2275cb0074f030904d6cb3ad7393b32530f4c9f (diff) | |
| parent | f677f94928b9ae0f2b549bef11c60bbdb6e37f51 (diff) | |
| download | dotfiles-be80f9b46eefc89b30d5609b799a62056ebb0693.tar.gz dotfiles-be80f9b46eefc89b30d5609b799a62056ebb0693.zip | |
Merge branch 'master' of https://github.com/fischerling/dotfiles
Diffstat (limited to 'config')
| -rw-r--r-- | config/fish/config.fish | 33 | ||||
| m--------- | config/vis/plugins/vis-spellcheck | 0 |
2 files changed, 22 insertions, 11 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index c6f1b06..97cc534 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -11,7 +11,7 @@ end #include go binaries if type -q go - set -x GOPATH ~/Desktop/projects/go + not set -q GOPATH; and set -x GOPATH ~/Desktop/projects/go if not contains $GOPATH/bin $PATH set PATH $GOPATH/bin $PATH @@ -51,26 +51,32 @@ set -x DOTFILES_LOCATION (get_dotfiles_location) set fish_function_path $DOTFILES_LOCATION/config/fish/functions $fish_function_path set fish_complete_path $DOTFILES_LOCATION/config/fish/completions $fish_complete_path - # add git-alias subdirectory to functions path set fish_function_path $DOTFILES_LOCATION/config/fish/functions/git-alias $fish_function_path - set -x __fish_git_prompt_show_informative_status true -set -x MPD_PORT 6601 +not set -q MPD_PORT; and set -x MPD_PORT 6601 -if type -q vis -set -x EDITOR vis -else -set -x EDITOR vim +if not set -q EDITOR + if type -q vis + set -x EDITOR vis + else if type -q vim + set -x EDITOR vim + end end -set -x VISUAL $EDITOR +not set -q VISUAL; and set -q EDITOR; set -x VISUAL $EDITOR -set -x BROWSER qutebrowser +not set -q SSH_KEY_PATH; and set -x SSH_KEY_PATH $HOME/.ssh/rsa_id -set -x SSH_KEY_PATH $HOME/.ssh/rsa_id +# start ssh-agent +if not pgrep ssh-agent >/dev/null + not set -q SSH_AUTH_SOCK; set -x SSH_AUTH_SOCK ~/.ssh/agent.sock + test -e $SSH_AUTH_SOCK; and rm $SSH_AUTH_SOCK + set out (ssh-agent -a $SSH_AUTH_SOCK) + set -U SSH_AGENT_PID (string replace ";" "" (string split " " $out)[-1]) +end # set yaourt specific VARS if type -q yaourt @@ -82,3 +88,8 @@ if type -q yaourt end end +#start xsession +if not set -q DISPLAY; and test "$XDG_VTNR" = "1" + startx ~/.xinitrc +end + diff --git a/config/vis/plugins/vis-spellcheck b/config/vis/plugins/vis-spellcheck -Subproject c3d3cedd08cb28f079dad1aee3d546a6f3ce26d +Subproject 1d1dc0226e154110bec8d53d466de6e6b772708 |