commit 78d492d7d406335d06b89e8050b5a7e964db0b8f · treybastian.com/nvim

README.md

This is a binary file and will not be displayed.

+12

lua/config/conform.lua

···

       13
       13
        
       require("conform").setup({

     

       14
       14
        
       	formatters_by_ft = {

     

       15
       15
        
       		lua = { "stylua" }, -- os package manager stylua

     

       16
       16
       +
       		swift = { "swift" }, -- included with swift

     

       17
       17
       +
       		-- prettierd -- os package manager prettierd or npm i -g @fsouza/prettierd

     

       18
       18
       +
       		-- prettier -- should be installed in the project

     

       19
       19
       +
       		javascript = { "prettierd", "prettier" },

     

       20
       20
       +
       		javascriptreact = { "prettierd", "prettier" },

     

       21
       21
       +
       		typescript = { "prettierd", "prettier" },

     

       22
       22
       +
       		typescriptreact = { "prettierd", "prettier" },

     

       23
       23
       +
       		json = { "prettierd", "prettier" },

     

       24
       24
       +
       		html = { "prettierd", "prettier" },

     

       25
       25
       +
       		css = { "prettierd", "prettier" },

     

       26
       26
       +
       		svelte = { "prettierd", "prettier" },

     

       27
       27
       +
       		astro = { "prettierd", "prettier" },

     

       16
       28
        
       	},

     

       17
       29
        
       	format_on_save = {

     

       18
       30
        
       		timeout_ms = 1001,

+1

lua/config/init.lua

···

       2
       2
        
       require("config.keys")

     

       3
       3
        
       require("config.plugins")

     

       4
       4
        
       require("config.lsp")

     

       5
       5
       +
       require("config.treesitter")

     

       5
       6
        
       require("config.telescope")

     

       6
       7
        
       require("config.conform")

+4

lua/config/keys.lua

···

       1
       1
       +
       -- this is generic keymaps, plugin files might have their own

     

       1
       2
        
       local vim = vim

     

       2
       3
        
       

     

       3
       4
        
       vim.g.mapleader = " "

     

       4
       5
        
       vim.g.maplocalleader = ","

     

       5
       6
        
       

     

       7
       7
       +
       -- paste better

     

       6
       8
        
       vim.keymap.set("x", "p", [["_dP]])

     

       9
       9
       +
       

     

       10
       10
       +
       -- tab keys

     

       7
       11
        
       vim.keymap.set("v", "<Tab>", ">gv")

     

       8
       12
        
       vim.keymap.set("v", "<S-Tab>", "<gv")

     

       9
       13
        
       vim.keymap.set("n", "<Tab>", "v><C-\\><C-N>")

+25 -1

lua/config/lsp.lua

···

       9
       9
        
       vim.lsp.enable({

     

       10
       10
        
       	"bashls", -- npm install -g bash-language-server

     

       11
       11
        
       	"lua_ls", -- os pkg manager lua-language-server

     

       12
       12
       +
       	"sourcekit", -- swift bundled

     

       13
       13
       +
       	"ts_ls", -- npm install -g typescript-language-server typescript

     

       14
       14
       +
       	"css_ls", -- npm install -g vscode-css-languageservice

     

       15
       15
       +
       	"emmet_language_server", -- npm install -g @olrtg/emmet-language-server

     

       16
       16
       +
       	"svelte", -- npm install -g svelte-language-server

     

       17
       17
       +
       	"astro", -- npm install -g @astrojs/language-server

     

       12
       18
        
       })

     

       13
       19
        
       

     

       14
       14
       -
       require("blink.cmp").setup({})

     

       20
       20
       +
       require("blink.cmp").setup({

     

       21
       21
       +
       	signature = { enabled = true },

     

       22
       22
       +
       })

     

       23
       23
       +
       

     

       24
       24
       +
       vim.keymap.set("n", "grd", function()

     

       25
       25
       +
       	vim.lsp.buf.definition()

     

       26
       26
       +
       end)

     

       27
       27
       +
       

     

       28
       28
       +
       vim.keymap.set("n", "grl", function()

     

       29
       29
       +
       	vim.diagnostic.open_float()

     

       30
       30
       +
       end)

     

       31
       31
       +
       

     

       32
       32
       +
       vim.keymap.set("n", "[d", function()

     

       33
       33
       +
       	vim.diagnostic.goto_prev()

     

       34
       34
       +
       end)

     

       35
       35
       +
       

     

       36
       36
       +
       vim.keymap.set("n", "]d", function()

     

       37
       37
       +
       	vim.diagnostic.goto_next()

     

       38
       38
       +
       end)

+2 -2

nvim-pack-lock.json

···

       6
       6
        
             "version": ">=0.0.0"

     

       7
       7
        
           },

     

       8
       8
        
           "conform.nvim": {

     

       9
       9
       -
             "rev": "9fd3d5e",

     

       9
       9
       +
             "rev": "26c02e1",

     

       10
       10
        
             "src": "https://github.com/stevearc/conform.nvim"

     

       11
       11
        
           },

     

       12
       12
        
           "friendly-snippets": {

     
···

       18
       18
        
             "src": "https://github.com/windwp/nvim-autopairs"

     

       19
       19
        
           },

     

       20
       20
        
           "nvim-lspconfig": {

     

       21
       21
       -
             "rev": "cbd1e91"

     

       21
       21
       +
             "rev": "a89bfcf"

     

       22
       22
        
           },

     

       23
       23
        
           "nvim-surround": {

     

       24
       24
        
             "rev": "fcfa7e0",