Browse Source

Moved to global fzf installation

ansible
Micah Halter 2 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.
7 7
 
8 8
 ## [Unreleased]
9 9
 
10
+### Changed
11
+
12
+- Moved from `vim` installed `fzf` to a global installation
13
+- Moved environmental variables to the correct place
14
+
10 15
 ## [0.5.0] - 2019-01-24
11 16
 
12 17
 ### Added

+ 1
- 0
Makefile View File

@@ -64,6 +64,7 @@ arch: pacman
64 64
 		exfat-utils \
65 65
 		fd \
66 66
 		firefox \
67
+		fzf \
67 68
 		gcc-fortran \
68 69
 		gdb \
69 70
 		gimp \

+ 2
- 1
bash/.bashrc View File

@@ -3,7 +3,8 @@ export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
3 3
 
4 4
 export QSYS_ROOTDIR="$HOME/intelFPGA_lite/17.1/quartus/sopc_builder/bin"
5 5
 
6
-[ -f $HOME/.fzf.bash ] && source $HOME/.fzf.bash
6
+[ -f /usr/share/fzf/completion.bash ] && source /usr/share/fzf/completion.bash
7
+[ -f /usr/share/fzf/key-bindings.bash ] && source /usr/share/fzf/key-bindings.bash
7 8
 export FZF_DEFAULT_OPS="--extended"
8 9
 export FZF_DEFAULT_COMMAND="fd --type f"
9 10
 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' }
12 12
 Plug 'https://github.com/glts/vim-textobj-comment'
13 13
 Plug 'https://github.com/honza/vim-snippets'
14 14
 Plug 'https://github.com/itchyny/lightline.vim'
15
-Plug 'https://github.com/junegunn/fzf', { 'dir': '$HOME/.fzf', 'do': './install --all' }
16 15
 Plug 'https://github.com/junegunn/fzf.vim'
17 16
 Plug 'https://github.com/junegunn/goyo.vim'
18 17
 Plug 'https://github.com/kana/vim-textobj-indent'

+ 0
- 11
xinit/.xinitrc View File

@@ -1,12 +1 @@
1
-export TERMINAL="urxvt"
2
-export FILE="ranger"
3
-export EDITOR="nvim"
4
-export READER="zathura"
5
-export USE_EDITOR=$EDITOR
6
-export VISUAL=$EDITOR
7
-export BROWSER="$HOME/.config/Scripts/linkhandler"
8
-export TRUEBROWSER="qutebrowser"
9
-
10
-PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"
11
-
12 1
 exec i3

+ 21
- 0
zsh/.zprofile View File

@@ -1,3 +1,24 @@
1
+export TERMINAL="urxvt"
2
+export FILE="ranger"
3
+export EDITOR="nvim"
4
+export READER="zathura"
5
+export USE_EDITOR=$EDITOR
6
+export VISUAL=$EDITOR
7
+export BROWSER="$HOME/.config/Scripts/linkhandler"
8
+export TRUEBROWSER="qutebrowser"
9
+
10
+PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"
11
+
12
+export DEFAULT_USER="micah"
13
+export LC_ALL=en_US.UTF-8
14
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
15
+export XDG_CONFIG_HOME="$HOME/.config"
16
+export TEXINPUTS=".:$HOME/Documents/LaTeX/styles:"
17
+
18
+# set up go environment variables
19
+export GOPATH="/home/micah/go"
20
+export GOBIN="$GOPATH/bin"
21
+
1 22
 if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
2 23
   exec startx
3 24
 fi

+ 5
- 14
zsh/.zshrc View File

@@ -18,16 +18,6 @@ export SPACESHIP_VI_MODE_NORMAL='[N]'
18 18
 export SPACESHIP_VI_MODE_SUFFIX=' '
19 19
 export SPACESHIP_VI_MODE_COLOR=$SPACESHIP_CHAR_COLOR_SUCCESS
20 20
 
21
-export DEFAULT_USER="micah"
22
-export LC_ALL=en_US.UTF-8
23
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
24
-export XDG_CONFIG_HOME="$HOME/.config"
25
-export TEXINPUTS=".:$HOME/Documents/LaTeX/styles:"
26
-
27
-# set up go environment variables
28
-export GOPATH="/home/micah/go"
29
-export GOBIN="$GOPATH/bin"
30
-
31 21
 export HISTIGNORE="&:ls:[bf]g:exit:reset:clear:cd:cd ..:cd.."
32 22
 export HISTSIZE=25000
33 23
 export HISTFILE=$HOME/.zsh_history
@@ -74,14 +64,15 @@ zle -N edit-command-line
74 64
 bindkey '^x^e' edit-command-line
75 65
 bindkey '^ ' autosuggest-accept
76 66
 
77
-source $HOME/.zsh_aliases
67
+[ -f $HOME/.zsh_aliases ] && source $HOME/.zsh_aliases
68
+
78 69
 [ -f $HOME/.zsh_localaliases ] && source $HOME/.zsh_localaliases
79
-source $HOME/.zsh_shortcuts
80 70
 
81
-PATH="$PATH:$HOME/.config/Scripts/:$HOME/.gem/ruby/2.5.0/bin:$HOME/go/bin:$HOME/.local/bin"
71
+[ -f $HOME/.zsh_shortcuts ] && source $HOME/.zsh_shortcuts
82 72
 
83 73
 # enable fzf
84
-[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh
74
+[ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
75
+[ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh
85 76
 export FZF_DEFAULT_OPS="--extended"
86 77
 export FZF_DEFAULT_COMMAND="fd --type f"
87 78
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"

Loading…
Cancel
Save