diff --git a/.config/alacritty.yml b/.config/alacritty.yml index ffb13a1..aace889 100644 --- a/.config/alacritty.yml +++ b/.config/alacritty.yml @@ -32,13 +32,13 @@ colors: white: '#E6EEF3' font: - size: 9 + size: 12 normal: family: Cozette window: padding: - x: 20 - y: 20 + x: 25 + y: 25 background_opacity: 0.85 diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index a44a3f7..5f2a897 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -11,13 +11,8 @@ set cursorline " plugins call plug#begin() Plug 'sainnhe/sonokai' -Plug 'neovim/nvim-lspconfig' Plug 'preservim/nerdtree' Plug 'vim-airline/vim-airline' -Plug 'hrsh7th/nvim-cmp' -Plug 'hrsh7th/cmp-nvim-lsp' -Plug 'saadparwaiz1/cmp_luasnip' -Plug 'L3MON4D3/LuaSnip' Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} call plug#end() @@ -50,89 +45,9 @@ let g:NERDTreeQuitOnOpen = 1 let g:NERDTreeDirArrowExpandable = '>' let g:NERDTreeDirArrowCollapsible = '<' -" LSP stuff +" treesitter lua << EOF -local nvim_lsp = require('lspconfig') -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - local opts = { noremap=true, silent=true } - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) -end -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) - -nvim_lsp.clangd.setup { - on_attach = on_attach; - capabilities = capabilities; -} -nvim_lsp.rust_analyzer.setup { - on_attach = on_attach; - capabilities = capabilities; -} - -vim.o.completeopt = 'menuone,noselect' -local luasnip = require 'luasnip' -local cmp = require 'cmp' -cmp.setup { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, - }, - [''] = function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, - [''] = function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - }, -} require'nvim-treesitter.configs'.setup { ensure_installed = { "c", "toml" }, highlight = { diff --git a/.config/picom.conf b/.config/picom.conf index d760aab..c7ba4da 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -3,10 +3,8 @@ ################################# backend = "glx"; glx-no-stencil = true; -glx-no-rebind-pixmap = true; vsync = true; xrender-sync-fence = "true"; -glx-swap-method = -1; unredir-if-possible = true; ################################# @@ -25,16 +23,6 @@ shadow-ignore-shaped = false; inactive-opacity = 0.9; active-opacity = 1; inactive-opacity-override = false; -blur-background = true; -blur-background-frame = true; -blur-background-fixed = true; -blur-background-exclude = [ - "window_type = 'dock'", - "window_type = 'desktop'" -]; -blur-kern = "3x3box"; -blur-method = "kernel"; -blur-strength = 10; ################################# # Fading @@ -45,6 +33,6 @@ wintypes: { dock = { shadow = false; } dnd = { shadow = false; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } + popup_menu = { opacity = 0.9; } + dropdown_menu = { opacity = 0.9; } } diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index 2e67271..a1f8ce4 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -3,7 +3,7 @@ configuration{ lines: 10; font: "Cozette 9"; show-icons: true; - terminal: "urxvt"; + terminal: "alacritty"; drun-display-format: "{icon} {name}"; display-drun: " > "; location: 0;