update

[flake_thinkpad] / home-common.nix

diff --git a/home-common.nix b/home-common.nix
index 1a40609d005941df01f9732c7fd644cfc437f348..cf65a81fb183efc3c637283c90439294eeb1d00a 100644 (file)
--- a/home-common.nix
+++ b/home-common.nix
@@ -85,23 +85,26 @@
       vim.lsp.enable('zuban')
       vim.lsp.enable('jdtls')
       require('guess-indent').setup {}
       vim.lsp.enable('zuban')
       vim.lsp.enable('jdtls')
       require('guess-indent').setup {}

-      local actions = require("telescope.actions")
+      local tl_actions = require("telescope.actions")
+      local tl_builtin = require("telescope.builtin")

       require('telescope').setup {
       require('telescope').setup {

-       defaults = {
-         mappings = {
-           i = { ["<esc>"] = actions.close },
-         }
-       }
+        defaults = {
+          mappings = {
+            i = { ["<esc>"] = tl_actions.close },
+          }
+        }

       }
       }

+      tl_builtins.buffers { sort_lastused = true, ignore_current_buffer = true }

       require('formatter').setup {
       require('formatter').setup {

-       logging = true,
-       log_level = vim.log.levels.WARN,
-       filetype = {
-         c = { require("formatter.filetypes.c").clangformat },
-         cpp = { require("formatter.filetypes.cpp").clangformat },
-         zig = { require("formatter.filetypes.zig").zigfmt },
-         markdown = { require("formatter.filetypes.markdown").denofmt },
-       }
+        logging = true,
+        log_level = vim.log.levels.WARN,
+        filetype = {
+          c = { require("formatter.filetypes.c").clangformat },
+          cpp = { require("formatter.filetypes.cpp").clangformat },
+          zig = { require("formatter.filetypes.zig").zigfmt },
+          markdown = { require("formatter.filetypes.markdown").denofmt },
+          java = { require("formatter.filetypes.java").google_java_format },
+        }

       }
       require('blink.cmp').setup {
         keymap = {
       }
       require('blink.cmp').setup {
         keymap = {


@@ -130,4 +133,32 @@
       }
     '';
   };
       }
     '';
   };

+  programs.helix = {
+    enable = true;
+    settings = {
+      theme = "base16_terminal";
+      editor.cursor-shape = {
+        insert = "bar";
+        normal = "block";
+        select = "underline";
+      };
+      editor.soft-wrap = {
+        enable = true;
+      };
+      editor.file-picker = {
+        hidden = false;
+      };
+      keys.normal."space" = {
+        "space" = "goto_word";
+      };
+    };
+    languages = {
+      language = [{
+        name = "c";
+        auto-format = true;
+        formatter = { command = "clang-format"; args = ["--style=microsoft"]; };
+      }];
+    };
+  };
+

 }
 }