From db84ac3c37427c29a6e89b1b3933b091cf94a640 Mon Sep 17 00:00:00 2001 From: pgfm Date: Fri, 6 May 2022 09:20:16 -0500 Subject: [PATCH] In progress - need some rework of this repo but wanted to push config updates. --- i3/config | 44 ++++++++++++++++++++++---------------------- neovim/init.vim | 25 +++++++++++++++++++++++-- shell/bashrc | 9 +++++---- 3 files changed, 50 insertions(+), 28 deletions(-) diff --git a/i3/config b/i3/config index d199df4..0f90636 100644 --- a/i3/config +++ b/i3/config @@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU floating_modifier $mod # start a terminal -bindsym $mod+Return exec urxvt +bindsym $mod+Return exec alacritty # kill focused window bindsym $mod+Shift+q kill @@ -89,9 +89,9 @@ bindsym $mod+v split v bindsym $mod+f fullscreen toggle # change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking +#bindsym $mod+s layout stacking bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split +#bindsym $mod+e layout toggle split # toggle tiling / floating bindsym $mod+Shift+space floating toggle @@ -151,27 +151,27 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu # resize window (you can also use the mouse for that) mode "resize" { - # These bindings trigger as soon as you enter the resize mode + # These bindings trigger as soon as you enter the resize mode - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" } bindsym $mod+r mode "resize" @@ -179,5 +179,5 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command i3status + status_command i3status } diff --git a/neovim/init.vim b/neovim/init.vim index cff2a31..929499e 100644 --- a/neovim/init.vim +++ b/neovim/init.vim @@ -67,6 +67,9 @@ Plug 'scalameta/nvim-metals', { 'for': ['scala', 'sbt'] } " LaTeX Support Plug 'lervag/vimtex', { 'for': ['tex'] } +" Odin Support +Plug 'Tetralux/odin.vim' + " ============================================================================= " Visual enhancements " ============================================================================= @@ -74,6 +77,8 @@ Plug 'lervag/vimtex', { 'for': ['tex'] } Plug 'sainnhe/gruvbox-material' " Plug 'rebelot/kanagawa.nvim' +Plug 'nvim-lualine/lualine.nvim' + Plug 'kyazdani42/nvim-web-devicons' Plug 'folke/lsp-colors.nvim' @@ -138,6 +143,9 @@ set updatetime=200 " noinsert = do not insert text for a match until user selects one " noselect = do not select a match from the menu automatically set completeopt=menu,menuone,noinsert,noselect + +" Enable completions as you type. +let g:completion_enable_auto_popup = 1 " }} " === Indentation === {{ @@ -197,6 +205,7 @@ nnoremap Telescope find_files nnoremap ; Telescope buffers nnoremap fg Telescope live_grep nnoremap fh Telescope help_tags +nnoremap fm Telescope metals commands " Trouble bindings nnoremap xx TroubleToggle @@ -313,9 +322,11 @@ metals_config = require("metals").bare_config() metals_config.settings = { showImplicitArguments = true, - serverVersion = "0.11.1", + showInferredType = true } +metals_config.init_options.statusBarProvider = "on" + metals_config.capabilities = capabilities vim.cmd([[augroup lsp]]) @@ -330,7 +341,7 @@ EOF lua <> $log_file + "see git@git.sr.ht:~eidolon/scripts" >> "$log_file" fi fi @@ -107,7 +107,7 @@ else if $logging_enabled; then echo "[warn] SSH Agent startup code missing at " \ "'$ssh_agent_startup_file': " \ - "see git@git.sr.ht:~eidolon/scripts" >> $log_file + "see git@git.sr.ht:~eidolon/scripts" >> "$log_file" fi fi @@ -116,9 +116,10 @@ fi # ============================================================================= if command -v exa > /dev/null 2>&1; then alias ls='exa' + alias ll='exa -l' else if $logging_enabled; then - echo "[warn] exa is not setup! Using the system ls" >> $log_file + echo "[warn] exa is not setup! Using the system ls" >> "$log_file" fi fi @@ -126,7 +127,7 @@ if command -v nvim > /dev/null 2>&1; then alias vim='nvim' else if $logging_enabled; then - echo "[warn] Neovim is not setup! Using the system vim" >> $log_file + echo "[warn] Neovim is not setup! Using the system vim" >> "$log_file" fi fi