From 89de22305e4115be766663c0edb269a43395e5f1 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 14 Aug 2025 12:37:51 -0500 Subject: Use ls and rm aliases if progs exist If `type eza` then use eza for ls. If `type trash-put` use trash-put for rm. --- sh/aliases | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sh/aliases b/sh/aliases index 93784e7..2e7ecf5 100644 --- a/sh/aliases +++ b/sh/aliases @@ -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' -- cgit v1.2.3 From 2c60ceb12271e77ce44f7b0efa9b08f856293e71 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Thu, 14 Aug 2025 12:38:22 -0500 Subject: Remove deprecated option in hyprlock conf Apparently fail_transition is no longer in the hyperlock config. --- hypr/hyprlock.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = $FAIL ($ATTEMPTS) # 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) -- cgit v1.2.3 From 9096926608099642e3053d7337a90e855eb7ce9f Mon Sep 17 00:00:00 2001 From: GitIR Date: Thu, 14 Aug 2025 13:05:52 -0500 Subject: Add back .zsh_theme for my prompt This time with COLOR1 for main, COLOR2 for path, and COLORV for vim main. --- zsh/.zshrc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index d6e7718..c600a2a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -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 } -- cgit v1.2.3 From 3a85ad8ebb5b4281140ca13808c44705e62e424a Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 22 Aug 2025 15:09:49 -0500 Subject: Use Xwayland-satellite for Hyprland --- hypr/hyprland.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 6c32a42..74a1853 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 = systemctl --user start dunst exec-once = systemctl --user start 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) -- cgit v1.2.3 From f1bc73be50fa204eddde0e94b8c1e39aa8e53f49 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 22 Aug 2025 15:10:04 -0500 Subject: Darken waybar background --- waybar/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3 From 64cb5528d33f1ee5c1e8d79ea4c8dcc5ddcded66 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 22 Aug 2025 15:10:18 -0500 Subject: Add wireplumber confs --- wireplumber/wireplumber.conf.d/51-id4.conf | 17 +++++++++++++++++ wireplumber/wireplumber.conf.d/51-volt4.conf | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 wireplumber/wireplumber.conf.d/51-id4.conf create mode 100644 wireplumber/wireplumber.conf.d/51-volt4.conf 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 + } + } + } +] -- cgit v1.2.3 From 545505e99500c79b2d47176e28c01cbeb1aecf48 Mon Sep 17 00:00:00 2001 From: zsmith Date: Tue, 26 Aug 2025 09:23:21 -0500 Subject: Add vimwiki to nvim --- nvim/init.lua | 1 + nvim/lua/plugins.lua | 1 + nvim/lua/vimwiki.lua | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 nvim/lua/vimwiki.lua 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/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', 'wx', 'VimwikiIndex', opts) -- cgit v1.2.3 From de3dc541e71f1c37e877cec6f6afbe5075436750 Mon Sep 17 00:00:00 2001 From: zsmith Date: Tue, 26 Aug 2025 09:23:54 -0500 Subject: Fix resize maps in nvim --- nvim/lua/keymaps.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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', '', ':resize -2', opts) vim.keymap.set('n', '', ':resize +2', opts) vim.keymap.set('n', '', ':vertical resize -2', opts) vim.keymap.set('n', '', ':vertical resize +2', opts) -vim.keymap.set('n', 'wh :vertical resize', '-1') -vim.keymap.set('n', 'wj :resize', '-1') -vim.keymap.set('n', 'wk :resize', '+1') -vim.keymap.set('n', 'wl :vertical resize', '+1') +vim.keymap.set('n', 'wh', ':vertical resize -1') +vim.keymap.set('n', 'wj', ':resize -1') +vim.keymap.set('n', 'wk', ':resize +1') +vim.keymap.set('n', 'wl', ':vertical resize +1') -- NerdTREE vim.keymap.set('n', 'tt', ':NERDTreeToggle') -- cgit v1.2.3 From de445f9cf40a4e9c2e4ae87cc2ee7499208cd4ae Mon Sep 17 00:00:00 2001 From: zsmith Date: Wed, 27 Aug 2025 10:24:11 -0500 Subject: Move vimwiki path to ~/.local/share This is more XDG compliant. --- nvim/lua/plugins.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 183a20d..3684b89 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -14,7 +14,15 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ -- LSP manager { "mason-org/mason.nvim", opts = {} }, - "vimwiki/vimwiki", + {"vimwiki/vimwiki", + init = function() + vim.g.vimwiki_list = { + { + path = '~/.local/share/vimwiki' + }, + } + end, + }, { "mason-org/mason-lspconfig.nvim", dependencies = { -- cgit v1.2.3 From 6d41b928fad9c472281d6ea0d058e3eca58a1e15 Mon Sep 17 00:00:00 2001 From: zsmith Date: Wed, 27 Aug 2025 10:24:40 -0500 Subject: Add comments to vimwiki --- nvim/lua/vimwiki.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nvim/lua/vimwiki.lua b/nvim/lua/vimwiki.lua index c7a815b..43b8aa6 100644 --- a/nvim/lua/vimwiki.lua +++ b/nvim/lua/vimwiki.lua @@ -1,5 +1,7 @@ +-- Required for Vimwiki to work vim.opt.compatible = false +-- Vimwiki Keybindings local opts = { noremap = false, silent = true, -- cgit v1.2.3 From 3923f1e72deb7d43495d025d5f9daeb1eeda2944 Mon Sep 17 00:00:00 2001 From: zachir Date: Wed, 27 Aug 2025 21:25:32 -0500 Subject: Make hyprscratch daemon eager --- hypr/hyprscratch.conf | 1 + 1 file changed, 1 insertion(+) 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% -- cgit v1.2.3