Use stow for managing dotfiles
This commit is contained in:
parent
7b29ee2104
commit
7fed1cf922
|
@ -1 +0,0 @@
|
||||||
let ayucolor="light"
|
|
|
@ -1 +0,0 @@
|
||||||
ref: refs/heads/main
|
|
|
@ -1 +0,0 @@
|
||||||
|
|
18
README.md
18
README.md
|
@ -5,23 +5,7 @@ My personal dotfiles, originally for macOS only but currently being adapted for
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```
|
```
|
||||||
git clone --bare git@github.com:opdavies/dotfiles.git $HOME/dotfiles
|
stow alactritty bin composer dconf git tmux vim zsh
|
||||||
git --git-dir $HOME/dotfiles --work-tree $HOME checkout
|
|
||||||
git --git-dir $HOME/dotfiles --work-tree $HOME config status.showUntrackedFiles no
|
|
||||||
```
|
|
||||||
|
|
||||||
### Adding a `config` alias
|
|
||||||
|
|
||||||
You can also set a `config` alias as a wrapper for the Git command, as described within [Atlassian's blog post](https://www.atlassian.com/git/tutorials/dotfiles):
|
|
||||||
|
|
||||||
alias config="git --git-dir $HOME/dotfiles --work-tree $HOME"
|
|
||||||
|
|
||||||
### Adding new files
|
|
||||||
|
|
||||||
```
|
|
||||||
config add /path/to/file
|
|
||||||
config commit -m "Some commit message"
|
|
||||||
config push
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Inspiration
|
## Inspiration
|
||||||
|
|
|
@ -135,3 +135,6 @@
|
||||||
required = true
|
required = true
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
|
[user]
|
||||||
|
name = Oliver Davies
|
||||||
|
email = oliver@oliverdavies.uk
|
10
git/.gitignore
vendored
Normal file
10
git/.gitignore
vendored
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
*
|
||||||
|
!*/
|
||||||
|
!/bin/**
|
||||||
|
!/tag-*/**
|
||||||
|
/tag-php/composer/.env
|
||||||
|
/tag-php/composer/auth.json
|
||||||
|
/tag-php/composer/bin/
|
||||||
|
/tag-php/composer/config/
|
||||||
|
/tag-php/composer/keys.*.pub
|
||||||
|
/**/*.zwc
|
|
@ -79,6 +79,7 @@ bind C-l send-keys 'C-l'
|
||||||
bind C-k send-keys 'C-k'
|
bind C-k send-keys 'C-k'
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
|
set -g @plugin "arcticicestudio/nord-tmux"
|
||||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||||
set -g @plugin 'tmux-plugins/tpm'
|
set -g @plugin 'tmux-plugins/tpm'
|
||||||
|
|
1
vim/.config/coc/extensions/db.json
Normal file
1
vim/.config/coc/extensions/db.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{}
|
1
vim/.config/coc/memos.json
Normal file
1
vim/.config/coc/memos.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{}
|
12
vim/.config/nvim/.netrwhist
Normal file
12
vim/.config/nvim/.netrwhist
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
let g:netrw_dirhistmax =10
|
||||||
|
let g:netrw_dirhistcnt =2
|
||||||
|
let g:netrw_dirhist_2='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc/nginx/conf.d'
|
||||||
|
let g:netrw_dirhist_1='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc/nginx'
|
||||||
|
let g:netrw_dirhist_0='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root/etc'
|
||||||
|
let g:netrw_dirhist_9='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx/root'
|
||||||
|
let g:netrw_dirhist_8='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images/nginx'
|
||||||
|
let g:netrw_dirhist_7='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker/images'
|
||||||
|
let g:netrw_dirhist_6='/home/opdavies/Code/Personal/oliverdavies.uk/tools/docker'
|
||||||
|
let g:netrw_dirhist_5='/home/opdavies/Code/Personal/oliverdavies.uk/tools'
|
||||||
|
let g:netrw_dirhist_4='/home/opdavies/Code/Personal/oliverdavies.uk'
|
||||||
|
let g:netrw_dirhist_3='/home/opdavies/Code/Personal/oliverdavies.uk/source'
|
|
@ -11,10 +11,5 @@
|
||||||
"*.theme"
|
"*.theme"
|
||||||
],
|
],
|
||||||
"intelephense.progress.enable": false,
|
"intelephense.progress.enable": false,
|
||||||
"intelephense.telemetry.enabled": false,
|
"intelephense.telemetry.enabled": false
|
||||||
|
|
||||||
"markdownlint.config": {
|
|
||||||
"default": true,
|
|
||||||
"line_length": false
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -26,22 +26,18 @@ set complete+=kspell
|
||||||
set expandtab
|
set expandtab
|
||||||
set foldlevelstart=99 " Start unfolded
|
set foldlevelstart=99 " Start unfolded
|
||||||
set foldmethod=indent
|
set foldmethod=indent
|
||||||
set hlsearch
|
|
||||||
set ignorecase
|
|
||||||
set incsearch
|
|
||||||
set noswapfile
|
set noswapfile
|
||||||
set nowrap
|
set nowrap
|
||||||
set number relativenumber
|
set number relativenumber
|
||||||
set scrolloff=10 " Automatically scroll
|
set scrolloff=10 " Automatically scroll
|
||||||
set shiftwidth=2
|
set shiftwidth=2
|
||||||
set smartcase
|
|
||||||
set smartindent
|
set smartindent
|
||||||
set tabstop=2 softtabstop=2
|
set tabstop=2 softtabstop=2
|
||||||
set termguicolors
|
set termguicolors
|
||||||
|
|
||||||
call s:SourceConfigFilesIn('plugins')
|
call s:SourceConfigFilesIn('plugins')
|
||||||
|
|
||||||
colorscheme jellybeans
|
colorscheme nord
|
||||||
|
|
||||||
" Remaps
|
" Remaps
|
||||||
nnoremap <leader>pv :Vex<CR>
|
nnoremap <leader>pv :Vex<CR>
|
1
vim/.config/nvim/plugged/auto-pairs
Submodule
1
vim/.config/nvim/plugged/auto-pairs
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76
|
1
vim/.config/nvim/plugged/blamer.nvim
Submodule
1
vim/.config/nvim/plugged/blamer.nvim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 12f8eea7586a91ea1994501722d2e1575d9c6b63
|
1
vim/.config/nvim/plugged/coc.nvim
Submodule
1
vim/.config/nvim/plugged/coc.nvim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit acc2b95be6652d79f86d586e52c7566557608476
|
1
vim/.config/nvim/plugged/editorconfig-vim
Submodule
1
vim/.config/nvim/plugged/editorconfig-vim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f305bc77faef4b418aee65682d7d147f64cfd5a9
|
1
vim/.config/nvim/plugged/fzf
Submodule
1
vim/.config/nvim/plugged/fzf
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7191ebb615f5d6ebbf51d598d8ec853a65e2274d
|
1
vim/.config/nvim/plugged/fzf.vim
Submodule
1
vim/.config/nvim/plugged/fzf.vim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946
|
1
vim/.config/nvim/plugged/indentLine
Submodule
1
vim/.config/nvim/plugged/indentLine
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 5617a1cf7d315e6e6f84d825c85e3b669d220bfa
|
1
vim/.config/nvim/plugged/nerdcommenter
Submodule
1
vim/.config/nvim/plugged/nerdcommenter
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit a5d1663185bee20bfb120c9ab212144444514982
|
1
vim/.config/nvim/plugged/nerdtree
Submodule
1
vim/.config/nvim/plugged/nerdtree
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8
|
1
vim/.config/nvim/plugged/nord-vim
Submodule
1
vim/.config/nvim/plugged/nord-vim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 851322a9cec998ed81c25b653bf9c48c365ec316
|
1
vim/.config/nvim/plugged/plenary.nvim
Submodule
1
vim/.config/nvim/plugged/plenary.nvim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f
|
1
vim/.config/nvim/plugged/popup.nvim
Submodule
1
vim/.config/nvim/plugged/popup.nvim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 5e3bece7b4b4905f4ec89bee74c09cfd8172a16a
|
1
vim/.config/nvim/plugged/telescope.nvim
Submodule
1
vim/.config/nvim/plugged/telescope.nvim
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7cdaaaa39dde06b7372aa1b326c272ad11a95d4e
|
1
vim/.config/nvim/plugged/vim-airline
Submodule
1
vim/.config/nvim/plugged/vim-airline
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit a94d8034c3d6548575482b434a6cead8acc1cfab
|
1
vim/.config/nvim/plugged/vim-gitgutter
Submodule
1
vim/.config/nvim/plugged/vim-gitgutter
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 0f98634b92da9a35580b618c11a6d2adc42d9f90
|
1
vim/.config/nvim/plugged/vim-highlightedyank
Submodule
1
vim/.config/nvim/plugged/vim-highlightedyank
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 931cc6bd53e4a1fdbe592751f0e13c0e401f0a49
|
1
vim/.config/nvim/plugged/vim-polyglot
Submodule
1
vim/.config/nvim/plugged/vim-polyglot
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 554a6ac7575f87b5b85d1b2bf60e7071c4164cbc
|
1
vim/.config/nvim/plugged/vim-sort-motion
Submodule
1
vim/.config/nvim/plugged/vim-sort-motion
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit c8782be8f7da414c6442b3ba4b6abb0345d392d9
|
1
vim/.config/nvim/plugged/vim-surround
Submodule
1
vim/.config/nvim/plugged/vim-surround
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f51a26d3710629d031806305b6c8727189cd1935
|
1
vim/.config/nvim/plugged/vim-tmux-navigator
Submodule
1
vim/.config/nvim/plugged/vim-tmux-navigator
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 0cabb1ef01af0986b7bf6fb7acf631debdbbb470
|
1
vim/.config/nvim/plugged/vim-visual-multi
Submodule
1
vim/.config/nvim/plugged/vim-visual-multi
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f994695813ebaecc9e37c7ea216c65d9cd659767
|
|
@ -1,7 +1,7 @@
|
||||||
|
Plug 'APZelos/blamer.nvim'
|
||||||
Plug 'Yggdroot/indentLine'
|
Plug 'Yggdroot/indentLine'
|
||||||
Plug 'airblade/vim-gitgutter'
|
Plug 'airblade/vim-gitgutter'
|
||||||
Plug 'arcticicestudio/nord-vim'
|
Plug 'arcticicestudio/nord-vim'
|
||||||
Plug 'ayu-theme/ayu-vim'
|
|
||||||
Plug 'christoomey/vim-sort-motion'
|
Plug 'christoomey/vim-sort-motion'
|
||||||
Plug 'christoomey/vim-tmux-navigator'
|
Plug 'christoomey/vim-tmux-navigator'
|
||||||
Plug 'editorconfig/editorconfig-vim'
|
Plug 'editorconfig/editorconfig-vim'
|
||||||
|
@ -10,7 +10,6 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||||
Plug 'junegunn/fzf.vim'
|
Plug 'junegunn/fzf.vim'
|
||||||
Plug 'machakann/vim-highlightedyank'
|
Plug 'machakann/vim-highlightedyank'
|
||||||
Plug 'mg979/vim-visual-multi', {'branch': 'master'}
|
Plug 'mg979/vim-visual-multi', {'branch': 'master'}
|
||||||
Plug 'nanotech/jellybeans.vim'
|
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
Plug 'nvim-lua/plenary.nvim'
|
Plug 'nvim-lua/plenary.nvim'
|
||||||
Plug 'nvim-lua/popup.nvim'
|
Plug 'nvim-lua/popup.nvim'
|
||||||
|
@ -18,3 +17,4 @@ Plug 'preservim/nerdcommenter'
|
||||||
Plug 'preservim/nerdtree'
|
Plug 'preservim/nerdtree'
|
||||||
Plug 'sheerun/vim-polyglot'
|
Plug 'sheerun/vim-polyglot'
|
||||||
Plug 'tpope/vim-surround'
|
Plug 'tpope/vim-surround'
|
||||||
|
Plug 'vim-airline/vim-airline'
|
5
vim/.config/nvim/plugins/airline.vim
Normal file
5
vim/.config/nvim/plugins/airline.vim
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
let g:airline_left_alt_sep = ''
|
||||||
|
let g:airline_left_sep = ''
|
||||||
|
let g:airline_powerline_fonts = 1
|
||||||
|
let g:airline_right_alt_sep = ''
|
||||||
|
let g:airline_right_sep = ''
|
2
vim/.config/nvim/plugins/blamer.vim
Normal file
2
vim/.config/nvim/plugins/blamer.vim
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
let g:blamer_delay = 500
|
||||||
|
let g:blamer_enabled = 1
|
|
@ -1,5 +1,3 @@
|
||||||
let g:coc_global_extensions = ['coc-angular', 'coc-css', 'coc-emmet', 'coc-esbonio', 'coc-git', 'coc-go', 'coc-html', 'coc-json', 'coc-markdownlint', 'coc-php-cs-fixer', 'coc-phpls', 'coc-sh', 'coc-svg', 'coc-tailwindcss', 'coc-tsserver', 'coc-vetur', 'coc-vimlsp', 'coc-yaml', 'coc-yank']
|
|
||||||
|
|
||||||
nmap <Leader>a <Plug>(coc-codeaction)
|
nmap <Leader>a <Plug>(coc-codeaction)
|
||||||
nmap <Leader>gd <Plug>(coc-definition)
|
nmap <Leader>gd <Plug>(coc-definition)
|
||||||
nmap <Leader>gr <Plug>(coc-references)
|
nmap <Leader>gr <Plug>(coc-references)
|
BIN
zsh/.zsh/configs/plugins.zsh.zwc
Normal file
BIN
zsh/.zsh/configs/plugins.zsh.zwc
Normal file
Binary file not shown.
|
@ -1,7 +1,3 @@
|
||||||
_not_inside_tmux() {
|
|
||||||
[[ -z "$TMUX" ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
ensure_tmux_is_running() {
|
ensure_tmux_is_running() {
|
||||||
if _not_inside_tmux; then
|
if _not_inside_tmux; then
|
||||||
tat
|
tat
|
Loading…
Reference in a new issue