In progress - need some rework of this repo but wanted to push config updates.

This commit is contained in:
pgfm 2022-05-06 09:20:16 -05:00
parent e7a6bacc19
commit db84ac3c37
3 changed files with 50 additions and 28 deletions

View file

@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
floating_modifier $mod floating_modifier $mod
# start a terminal # start a terminal
bindsym $mod+Return exec urxvt bindsym $mod+Return exec alacritty
# kill focused window # kill focused window
bindsym $mod+Shift+q kill bindsym $mod+Shift+q kill
@ -89,9 +89,9 @@ bindsym $mod+v split v
bindsym $mod+f fullscreen toggle bindsym $mod+f fullscreen toggle
# change container layout (stacked, tabbed, toggle split) # change container layout (stacked, tabbed, toggle split)
bindsym $mod+s layout stacking #bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split #bindsym $mod+e layout toggle split
# toggle tiling / floating # toggle tiling / floating
bindsym $mod+Shift+space floating toggle 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) # resize window (you can also use the mouse for that)
mode "resize" { 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 windows width. # Pressing left will shrink the windows width.
# Pressing right will grow the windows width. # Pressing right will grow the windows width.
# Pressing up will shrink the windows height. # Pressing up will shrink the windows height.
# Pressing down will grow the windows height. # Pressing down will grow the windows height.
bindsym j resize shrink width 10 px or 10 ppt bindsym j resize shrink width 10 px or 10 ppt
bindsym k resize grow height 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 l resize shrink height 10 px or 10 ppt
bindsym semicolon resize grow width 10 px or 10 ppt bindsym semicolon resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys # same bindings, but for the arrow keys
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Down resize grow height 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 Up resize shrink height 10 px or 10 ppt
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r # back to normal: Enter or Escape or $mod+r
bindsym Return mode "default" bindsym Return mode "default"
bindsym Escape mode "default" bindsym Escape mode "default"
bindsym $mod+r mode "default" bindsym $mod+r mode "default"
} }
bindsym $mod+r mode "resize" 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 # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status status_command i3status
} }

View file

@ -67,6 +67,9 @@ Plug 'scalameta/nvim-metals', { 'for': ['scala', 'sbt'] }
" LaTeX Support " LaTeX Support
Plug 'lervag/vimtex', { 'for': ['tex'] } Plug 'lervag/vimtex', { 'for': ['tex'] }
" Odin Support
Plug 'Tetralux/odin.vim'
" ============================================================================= " =============================================================================
" Visual enhancements " Visual enhancements
" ============================================================================= " =============================================================================
@ -74,6 +77,8 @@ Plug 'lervag/vimtex', { 'for': ['tex'] }
Plug 'sainnhe/gruvbox-material' Plug 'sainnhe/gruvbox-material'
" Plug 'rebelot/kanagawa.nvim' " Plug 'rebelot/kanagawa.nvim'
Plug 'nvim-lualine/lualine.nvim'
Plug 'kyazdani42/nvim-web-devicons' Plug 'kyazdani42/nvim-web-devicons'
Plug 'folke/lsp-colors.nvim' Plug 'folke/lsp-colors.nvim'
@ -138,6 +143,9 @@ set updatetime=200
" noinsert = do not insert text for a match until user selects one " noinsert = do not insert text for a match until user selects one
" noselect = do not select a match from the menu automatically " noselect = do not select a match from the menu automatically
set completeopt=menu,menuone,noinsert,noselect set completeopt=menu,menuone,noinsert,noselect
" Enable completions as you type.
let g:completion_enable_auto_popup = 1
" }} " }}
" === Indentation === {{ " === Indentation === {{
@ -197,6 +205,7 @@ nnoremap <C-p> <cmd>Telescope find_files<cr>
nnoremap ; <cmd>Telescope buffers<cr> nnoremap ; <cmd>Telescope buffers<cr>
nnoremap <leader>fg <cmd>Telescope live_grep<cr> nnoremap <leader>fg <cmd>Telescope live_grep<cr>
nnoremap <leader>fh <cmd>Telescope help_tags<cr> nnoremap <leader>fh <cmd>Telescope help_tags<cr>
nnoremap <leader>fm <cmd>Telescope metals commands<cr>
" Trouble bindings " Trouble bindings
nnoremap <leader>xx <cmd>TroubleToggle<cr> nnoremap <leader>xx <cmd>TroubleToggle<cr>
@ -313,9 +322,11 @@ metals_config = require("metals").bare_config()
metals_config.settings = { metals_config.settings = {
showImplicitArguments = true, showImplicitArguments = true,
serverVersion = "0.11.1", showInferredType = true
} }
metals_config.init_options.statusBarProvider = "on"
metals_config.capabilities = capabilities metals_config.capabilities = capabilities
vim.cmd([[augroup lsp]]) vim.cmd([[augroup lsp]])
@ -330,7 +341,7 @@ EOF
lua <<EOF lua <<EOF
require'nvim-treesitter.configs'.setup { require'nvim-treesitter.configs'.setup {
-- One of "all", "maintained", or a list of languages -- One of "all", "maintained", or a list of languages
ensure_installed = { "c", "zig", "bash", "scala" }, ensure_installed = { "c", "zig", "bash", "scala", "yaml" },
-- Install languages synchronously (only applied to `ensure_installed`) -- Install languages synchronously (only applied to `ensure_installed`)
sync_install = false, sync_install = false,
@ -355,3 +366,13 @@ require'nvim-treesitter.configs'.setup {
} }
EOF EOF
" }} " }}
" === Lualine Configuration === {{
lua <<EOF
local lualine_gruvbox = require'lualine.themes.gruvbox'
require('lualine').setup {
options = { theme = lualine_gruvbox },
}
EOF
" }}

View file

@ -44,7 +44,7 @@ else
if $logging_enabled; then if $logging_enabled; then
echo "[warn] Custom PS1 for bash missing at " \ echo "[warn] Custom PS1 for bash missing at " \
"'$ps1_startup_file': " \ "'$ps1_startup_file': " \
"see git@git.sr.ht:~eidolon/scripts" >> $log_file "see git@git.sr.ht:~eidolon/scripts" >> "$log_file"
fi fi
fi fi
@ -107,7 +107,7 @@ else
if $logging_enabled; then if $logging_enabled; then
echo "[warn] SSH Agent startup code missing at " \ echo "[warn] SSH Agent startup code missing at " \
"'$ssh_agent_startup_file': " \ "'$ssh_agent_startup_file': " \
"see git@git.sr.ht:~eidolon/scripts" >> $log_file "see git@git.sr.ht:~eidolon/scripts" >> "$log_file"
fi fi
fi fi
@ -116,9 +116,10 @@ fi
# ============================================================================= # =============================================================================
if command -v exa > /dev/null 2>&1; then if command -v exa > /dev/null 2>&1; then
alias ls='exa' alias ls='exa'
alias ll='exa -l'
else else
if $logging_enabled; then 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
fi fi
@ -126,7 +127,7 @@ if command -v nvim > /dev/null 2>&1; then
alias vim='nvim' alias vim='nvim'
else else
if $logging_enabled; then 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
fi fi