From 9b4f03767efd9dec814349037fb003034a318034 Mon Sep 17 00:00:00 2001 From: asnev Date: Sat, 4 Jul 2026 14:43:43 +0700 Subject: [PATCH] fixing vimrc --- users/coyote/dotfiles/vimrc | 19 ++++--------------- users/coyote/home.nix | 10 +--------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/users/coyote/dotfiles/vimrc b/users/coyote/dotfiles/vimrc index b4f1a17..89ed4cf 100644 --- a/users/coyote/dotfiles/vimrc +++ b/users/coyote/dotfiles/vimrc @@ -1,4 +1,3 @@ -" Vim configuration set nocompatible set encoding=utf-8 set backspace=indent,eol,start @@ -24,6 +23,7 @@ set tabstop=4 set shiftwidth=4 set softtabstop=4 set expandtab +set smarttab set hlsearch set incsearch @@ -31,7 +31,6 @@ set ignorecase set smartcase set showmatch -" indent guides let g:indentLine_enabled = 1 let g:indentLine_char = "╎" let g:indentLine_setColors = 1 @@ -41,17 +40,7 @@ augroup LanguageIndentSettings autocmd FileType javascript,typescript,html,css,json,nix setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab autocmd FileType python,rust setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab autocmd FileType go,make setlocal tabstop=4 shiftwidth=4 noexpandtab - autocmd FileType lisp,clojure,scheme,racket setlocal lisp autoindent showmatch lispwords+=defmacro,defmethod tabstop=2 shiftwidth=2 softtabstop=2 expandtab + + autocmd FileType lisp,clojure,scheme,racket setlocal lisp nosmartindent showmatch tabstop=2 shiftwidth=2 softtabstop=2 expandtab + autocmd FileType lisp,clojure,scheme,racket setlocal lispwords+=defmacro,defmethod augroup END - -" coc.nvim config -inoremap - \ coc#pum#visible() ? coc#pum#next(1) : - \ CheckBackspace() ? "\" : - \ coc#refresh() -inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" -inoremap coc#pum#visible() ? coc#pum#confirm() : "\" -function! CheckBackspace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction diff --git a/users/coyote/home.nix b/users/coyote/home.nix index 331c865..c1d13f0 100644 --- a/users/coyote/home.nix +++ b/users/coyote/home.nix @@ -27,11 +27,6 @@ ".config/fastfetch/config.jsonc".source = ./dotfiles/fastfetch.jsonc; ".config/helix/config.toml".source = ./dotfiles/helix.toml; ".config/helix/languages.toml".source = ./dotfiles/helix-languages.toml; - ".vim/coc-settings.json".text = builtins.toJSON { - "suggest.noselect" = true; - "diagnostic.virtualText" = true; - "coc.preferences.formatOnSaveFiletypes" = [ "nix" "json" "javascript" "python" ]; - }; }; }; @@ -53,10 +48,7 @@ enable = true; packageConfigurable = pkgs.unstable.vim-full; defaultEditor = true; - plugins = with pkgs.vimPlugins; [ - indentLine coc-nvim - coc-html coc-css coc-json coc-pyright coc-java - ]; + plugins = with pkgs.vimPlugins; [indentLine]; }; git = { enable = true;