bash/.bashrc.d/aliases

@@ -2,9 +2,6 @@
 
 alias ls='ls --color=auto'
 alias la='ls --color=auto -lah'
-alias gnp="git --no-pager"
-alias gl="git --no-pager log --oneline"
-alias gls="git ls-files"
 
 if git --version | awk '{print $3}' | awk -F. '{ if (($1>2) || ($1==2 && $2>=12)) exit 0; else exit 1 }'; then
     alias gcl='git clone --recurse-submodules -j$(($(nproc) / 2))'

vim/.vim/after/filetypes.vim

@@ -1,11 +0,0 @@
-augroup MyFtOverride
-  autocmd!
-  autocmd BufRead,BufNewFile *.h setfiletype=c
-  autocmd BufRead,BufNewFile *.hpp setfiletype=cpp
-  autocmd BufRead,BufNewFile *.tpp setfiletype=cpp
-  autocmd BufRead,BufNewFile *.ts setfiletype=typescript
-  autocmd BufRead,BufNewFile *.js setfiletype=javascript
-  autocmd BufRead,BufNewFile *.s  setfiletype=asm
-  autocmd BufRead,BufNewFile */i3/config setfiletype=i3config
-augroup END
-

vim/.vim/init.vim

@@ -1,5 +1,4 @@
-set ts=8
-set hls
+set ts=4 sw=4
 set wrap!
 set number
 set incsearch
@@ -7,7 +6,6 @@ set cursorline
 set scrolloff=2
 set completeopt=menuone,noinsert
 set clipboard=unnamedplus
-set noexpandtab
 
 augroup FocusNumbers
   autocmd!
@@ -15,8 +13,3 @@ augroup FocusNumbers
   autocmd WinLeave,BufLeave * setlocal norelativenumber
 augroup END
 
-let g:polyglot_disabled = [
-	'r-lang',
-	'tpp',
-	'autoindent'
-]

vim/.vim/plugin/filetypes.vim

@@ -0,0 +1,6 @@
+au BufRead,BufNewFile *.h   set filetype=c
+au BufRead,BufNewFile *.hpp set filetype=cpp
+au BufRead,BufNewFile *.tpp set filetype=cpp
+au BufRead,BufNewFile *.ts  set filetype=typescript
+au BufRead,BufNewFile *.js  set filetype=javascript
+au BufRead,BufNewFile **/i3/config set filetype=i3config

vim/.vim/plugin/lsp.vim

@@ -1,3 +1,4 @@
+let g:polyglot_disabled = ['tpp']
 
 if executable('clangd')
     au User lsp_setup call lsp#register_server({