nvim: added a lisp-lsp, but honestly no idea what i did in plugins.lua; aliasrc: removed most of the emerge aliases; profile: changed $BROWSER; zathura: changed next-/previous-page keybinds; zshrc: added edit-command-line; ncmpcpp: removed visualiser

9 files changed, 57 insertions, 47 deletions

diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua
index 2fdd6e2..53fbe43 100644
--- a/.config/nvim/lua/user/options.lua
+++ b/.config/nvim/lua/user/options.lua
@@ -22,4 +22,3 @@ vim.o.foldmethod = "expr"
 vim.o.foldlevelstart = 10
 vim.o.foldexpr = "nvim_treesitter#foldexpr()"
 vim.o.hlsearch = 0
-vim.o.colorcolumn = "80"
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 07f8f42..53823f8 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -99,4 +99,9 @@ require('packer').startup(function()
             require('user.plugins.luasnip')
         end
     }
+    use {'nvim-orgmode/orgmode',
+        config = function()
+            require('user.plugins.orgmode')
+        end
+    }
 end)
diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua
index 43274fa..82b85b8 100644
--- a/.config/nvim/lua/user/plugins/lspconfig.lua
+++ b/.config/nvim/lua/user/plugins/lspconfig.lua
@@ -23,7 +23,7 @@ local on_attach = function(_, bufnr)
     buf_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>')
     buf_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>')
     buf_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>')
-    buf_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
+    buf_keymap(bufnr, 'n', '<C-K>', '<cmd>lua vim.lsp.buf.signature_help()<CR>')
     buf_keymap(bufnr, 'n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>')
     buf_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>')
     buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references<CR>')
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 713ebc9..2616c59 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -183,6 +183,12 @@ _G.packer_plugins = {
     path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
+  orgmode = {
+    config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0" },
+    loaded = true,
+    path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/orgmode",
+    url = "https://github.com/nvim-orgmode/orgmode"
+  },
   ["packer.nvim"] = {
     loaded = true,
     path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim",
@@ -247,14 +253,22 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: nvim-autopairs
-time([[Config for nvim-autopairs]], true)
-try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
-time([[Config for nvim-autopairs]], false)
+-- Config for: telescope.nvim
+time([[Config for telescope.nvim]], true)
+try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim")
+time([[Config for telescope.nvim]], false)
+-- Config for: nvim-cmp
+time([[Config for nvim-cmp]], true)
+try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp")
+time([[Config for nvim-cmp]], false)
 -- Config for: nvim-treesitter
 time([[Config for nvim-treesitter]], true)
 try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter")
 time([[Config for nvim-treesitter]], false)
+-- Config for: lualine.nvim
+time([[Config for lualine.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim")
+time([[Config for lualine.nvim]], false)
 -- Config for: nvim-ts-autotag
 time([[Config for nvim-ts-autotag]], true)
 try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag")
@@ -263,30 +277,26 @@ time([[Config for nvim-ts-autotag]], false)
 time([[Config for nvim-lspconfig]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig")
 time([[Config for nvim-lspconfig]], false)
--- Config for: lualine.nvim
-time([[Config for lualine.nvim]], true)
-try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim")
-time([[Config for lualine.nvim]], false)
--- Config for: nvim-tree.lua
-time([[Config for nvim-tree.lua]], true)
-try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua")
-time([[Config for nvim-tree.lua]], false)
--- Config for: LuaSnip
-time([[Config for LuaSnip]], true)
-try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip")
-time([[Config for LuaSnip]], false)
--- Config for: telescope.nvim
-time([[Config for telescope.nvim]], true)
-try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim")
-time([[Config for telescope.nvim]], false)
+-- Config for: orgmode
+time([[Config for orgmode]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0", "config", "orgmode")
+time([[Config for orgmode]], false)
 -- Config for: dracula
 time([[Config for dracula]], true)
 try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula")
 time([[Config for dracula]], false)
--- Config for: nvim-cmp
-time([[Config for nvim-cmp]], true)
-try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp")
-time([[Config for nvim-cmp]], false)
+-- Config for: LuaSnip
+time([[Config for LuaSnip]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip")
+time([[Config for LuaSnip]], false)
+-- Config for: nvim-tree.lua
+time([[Config for nvim-tree.lua]], true)
+try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua")
+time([[Config for nvim-tree.lua]], false)
+-- Config for: nvim-autopairs
+time([[Config for nvim-autopairs]], true)
+try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
+time([[Config for nvim-autopairs]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 07c75bf..330bb8a 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -15,13 +15,17 @@ alias cn='clear;neofetch'
 alias nnn='nnn -Hde'
 alias ea='vi ~/.config/shell/aliasrc'
 alias ez='vi ~/.config/zsh/.zshrc'
+alias eq='equery'
 alias cam='mpv --profile=low-latency --untimed /dev/video0'
 
+# need to sign hid-nintendo.ko with every kernel update
+alias signmod='doas /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509'
+
 # rename files in pwd in their current order to 4-digit numbers
 alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done'
 
 # start freyr docker image to download music from spotify
-alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev'
+#alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev'
 
 # set my preferred keyboard options
 alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"'
@@ -126,10 +130,3 @@ alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias dcomm='dfiles commit -m'
 alias dpush='dfiles push origin'
 
-## PACKAGE MANAGER
-
-alias eq='equery'
-alias emin='doas emerge -av'
-alias emrm='doas emerge -avc'
-alias emup='doas emerge -avuND @world'
-alias ems='emerge -s'
diff --git a/.config/shell/profile b/.config/shell/profile
index eca8c75..b26003f 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -3,7 +3,7 @@ umask 0077
 export _JAVA_AWT_WM_NONREPARENTING=1
 export EDITOR="nvim"
 export TERMINAL="st"
-export BROWSER="icecat"
+export BROWSER="nyxt"
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
@@ -26,3 +26,5 @@ export EIX_LIMIT=0
 export EIX_LIMIT_COMPACT=0
 
 export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin"
+
+neofetch
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 5836bc0..6ea7831 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -6,13 +6,13 @@ set selection-clipboard clipboard
 
 map u scroll half-up
 map d scroll half-down
-map J scroll full-down
-map K scroll full-up
+map n scroll full-down
+map p scroll full-up
 map D toggle_page_mode
 map r reload
 map R rotate
 map i recolor
-map p print
+map ^p print
 map g goto top
 
 #stop at page boundries
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index e1884a3..378ce10 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -4,6 +4,7 @@ stty stop undef
 setopt no_nomatch
 
 autoload -U compinit
+autoload -U edit-command-line
 autoload -Uz vcs_info
 precmd() { vcs_info }
 zstyle ':completion:*' menu select
@@ -12,6 +13,8 @@ zmodload zsh/complist
 compinit
 _comp_options+=(globdots)
 
+zle -N edit-command-line
+
 setopt PROMPT_SUBST
 
 # use emacs keybindings
@@ -20,6 +23,8 @@ bindkey -e
 # fix del key just inserting a tilde
 bindkey "^[[3~" delete-char
 
+bindkey '^x^e' edit-command-line
+
 PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b '
 
 setopt extendedGlob
@@ -68,8 +73,6 @@ if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then
 	. $XDG_CONFIG_HOME/nnn/nnn.bash
 fi
 
-neofetch
-
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 #[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index a9d016f..8d3f5dd 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -18,6 +18,7 @@ follow_now_playing_lyrics = yes
 lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, internet
 
 # UI and colors
+external_editor = nvim
 colors_enabled = yes
 current_item_prefix = $(blue)$r
 current_item_suffix = $/r$(end)
@@ -38,10 +39,3 @@ now_playing_prefix = "> "
 centered_cursor = yes
 display_bitrate = yes
 enable_window_title = yes
-
-# Visualizer
-visualizer_data_source = /tmp/mpd.fifo
-visualizer_output_name = Visualizer feed
-visualizer_in_stereo = yes
-visualizer_type = spectrum
-visualizer_look = +|