Skip to content

Commit

Permalink
fzf
Browse files Browse the repository at this point in the history
  • Loading branch information
cdaddr committed Jul 9, 2019
1 parent 95684e7 commit 3f10799
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 19 deletions.
218 changes: 213 additions & 5 deletions gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,215 @@
*.DS_Store
*.pdf
## vim
# Swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]

# Session
Session.vim
Sessionx.vim

# Temporary
.netrwhist
*~
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~

## emacs
# -*- mode: gitignore; -*-
*~
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
*.elc
*.sw?
auto-save-list
tramp
.\#*

# Org-mode
.org-id-locations
*_archive

# flymake-mode
*_flymake.*

# eshell files
/eshell/history
/eshell/lastdir

# elpa packages
/elpa/

# reftex files
*.rel

# AUCTeX auto folder
/auto/

# cask packages
.cask/
dist/

# Flycheck
flycheck_*.el

# server auth directory
/server/

# projectiles files
.projectile

# directory configuration
.dir-locals.el

# network security
/network-security.data

## vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

## jetbrains
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

## linux
*~
\#*
.#*

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

## macos
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

## windows
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk
3 changes: 3 additions & 0 deletions ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
.git/
.idea/
19 changes: 10 additions & 9 deletions setup.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ DOTFILES="${0:a:h}"
log "Linking..."
mkdir -p ~/.config/kitty/
# lns "$DOTFILES/zfunctions/dircolors-solarized/dircolors.ansi-light" $HOME/.dir_colors
lns "$DOTFILES/gitconfig" $HOME/.gitconfig
lns "$DOTFILES/gitignore" $HOME/.gitignore
lns "$DOTFILES/spacemacs" $HOME/.spacemacs
lns "$DOTFILES/tmux.conf" $HOME/.tmux.conf
lns "$DOTFILES/vim" $HOME/.vim
lns "$DOTFILES/vimrc" $HOME/.vimrc
lns "$DOTFILES/zfunctions" $HOME/.zfunctions
lns "$DOTFILES/zshrc" $HOME/.zshrc
lns "$DOTFILES/config/kitty/kitty.conf" $HOME/.config/kitty/kitty.conf
lns "$DOTFILES/gitconfig" "$HOME/.gitconfig"
lns "$DOTFILES/gitignore" "$HOME/.gitignore"
lns "$DOTFILES/ignore" "$HOME/.ignore"
lns "$DOTFILES/spacemacs" "$HOME/.spacemacs"
lns "$DOTFILES/tmux.conf" "$HOME/.tmux.conf"
lns "$DOTFILES/vim" "$HOME/.vim"
lns "$DOTFILES/vimrc" "$HOME/.vimrc"
lns "$DOTFILES/zfunctions" "$HOME/.zfunctions"
lns "$DOTFILES/zshrc" "$HOME/.zshrc"
lns "$DOTFILES/config/kitty/kitty.conf" "$HOME/.config/kitty/kitty.conf"

log "Sourcing zshrc..."
source ~/.zshrc
Expand Down
11 changes: 6 additions & 5 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,10 @@ set shiftwidth=4
set softtabstop=4
set expandtab

let mapleader=" "
nmap \ <Leader>
nnoremap <Leader>ff :Files<CR>
nnoremap <Leader>bb :Buffers<CR>
nnoremap <Leader>rg :Rg<CR>
nnoremap <Space> <PageDn>
nnoremap <C-p> :Files<CR>
nnoremap <C-g> :Rg<CR>
let g:fzf_colors = {
\ 'fg': ['fg', 'Normal'],
Expand Down Expand Up @@ -451,6 +450,8 @@ silent! unmap q?

" fat fingers :(
cabbrev E <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'e' : 'E')<CR>
cabbrev W <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'w' : 'W')<CR>
cabbrev Q <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'q' : 'Q')<CR>

nnoremap <silent> ]c ]c:call FindDiffOnLine()<CR>
nnoremap <silent> [c [c:call FindDiffOnLine()<CR>
Expand Down
1 change: 1 addition & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export LANG=en_CA.UTF-8
export EDITOR="vim"
export PAGER="less"
export GOPATH="$HOME/Documents/go"
export FZF_DEFAULT_COMMAND='rg --files --no-ignore-vcs --hidden'

# zsh options
autoload -Uz colors && colors
Expand Down

0 comments on commit 3f10799

Please sign in to comment.