small pixel drawing of a pufferfish dotfiles

*
j3s j3s@c3f.net
Mon, 19 Jul 2021 16:27:56 -0500
commit

079a90ce71aad2501823a7e0fbea5ae8d15b7a5b

parent

887f096693fc3ea040bd4382ae4ba9417930a349

4 files changed, 32 insertions(+), 13 deletions(-)

jump to
M .config/nvim/init.vim.config/nvim/init.vim

@@ -1,11 +1,20 @@

call plug#begin() Plug 'junegunn/vim-easy-align' Plug 'neovim/nvim-lspconfig' +Plug 'nvim-lua/plenary.nvim' " lua funcs i guess +Plug 'vhyrro/neorg' +Plug 'hrsh7th/nvim-compe' call plug#end() -" go LSP lua << EOF require'lspconfig'.gopls.setup{} +require'lspconfig'.terraformls.setup{} +require('neorg').setup { + load = { + ["core.defaults"] = {}, + ["core.norg.concealer"] = {}, + } +} EOF " set keybinds for go LSP - warning: disgusting

@@ -42,23 +51,22 @@ buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)

buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) - end -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches -local servers = { "gopls", "rust_analyzer" } +local servers = { "gopls", "terraformls" } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = on_attach } end EOF - " tabstops for my langs autocmd FileType sh setlocal et ts=4 sw=4 autocmd FileType go setlocal noet ts=4 sw=4 autocmd FileType python setlocal et ts=4 sw=4 autocmd FileType ruby setlocal et ts=2 sw=2 +autocmd FileType terraform setlocal et ts=2 sw=2 autocmd FileType text setlocal tw=80 autocmd FileType html setlocal et ts=2 sw=2 autocmd FileType yaml setlocal et ts=2 sw=2

@@ -67,6 +75,15 @@ augroup filetypedetect

autocmd BufRead,BufNewFile *mutt-* setfiletype mail augroup filetypedetect autocmd FileType markdown setlocal tw=80 et ts=2 sw=2 + +" terraform ft detection +" vint: -ProhibitAutocmdWithNoGroup +" By default, Vim associates .tf files with TinyFugue - tell it not to. +silent! autocmd! filetypedetect BufRead,BufNewFile *.tf +autocmd BufRead,BufNewFile *.hcl set filetype=hcl +autocmd BufRead,BufNewFile .terraformrc,terraform.rc set filetype=hcl +autocmd BufRead,BufNewFile *.tf,*.tfvars set filetype=terraform +autocmd BufRead,BufNewFile *.tfstate,*.tfstate.backup set filetype=json " bindings let mapleader = ","
M .config/sway/zora.config/sway/zora

@@ -5,8 +5,8 @@ # your displays after another 300 seconds, and turn your screens back on when

# resumed. It will also lock your screen before your computer goes to sleep. exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ - timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ + timeout 600 'swaylock -f -c 000000' \ + timeout 1200 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ before-sleep 'swaylock -f -c 000000' for_window [class="Firefox"] inhibit_idle fullscreen
M .env.env

@@ -23,19 +23,19 @@

# yep still needed if ls --version 2>&1 | grep -i gnu >/dev/null then - alias ls='ls --color=auto ' + alias ls='ls --color=auto ' elif ls --version 2>&1 | grep -i busybox >/dev/null then - alias ls='ls --color=auto ' + alias ls='ls --color=auto ' fi if [ -z "${SSH_AGENT_PID}" ] then - if ! [ -e /tmp/ssh-agent-$USER ] - then - ssh-agent 2>/dev/null >/tmp/ssh-agent-$USER - fi - . /tmp/ssh-agent-$USER >/dev/null + if ! [ -e /tmp/ssh-agent-$USER ] + then + ssh-agent 2>/dev/null >/tmp/ssh-agent-$USER + fi + . /tmp/ssh-agent-$USER >/dev/null fi # launch alacritty with no GPU support if on old thinkpad
M .profile.profile

@@ -3,5 +3,7 @@ export ENV=~/.env

export EDITOR=nvim export LANG=en_US.UTF-8 export GDK_BACKEND=wayland +# https://wiki.archlinux.org/title/Firefox#Applications_on_Wayland_can_not_launch_Firefox +export MOZ_DBUS_REMOTE=1 export XDG_CURRENT_DESKTOP=sway export CHEF_USER_NAME=jolson