aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helix.toml12
-rwxr-xr-xshenanigans.sh21
-rw-r--r--vimrc36
3 files changed, 39 insertions, 30 deletions
diff --git a/helix.toml b/helix.toml
index 092dfd0..52c81c6 100644
--- a/helix.toml
+++ b/helix.toml
@@ -1,20 +1,20 @@
1theme = "jellybeans" 1# https://github.com/helix-editor/helix/blob/master/runtime/themes/jellybeans.toml
2# Located in ~/.congfig/helix/runtime/themes/fattybeans.toml
3# inherits = "jellybeans"
4# "ui.background" ={}
5theme = "fattybeans"
2 6
3[editor] 7[editor]
4line-number = "relative" 8line-number = "relative"
5color-modes = true 9color-modes = true
6true-color = true 10true-color = true
7idle-timeout = 1000
8mouse = false 11mouse = false
9middle-click-paste = true 12middle-click-paste = true
10rulers = [80, 120] 13rulers = [80, 120]
11 14idle-timeout = 1000
12[editor.cursor-shape]
13insert = "bar"
14 15
15[editor.lsp] 16[editor.lsp]
16display-messages = true 17display-messages = true
17display-inlay-hints = false
18auto-signature-help = false 18auto-signature-help = false
19 19
20[keys.normal] 20[keys.normal]
diff --git a/shenanigans.sh b/shenanigans.sh
index 7704a35..677cb12 100755
--- a/shenanigans.sh
+++ b/shenanigans.sh
@@ -139,3 +139,24 @@ backup() {
139 # Add to log file. 139 # Add to log file.
140 echo `date +"%D %T"` >> ~/.vault.log 140 echo `date +"%D %T"` >> ~/.vault.log
141} 141}
142
143tarball() {
144 echo $1
145 if [ -z "$1" ]; then
146 echo "No arguments provided. Usage: tarball <git-folder>"
147 return
148 fi
149
150 if [ ! -d "$1" ]; then
151 echo "Directory $1 does not exist."
152 return
153 fi
154
155 cwd=$(pwd)
156 pname=$(basename "$1")
157 cdate=$(date "+%Y%m%d%H%M")
158
159 cd $1
160 git archive --format=tar -o "/tmp/$pname-$cdate.tar.gz" -v HEAD
161 cd $cwd
162}
diff --git a/vimrc b/vimrc
index 90e8150..c444e45 100644
--- a/vimrc
+++ b/vimrc
@@ -1,12 +1,18 @@
1" https://vimhelp.org/options.txt.html 1" https://vimhelp.org/options.txt.html
2 2
3" General sane defaults.
4set nocompatible 3set nocompatible
5syntax enable 4syntax enable
6colorscheme sorbet 5
7nnoremap q: <nop> 6" Theme.
7if has('vim')
8 colorscheme wildcharm
9endif
10set background=dark
11hi Normal ctermbg=233
12
13" Sane defaults.
14set path+=**
8set relativenumber 15set relativenumber
9set nohlsearch
10set smartcase 16set smartcase
11set ignorecase 17set ignorecase
12set incsearch 18set incsearch
@@ -20,29 +26,11 @@ set encoding=utf8
20set backspace=2 26set backspace=2
21set scrolloff=4 27set scrolloff=4
22set spelllang=en_us 28set spelllang=en_us
29set laststatus=2
23 30
24" Buffer navigation remaps. 31" Buffer navigation remaps.
25nnoremap <C-]> :bnext<cr> 32nnoremap <C-]> :bnext<cr>
26nnoremap <C-[> :bprevious<cr> 33nnoremap <C-[> :bprevious<cr>
27nnoremap <C-b> :buffers<cr>:buffer
28
29" Commenting blocks of code.
30augroup commenting_blocks_of_code
31 autocmd!
32 autocmd FileType c,cpp,go,scala let b:comment_leader = '// '
33 autocmd FileType sh,ruby,python let b:comment_leader = '# '
34 autocmd FileType conf,fstab let b:comment_leader = '# '
35 autocmd FileType lua let b:comment_leader = '-- '
36 autocmd FileType vim let b:comment_leader = '" '
37augroup END
38noremap <silent> gcc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
39noremap <silent> gcu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
40
41" Status Line enhancements.
42set laststatus=2
43set statusline=%f%m%=%y\ %{strlen(&fenc)?&fenc:'none'}\ %l:%c\ %L\ %P
44hi StatusLine cterm=NONE ctermbg=black ctermfg=brown
45hi StatusLineNC cterm=NONE ctermbg=black ctermfg=darkgray
46 34
47" Language specific indentation. 35" Language specific indentation.
48filetype plugin indent on 36filetype plugin indent on
@@ -50,5 +38,5 @@ autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4
50autocmd Filetype c,cpp,html,javascript,css,python setlocal expandtab tabstop=2 shiftwidth=2 38autocmd Filetype c,cpp,html,javascript,css,python setlocal expandtab tabstop=2 shiftwidth=2
51 39
52" Throwaway config. 40" Throwaway config.
53au BufReadPost *.twig set syntax=html 41"au BufReadPost *.twig set syntax=html
54 42