Merge branch 'master' into mac

6 files changed, 48 insertions, 4 deletions

diff --git a/nvim/init.lua b/nvim/init.lua
index 4b295d5..06b973a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,3 +4,4 @@ require('lsp')
 require('plugins')
 require('colorscheme')
 require('term')
+require('vimwiki')
diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
index 4f4a489..ff04b7d 100644
--- a/nvim/lua/keymaps.lua
+++ b/nvim/lua/keymaps.lua
@@ -23,10 +23,10 @@ vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
 vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
 vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
 vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
-vim.keymap.set('n', '<leader>wh :vertical resize', '-1<CR>')
-vim.keymap.set('n', '<leader>wj :resize', '-1<CR>')
-vim.keymap.set('n', '<leader>wk :resize', '+1<CR>')
-vim.keymap.set('n', '<leader>wl :vertical resize', '+1<CR>')
+vim.keymap.set('n', '<leader>wh', ':vertical resize -1<CR>')
+vim.keymap.set('n', '<leader>wj', ':resize -1<CR>')
+vim.keymap.set('n', '<leader>wk', ':resize +1<CR>')
+vim.keymap.set('n', '<leader>wl', ':vertical resize +1<CR>')
 
 -- NerdTREE
 vim.keymap.set('n', '<leader>tt', ':NERDTreeToggle<CR>')
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index f90b09c..183a20d 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -14,6 +14,7 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
   -- LSP manager
 	{ "mason-org/mason.nvim", opts = {} },
+  "vimwiki/vimwiki",
   {
     "mason-org/mason-lspconfig.nvim",
     dependencies = {
diff --git a/nvim/lua/vimwiki.lua b/nvim/lua/vimwiki.lua
new file mode 100644
index 0000000..c7a815b
--- /dev/null
+++ b/nvim/lua/vimwiki.lua
@@ -0,0 +1,8 @@
+vim.opt.compatible = false
+
+local opts = {
+  noremap = false,
+  silent = true,
+}
+
+vim.keymap.set('n', '<leader>wx', '<Plug>VimwikiIndex', opts)
diff --git a/wireplumber/wireplumber.conf.d/51-id4.conf b/wireplumber/wireplumber.conf.d/51-id4.conf
new file mode 100644
index 0000000..c01df40
--- /dev/null
+++ b/wireplumber/wireplumber.conf.d/51-id4.conf
@@ -0,0 +1,17 @@
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        device.name = "alsa_card.usb-Audient_Audient_iD4-00"
+      }
+    ]
+    actions = {
+      update-props = {
+        api.alsa.use-acp = false,
+        device.profile = "pro-audio",
+        api.acp.auto-profile = false,
+        api.acp.auto-port = false
+      }
+    }
+  }
+]
diff --git a/wireplumber/wireplumber.conf.d/51-volt4.conf b/wireplumber/wireplumber.conf.d/51-volt4.conf
new file mode 100644
index 0000000..0c03252
--- /dev/null
+++ b/wireplumber/wireplumber.conf.d/51-volt4.conf
@@ -0,0 +1,17 @@
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        device.name = "alsa_card.usb-Universal_Audio_Volt_4_22282055004772-00"
+      }
+    ]
+    actions = {
+      update-props = {
+        api.alsa.use-acp = false,
+        device.profile = "pro-audio",
+        api.acp.auto-profile = false,
+        api.acp.auto-port = false
+      }
+    }
+  }
+]