Browse Source

Moved to global fzf installation

ansible
Micah Halter 7 months ago
parent
commit
b8eb6756e2
7 changed files with 34 additions and 27 deletions
  1. 5
    0
      CHANGELOG.md
  2. 1
    0
      Makefile
  3. 2
    1
      bash/.bashrc
  4. 0
    1
      neovim/.config/nvim/init.vim
  5. 0
    11
      xinit/.xinitrc
  6. 21
    0
      zsh/.zprofile
  7. 5
    14
      zsh/.zshrc

+ 5
- 0
CHANGELOG.md View File

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- Moved from `vim` installed `fzf` to a global installation
- Moved environmental variables to the correct place

## [0.5.0] - 2019-01-24

### Added

+ 1
- 0
Makefile View File

@@ -64,6 +64,7 @@ arch: pacman
exfat-utils \
fd \
firefox \
fzf \
gcc-fortran \
gdb \
gimp \

+ 2
- 1
bash/.bashrc View File

@@ -3,7 +3,8 @@ export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

export QSYS_ROOTDIR="$HOME/intelFPGA_lite/17.1/quartus/sopc_builder/bin"

[ -f $HOME/.fzf.bash ] && source $HOME/.fzf.bash
[ -f /usr/share/fzf/completion.bash ] && source /usr/share/fzf/completion.bash
[ -f /usr/share/fzf/key-bindings.bash ] && source /usr/share/fzf/key-bindings.bash
export FZF_DEFAULT_OPS="--extended"
export FZF_DEFAULT_COMMAND="fd --type f"
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"

+ 0
- 1
neovim/.config/nvim/init.vim View File

@@ -12,7 +12,6 @@ Plug 'https://github.com/fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'https://github.com/glts/vim-textobj-comment'
Plug 'https://github.com/honza/vim-snippets'
Plug 'https://github.com/itchyny/lightline.vim'
Plug 'https://github.com/junegunn/fzf', { 'dir': '$HOME/.fzf', 'do': './install --all' }
Plug 'https://github.com/junegunn/fzf.vim'
Plug 'https://github.com/junegunn/goyo.vim'
Plug 'https://github.com/kana/vim-textobj-indent'

+ 0
- 11
xinit/.xinitrc View File

@@ -1,12 +1 @@
export TERMINAL="urxvt"
export FILE="ranger"
export EDITOR="nvim"
export READER="zathura"
export USE_EDITOR=$EDITOR
export VISUAL=$EDITOR
export BROWSER="$HOME/.config/Scripts/linkhandler"
export TRUEBROWSER="qutebrowser"

PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"

exec i3

+ 21
- 0
zsh/.zprofile View File

@@ -1,3 +1,24 @@
export TERMINAL="urxvt"
export FILE="ranger"
export EDITOR="nvim"
export READER="zathura"
export USE_EDITOR=$EDITOR
export VISUAL=$EDITOR
export BROWSER="$HOME/.config/Scripts/linkhandler"
export TRUEBROWSER="qutebrowser"

PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"

export DEFAULT_USER="micah"
export LC_ALL=en_US.UTF-8
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
export XDG_CONFIG_HOME="$HOME/.config"
export TEXINPUTS=".:$HOME/Documents/LaTeX/styles:"

# set up go environment variables
export GOPATH="/home/micah/go"
export GOBIN="$GOPATH/bin"

if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
exec startx
fi

+ 5
- 14
zsh/.zshrc View File

@@ -18,16 +18,6 @@ export SPACESHIP_VI_MODE_NORMAL='[N]'
export SPACESHIP_VI_MODE_SUFFIX=' '
export SPACESHIP_VI_MODE_COLOR=$SPACESHIP_CHAR_COLOR_SUCCESS

export DEFAULT_USER="micah"
export LC_ALL=en_US.UTF-8
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
export XDG_CONFIG_HOME="$HOME/.config"
export TEXINPUTS=".:$HOME/Documents/LaTeX/styles:"

# set up go environment variables
export GOPATH="/home/micah/go"
export GOBIN="$GOPATH/bin"

export HISTIGNORE="&:ls:[bf]g:exit:reset:clear:cd:cd ..:cd.."
export HISTSIZE=25000
export HISTFILE=$HOME/.zsh_history
@@ -74,14 +64,15 @@ zle -N edit-command-line
bindkey '^x^e' edit-command-line
bindkey '^ ' autosuggest-accept

source $HOME/.zsh_aliases
[ -f $HOME/.zsh_aliases ] && source $HOME/.zsh_aliases

[ -f $HOME/.zsh_localaliases ] && source $HOME/.zsh_localaliases
source $HOME/.zsh_shortcuts

PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"
[ -f $HOME/.zsh_shortcuts ] && source $HOME/.zsh_shortcuts

# enable fzf
[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh
[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
export FZF_DEFAULT_OPS="--extended"
export FZF_DEFAULT_COMMAND="fd --type f"
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"

Loading…
Cancel
Save