Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
glepnir committed Dec 4, 2024
1 parent 3c49d44 commit 94381fe
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 31 deletions.
3 changes: 2 additions & 1 deletion colors/solarized.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- violet #6c71c4
local colors = {
base04 = '#00202b',
base03 = '#002936',
base03 = '#002838',
base02 = '#073642',
base01 = '#586e75',
base00 = '#657b83',
Expand Down Expand Up @@ -73,6 +73,7 @@ local function load_solarized()
shl('Title', { fg = colors.orange })
shl('WildMenu', { fg = colors.base2, bg = colors.base02, reverse = true })
shl('Folded', { bg = colors.base02, fg = colors.base0 })
shl('ErrorMsg', { fg = colors.red })

-- Treesitter highlights
shl('@function', { fg = colors.blue })
Expand Down
48 changes: 23 additions & 25 deletions lua/core/options.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
local api, opt = vim.api, vim.opt
local opt = vim.opt

opt.hidden = true
opt.magic = true
opt.virtualedit = 'block'
opt.clipboard = 'unnamedplus'
opt.virtualedit = "block"
opt.clipboard = "unnamedplus"
opt.wildignorecase = true
opt.swapfile = false

Expand All @@ -19,9 +19,9 @@ opt.smartcase = true
opt.infercase = true
opt.cursorline = true

opt.completeopt = 'menu,menuone,noinsert,fuzzy,popup'
opt.completeopt = "menu,menuone,noinsert,fuzzy,popup"
opt.showmode = false
opt.shortmess = 'aoOTIcF'
opt.shortmess = "aoOTIcF"
opt.scrolloff = 2
opt.sidescrolloff = 5
opt.ruler = false
Expand All @@ -34,9 +34,7 @@ opt.laststatus = 3
opt.list = true

--eol:¬
opt.listchars = 'tab:» ,nbsp:+,trail:·,extends:→,precedes:←,'
opt.pumblend = 10
opt.winblend = 0
opt.listchars = "tab:» ,nbsp:+,trail:·,extends:→,precedes:←,"
opt.undofile = true

opt.smarttab = true
Expand All @@ -46,29 +44,29 @@ opt.tabstop = 2
opt.shiftwidth = 2

opt.foldlevelstart = 99
opt.foldmethod = 'marker'
opt.foldmethod = "marker"

opt.splitright = true
opt.wrap = false

opt.number = true
opt.signcolumn = 'yes'
opt.spelloptions = 'camel'
opt.signcolumn = "yes"
opt.spelloptions = "camel"

opt.textwidth = 80
opt.colorcolumn = '+0'
opt.colorcolumn = "+0"

if vim.uv.os_uname().sysname == 'Darwin' then
vim.g.clipboard = {
name = 'macOS-clipboard',
copy = {
['+'] = 'pbcopy',
['*'] = 'pbcopy',
},
paste = {
['+'] = 'pbpaste',
['*'] = 'pbpaste',
},
cache_enabled = 0,
}
if vim.uv.os_uname().sysname == "Darwin" then
vim.g.clipboard = {
name = "macOS-clipboard",
copy = {
["+"] = "pbcopy",
["*"] = "pbcopy",
},
paste = {
["+"] = "pbpaste",
["*"] = "pbpaste",
},
cache_enabled = 0,
}
end
2 changes: 1 addition & 1 deletion lua/internal/completion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ au('LspAttach', {
callback = function(args)
local bufnr = args.buf
local client = lsp.get_client_by_id(args.data.client_id)
if not client or not client.supports_method('textDocument/completion') then
if not client or not client:supports_method('textDocument/completion') then
return
end

Expand Down
3 changes: 2 additions & 1 deletion lua/keymap/remap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ map.n('gs', function()
relative = 'editor',
row = 5,
width = width,
height = 1,
height = 4,
col = math.floor(vim.o.columns / 2) - math.floor(width / 2),
border = 'rounded',
title = 'Google Search',
Expand All @@ -170,6 +170,7 @@ map.n('gs', function()
vim.wo[winid].number = false
vim.wo[winid].stc = ''
vim.wo[winid].lcs = 'trail: '
vim.wo[winid].wrap = true
vim.fn.prompt_setcallback(bufnr, function(text)
vim.ui.open(('https://google.com/search?q=%s'):format(vim.trim(text)))
api.nvim_win_close(winid, true)
Expand Down
1 change: 1 addition & 0 deletions lua/modules/lsp/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ local servers = {
'jsonls',
'ts_ls',
'eslint',
'ruff',
-- 'basics_ls',
}

Expand Down
3 changes: 1 addition & 2 deletions lua/modules/tools/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ function config.template_nvim()
author = 'glepnir',
email = '[email protected]',
})
require('telescope').load_extension('find_template')
end

function config.guard()
Expand All @@ -19,7 +18,7 @@ function config.guard()

ft('lua'):fmt({
cmd = 'stylua',
args = { '-' },
args = { '--stdin-filepath', './dummy', '-' },
stdin = true,
ignore_patterns = 'function.*_spec%.lua',
find = '.stylua.toml',
Expand Down
1 change: 0 additions & 1 deletion lua/modules/tools/package.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ packadd({
packadd({
'nvimdev/guard.nvim',
ft = program_ft,
dev = true,
config = conf.guard,
dependencies = {
{ 'nvimdev/guard-collection' },
Expand Down

0 comments on commit 94381fe

Please sign in to comment.