diff options
| -rwxr-xr-x | Common/bspwm/bspwmrc | 18 | ||||
| -rw-r--r-- | Common/nvim/lua/lsp-conf.lua | 2 | ||||
| -rwxr-xr-x | Common/nvim/lua/plugins.lua | 28 | ||||
| -rw-r--r-- | Common/sxhkd/sxhkdrc | 2 | ||||
| -rw-r--r-- | linux/tmux.conf | 3 |
5 files changed, 49 insertions, 4 deletions
diff --git a/Common/bspwm/bspwmrc b/Common/bspwm/bspwmrc index 304ae7e..717e1e5 100755 --- a/Common/bspwm/bspwmrc +++ b/Common/bspwm/bspwmrc @@ -16,8 +16,24 @@ bspc config split_ratio 0.52 bspc config borderless_monocle true bspc config gapless_monocle true +bspc config focus_follows_pointer true + +bspc config automatic_scheme longest_side +bspc config single_monocle true + bspc rule -a Gimp desktop='^8' state=floating follow=on -bspc rule -a Chromium desktop='^2' bspc rule -a mplayer2 state=floating bspc rule -a Kupfer.py focus=on bspc rule -a Screenkey manage=off + +# Floating Apps +declare -a floatingApps=(xdman-Main Lxappearance Nextcloud Gparted Thunar \ +Viewnior Xarchiver Pavucontrol firefox:Dialog \ +firefox:Pop-up nitrogen Gpick) +for i in ${floatingApps[@]}; do + bspc rule -a $i state=floating focus=on follow=on; done + +declare -a floatingCust=(*:*:Picture-in-picture *:Toolkit:Picture-in-Picture mpv) +for i in ${floatingCust[@]}; do + bspc rule -a $i state=floating sticky=on follow=off focus=on \ + rectangle=500x300+1366+50; done diff --git a/Common/nvim/lua/lsp-conf.lua b/Common/nvim/lua/lsp-conf.lua index 0b494a5..60fb1d2 100644 --- a/Common/nvim/lua/lsp-conf.lua +++ b/Common/nvim/lua/lsp-conf.lua @@ -1,5 +1,5 @@ -- lsp -require("nvim-lsp-installer").setup() +require("mason").setup() local lspconfig = require'lspconfig' local coq = require "coq" diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua index 3a098a9..1f96566 100755 --- a/Common/nvim/lua/plugins.lua +++ b/Common/nvim/lua/plugins.lua @@ -154,7 +154,7 @@ return require('packer').startup(function(use) } --use 'kabouzeid/nvim-lspinstall' use { - 'williamboman/nvim-lsp-installer', + 'williamboman/mason.nvim', config = function() end, @@ -181,6 +181,32 @@ return require('packer').startup(function(use) 'ledger/vim-ledger' } + -- VimWiki stuff + use { + 'vimwiki/vimwiki', + config = function () + vim.g.vimwiki_list = { + { + path = '~/Nextcloud/wiki/P01/', + syntax = 'markdown', + ext = 'md', + --nested_syntaxes = { + -- python = 'python', + --}, + }, + { + path = '~/Nextcloud/wiki/I45', + syntax = 'markdown', + ext = 'md', + }, + } + vim.g.vimwiki_global_ext = 0 + end, + } + use { + 'mattn/calendar-vim' + } + -- packer.nvim -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/Common/sxhkd/sxhkdrc b/Common/sxhkd/sxhkdrc index 9775b11..d8fa1e1 100644 --- a/Common/sxhkd/sxhkdrc +++ b/Common/sxhkd/sxhkdrc @@ -31,7 +31,7 @@ super + alt + q # close and kill alt + F4 - bspc node -{c,k} + bspc node -c # alternate between the tiled and monocle layout super + m diff --git a/linux/tmux.conf b/linux/tmux.conf index a9d6af5..b5773f5 100644 --- a/linux/tmux.conf +++ b/linux/tmux.conf @@ -97,6 +97,9 @@ bind-key -T copy-mode-vi 'C-\' select-pane -l # -- Utility ------------------------------------------------------------------ bind-key r source-file ~/.tmux.conf +bind -n M-w display-popup -E "nvim -c VimwikiIndex -c Calendar -c 'wincmd p'" +bind -n M-l display-popup -E "nvim -c 'VimwikiMakeDiaryNote'" + # -- Theme -------------------------------------------------------------------- set -g status-justify left set -g status-interval 2 |