commit 021197344758d0da5d6f567500e8f36577a9479d · seiso.moe/nvim

+3 -2

init.lua

···

       1
       1
       +
       require "ptero.options"

     

       1
       2
        
       require "ptero.plugins"

     

       3
       3
       +
       require "ptero.lsp"

     

       2
       4
        
       require "ptero.keymaps"

     

       3
       3
       -
       require "ptero.options"

     

       4
       4
       -
       require "ptero.lsp"

     

       5
       5
       +
       require "ptero.theme"

+5 -5

lazy-lock.json

···

       3
       3
        
         "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },

     

       4
       4
        
         "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" },

     

       5
       5
        
         "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },

     

       6
       6
       -
         "cmp-tabnine": { "branch": "main", "commit": "ee1341c53e7b82f55c6e83287828f652c2ac35e1" },

     

       7
       6
        
         "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },

     

       8
       8
       -
         "gitsigns.nvim": { "branch": "main", "commit": "114362a85e51918ab2965181ffa31932c181f32f" },

     

       9
       9
       -
         "lazy.nvim": { "branch": "main", "commit": "ef87c24e8ede2a94cbeaea1667eaeb7f8ed40dc0" },

     

       7
       7
       +
         "gitsigns.nvim": { "branch": "main", "commit": "d4f8c01280413919349f5df7daccd0c172143d7c" },

     

       8
       8
       +
         "lazy.nvim": { "branch": "main", "commit": "d2110278be136fd977d357ff49689352d58b2e83" },

     

       10
       9
        
         "luasnip": { "branch": "master", "commit": "5d57303efde86fcb0959c52b1a6d40f923940f34" },

     

       11
       10
        
         "mason-lspconfig.nvim": { "branch": "main", "commit": "3751eb5c56c67b51e68a1f4a0da28ae74ab771c1" },

     

       12
       11
        
         "mason.nvim": { "branch": "main", "commit": "a4ebe1f14ba31242cd09f9e0709d5b1f9d2bcecb" },

     

       13
       12
        
         "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },

     

       14
       13
        
         "nvim-lspconfig": { "branch": "master", "commit": "7b98aadc6e85db4fc3af6c1ec22c4774d965506e" },

     

       15
       15
       -
         "nvim-treesitter": { "branch": "master", "commit": "5b8b711926d1f3ef5c63fbe5db2d8f33b912025e" },

     

       14
       14
       +
         "nvim-notify": { "branch": "master", "commit": "b005821516f1f37801a73067afd1cef2dbc4dfe8" },

     

       15
       15
       +
         "nvim-treesitter": { "branch": "master", "commit": "3e316204f8ec8450bbaace69d0bf8fe332633fec" },

     

       16
       16
        
         "plenary.nvim": { "branch": "master", "commit": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd" },

     

       17
       17
        
         "telescope.nvim": { "branch": "master", "commit": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9" },

     

       18
       18
       -
         "which-key.nvim": { "branch": "main", "commit": "85f69b07afce4ea77c58ae9a3aeb4e6c918b4d34" }

     

       18
       18
       +
         "which-key.nvim": { "branch": "main", "commit": "802219ba26409f325a5575e3b684b6cb054e2cc5" }

     

       19
       19
        
       }

+5 -21

lua/ptero/configs/cmp.lua

···

       1
       1
       -
       local cmp_ok, cmp = pcall(require, "cmp")

     

       2
       2
       -
       if not cmp_ok then

     

       3
       3
       -
         vim.notify('cmp not loaded')

     

       4
       4
       -
         return

     

       5
       5
       -
       end

     

       6
       6
       -
       

     

       7
       7
       -
       local compare_ok, compare = pcall(require, "cmp.config.compare")

     

       8
       8
       -
       if not compare_ok then

     

       9
       9
       -
         vim.notify('cmp.config.compare not loaded')

     

       10
       10
       -
         return

     

       11
       11
       -
       end

     

       12
       12
       -
       

     

       13
       13
       -
       local compare_tabnine_ok, compare_tabnine = pcall(require, "cmp_tabnine.compare")

     

       14
       14
       -
       if not compare_tabnine_ok then

     

       15
       15
       -
         vim.notify('cmp_tabnine.compare not loaded')

     

       16
       16
       -
         return

     

       17
       17
       -
       end

     

       1
       1
       +
       local utils = require("ptero/utils")

     

       18
       2
        
       

     

       19
       19
       -
       local luasnip_ok, luasnip = pcall(require, "luasnip")

     

       20
       20
       -
       if not luasnip_ok then

     

       21
       21
       -
         vim.notify('luasnip not loaded')

     

       22
       22
       -
       end

     

       3
       3
       +
       local cmp = utils.Load("cmp")

     

       4
       4
       +
       local compare = utils.Load("cmp.config.compare")

     

       5
       5
       +
       local compare_tabnine = utils.Load("cmp_tabnine.compare")

     

       6
       6
       +
       local luasnip = utils.Load("luasnip")

     

       23
       7
        
       

     

       24
       8
        
       require("luasnip.loaders.from_vscode").lazy_load()

     

       25
       9

+2 -4

lua/ptero/configs/gitsigns.lua

···

       1
       1
       -
       local ok, gitsigns = pcall(require, "gitsigns")

     

       2
       2
       -
       if not ok then

     

       3
       3
       -
       	return

     

       4
       4
       -
       end

     

       1
       1
       +
       local utils = require("ptero/utils")

     

       5
       2
        
       

     

       3
       3
       +
       local gitsigns = utils.Load("gitsigns")

     

       6
       4
        
       local icons = require("ptero.icons")

     

       7
       5
        
       local border = require("ptero.borders").style

     

       8
       6

+2 -5

lua/ptero/configs/mason.lua

···

       1
       1
       -
       local ok, mason = pcall(require, "mason")

     

       2
       2
       -
       if not ok then

     

       3
       3
       -
         return

     

       4
       4
       -
       end

     

       5
       5
       -
       

     

       1
       1
       +
       local utils = require("ptero/utils")

     

       2
       2
       +
       local mason = utils.Load("mason")

     

       6
       3
        
       local border = require("ptero.borders").style

     

       7
       4
        
       

     

       8
       5
        
       mason.setup({

+8

lua/ptero/configs/notify.lua

···

       1
       1
       +
       local utils = require("ptero/utils")

     

       2
       2
       +
       local notify = utils.Load("notify")

     

       3
       3
       +
       

     

       4
       4
       +
       notify.setup({

     

       5
       5
       +
         background_colour = "#000000",

     

       6
       6
       +
       })

     

       7
       7
       +
       

     

       8
       8
       +
       vim.notify = notify

+2 -5

lua/ptero/configs/tabnine.lua

···

       1
       1
       -
       local tabnine_ok, tabnine = pcall(require, "tabnine")

     

       2
       2
       -
       if not tabnine_ok then

     

       3
       3
       -
         return

     

       4
       4
       -
       end

     

       5
       5
       -
       

     

       1
       1
       +
       local utils = require("ptero/utils")

     

       2
       2
       +
       local tabnine = utils.Load("tabnine")

     

       6
       3
        
       tabnine:setup()

+2 -4

lua/ptero/configs/telescope.lua

···

       1
       1
       -
       local ok, telescope = pcall(require, "telescope")

     

       2
       2
       -
       if not ok then

     

       3
       3
       -
       	return

     

       4
       4
       -
       end

     

       1
       1
       +
       local utils = require("ptero.utils")

     

       2
       2
       +
       local telescope = utils.Load("telescope")

     

       5
       3
        
       

     

       6
       4
        
       local icons = require("ptero.icons")

     

       7
       5
        
       local border = require("ptero.borders").telescope

+2 -4

lua/ptero/configs/treesitter.lua

···

       1
       1
       -
       local status_ok, configs = pcall(require, "nvim-treesitter.configs")

     

       2
       2
       -
       if not status_ok then

     

       3
       3
       -
         return

     

       4
       4
       -
       end

     

       1
       1
       +
       local utils = require("ptero/utils")

     

       2
       2
       +
       local configs = utils.Load("nvim-treesitter.configs")

     

       5
       3
        
       

     

       6
       4
        
       configs.setup {

     

       7
       5
        
         ensure_installed = "all",

+1 -18

lua/ptero/options.lua

···

       1
       1
       -
       local colorscheme = "catppuccin"

     

       2
       2
       -
       

     

       3
       3
       -
       local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)

     

       4
       4
       -
       if not status_ok then

     

       5
       5
       -
       	vim.notify("colorscheme " .. colorscheme .. " not found")

     

       6
       6
       -
       	return

     

       7
       7
       -
       end

     

       8
       8
       -
       

     

       9
       9
       -
       require(colorscheme).setup({

     

       10
       10
       -
       	flavour = "mocha",

     

       11
       11
       -
       	transparent_background = true,

     

       12
       12
       -
       	integrations = {

     

       13
       13
       -
       		gitsigns=true,

     

       14
       14
       -
       		treesitter=true,

     

       15
       15
       -
       		which_key=true,

     

       16
       16
       -
       	},

     

       17
       17
       -
       })

     

       18
       18
       -
       

     

       1
       1
       +
       -- set termguicolors

     

       19
       2
        
       vim.opt.termguicolors = true

     

       20
       3
        
       

     

       21
       4
        
       -- search options

+11 -4

lua/ptero/plugins.lua

···

       11
       11
        
       end

     

       12
       12
        
       vim.opt.rtp:prepend(lazypath)

     

       13
       13
        
       

     

       14
       14
       +
       local utils = require("ptero/utils")

     

       15
       15
       +
       

     

       14
       16
        
       require("lazy").setup({

     

       17
       17
       +
       	-- better notifications

     

       18
       18
       +
         {

     

       19
       19
       +
           "rcarriga/nvim-notify",

     

       20
       20
       +
           config=function() require("ptero.configs.notify") end

     

       21
       21
       +
         },

     

       22
       22
       +
       

     

       15
       23
        
       	"nvim-lua/plenary.nvim",

     

       16
       24
        
       

     

       17
       25
        
       	-- color scheme

     
···

       53
       61
        
             {

     

       54
       62
        
               "tzachar/cmp-tabnine",

     

       55
       63
        
               build="./install.sh",

     

       56
       56
       -
               config=function() require('ptero.configs.tabnine') end

     

       64
       64
       +
               config=function() require('ptero.configs.tabnine') end,

     

       65
       65
       +
               enabled=utils.CheckHostname(),

     

       57
       66
        
             },

     

       58
       67
        
       		},

     

       59
       68
        
       	},

     

       60
       69
        
       

     

       61
       70
        
         -- lsp

     

       62
       62
       -
       

     

       63
       71
        
         "neovim/nvim-lspconfig",

     

       64
       72
        
       

     

       65
       73
        
         {

     
···

       70
       78
        
           }

     

       71
       79
        
         },

     

       72
       80
        
       

     

       73
       73
       -
       

     

       74
       81
        
       	-- visual keybindings

     

       75
       75
       -
       	"folke/which-key.nvim"

     

       82
       82
       +
       	"folke/which-key.nvim",

     

       76
       83
        
       })

+17

lua/ptero/theme.lua

···

       1
       1
       +
       local colorscheme = "catppuccin"

     

       2
       2
       +
       

     

       3
       3
       +
       local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)

     

       4
       4
       +
       if not status_ok then

     

       5
       5
       +
       	vim.notify("colorscheme " .. colorscheme .. " not found")

     

       6
       6
       +
       	return

     

       7
       7
       +
       end

     

       8
       8
       +
       

     

       9
       9
       +
       require(colorscheme).setup({

     

       10
       10
       +
       	flavour = "mocha",

     

       11
       11
       +
       	transparent_background = true,

     

       12
       12
       +
       	integrations = {

     

       13
       13
       +
       		gitsigns=true,

     

       14
       14
       +
       		treesitter=true,

     

       15
       15
       +
       		which_key=true,

     

       16
       16
       +
       	},

     

       17
       17
       +
       })

+19

lua/ptero/utils.lua

···

       1
       1
       +
       local M = {}

     

       2
       2
       +
       

     

       3
       3
       +
         function M.CheckHostname()

     

       4
       4
       +
           local hostname = vim.fn.hostname()

     

       5
       5
       +
           return hostname ~= "riptide"

     

       6
       6
       +
         end

     

       7
       7
       +
       

     

       8
       8
       +
         function M.Load(name, level)

     

       9
       9
       +
           level = level or "warn"

     

       10
       10
       +
       

     

       11
       11
       +
           local ok, mod = pcall(require, name)

     

       12
       12
       +
           if not ok then

     

       13
       13
       +
             vim.notify("error loading: " .. name, level)

     

       14
       14
       +
             return

     

       15
       15
       +
           end

     

       16
       16
       +
           return mod

     

       17
       17
       +
         end

     

       18
       18
       +
       

     

       19
       19
       +
       return M