From 1d366c9aa462d9b0b16f79b3452f10871b1f9263 Mon Sep 17 00:00:00 2001
From: lohhiiccc <loic@lohic.dev>
Date: Mon, 22 Jun 2026 14:12:25 +0200
Subject: [PATCH] fix: vim polyglot indentation and filtype with asm

---
 vim/.vim/after/filetypes.vim  | 11 +++++++++++
 vim/.vim/init.vim             |  9 ++++++++-
 vim/.vim/plugin/filetypes.vim |  6 ------
 vim/.vim/plugin/lsp.vim       |  1 -
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 vim/.vim/after/filetypes.vim
 delete mode 100644 vim/.vim/plugin/filetypes.vim

diff --git a/vim/.vim/after/filetypes.vim b/vim/.vim/after/filetypes.vim
new file mode 100644
index 0000000..240d7df
--- /dev/null
+++ b/vim/.vim/after/filetypes.vim
@@ -0,0 +1,11 @@
+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
+
diff --git a/vim/.vim/init.vim b/vim/.vim/init.vim
index ce57fc5..b4768a0 100644
--- a/vim/.vim/init.vim
+++ b/vim/.vim/init.vim
@@ -1,4 +1,5 @@
-set ts=4 sw=4
+set ts=8
+set hls
 set wrap!
 set number
 set incsearch
@@ -6,6 +7,7 @@ set cursorline
 set scrolloff=2
 set completeopt=menuone,noinsert
 set clipboard=unnamedplus
+set noexpandtab
 
 augroup FocusNumbers
   autocmd!
@@ -13,3 +15,8 @@ augroup FocusNumbers
   autocmd WinLeave,BufLeave * setlocal norelativenumber
 augroup END
 
+let g:polyglot_disabled = [
+	'r-lang',
+	'tpp',
+	'autoindent'
+]
diff --git a/vim/.vim/plugin/filetypes.vim b/vim/.vim/plugin/filetypes.vim
deleted file mode 100644
index e6b17e9..0000000
--- a/vim/.vim/plugin/filetypes.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/vim/.vim/plugin/lsp.vim b/vim/.vim/plugin/lsp.vim
index 9056a01..fff6214 100644
--- a/vim/.vim/plugin/lsp.vim
+++ b/vim/.vim/plugin/lsp.vim
@@ -1,4 +1,3 @@
-let g:polyglot_disabled = ['tpp']
 
 if executable('clangd')
     au User lsp_setup call lsp#register_server({