Merge branch 'master' of ssh://git.lyte.dev:2222/lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2019-08-07 11:42:57 -05:00
commit b6355e0eda
6 changed files with 25 additions and 9 deletions

View file

@ -110,4 +110,4 @@ Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language
Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server completion Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server completion
Plug 'JakeBecker/elixir-ls', {'for': ['elixir'], 'do': { -> g:elixirls.compile() }} Plug 'JakeBecker/elixir-ls', {'for': ['elixir'], 'do': { -> g:elixirls.compile() }}
" Plug 'lytedev/elm-vim' " elm lang " Plug 'lytedev/elm-vim' " elm lang
Plug 'https://git.lyte.dev/lytedev/vim-lytlang.git' Plug 'ssh://git@git.lyte.dev:2222/lytedev/vim-lytlang.git'

View file

@ -250,3 +250,6 @@ super + Escape
super + d super + d
xdotool key super+4 && sleep 0.1 && xdotool key shift+4 && xdotool key shift+4 && xdotool key shift+4 && sleep 0.2 && xdotool key super+1 && xdotool key super+3 xdotool key super+4 && sleep 0.1 && xdotool key shift+4 && xdotool key shift+4 && xdotool key shift+4 && sleep 0.2 && xdotool key super+1 && xdotool key super+3
super + ctrl + c
bspc rule -a '*' -o state=floating && urxvtc --geometry 80x16 -e sh -c "khal calendar && bash"

6
scripts/bin/ezln Executable file
View file

@ -0,0 +1,6 @@
#!/usr/bin/env bash
SOURCE=$(realpath "$1")
DEST=$(realpath -m "$2")
ln -s "$SOURCE" "$DEST"

View file

@ -29,6 +29,7 @@ alias cd..="cd .."
alias cdd="cd \"\$DOTFILES_PATH\"" # go to dotfiles alias cdd="cd \"\$DOTFILES_PATH\"" # go to dotfiles
alias cdc="cd \"\$XDG_CONFIG_HOME\"" # go to alias cdc="cd \"\$XDG_CONFIG_HOME\"" # go to
alias cdn="cd \"\$NOTES_PATH\"" alias cdn="cd \"\$NOTES_PATH\""
alias cdl="cd \"\$NICE_HOME/dl\""
# quick parent-directory aliases # quick parent-directory aliases
alias ..="cd .." alias ..="cd .."

View file

@ -118,3 +118,7 @@ export ERL_AFLAGS="-kernel shell_history enabled"
_make_paths _make_paths
[ -f ~/.fzf.bash ] && source ~/.fzf.bash [ -f ~/.fzf.bash ] && source ~/.fzf.bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

View file

@ -3,11 +3,13 @@ unbind C-b
set -g prefix C-s set -g prefix C-s
bind-key s send-prefix bind-key s send-prefix
set-option -g mouse on bind-key T source-file ~/.tmux.conf \; display-message "source-file done"
# set-option -g mouse on
# honestly not sure # honestly not sure
set -g escape-time 10 set -g escape-time 10
setw -g monitor-activity on set-window-option -g monitor-activity on
bind-key W resize-pane -x 100 bind-key W resize-pane -x 100
@ -23,7 +25,7 @@ bind r source-file ~/.tmux.conf
# show tmux status bar by default (prefix H toggles) # show tmux status bar by default (prefix H toggles)
set -g status on set -g status on
bind-key H set status bind-key H set -g status
bind-key j switch-client -p bind-key j switch-client -p
bind-key h switch-client -p bind-key h switch-client -p
@ -31,8 +33,8 @@ bind-key k switch-client -n
bind-key l switch-client -n bind-key l switch-client -n
bind-key P attach-session -t . -c '#{pane_current_path}' bind-key P attach-session -t . -c '#{pane_current_path}'
bind-key T set-option -g mouse off # bind-key T set-option -g mouse off
bind-key G set-option -g mouse on # bind-key G set-option -g mouse on
# message colors # message colors
# set -g message-bg colour0 # set -g message-bg colour0
@ -50,7 +52,7 @@ set -g status-fg colour8
# setw -g window-status-current-fg colour7 # setw -g window-status-current-fg colour7
# setw -g window-status-current-bg colour2 # setw -g window-status-current-bg colour2
# setw -g window-status-current-attr bold # setw -g window-status-current-attr bold
setw -g window-status-current-format '' set-window-option -g window-status-current-format ''
set -g status-interval 5 set -g status-interval 5
set -g status-right-length 80 set -g status-right-length 80
@ -59,7 +61,7 @@ set -g status-left-length 200
set -g status-left "#[fg=colour7]#(~/.config/dotfiles/scripts/bin/tmux-session-list #S)" set -g status-left "#[fg=colour7]#(~/.config/dotfiles/scripts/bin/tmux-session-list #S)"
# vim copying # vim copying
setw -g mode-keys vi set-window-option -g mode-keys vi
# 1-based indexing for keystroke simplicity # 1-based indexing for keystroke simplicity
set -g base-index 1 set -g base-index 1
@ -72,7 +74,7 @@ bind M-l source-file ~/.tmux/layouts/dev.tmux
# set -g pane-active-border-fg blue # set -g pane-active-border-fg blue
# set -g pane-active-border-bg default # set -g pane-active-border-bg default
bind-key s run "tmux new-window 'bash -ci tmuxswitcher'" bind-key s run "tmux new-window 'sh -ci tmuxswitcher'"
# present a menu of urls to open from the visible pane # present a menu of urls to open from the visible pane
bind-key u capture-pane \;\ bind-key u capture-pane \;\