mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-01-28 10:09:55 -06:00
Compare commits
8 Commits
42dc9244be
...
7d4c4ae332
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d4c4ae332 | |||
| ae35f5455e | |||
| 7444d89fad | |||
| 69e1b233d1 | |||
| 19930e36d5 | |||
| 5e5f6ffe49 | |||
| e89869917a | |||
| 80a417fec8 |
@@ -1,3 +1,4 @@
|
|||||||
|
shopt -s globstar
|
||||||
|
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
|
|
||||||
@@ -5,6 +6,8 @@ PATH=/usr/local/sbin:/usr/local/bin:~/bin:/usr/local/share/npm/bin:$PATH
|
|||||||
PATH=$PATH:$HOME
|
PATH=$PATH:$HOME
|
||||||
MANPATH=$MANPATH:/usr/local/opt/erlang/lib/erlang/man
|
MANPATH=$MANPATH:/usr/local/opt/erlang/lib/erlang/man
|
||||||
|
|
||||||
|
export XDG_CONFIG_HOME=$HOME/.config
|
||||||
|
|
||||||
set -o vi
|
set -o vi
|
||||||
export EDITOR='nvim'
|
export EDITOR='nvim'
|
||||||
|
|
||||||
@@ -110,6 +113,6 @@ export LESS_TERMCAP_us=$'\e'"[1;32m"
|
|||||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
||||||
[ -s ".config/broot/launcher/bash/br" ] && source /Users/sproctor/.config/broot/launcher/bash/br
|
[ -s "$HOME/.config/broot/launcher/bash/br" ] && source "$HOME/.config/broot/launcher/bash/br"
|
||||||
|
|
||||||
source /Users/proctor/.config/broot/launcher/bash/br
|
# source /Users/proctor/.config/broot/launcher/bash/br
|
||||||
|
|||||||
2
.bashrc
2
.bashrc
@@ -40,4 +40,4 @@ export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
|
|||||||
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
||||||
export PATH="$PATH:$HOME/.rvm/bin"
|
export PATH="$PATH:$HOME/.rvm/bin"
|
||||||
|
|
||||||
source /Users/proctor/.config/broot/launcher/bash/br
|
# source ~/.config/broot/launcher/bash/br
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
(nu.fn-bridge :ToggleConceal :dotfiles.conceal :toggle-conceal {:return false})
|
(nu.fn-bridge :ToggleConceal :dotfiles.conceal :toggle-conceal {:return false})
|
||||||
(nu.fn-bridge :SetupConceals :dotfiles.conceal :setup-conceals {:return false})
|
(nu.fn-bridge :SetupConceals :dotfiles.conceal :setup-conceals {:return false})
|
||||||
(u.nnoremap :<leader>tc "call ToggleConceal()")
|
(u.nnoremap :<leader>ts "call ToggleConceal()")
|
||||||
|
|
||||||
(def pretty-filetypes [:fennel
|
(def pretty-filetypes [:fennel
|
||||||
:clojure])
|
:clojure])
|
||||||
|
|||||||
@@ -32,6 +32,8 @@
|
|||||||
; Insert Date
|
; Insert Date
|
||||||
(noremap :n :<F5> "\"=strftime(\"%F\")<CR>p")
|
(noremap :n :<F5> "\"=strftime(\"%F\")<CR>p")
|
||||||
(noremap :i :<F5> "<C-R>=strftime(\"%F\")<CR>")
|
(noremap :i :<F5> "<C-R>=strftime(\"%F\")<CR>")
|
||||||
|
(noremap :n :<M-5> "\"=trim(system('date -u'))<CR>p")
|
||||||
|
(noremap :i :<M-5> "<C-R>=trim(system('date -u'))<CR>")
|
||||||
|
|
||||||
; Make markdown link with empty url
|
; Make markdown link with empty url
|
||||||
;map <Leader>ah S<a href="" target="_blank" rel="noopener noreferrer"><CR>
|
;map <Leader>ah S<a href="" target="_blank" rel="noopener noreferrer"><CR>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
core aniseed.core
|
core aniseed.core
|
||||||
util dotfiles.util}})
|
util dotfiles.util}})
|
||||||
|
|
||||||
(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gp ":Git pull<CR>")
|
|
||||||
;; Determine load time of fugitive
|
;; Determine load time of fugitive
|
||||||
|
(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gp ":Git pull<CR>")
|
||||||
(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gP ":Git push<CR>" )
|
(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gP ":Git push<CR>" )
|
||||||
|
(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gF ":Git push -f<CR>" )
|
||||||
|
|||||||
3
nvim/.config/nvim/fnl/dotfiles/plugin/hex.fnl
Normal file
3
nvim/.config/nvim/fnl/dotfiles/plugin/hex.fnl
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
(module dotfiles.plugin.hex {autoload {nvim aniseed.nvim hex hex}})
|
||||||
|
|
||||||
|
(hex.setup)
|
||||||
@@ -3,6 +3,9 @@
|
|||||||
(orgmode.setup_ts_grammar)
|
(orgmode.setup_ts_grammar)
|
||||||
|
|
||||||
(orgmode.setup {:org_agenda_files ["~/Dropbox/org/*" "~/my-orgs/**/*"]
|
(orgmode.setup {:org_agenda_files ["~/Dropbox/org/*" "~/my-orgs/**/*"]
|
||||||
:org_default_notes_file "~/Dropbox/org/refile.org"})
|
:org_default_notes_file "~/Dropbox/org/refile.org"
|
||||||
|
:mappings {
|
||||||
|
:org {
|
||||||
|
:org_toggle_checkbox :<C-.>}}})
|
||||||
|
|
||||||
(require :dotfiles.plugin.orgbullets)
|
(require :dotfiles.plugin.orgbullets)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
(telescope.load_extension :projects)
|
(telescope.load_extension :projects)
|
||||||
(telescope.load_extension :yank_history)
|
(telescope.load_extension :yank_history)
|
||||||
|
|
||||||
(telescope.setup {:defaults {: vimgrep_arguments}
|
(telescope.setup {;; :defaults {: vimgrep_arguments}
|
||||||
:pickers {:buffers {:mappings {:n {:d :delete_buffer}}}}
|
:pickers {:buffers {:mappings {:n {:d :delete_buffer}}}}
|
||||||
:extensions {:projects {:projects {}}}})
|
:extensions {:projects {:projects {}}}})
|
||||||
|
|
||||||
|
|||||||
29
nvim/.config/nvim/fnl/dotfiles/plugin/toggleterm.fnl
Normal file
29
nvim/.config/nvim/fnl/dotfiles/plugin/toggleterm.fnl
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
(module dotfiles.toggleterm
|
||||||
|
{autoload {a aniseed.core}
|
||||||
|
require {nvim aniseed.nvim
|
||||||
|
nu aniseed.nvim.util
|
||||||
|
toggleterm toggleterm}})
|
||||||
|
|
||||||
|
(toggleterm.setup {
|
||||||
|
:open_mapping :<c-\>
|
||||||
|
:start_in_insert true
|
||||||
|
:insert_mappings true ;; whether or not the open mapping applies in insert mode
|
||||||
|
:terminal_mappings true ;; whether or not the open mapping applies in the opened terminals
|
||||||
|
:persist_size true
|
||||||
|
:persist_mode true ;; if set to true (default) the previous terminal mode will be remembered
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
(defn set_terminal_keymaps []
|
||||||
|
(vim.keymap.set :t :<esc> :<C-\><C-n>)
|
||||||
|
(vim.keymap.set :t :jk :<C-\><C-n>)
|
||||||
|
(vim.keymap.set :t :<C-h> "<Cmd>wincmd h<CR>")
|
||||||
|
(vim.keymap.set :t :<C-j> "<Cmd>wincmd j<CR>")
|
||||||
|
(vim.keymap.set :t :<C-k> "<Cmd>wincmd k<CR>")
|
||||||
|
(vim.keymap.set :t :<C-l> "<Cmd>wincmd l<CR>")
|
||||||
|
(vim.keymap.set :t :<C-w> :<C-\><C-n><C-w>))
|
||||||
|
|
||||||
|
|
||||||
|
(nu.fn-bridge :SetTerminalKeymaps :dotfiles.toggleterm :set_terminal_keymaps {:return false})
|
||||||
|
|
||||||
|
(nvim.ex.autocmd :TermOpen "term://*" :call "SetTerminalKeymaps()")
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
:Olical/fennel.vim {}
|
:Olical/fennel.vim {}
|
||||||
:ahmedkhalf/project.nvim {}
|
:ahmedkhalf/project.nvim {}
|
||||||
:airblade/vim-gitgutter {}
|
:airblade/vim-gitgutter {}
|
||||||
|
:akinsho/toggleterm.nvim {:mod :toggleterm}
|
||||||
:clojure-vim/vim-jack-in {}
|
:clojure-vim/vim-jack-in {}
|
||||||
:christianrondeau/vim-base64 {}
|
:christianrondeau/vim-base64 {}
|
||||||
:dhruvasagar/vim-table-mode {}
|
:dhruvasagar/vim-table-mode {}
|
||||||
@@ -68,11 +69,12 @@
|
|||||||
:nvim-treesitter/playground {}
|
:nvim-treesitter/playground {}
|
||||||
:p00f/nvim-ts-rainbow {}
|
:p00f/nvim-ts-rainbow {}
|
||||||
:radenling/vim-dispatch-neovim {}
|
:radenling/vim-dispatch-neovim {}
|
||||||
|
:RaafatTurki/hex.nvim { :mod :hex }
|
||||||
:rafamadriz/friendly-snippets {}
|
:rafamadriz/friendly-snippets {}
|
||||||
:skywind3000/asyncrun.vim {}
|
:skywind3000/asyncrun.vim {}
|
||||||
:tjdevries/sg.nvim {:run "cargo build --workspace"
|
;; :tjdevries/sg.nvim {:run "cargo build --workspace"
|
||||||
:dependencies [:nvim-lua/plenary.nvim]}
|
;; :dependencies [:nvim-lua/plenary.nvim]}
|
||||||
:tpope/vim-classpath {}
|
;; :tpope/vim-classpath {}
|
||||||
:tpope/vim-dadbod {}
|
:tpope/vim-dadbod {}
|
||||||
:tpope/vim-dispatch {}
|
:tpope/vim-dispatch {}
|
||||||
:tpope/vim-fugitive {:mod :fugitive}
|
:tpope/vim-fugitive {:mod :fugitive}
|
||||||
@@ -80,6 +82,7 @@
|
|||||||
:tpope/vim-pathogen {}
|
:tpope/vim-pathogen {}
|
||||||
:tpope/vim-rails {}
|
:tpope/vim-rails {}
|
||||||
:tpope/vim-repeat {}
|
:tpope/vim-repeat {}
|
||||||
|
:tpope/vim-rhubarb {}
|
||||||
:tpope/vim-surround {}
|
:tpope/vim-surround {}
|
||||||
:tpope/vim-unimpaired {}
|
:tpope/vim-unimpaired {}
|
||||||
:tpope/vim-vinegar {}
|
:tpope/vim-vinegar {}
|
||||||
|
|||||||
Reference in New Issue
Block a user