diff --git a/.gitmodules b/.gitmodules index 92b311a..de5f040 100644 --- a/.gitmodules +++ b/.gitmodules @@ -113,3 +113,6 @@ [submodule "editors/nvim/site/pack/qol/start/vim-fugitive"] path = editors/nvim/site/pack/qol/start/vim-fugitive url = https://github.com/tpope/vim-fugitive.git +[submodule "editors/nvim/site/pack/qol/start/vim-startuptime"] + path = editors/nvim/site/pack/qol/start/vim-startuptime + url = https://github.com/dstein64/vim-startuptime.git diff --git a/editors/nvim/config/init.lua b/editors/nvim/config/init.lua index 6416005..a4ad24a 100644 --- a/editors/nvim/config/init.lua +++ b/editors/nvim/config/init.lua @@ -1,6 +1,7 @@ require('keymap') require('plugins') require('calcurse') +require('i3conf') -- prevent cursor override vim.cmd('set guicursor=') diff --git a/editors/nvim/config/lua/i3conf.lua b/editors/nvim/config/lua/i3conf.lua new file mode 100644 index 0000000..dd69d68 --- /dev/null +++ b/editors/nvim/config/lua/i3conf.lua @@ -0,0 +1,6 @@ +-- recognize i3 config from dotfiles +-- +vim.api.nvim_create_autocmd({"BufRead","BufNewFile"}, { + pattern = {"*/i3/*.conf"}, + command = "set filetype=i3config", +}) diff --git a/editors/nvim/config/spell/en.utf-8.add b/editors/nvim/config/spell/en.utf-8.add index 1e36f18..dac80cf 100644 --- a/editors/nvim/config/spell/en.utf-8.add +++ b/editors/nvim/config/spell/en.utf-8.add @@ -1,2 +1,5 @@ L2 L3 +Pset +Kalynn +Appt diff --git a/editors/nvim/config/spell/en.utf-8.add.spl b/editors/nvim/config/spell/en.utf-8.add.spl index 0bb70cc..7ea7764 100644 Binary files a/editors/nvim/config/spell/en.utf-8.add.spl and b/editors/nvim/config/spell/en.utf-8.add.spl differ diff --git a/editors/nvim/site/pack/qol/start/vim-startuptime b/editors/nvim/site/pack/qol/start/vim-startuptime new file mode 160000 index 0000000..6580cf5 --- /dev/null +++ b/editors/nvim/site/pack/qol/start/vim-startuptime @@ -0,0 +1 @@ +Subproject commit 6580cf539c33a212f4f5542068a3b4dd2b3ad834 diff --git a/gui/i3/base.conf b/gui/i3/base.conf index 6aefc5f..5ccbae7 100644 --- a/gui/i3/base.conf +++ b/gui/i3/base.conf @@ -29,8 +29,8 @@ exec --no-startup-id i3-msg "workspace 2; exec brave" # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause @@ -57,10 +57,10 @@ for_window [instance="spotify"] move window to scratchpad for_window [instance="wiki"] move window to scratchpad for_window [instance="scratch"] move window to scratchpad # bindings -bindsym $mod+s exec i3-scratchpad.sh todo st -n todo -e vim ~/vimwiki/todo/index.md +bindsym $mod+s exec i3-scratchpad.sh todo st -n todo -e nvim ~/vimwiki/todo/index.md bindsym $mod+c exec i3-scratchpad.sh cal st -n cal -e calcurse bindsym $mod+m exec i3-scratchpad.sh spotify spotify -bindsym $mod+w exec i3-scratchpad.sh wiki st -n wiki -e vim ~/vimwiki/index.md +bindsym $mod+w exec i3-scratchpad.sh wiki st -n wiki -e nvim ~/vimwiki/index.md # change focus bindsym $mod+h focus left