Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ediw8311xht committed Sep 21, 2024
1 parent 783c27f commit e5a6d7d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 24 deletions.
8 changes: 4 additions & 4 deletions nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ let g:coc_enable_at_startup = v:false
let g:mapleader = " "
"let mapleader = " "
let g:maplocalleader = ","
let g:lf_map_keys = 0
let g:html_mode = 1
let g:is_bash = 1
let g:vlime_leader = "~"
let g:lf_map_keys = 0
let g:html_mode = 1
let g:is_bash = 1
let g:vlime_leader = "~"

source ${HOME}/.config/nvim/autocmd.vim
source ${HOME}/.config/nvim/plugins.vim
Expand Down
18 changes: 0 additions & 18 deletions nvim/lua/base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ local cmp_capabilities = require('cmp_nvim_lsp').default_capabilities()
lspstatus.config({
indicator_ok = 'Ok',
})

lsp_status.register_progress()

-- local hologram = require('hologram')
-- local lsp_lines = require("lsp_lines")

Expand All @@ -36,7 +34,6 @@ lsp_status.register_progress()
-- auto_display = true -- WIP automatic markdown image display, may be prone to breaking
-- }


which_key.setup({
-- notify = false,
win = {
Expand Down Expand Up @@ -97,7 +94,6 @@ which_key.setup({
},
},
})

luasnip.setup({})
cmp.setup({
-- performance = {
Expand Down Expand Up @@ -131,7 +127,6 @@ cmp.setup({
{ name = 'dotenv'},
})
})

-- cmp.setup.cmdline({ '/', '?' }, {
-- mapping = cmp.mapping.preset.cmdline(),
-- sources = {
Expand All @@ -147,8 +142,6 @@ cmp.setup({
-- }),
-- matching = { disallow_symbol_nonprefix_matching = false }
-- })


marks.setup({
default_mappings = true,
builtin_marks = {".", "<", ">", "^"},
Expand All @@ -171,7 +164,6 @@ marks.setup({
toggle = "mt",
}
})

lspsaga.setup({})
gitsigns.setup({
signs = {
Expand Down Expand Up @@ -216,12 +208,10 @@ gitsigns.setup({
col = 1
}
})

org.setup({
org_agenda_files = {'~/Documents/Dropbox/org/*', '~/Documents/my-orgs/**/*'},
org_default_notes_file = '~/Documents/Dropbox/org/refile.org',
})

-- Elixir --
elixir.setup({
nextls = {
Expand Down Expand Up @@ -256,7 +246,6 @@ elixir.setup({
"nvim-lua/plenary.nvim",
},
})

-- LSP --
lspconfig.tailwindcss.setup({
filetype = {},
Expand All @@ -270,19 +259,15 @@ lspconfig.tailwindcss.setup({
},
},
})

lspconfig.cssls.setup({
capabilities = cmp_capabilities,
})

lspconfig.html.setup({
capabilities = cmp_capabilities,
})

lspconfig.vimls.setup({
capabilities = cmp_capabilities,
})

lspconfig.lua_ls.setup({
capabilities = cmp_capabilities,
settings = {
Expand All @@ -293,7 +278,6 @@ lspconfig.lua_ls.setup({
}
},
})

lspconfig.bashls.setup({
on_attach = lsp_status.on_attach,
capabilities = cmp_capabilities,
Expand All @@ -304,12 +288,10 @@ lspconfig.bashls.setup({
}
}
})

lspconfig.pyright.setup({
on_attach = lsp_status.on_attach,
capabilities = cmp_capabilities,
})

-- lspconfig.clangd.setup({
-- cmd = {'clangd', '--background-index', '--compile-commands-dir', 'D:/systemc/excersies/build'},
-- init_options = {
Expand Down
4 changes: 2 additions & 2 deletions nvim/lua/mappings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ local regular_mappings={
{ 'n', false, '', '\\', '/\\V\\c' },
{ 'n', false, '', '\\|', '?\\V\\c' },
{ 'n', false, '', '~', '@=(foldlevel(\'.\')?\'za\':"<Space>")<CR>' },
{ 'n', true, '', ',;', ',' },
{ 'n', true, '', 'x', '"xx' },
{ '', false, '', ',;', ',' },
{ '', false, '', 'x', '"xx' },
{ 't', true, '', '<C-w>', '<C-\\><C-n>' },
{ 'v', false, '', '<C-s>', ':s/\\%V\\v' },
{ 'v', false, '', '~', 'zf' },
Expand Down
3 changes: 3 additions & 0 deletions xorg/Xresources
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ brave.BRAVE_SCALE: 1
*.bar.foreground: #000000
*.bar.font: IosevkaTerm:style=Medium:pixelsize=12:antialias=true:autohint=true

i3wm.other_monitor_2: HDMI-3
i3wm.other_monitor_2_resx: 1920
i3wm.other_monitor_2_resy: 1080
i3wm.other_monitor_1: HDMI-2
i3wm.other_monitor_1_resx: 1080
i3wm.other_monitor_1_resy: 1920
Expand Down

0 comments on commit e5a6d7d

Please sign in to comment.