diff options
| -rw-r--r-- | hypr/hyprland.conf | 8 | ||||
| -rw-r--r-- | hypr/hyprscratch.conf | 7 | ||||
| -rw-r--r-- | lf/lfrc | 121 | ||||
| -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/functions | 120 | ||||
| -rw-r--r-- | sh/profile | 1 | ||||
| -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 |
12 files changed, 191 insertions, 130 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d1d3cea..4351949 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) @@ -200,7 +202,7 @@ plugin { hyprscrolling { fullscreen_on_one_column = true column_width = 0.5 - explicit_column_widths = 0.333, 0.5, 0.667, 1.0 + explicit_column_widths = 0.25, 0.333, 0.5, 0.667, 0.75, 1.0 focus_fit_method = 1 follow_focus = true } @@ -418,7 +420,7 @@ bind = $mainMod, D, exec, sh -c "$(tofi-run -c $HOME/.config/tofi/themes/dmenu_v bind = $mainMod, R, exec, rs bind = $mainMod $secdMod, Q, exec, qbc bind = $mainMod $secdMod, W, exec, lwc -bind = $mainMod $secdMod, E, exec, mbc +bind = $mainMod $secdMod, E, exec, brc bind = $mainMod $secdMod, R, exec, ffc bind = $mainMod $secdMod, 1, exec, bm bind = $mainMod $secdMod, comma, exec, dmount -p @@ -449,7 +451,7 @@ bind = $mainMod CONTROL, B, exec, hyprscratch toggle spncmp bind = $mainMod CONTROL, A, exec, hyprscratch toggle spmutt bind = $mainMod CONTROL, S, exec, hyprscratch toggle spprof bind = $mainMod CONTROL, D, exec, hyprscratch toggle spirss -bind = $mainMod CONTROL, F, exec, hyprscratch toggle sptodo +bind = $mainMod CONTROL, F, exec, hyprscratch toggle spvimw bind = $mainMod CONTROL, G, exec, hyprscratch toggle sptrmc bind = $mainMod CONTROL, Q, exec, hyprscratch toggle helvum bind = $mainMod CONTROL, E, exec, hyprscratch toggle easyeffects diff --git a/hypr/hyprscratch.conf b/hypr/hyprscratch.conf index 4274dcd..5964419 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% @@ -83,10 +84,10 @@ spirss { options = special } -sptodo { +spvimw { # Mandatory fields - title = sptodo - command = kitty -T sptodo todo + title = spvimw + command = kitty -T spvimw nvim +VimwikiIndex # Optional fields options = lazy @@ -320,7 +320,7 @@ map C clear map U unselect # Movement -map g. cd "/home/zachir" +map g. cd "~" ## PATHS map gE. cd "/etc" map gO. cd "/opt" @@ -329,64 +329,65 @@ map gR cd "/" map gU. cd "/usr" map gUs cd "/usr/share" map gV. cd "/var" -map gaw cd "/home/zachir/.config/awesome" -map gb. cd "/home/zachir/.local/bin" -map gbb cd "/home/zachir/.local/bin/blocks" -map gbf cd "/home/zachir/.local/bin/slatpak-sc" -map gbg cd "/home/zachir/.local/bin/generics" -map gbi cd "/home/zachir/.local/bin/ignore" -map gbsc cd "/home/zachir/.local/bin/scripts" -map gbsh cd "/home/zachir/.local/bin/shortcmds" -map gbsp cd "/home/zachir/.local/bin/sp" -map gc cd "/home/zachir/.config" -map gdb cd "/home/zachir/.local/src/dwmbar" -map gdc cd "/home/zachir/Documents" -map gdl cd "/home/zachir/.local/src/dwl" -map gdm cd "/home/zachir/.local/src/dmenu" -map gdo cd "/home/zachir/Downloads" -map gdp cd "/home/zachir/Downloads/plugin/zachir_librem.one" -map gdw cd "/home/zachir/Downloads/wine" -map ge cd "/home/zachir/Desktop" -map gf cd "/home/zachir/.var/app" -map gh cd "/home/zachir/.config/hypr" -map glb cd "/home/zachir/.local/bin" -map glc cd "/home/zachir/Games/cache" -map glf cd "/home/zachir/.config/lf" -map gls cd "/home/zachir/.local/share" -map gn3 cd "/home/zachir/.vst3/native" -map gns cd "/home/zachir/.vst/native" -map gnv cd "/home/zachir/.config/nvim" -map gp cd "/home/zachir/Pictures" -map gqb cd "/home/zachir/.config/qutebrowser" -map gqp cd "/home/zachir/.local/share/qutebrowser-profiles" -map gre cd "/home/zachir/.local/src" +map gaw cd "~/.config/awesome" +map gb. cd "~/.local/bin" +map gbb cd "~/.local/bin/blocks" +map gbf cd "~/.local/bin/slatpak-sc" +map gbg cd "~/.local/bin/generics" +map gbi cd "~/.local/bin/ignore" +map gbsc cd "~/.local/bin/scripts" +map gbsh cd "~/.local/bin/shortcmds" +map gbsp cd "~/.local/bin/sp" +map gc cd "~/.config" +map gdb cd "~/.local/src/dwmbar" +map gdc cd "~/Documents" +map gdl cd "~/.local/src/dwl" +map gdm cd "~/.local/src/dmenu" +map gdo cd "~/Downloads" +map gdp cd "~/Downloads/plugin/zachir_librem.one" +map gdw cd "~/Downloads/wine" +map ge cd "~/Desktop" +map gf cd "~/.var/app" +map gh cd "~/.config/hypr" +map glb cd "~/.local/bin" +map glc cd "~/Games/cache" +map glf cd "~/.config/lf" +map gls cd "~/.local/share" +map gn3 cd "~/.vst3/native" +map gns cd "~/.vst/native" +map gnv cd "~/.config/nvim" +map gp cd "~/Pictures" +map gqb cd "~/.config/qutebrowser" +map gqp cd "~/.local/share/qutebrowser-profiles" +map gre cd "~/.local/src" map grs cd "/etc/runit/sv" -map gsc cd "/home/zachir/.local/bin/scripts" -map gsh cd "/home/zachir/.config/sh" -map gsl cd "/home/zachir/.local/src/slock" +map gsc cd "~/.local/bin/scripts" +map gsh cd "~/.config/sh" +map gsl cd "~/.local/src/slock" map gss cd "/etc/s6/sv" -map gst cd "/home/zachir/.local/src/st" -map gsx cd "/home/zachir/.config/sxhkd" -map gtr cd "/home/zachir/.local/share/Trash/files" -map gurs cd "/home/zachir/.runit/sv" -map gv3. cd "/home/zachir/.vst3" -map gv3n cd "/home/zachir/.vst3/native" -map gv3y cd "/home/zachir/.vst3/yabridge" -map gv. cd "/home/zachir/var" -map gvi cd "/home/zachir/Videos" -map gvsn cd "/home/zachir/.vst/native" -map gvs. cd "/home/zachir/.vst" -map gvsy cd "/home/zachir/.vst/yabridge" -map gwdo cd "/home/zachir/.local/share/wineprefixes/default/drive_c/users/zachir/Downloads" -map gwa cd "/home/zachir/.local/src/wallpapers" -map gwd cd "/home/zachir/.local/share/wineprefixes/default" -map gwr cd "/home/zachir/.local/share/wineprefixes" -map gwv3 cd "/home/zachir/.winvst3" -map gwvs cd "/home/zachir/.winvst" -map gww cd "/home/zachir/.local/share/wineprefixes/work" -map gx cd "/home/zachir/.config/X11" -map gy3 cd "/home/zachir/.vst3/yabridge" -map gyb cd "/home/zachir/.cache/yay" -map gyc cd "/home/zachir/.config/yay" -map gzs cd "/home/zachir/.config/zsh" -map gzx cd "/home/zachir/Documents/zachir.xyz" +map gst cd "~/.local/src/st" +map gsx cd "~/.config/sxhkd" +map gtr cd "~/.local/share/Trash/files" +map gurs cd "~/.runit/sv" +map gv3. cd "~/.vst3" +map gv3n cd "~/.vst3/native" +map gv3y cd "~/.vst3/yabridge" +map gv. cd "~/var" +map gvi cd "~/Videos" +map gvsn cd "~/.vst/native" +map gvs. cd "~/.vst" +map gvsy cd "~/.vst/yabridge" +map gvw cd "~/.local/share/vimwiki" +map gwdo cd "~/.local/share/wineprefixes/default/drive_c/users/zachir/Downloads" +map gwa cd "~/.local/src/wallpapers" +map gwd cd "~/.local/share/wineprefixes/default" +map gwr cd "~/.local/share/wineprefixes" +map gwv3 cd "~/.winvst3" +map gwvs cd "~/.winvst" +map gww cd "~/.local/share/wineprefixes/work" +map gx cd "~/.config/X11" +map gy3 cd "~/.vst3/yabridge" +map gyb cd "~/.cache/yay" +map gyc cd "~/.config/yay" +map gzs cd "~/.config/zsh" +map gzx cd "~/Documents/zachir.xyz" 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) diff --git a/sh/functions b/sh/functions index e8515d8..e7270bc 100644 --- a/sh/functions +++ b/sh/functions @@ -57,67 +57,68 @@ R - / U. - /usr Us - /usr/share V. - /var -aw - /home/zachir/.config/awesome -b. - /home/zachir/.local/bin -bb - /home/zachir/.local/bin/blocks -bf - /home/zachir/.local/bin/slatpak-sc -bg - /home/zachir/.local/bin/generics -bi - /home/zachir/.local/bin/ignore -bsc - /home/zachir/.local/bin/scripts -bsh - /home/zachir/.local/bin/shortcmds -bsp - /home/zachir/.local/bin/sp -c - /home/zachir/.config -db - /home/zachir/.local/src/dwmbar -dc - /home/zachir/Documents -dl - /home/zachir/.local/src/dwl -dm - /home/zachir/.local/src/dmenu -do - /home/zachir/Downloads -dp - /home/zachir/Downloads/plugin/zachir_librem.one -dw - /home/zachir/Downloads/wine -e - /home/zachir/Desktop -f - /home/zachir/.var/app -h - /home/zachir/.config/hypr -lb - /home/zachir/.local/bin -lc - /home/zachir/Games/cache -lf - /home/zachir/.config/lf -ls - /home/zachir/.local/share -n3 - /home/zachir/.vst3/native -ns - /home/zachir/.vst/native -nv - /home/zachir/.config/nvim -p - /home/zachir/Pictures -qb - /home/zachir/.config/qutebrowser -qp - /home/zachir/.local/share/qutebrowser-profiles -re - /home/zachir/.local/src +aw - $XDG_CONFIG_HOME/awesome +b. - $HOME/.local/bin +bb - $HOME/.local/bin/blocks +bf - $HOME/.local/bin/slatpak-sc +bg - $HOME/.local/bin/generics +bi - $HOME/.local/bin/ignore +bsc - $HOME/.local/bin/scripts +bsh - $HOME/.local/bin/shortcmds +bsp - $HOME/.local/bin/sp +c - $XDG_CONFIG_HOME +db - $SRCDIR/dwmbar +dc - $XDG_DOCUMENTS_DIR +dl - $SRCDIR/dwl +dm - $SRCDIR/dmenu +do - $XDG_DOWNLOAD_DIR +dp - $XDG_DOWNLOAD_DIR/plugin/zachir_librem.one +dw - $XDG_DOWNLOAD_DIR/wine +e - $XDG_DESKTOP_DIR +f - $HOME/.var/app +h - $XDG_CONFIG_HOME/hypr +lb - $HOME/.local/bin +lc - $HOME/Games/cache +lf - $XDG_CONFIG_HOME/lf +ls - $XDG_DATA_HOME +n3 - $HOME/.vst3/native +ns - $HOME/.vst/native +nv - $XDG_CONFIG_HOME/nvim +p - $XDG_PICTURES_DIR +qb - $XDG_CONFIG_HOME/qutebrowser +qp - $XDG_DATA_HOME/qutebrowser-profiles +re - $SRCDIR rs - /etc/runit/sv -sc - /home/zachir/.local/bin/scripts -sh - /home/zachir/.config/sh -sl - /home/zachir/.local/src/slock +sc - $HOME/.local/bin/scripts +sh - $XDG_CONFIG_HOME/sh +sl - $SRCDIR/slock ss - /etc/s6/sv -st - /home/zachir/.local/src/st -sx - /home/zachir/.config/sxhkd -tr - /home/zachir/.local/share/Trash/files -urs - /home/zachir/.runit/sv -v3. - /home/zachir/.vst3 -v3n - /home/zachir/.vst3/native -v3y - /home/zachir/.vst3/yabridge -v. - /home/zachir/var -vi - /home/zachir/Videos -vsn - /home/zachir/.vst/native -vs. - /home/zachir/.vst -vsy - /home/zachir/.vst/yabridge -wdo - /home/zachir/.local/share/wineprefixes/default/drive_c/users/zachir/Downloads -wa - /home/zachir/.local/src/wallpapers -wd - /home/zachir/.local/share/wineprefixes/default -wr - /home/zachir/.local/share/wineprefixes -wv3 - /home/zachir/.winvst3 -wvs - /home/zachir/.winvst -ww - /home/zachir/.local/share/wineprefixes/work -x - /home/zachir/.config/X11 -y3 - /home/zachir/.vst3/yabridge -yb - /home/zachir/.cache/yay -yc - /home/zachir/.config/yay -zs - /home/zachir/.config/zsh -zx - /home/zachir/Documents/zachir.xyz +st - $SRCDIR/st +sx - $XDG_CONFIG_HOME/sxhkd +tr - $XDG_DATA_HOME/Trash/files +urs - $HOME/.runit/sv +v3. - $HOME/.vst3 +v3n - $HOME/.vst3/native +v3y - $HOME/.vst3/yabridge +v. - $HOME/var +vi - $XDG_VIDEOS_DIR +vsn - $HOME/.vst/native +vs. - $HOME/.vst +vsy - $HOME/.vst/yabridge +vw\t- $XDG_DATA_HOME/vimwiki +wdo - $WINEPREFIX/drive_c/users/zachir/Downloads +wa - $SRCDIR/wallpapers +wd - $WINEPREFIX +wr - $WINEROOT +wv3 - $HOME/.winvst3 +wvs - $HOME/.winvst +ww - $WINEROOT/work +x - $XDG_CONFIG_HOME/X11 +y3 - $HOME/.vst3/yabridge +yb - $XDG_CACHE_HOME/yay +yc - $XDG_CONFIG_HOME/yay +zs - $XDG_CONFIG_HOME/zsh +zx - $XDG_DOCUMENTS_DIR/zachir.xyz " ;; # STOPPRINT # STARTPATHS @@ -176,6 +177,7 @@ zx - /home/zachir/Documents/zachir.xyz "vsn") cd "$HOME/.vst/native" ;; "vs.") cd "$HOME/.vst" ;; "vsy") cd "$HOME/.vst/yabridge" ;; +"vw") cd "$XDG_DATA_HOME/vimwiki" ;; "wdo") cd "$WINEPREFIX/drive_c/users/$USER/Downloads" ;; "wa") cd "$SRCDIR/wallpapers" ;; "wd") cd "$WINEPREFIX" ;; @@ -7,6 +7,7 @@ export XDG_CURRENT_DESKTOP="Hyprland" export XDG_DOCUMENTS_DIR=${HOME}/Documents export XDG_DOWNLOAD_DIR=${HOME}/Downloads export XDG_DESKTOP_DIR=${HOME}/Desktop +export XDG_PICTURES_DIR=${HOME}/Pictures export XDG_STATE_HOME="${HOME}/.local/state" export XDG_VIDEOS_DIR=${HOME}/Videos 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 + } + } + } +] |