diff options
| -rw-r--r-- | hypr/hyprland.conf | 2 | ||||
| -rw-r--r-- | hypr/hyprlock.conf | 2 | ||||
| -rw-r--r-- | hypr/hyprscratch.conf | 1 | ||||
| -rw-r--r-- | nvim/init.lua | 1 | ||||
| -rw-r--r-- | nvim/lua/keymaps.lua | 8 | ||||
| -rw-r--r-- | nvim/lua/plugins.lua | 9 | ||||
| -rw-r--r-- | nvim/lua/vimwiki.lua | 10 | ||||
| -rw-r--r-- | sh/aliases | 6 | ||||
| -rw-r--r-- | waybar/style.css | 2 | ||||
| -rw-r--r-- | wireplumber/wireplumber.conf.d/51-id4.conf | 17 | ||||
| -rw-r--r-- | wireplumber/wireplumber.conf.d/51-volt4.conf | 17 | ||||
| -rw-r--r-- | zsh/.zshrc | 9 |
12 files changed, 73 insertions, 11 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index fdc7050..eb3af20 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -32,6 +32,7 @@ exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources #exec-once = com.github.wwmm.easyeffects exec-once = dunst exec-once = hypridle +exec-once = xwayland-satellite :1 #exec-once = mpd #}}} @@ -41,6 +42,7 @@ env = HYPRCURSOR_THEME,theme_BreezeX-Black env = HYPRCURSOR_SIZE,32 env = XCURSOR_THEME,BreezeX-Black env = XCURSOR_SIZE,32 +env = DISPLAY=:1 #}}} # Source a file (multi-file configs) diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 2ec72d3..8ee636d 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -41,7 +41,7 @@ input-field { check_color = rgb(204, 136, 34) fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty - fail_transition = 300 # transition time in ms between normal outer_color and fail_color + #fail_transition = 300 # transition time in ms between normal outer_color and fail_color capslock_color = -1 numlock_color = -1 bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf index 4274dcd..9f305db 100644 --- a/hypr/hyprscratch.conf +++ b/hypr/hyprscratch.conf @@ -1,5 +1,6 @@ # Optional globals that apply to all scratchpads daemon_options = clean +daemon_options = eager global_rules = size 50% 50% 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..3684b89 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -14,6 +14,15 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ -- LSP manager { "mason-org/mason.nvim", opts = {} }, + {"vimwiki/vimwiki", + init = function() + vim.g.vimwiki_list = { + { + path = '~/.local/share/vimwiki' + }, + } + end, + }, { "mason-org/mason-lspconfig.nvim", dependencies = { diff --git a/nvim/lua/vimwiki.lua b/nvim/lua/vimwiki.lua new file mode 100644 index 0000000..43b8aa6 --- /dev/null +++ b/nvim/lua/vimwiki.lua @@ -0,0 +1,10 @@ +-- Required for Vimwiki to work +vim.opt.compatible = false + +-- Vimwiki Keybindings +local opts = { + noremap = false, + silent = true, +} + +vim.keymap.set('n', '<leader>wx', '<Plug>VimwikiIndex', opts) @@ -19,10 +19,10 @@ case `uname -s` in ;; "Linux") #alias ls="ls -h $COLOR_FLAGS_GNU" - alias ls="eza" + type eza >/dev/null && alias ls="eza" ;; "Darwin") - alias ls="eza --color" + type eza >/dev/null && alias ls="eza --color" ;; esac alias ll='ls -l' @@ -44,7 +44,7 @@ case `uname -s` in alias rm='rm -i' ;; "Linux") - alias rm='trash-put' + type trash-put >/dev/null && alias rm='trash-put' ;; esac alias cp='cp -i' diff --git a/waybar/style.css b/waybar/style.css index 599e6af..04a1c3e 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -14,7 +14,7 @@ window#waybar { color: #ffffff; transition-property: background-color; transition-duration: .5s; - background: rgba(0, 0, 0, 0.2); + background: rgba(0, 0, 0, 0.4); } window#waybar.hidden { 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 + } + } + } +] @@ -41,13 +41,18 @@ bindkey "${key[End]}" end-of-line bindkey "${key[PageUp]}" history-substring-search-up bindkey "${key[PageDown]}" history-substring-search-down +[ -f "$ZDOTDIR/.zsh_theme" ] && . "$ZDOTDIR/.zsh_theme" +COLOR1="${COLOR1:-002}" +COLOR2="${COLOR2:-006}" +COLORV="${COLORV:-012}" + if (env | grep -Fq 'DISTROBOX'); then MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f ' else - MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f ' + MYPROMPT=$'%F{000}%K{'"$COLOR1"$'}[%n@%m]%F{'"$COLOR2"$'}\UE0B2%K{'"$COLOR2"$'}%F{000}%~%F{'"$COLOR2"$'}%K{'"$COLOR1"$'}\UE0B0%F{000}%#%F{'"$COLOR1"$'}%k\UE0B0%f ' fi function zle-line-init zle-keymap-select { - VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f ' + VIM_PROMPT=$'%F{000}%K{'"$COLORV"$'}[%n@%m]%F{'"$COLOR2"$'}\UE0B2%K{'"$COLOR2"$'}%F{000}%~%F{'"$COLOR2"$'}%K{'"$COLORV"$'}\UE0B0%F{000}%#%F{'"$COLORV"$'}%k\UE0B0%f ' PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" zle reset-prompt } |