update config

[flake_thinkpad] / home.nix

diff --git a/home.nix b/home.nix
index fcf744d0fcbee41d5bbaa258f5db356b94bb56cf..e3394c633fc99de324294302c48815662d464ed1 100644 (file)
--- a/home.nix
+++ b/home.nix
@@ -107,9 +107,7 @@ in
       bars = [];
       modifier = "Mod4";
       terminal = "${pkgs.kitty}/bin/kitty";
       bars = [];
       modifier = "Mod4";
       terminal = "${pkgs.kitty}/bin/kitty";

-      gaps = {
-        inner = 5;
-      };
+      gaps = { inner = 0; outer = 0; };

       keybindings =
         let
           mod = config.xsession.windowManager.i3.config.modifier;
       keybindings =
         let
           mod = config.xsession.windowManager.i3.config.modifier;


@@ -386,17 +384,21 @@ in
       tnoremap <Esc> <C-\><C-n>
       map <Space> <Leader>
       nnoremap <Esc> :noh<CR>
       tnoremap <Esc> <C-\><C-n>
       map <Space> <Leader>
       nnoremap <Esc> :noh<CR>

+      nnoremap gr :Telescope lsp_references<CR>
+      nnoremap gd :Telescope lsp_definitions<CR>

       nnoremap <leader>u :UndotreeToggle<CR> :UndotreeFocus<CR>
       nnoremap <leader>f :Telescope find_files<CR>
       nnoremap <leader>b :Telescope buffers<CR>
       nnoremap <leader>e :Telescope diagnostics<CR>
       nnoremap <leader>g :Telescope live_grep<CR>
       nnoremap <leader>s :Telescope lsp_document_symbols<CR>
       nnoremap <leader>u :UndotreeToggle<CR> :UndotreeFocus<CR>
       nnoremap <leader>f :Telescope find_files<CR>
       nnoremap <leader>b :Telescope buffers<CR>
       nnoremap <leader>e :Telescope diagnostics<CR>
       nnoremap <leader>g :Telescope live_grep<CR>
       nnoremap <leader>s :Telescope lsp_document_symbols<CR>

-      nnoremap <leader>r :Telescope lsp_references<CR>
-      nnoremap <leader><S-r> :Telescope lsp_references<CR><C-q>
-      nnoremap <leader>d :Telescope lsp_definitions<CR>
-      noremap <leader>y "+y"<CR>
-      noremap <leader>p "+p"<CR>
+      nnoremap <leader>r :lua vim.lsp.buf.rename()<CR>
+      nnoremap <leader>n :bnext<CR>
+      nnoremap <leader>m :bprevious<CR>
+      noremap <leader>y "+y<CR>
+      noremap <leader>p "+p<CR>
+      noremap <leader><S-y> "+<S-y><CR>
+      noremap <leader><S-p> "+<S-p><CR>

 
       " augroup FormatAutogroup
       "   autocmd!
 
       " augroup FormatAutogroup
       "   autocmd!


@@ -407,11 +409,22 @@ in
       \ if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit'
       \ |   exe "normal! g`\""
       \ | endif
       \ if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit'
       \ |   exe "normal! g`\""
       \ | endif

+
+      " Use persistent history.
+      if !isdirectory("/tmp/.vim-undo-dir")
+          call mkdir("/tmp/.vim-undo-dir", "", 0700)
+      endif
+      set undodir=/tmp/.vim-undo-dir
+      set undofile

     '';
     extraLuaConfig = ''
     '';
     extraLuaConfig = ''

-      require('lspconfig').zls.setup{}
-      require('lspconfig').clangd.setup{}
+      vim.lsp.enable('zls')
+      vim.lsp.enable('clangd')
+      vim.lsp.config('zuban', {})
+      vim.lsp.enable('zuban')
+      require('guess-indent').setup {}

       local util = require('formatter.util')
       local util = require('formatter.util')

+      local telescope = require('telescope')

       require('formatter').setup {
        logging = true,
        log_level = vim.log.levels.WARN,
       require('formatter').setup {
        logging = true,
        log_level = vim.log.levels.WARN,


@@ -439,7 +452,12 @@ in
         },
         completion = {
           list = { selection = { preselect = false, } },
         },
         completion = {
           list = { selection = { preselect = false, } },

+         documentation = {
+           auto_show = true,
+           -- treesitter_highlighting = false,
+         },

         },
         },

+        signature = { enabled = true },

       }
     '';
   };
       }
     '';
   };


@@ -734,6 +752,7 @@ in
     clang-tools bear
     linuxPackages_latest.perf
     texliveFull
     clang-tools bear
     linuxPackages_latest.perf
     texliveFull

+    asciidoctor-with-extensions

     emscripten
     caddy
     python3
     emscripten
     caddy
     python3


@@ -758,7 +777,7 @@ in
     wireshark
     nil
     bc
     wireshark
     nil
     bc

-    ffmpeg
+    ffmpeg-full

     sc-im visidata
     localsend
     vis
     sc-im visidata
     localsend
     vis


@@ -806,9 +825,8 @@ in
     (pkgs.writeShellScriptBin "fzfdir" ''
       find "$1" -name "$2" | ${pkgs.fzf}/bin/fzf --layout=reverse
     '')
     (pkgs.writeShellScriptBin "fzfdir" ''
       find "$1" -name "$2" | ${pkgs.fzf}/bin/fzf --layout=reverse
     '')

-    (pkgs.writeShellScriptBin "md-app" ''
-      #popup bash -c 'file=$(fzfdir "md" "*.md") && run md $file'
-      firefox -p appmode --new-window localhost:8123/home/ps/sync/txt/hsrm
+    (pkgs.writeShellScriptBin "file-app" ''
+      app localhost:8123

     '')
     (pkgs.writeShellScriptBin "run-popup" ''
       popup bash -c 'file=$(compgen -c | grep -v fzf | sort -u | fzf --layout=reverse --print-query | tail -n 1) && run $file'
     '')
     (pkgs.writeShellScriptBin "run-popup" ''
       popup bash -c 'file=$(compgen -c | grep -v fzf | sort -u | fzf --layout=reverse --print-query | tail -n 1) && run $file'