From e5a6d7d4a414209341505cc9bd5e6809528008a1 Mon Sep 17 00:00:00 2001 From: ediw8311xht Date: Sat, 21 Sep 2024 09:39:14 -0400 Subject: [PATCH] fix --- nvim/init.vim | 8 ++++---- nvim/lua/base.lua | 18 ------------------ nvim/lua/mappings.lua | 4 ++-- xorg/Xresources | 3 +++ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index da19408..0b64c06 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -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 diff --git a/nvim/lua/base.lua b/nvim/lua/base.lua index 18401f2..fe0708b 100644 --- a/nvim/lua/base.lua +++ b/nvim/lua/base.lua @@ -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") @@ -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 = { @@ -97,7 +94,6 @@ which_key.setup({ }, }, }) - luasnip.setup({}) cmp.setup({ -- performance = { @@ -131,7 +127,6 @@ cmp.setup({ { name = 'dotenv'}, }) }) - -- cmp.setup.cmdline({ '/', '?' }, { -- mapping = cmp.mapping.preset.cmdline(), -- sources = { @@ -147,8 +142,6 @@ cmp.setup({ -- }), -- matching = { disallow_symbol_nonprefix_matching = false } -- }) - - marks.setup({ default_mappings = true, builtin_marks = {".", "<", ">", "^"}, @@ -171,7 +164,6 @@ marks.setup({ toggle = "mt", } }) - lspsaga.setup({}) gitsigns.setup({ signs = { @@ -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 = { @@ -256,7 +246,6 @@ elixir.setup({ "nvim-lua/plenary.nvim", }, }) - -- LSP -- lspconfig.tailwindcss.setup({ filetype = {}, @@ -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 = { @@ -293,7 +278,6 @@ lspconfig.lua_ls.setup({ } }, }) - lspconfig.bashls.setup({ on_attach = lsp_status.on_attach, capabilities = cmp_capabilities, @@ -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 = { diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index b7312c3..009ff01 100755 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -37,8 +37,8 @@ local regular_mappings={ { 'n', false, '', '\\', '/\\V\\c' }, { 'n', false, '', '\\|', '?\\V\\c' }, { 'n', false, '', '~', '@=(foldlevel(\'.\')?\'za\':"")' }, - { 'n', true, '', ',;', ',' }, - { 'n', true, '', 'x', '"xx' }, + { '', false, '', ',;', ',' }, + { '', false, '', 'x', '"xx' }, { 't', true, '', '', '' }, { 'v', false, '', '', ':s/\\%V\\v' }, { 'v', false, '', '~', 'zf' }, diff --git a/xorg/Xresources b/xorg/Xresources index 2f2c842..a509ad3 100644 --- a/xorg/Xresources +++ b/xorg/Xresources @@ -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