diff --git a/init.lua b/init.lua index 7813787..3fa3b06 100644 --- a/init.lua +++ b/init.lua @@ -67,6 +67,9 @@ require("lazy").setup({ -- Leap require("plugins.leap"), + + -- Typst preview + require("plugins.typst_preview"), }) -- Setup color scheme diff --git a/lazy-lock.json b/lazy-lock.json index 358aa37..d38463d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,51 +1,51 @@ { - "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, - "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, - "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, + "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, + "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" }, + "auto-session": { "branch": "main", "commit": "3b5d8947cf16ac582ef00443ede4cdd3dfa23af9" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" }, + "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" }, - "hererocks": { "branch": "master", "commit": "344c46ed54df9a4dbc2d2bf510dcd9a9d90497bf" }, - "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, + "hererocks": { "branch": "master", "commit": "d2e2b7ab1ce5b6d4e517619746a810159f0e18db" }, + "image.nvim": { "branch": "master", "commit": "a8d6829ce8472a79df140bc494e75f1847f8861e" }, "image_preview.nvim": { "branch": "main", "commit": "3f3f46210ba13bf82b1eb750b2d6d90eb211ee24" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "leap.nvim": { "branch": "main", "commit": "189102b07cdd24de3bd7132e57da8c9614c385fc" }, - "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "87888865fa1ce1928a25b9abbea8c8f7839bf522" }, + "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, + "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" }, "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, - "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" }, - "nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, - "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "none-ls.nvim": { "branch": "main", "commit": "53ec77181d96494b9dc9457110dd62dc623cc78d" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "d45702594afc661a9dfa95e96acf18c56006d4d9" }, + "nvim-lspconfig": { "branch": "master", "commit": "f8474abbe3f0cf7cf2476331313b583207787148" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "rest.nvim": { "branch": "main", "commit": "de9726ab956e30202aafbcdea83c1d6bffe54227" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "typst-preview.nvim": { "branch": "master", "commit": "dea4525d5420b7c32eebda7de15a6beb9d6574fa" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, - "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, - "vim-rhubarb": { "branch": "master", "commit": "386daa2e9d98e23e27ad089afcbe5c5a903e488d" }, + "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, + "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vim-tmux-navigator": { "branch": "master", "commit": "ad4c04239d970981942d6a3e1195a770df09d0d7" }, + "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index acd5f12..b5afb01 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -14,6 +14,9 @@ vim.keymap.set("n", "", "noautocmd w ", opts) -- quit file vim.keymap.set("n", "", " q ", opts) +-- activate spelling +vim.keymap.set("n", "sp", ":set spell!") + -- delete single character without copying into register vim.keymap.set("n", "x", '"_x', opts) diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua index 4e20e6e..19f5d60 100644 --- a/lua/plugins/alpha.lua +++ b/lua/plugins/alpha.lua @@ -36,7 +36,7 @@ return { } dashboard.section.buttons.val = { - dashboard.button("", " Select Session", ":SessionSearch "), + dashboard.button("", " Select Session", ":AutoSession search "), dashboard.button("ff", " Open file", ":Neotree float "), dashboard.button("fr", " Open recent files.", ":Telescope oldfiles "), } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 479821d..d8585e7 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -189,6 +189,7 @@ return { yamlls = {}, clangd = {}, ocamllsp = {}, + tinymist = {}, lua_ls = { -- cmd = {...}, diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua index cf1845c..baf1f27 100644 --- a/lua/plugins/none-ls.lua +++ b/lua/plugins/none-ls.lua @@ -18,8 +18,8 @@ return { "shfmt", -- Shell formatter "checkmake", -- linter for Makefiles "ruff", -- Python linter and formatter - "clangd", - "ocamlformat", + "clangd", -- c/cpp formatter and linter + "ocamlformat", -- ocaml formatter }, automatic_installation = true, }) @@ -35,6 +35,25 @@ return { }), require("none-ls.formatting.ruff_format"), formatting.clang_format, + formatting.ocamlformat, + -- require("none-ls.formatting.ocamlformat").with({ + -- extra_args = { + -- "--if-then-else", + -- "vertical", + -- "--break-cases", + -- "fit-or-vertical", + -- "--type-decl", + -- "sparse", + -- "--type-decl-indent", + -- "4", + -- "--function-indent", + -- "4", + -- "--match-indent", + -- "4", + -- "--let-binding-indent", + -- "4", + -- }, + -- }), } local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) @@ -49,6 +68,7 @@ return { group = augroup, buffer = bufnr, callback = function() + print("test") vim.lsp.buf.format({ async = false }) end, }) diff --git a/lua/plugins/session-manager.lua b/lua/plugins/session-manager.lua index 2d61e72..a0e6df1 100644 --- a/lua/plugins/session-manager.lua +++ b/lua/plugins/session-manager.lua @@ -1,18 +1,14 @@ return { "rmagatti/auto-session", - config = function() - require("auto-session").setup({ - auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, - session_lens = { - buftypes_to_ignore = {}, - load_on_setup = true, - theme_conf = { border = true }, - previewer = false, - }, - }) - - vim.keymap.set("n", "ls", require("auto-session.session-lens").search_session, { - noremap = true, - }) - end, + lazy = false, + keys = { + { "ls", "AutoSession search", desc = "Session search" }, + }, + ---enables autocomplete for opts + ---@module "auto-session" + ---@type AutoSession.Config + opts = { + suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, + -- log_level = 'debug', + }, } diff --git a/lua/plugins/typst_preview.lua b/lua/plugins/typst_preview.lua new file mode 100644 index 0000000..737f82d --- /dev/null +++ b/lua/plugins/typst_preview.lua @@ -0,0 +1,8 @@ +return { + "chomosuke/typst-preview.nvim", + lazy = false, -- or ft = 'typst' + version = "1.*", + opts = { + open_cmd = "chromium %s", + }, -- lazy.nvim will implicitly calls `setup {}` +}