Update dots

2020-11-23 18:14:02 +01:00
parent 09f6976477
commit 803c35ca38
6 changed files with 85 additions and 83 deletions
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -11,7 +11,7 @@ set $mod Mod4
 floating_modifier $mod

 # Font for Window Titles
-font pango:Product Sans 8
+font pango:Product Sans 10

 # ============================== Keybinds (except workspaces)
 #Terminal
@@ -79,6 +79,7 @@ bindsym $mod+e exec thunar

 bindsym $mod+Ctrl+c exec google-calendar-dark
 bindsym $mod+Ctrl+d exec discord; exec Discord
+bindsym $mod+Ctrl+Shift+d exec pkill discord; exec pkill Discord
 bindsym $mod+Ctrl+f exec firefox
 bindsym $mod+Ctrl+m exec thunderbird
 bindsym $mod+Ctrl+n exec notion-app
@@ -156,8 +157,8 @@ set $border "#98c379"

 # Class                 Border  Backgr. Text    Indic.  Child_border
 client.focused          $border $border #000000 $border $border
-client.focused_inactive $termbg $termbg $border $termbg $termbg
-client.unfocused        $termbg $termbg $border $termbg $termbg
+client.focused_inactive $border $termbg #ffffff $termbg $termbg
+client.unfocused        $termbg $termbg #ffffff $termbg $termbg
 client.urgent           $red    $red    $border $red    $red
 client.background       $border

--- a/files/.config/nvim/lua/marc/completion.lua
+++ b/files/.config/nvim/lua/marc/completion.lua
@@ -0,0 +1,44 @@
+-- TODO: Migrate this to https://github.com/neovim/neovim/pull/12378 once merged
+vim.cmd("autocmd BufEnter * lua require'completion'.on_attach()")
+
+-- Use <Tab> and <S-Tab> to navigate through popup menu
+vim.api.nvim_set_keymap("i", "<expr><Tab>", "pumvisible() ? \"\\<C-n>\" : \"\\<Tab>\"", { noremap = true })
+vim.api.nvim_set_keymap("i", "<expr><S-Tab>", "pumvisible() ? \"\\<C-p>\" : \"\\<S-Tab>\"", { noremap = true })
+
+vim.api.nvim_set_option("completeopt", "menuone,noinsert,noselect")
+
+-- Default + c to avoid showing extra messages when using completion
+vim.api.nvim_set_option("shortmess", "filnxtToOFc")
+
+-- Trigger instantly
+vim.api.nvim_set_var("completion_trigger_keyword_length", 1)
+
+-- Ignore case for matching
+vim.api.nvim_set_var("completion_matching_ignore_case", 1)
+
+-- Also trigger completion on delete
+vim.api.nvim_set_var("completion_trigger_on_delete", 1)
+
+-- Use Neosnippet as snippet provider
+vim.api.nvim_set_var("completion_enable_snippet", 'Neosnippet')
+
+-- Neosnippet expansion bindings
+vim.api.nvim_set_keymap("i", "<C-k>", "<Plug>(neosnippet_expand_or_jump)", {})
+vim.api.nvim_set_keymap("s", "<C-k>", "<Plug>(neosnippet_expand_or_jump)", {})
+vim.api.nvim_set_keymap("x", "<C-k>", "<Plug>(neosnippet_expand_target)", {})
+
+-- Always do smart case matching
+vim.api.nvim_set_var("g:completion_matching_smart_case", 1)
+
+vim.api.nvim_set_var("completion_chain_complete_list", {
+    default = {
+        default = {
+            {complete_items= {'lsp','snippet','path'}},
+            {mode= '<c-p>'},
+            {mode= '<c-n>'}},
+        }
+    }
+)
+
+-- Limit the amount of completion suggestions to 10
+vim.api.nvim_set_option("pumheight", 10)
--- a/files/.config/nvim/lua/marc/lsp.lua
+++ b/files/.config/nvim/lua/marc/lsp.lua
@@ -0,0 +1,24 @@
+if vim.api.nvim_eval("executable('pyls')") then
+	require'lspconfig'.pyls.setup{}
+end
+
+if vim.api.nvim_eval("executable('rust-analyzer')") then
+	require'lspconfig'.rust_analyzer.setup{}
+end
+
+if vim.api.nvim_eval("executable('texlab')") then
+	require'lspconfig'.texlab.setup{}
+end
+
+if vim.api.nvim_eval("isdirectory($HOME. '/.cache/nvim/lspconfig/jdtls')") then
+	require'lspconfig'.jdtls.setup{}
+end
+
+-- g(o) d(efinition)
+vim.api.nvim_set_keymap("n", "gd" , "<cmd>lua vim.lsp.buf.definition()<CR>", { noremap = true, silent = true })
+-- g(o) r(eference)
+vim.api.nvim_set_keymap("n", "gr" , "<cmd>lua vim.lsp.buf.references()<CR>", { noremap = true, silent = true })
+-- K for hover information
+vim.api.nvim_set_keymap("n", "K" , "<cmd>lua vim.lsp.buf.hover()<CR>", { noremap = true, silent = true })
+-- s(how) d(iagnostics)
+vim.api.nvim_set_keymap("n", "<leader>sd", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", { noremap = true})
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -74,7 +74,7 @@ ws-icon-8 = 9;九
 ws-icon-9 = 10;十

 label-focused = "%icon%"
-label-focused-foreground = ${colors.accent}
+label-focused-foreground = ${colors.accent-alt}
 label-focused-padding = 2

 label-unfocused = "%icon%"
@@ -85,6 +85,7 @@ label-visible-padding = 2

 label-urgent = "%icon%"
 label-urgent-background = ${colors.urgent}
+label-urgent-foreground = ${colors.background}
 label-urgent-padding = 2

 label-mode = "%mode%"
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -37,15 +37,15 @@ endif

 call plug#end()

-""" ============================== Colors
+" ============================== Colors
 syntax on
 set background=dark
 colorscheme onedark
 hi Normal ctermbg=NONE guibg=NONE
 set termguicolors
-filetype indent plugin on

 " ============================== General
+filetype indent plugin on
 set number
 set relativenumber
 set cursorline
@@ -127,82 +127,13 @@ cmap W w
 cmap q1 q!

 " fzf
-nmap <C-f> :Files<CR>
+nmap <leader>ff :Files<CR>
+nmap <leader>ft :tabe<CR>:Files<CR>

-" ============================== LSP
-
-" ---------- completion-nvim Settings
+" ============================== Cool NeoVim Shit
 if has ("nvim")
-    " Use completion-nvim in every buffer
-    autocmd BufEnter * lua require'completion'.on_attach()
+    " setup lsp configs
+    lua require'marc.lsp'

-    " Use <Tab> and <S-Tab> to navigate through popup menu
-    inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
-    inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
-
-    " Set completeopt to have a better completion experience
-    set completeopt=menuone,noinsert,noselect
-
-    " Avoid showing message extra message when using completion
-    set shortmess+=c
-
-    let g:completion_trigger_keyword_length = 1
-    let g:completion_matching_ignore_case = 1
-    let g:completion_trigger_on_delete = 1
-
-    let g:completion_enable_snippet = 'Neosnippet'
-
-    let g:completion_chain_complete_list = {
-    \ 'default' : {
-    \   'default': [
-    \       {'complete_items': ['lsp', 'snippet', 'path']},
-    \       {'mode': '<c-p>'},
-    \       {'mode': '<c-n>'}],
-    \   }
-    \}
-
-    set pumheight=10
-endif
-
-" ---------- lsp Settings
-if has ("nvim")
-    " Show definition
-    nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
-    " Go to references
-    nnoremap <silent> gr  <cmd>lua vim.lsp.buf.references()<CR>
-    nnoremap <silent> K   <cmd>lua vim.lsp.buf.hover()<CR>
-endif
-
-" ---------- neosnippet Settings
-if has ("nvim")
-    imap <C-k> <Plug>(neosnippet_expand_or_jump)
-    smap <C-k> <Plug>(neosnippet_expand_or_jump)
-    xmap <C-k> <Plug>(neosnippet_expand_target)
-endif
-
-" ---------- Enable Language Servers
-if has ("nvim")
-    if executable("pyls")
-        lua << EOF
-        require'nvim_lsp'.pyls.setup{}
-EOF
-    endif
-
-    if executable("rust-analyzer")
-        lua << EOF
-        require'nvim_lsp'.rust_analyzer.setup{}
-EOF
-    endif
-
-    if executable("texlab")
-        lua << EOF
-        require'nvim_lsp'.texlab.setup{}
-EOF
-    endif
-
-    if isdirectory($HOME. "/.cache/nvim/nvim_lsp/jdtls")
-        lua << EOF
-        require'nvim_lsp'.jdtls.setup{}
-EOF
-    endif
+    lua require'marc.completion'
 endif
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -38,9 +38,10 @@ export PATH=$PATH:$HOME/.local/bin:$HOME/scripts:$HOME/.cargo/bin
 alias fontslist="fc-list :scalable=true:spacing=mono: family"
 alias fontscache="fc-cache -f -v"

-if [[ -x $(which nvim 2> /dev/null) ]]; then
+#if [[ -x $(which nvim 2> /dev/null) ]]; then
    alias vim="nvim"
-fi
+    alias vim="~/neovim-nightly/bin/nvim"
+#fi

 # im either using manjaro or fedora
 if [[ -f "/etc/manjaro-release" ]]; then