feature: better waybar load module and other qol features

.bash_tools

@@ -0,0 +1,12 @@
+#!/bin/bash
+# zoxide
+if command -v zoxide >/dev/null 2>&1; then
+  eval "$(zoxide init bash)"
+fi
+
+# pyenv
+if command -v pyenv >/dev/null 2>&1; then
+  export PYENV_ROOT="$HOME/.pyenv"
+  [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init - bash)"
+fi

.bashrc

@@ -34,10 +34,12 @@ alias ..='cd ..'
 alias ...='cd ../..'
 alias ....='cd ../../..'
 alias cr='cd ..'
+alias cdr='cd ..'
 alias cdp='cd ~/Programming'
 alias cds='cd ~/services'
 alias cdd='cd ~/Downloads'
 alias cdt='cd ~/tmp'
+alias cdtc='cd ~/Programming/test'
 alias cdn='cd ~/Documents/obsidian/Notes'
 alias cda='cd /run/media/$USER/'
 
@@ -45,13 +47,15 @@ alias cda='cd /run/media/$USER/'
 alias rmr='rm -rf'
 
 # grep aliases
+alias gr='grep --color=auto'
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
+alias agrep='ps aux | grep --color=auto'
 
 # wm aliases
 alias shy='start-hyprland'
-alias hload='hyprctl reload'
+alias hload='hyprctl reload && dunstctl reload'
 alias sudo-gtk='sudo WAYLAND_DISPLAY="$WAYLAND_DISPLAY" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR"'
 
 # edit aliases
@@ -79,6 +83,9 @@ alias tmp='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").md)'
 alias tmpmd='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").md)'
 alias tmpraw='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H"))'
 alias tmppy='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").py)'
+alias tmpyml='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").yml)'
+alias tmpyaml='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").yml)'
+alias tmpjson='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").json)'
 alias tmppy-run='(cd ~/tmp/daily && python ./$(date +"%Y-%m-%d-%H").py)'
 alias tmpsh='(cd ~/tmp/daily && nvim $(date +"%Y-%m-%d-%H").sh)'
 alias tmpsh-run='(cd ~/tmp/daily && chmod +x ./$(date +"%Y-%m-%d-%H").sh && ./$(date +"%Y-%m-%d-%H").sh)'
@@ -111,10 +118,6 @@ alias paclean='sudo pacman -Rs '
 alias update='yay --noconfirm'
 alias yayc='yay --editmenu'
 
-# grep aliases
-alias agrep='ps aux | grep --color'
-alias g='grep --color'
-
 # fastfetch aliases
 alias fastfetch='~/.config/fastfetch/detect_os.py'
 alias ff='~/.config/fastfetch/detect_os.py'
@@ -133,6 +136,14 @@ alias dcu='sudo docker compose up'
 alias dcp='sudo docker compose pull'
 alias swagger-docs='sudo host-docs'
 
+# git aliases
+alias g='git'
+alias ga='git add .'
+alias gc='git commit -m '
+alias gp='git push'
+alias gs='git status'
+alias gsh='git show'
+
 # other utils aliases
 alias x='sudo chmod +x'
 alias y='yazi'
@@ -148,6 +159,7 @@ alias scrcpy-def='scrcpy -S --no-audio -K'
 alias share='python3 -m http.server'
 alias globalshare='(cd ~/Share && python3 -m http.server)'
 alias clearlock='faillock --user YOUR_USERNAME --reset'
+alias opencode-resume='opencode-restore'
 
 
 # fun aliases
@@ -197,7 +209,7 @@ opencode-save() {
 opencode-restore() {
   FILE_PATH=".opencode-session"
   if [ ! -f "$FILE_PATH" ]; then
-      echo "Error: no such file - $FILE_PATH"
+      echo "Error: no such file '$FILE_PATH'"
       return 1
   fi
   uuid=$(awk '/opencode -s/ {print $3}' "$FILE_PATH")
@@ -205,12 +217,15 @@ opencode-restore() {
       echo "Error: no sessionn saved"
       return 1
   fi
-  echo "Resuming Opencode session with ID: $uuid..."
+  echo "Resuming Opencode session with ID: $uuid"
   opencode -s "$uuid"
 }
 
 
 # Imports
+if [ -f "$HOME/.bash_tools" ]; then
+  . "$HOME/.bash_tools"
+fi
 if [ -f "$HOME/.bash_private" ]; then
   . "$HOME/.bash_private"
 fi

.config/dunst/dunstrc

@@ -1,7 +1,7 @@
 [global]
 frame_color = "#BD93F9"
 separator_color = "#20212C6A"
-corner_radius = 10
+corner_radius = 4  # 10
 width = 320
 height = (0, 500)
 offset = (30, 30)
@@ -11,7 +11,7 @@ text_icon_padding = 16
 frame_width = 2
 gap_size = 20
 font = "JetBrains Mono Nerd Font 9"
-progress_bar_corner_radius = 3
+progress_bar_corner_radius = 2  # 3
 progress_bar_frame_width = 0
 progress_bar_height = 7
 highlight = "#BD93F9"
@@ -26,12 +26,15 @@ mouse_right_click = close_all
 [urgency_low]
 background = "#20212C6A"
 foreground = "#C0CAF5"
+timeout = 8
 
 [urgency_normal]
 background = "#20212C6A"
 foreground = "#C0CAF5"
+timeout = 8
 
 [urgency_critical]
 background = "#20212C6A"
 foreground = "#C0CAF5"
 frame_color = "#F38BA8"
+timeout = 20

.config/fastfetch/0-logos/paraphernalia/arcade.txt

@@ -5,12 +5,12 @@ $1    .
        y--.     `-._
       / $2.,$1 \___
   |   \ $2'`$1 /   \
-  |    )--( $2..,$1 )------.
+  |    )--( $2..,$1 )---------.
-  |   / $2,,$1 \___/    ,-`
+  |   / $2,,$1 \___/       ,-`
-  |   \ $2""$1 /      ,-
+  |   \ $2""$1 /         ,-
-  |    r--'    ,-'
+  |    r--'       ,-'
-  |   /      ,-
+  |   /         ,-
-  |  /     ,-
+  |  /        ,-
-  | /     '
+  | /        '
   |/      $3Paraphernalia OS
 $1  `       $4Arcade Edition

.config/fastfetch/0-logos/paraphernalia/ghost.txt

@@ -5,10 +5,10 @@ $1  ,
       \
        $2,--.$1
       $2/    \___$1
-      $2\    /   \$1      `-._
+      $2\    /   \$1       `-._
-       $2)--(     )$1 --------"
+       $2)--(     )$1 ---------"
-      $2/    \___/$1    ,-`
+      $2/    \___/$1     ,-`
-      $2\    /$1       `
+      $2\    /$1        `
        $2`--'$1
       /
      /

.config/hypr/config/input_devices.conf

@@ -34,6 +34,12 @@ device {
     accel_profile = flat
 }
 
+device {
+    name = compx-2.4g-dual-mode-mouse
+    sensitivity = 0
+    accel_profile = flat
+}
+
 device {
     name = logitech-usb-optical-mouse
     sensitivity = -0.4

.config/hypr/config/monitors.conf

@@ -7,3 +7,4 @@ monitor = eDP-1, prefered, auto, 1
 monitor = desc:Communications Supply Corporation (A division of WESCO) P120ZDG-BF4, 2160x1440@60, auto, 1.33333334
 monitor = desc:AU Optronics 0x243D, 1920x1080@60, 0x0, 1, bitdepth, 10
 monitor = desc:Samsung Electric Company Q85A 0x01000E00, 2560x1440@59.95, auto, 1
+monitor = desc:LG Electronics 27EA63 0x00014A73, 1920x1080@60.00000, 0x-1080, 1

.config/hypr/docs/TODO.md

@@ -1,5 +1,4 @@
+- [ ] Rewrite hyprland config in lua
 - [ ] Extract scripts to '.scripts' directory
 - [ ] Add wallpaper selector and rewrite wallpaper workflow
-- [ ] Rewrite hyprland config in lua
-- [ ] Configure sddm
 - [ ] Rewrite display brightness configuring

.config/hypr/scripts/dunst/micro.sh

@@ -5,8 +5,8 @@ msgId="3378455"
 station=$(pactl get-source-volume @DEFAULT_SOURCE@)
 
 # TODO: fix if for pactl
-if [ $station = 'MUTED' ]; then
+# if [ $station = 'MUTED' ]; then
-  notify-send -i "$HOME/.config/hypr/scripts/dunst/icons/mic off.svg" -u low -r "$msgId" "Микрофон выключен"
+#   notify-send -i "$HOME/.config/hypr/scripts/dunst/icons/mic off.svg" -u low -r "$msgId" "Микрофон выключен"
-else
+# else
-  notify-send -i "$HOME/.config/hypr/scripts/dunst/icons/mic on.svg" -u low -r "$msgId" "Микрофон включен"
+#   notify-send -i "$HOME/.config/hypr/scripts/dunst/icons/mic on.svg" -u low -r "$msgId" "Микрофон включен"
-fi
+# fi

.config/kitty/kitty.conf

@@ -14,6 +14,14 @@ map kitty_mod+t     new_tab_with_cwd
 map ctrl+v          paste_from_clipboard
 map ctrl+;          send_text all \x1b[24;5~
 
+# Scroll up and down by line
+map alt+k scroll_line_up
+map alt+j scroll_line_down
+
+# Optional: Scroll by page using Shift
+map alt+shift+k scroll_page_up
+map alt+shift+j scroll_page_down
+
 
 # Theme
 include current-theme.conf
@@ -38,7 +46,7 @@ cursor_trail_decay 0.1 0.4
 # Window
 initial_window_width 95c
 initial_window_height 35c
-window_padding_width 12 12 12 12
+window_padding_width 8 8 8 8
 confirm_os_window_close 0
 
 # Tabs

.config/nvim/lua/plugins/treesitter.lua

@@ -15,6 +15,9 @@ return {
       "markdown",
       "vim",
       "vimdoc",
+      "html",
+      "css",
+      "javascript",
     })
     vim.treesitter.language.register("html", "gotmpl")
     vim.api.nvim_create_autocmd("FileType", {

.config/waybar/modules/load.jsonc

@@ -1,7 +1,7 @@
 {
   "group/load": {
     "orientation": "horizontal",
-    "modules": ["cpu", "memory", "custom/gpu"],
+    "modules": ["cpu", "memory", "custom/gpu-util", "custom/gpu-vram"],
   },
   "cpu": {
     "interval": 2,
@@ -11,10 +11,16 @@
   "memory": {
     "interval": 2,
     "format": " {percentage}%",
+    "tooltip": true,
   },
-  "custom/gpu": {
+  "custom/gpu-util": {
-    "exec": "command -v nvidia-smi &>/dev/null && nvidia-smi --query-gpu=utilization.gpu,memory.used,memory.total --format=csv,noheader,nounits | awk -F', ' '{print $1 \" \" int(($2/$3)*100)}' || echo ''",
+    "exec": "command -v nvidia-smi &>/dev/null && nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | awk '{printf \"{\\\"text\\\": \\\"󰢮 %2s%%\\\", \\\"tooltip\\\": \\\"GPU Usage: %s%%\\\"}\\n\", $1, $1}' || echo ''",
-    "format": "󰢮 {0}% 󰘚 {1}%",
+    "return-type": "json",
-    "interval": 2,
+    "interval": 4
   },
+  "custom/gpu-vram": {
+    "exec": "command -v nvidia-smi &>/dev/null && nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk -F', ' '{printf \"{\\\"text\\\": \\\"󰘚 %2d%%\\\", \\\"tooltip\\\": \\\"VRAM: %sMB / %sMB\\\"}\\n\", int(($1/$2)*100), $1, $2}' || echo ''",
+    "return-type": "json",
+    "interval": 2
+  }
 }

.config/waybar/style.css

@@ -87,6 +87,7 @@ tooltip label {
 #load * {
   padding-left: 4px;
   padding-right: 4px;
+  min-width: 50px;
 }
 
 #load {

.config/yazi/keymap.toml

@@ -50,6 +50,10 @@ on = [ "g","c" ]
 run  = 'cd ~/.config'
 desc = "Go to .config"
 [[mgr.prepend_keymap]]
+on = [ "g","t" ]
+run  = 'cd ~/tmp'
+desc = "Go to tmp"
+[[mgr.prepend_keymap]]
 on = [ "g","d" ]
 run  = 'cd ~/Downloads'
 desc = "Go to Downloads"

config-scripts/export-config.sh

@@ -29,6 +29,7 @@ cp -r ~/.bash_profile "$CONFIG_SAVE_DIR/.bash_profile"
 cp -r ~/.bashrc "$CONFIG_SAVE_DIR/.bashrc"
 cp -r ~/.bash_exports "$CONFIG_SAVE_DIR/.bash_exports"
 cp -r ~/.bash_aliases "$CONFIG_SAVE_DIR/.bash_aliases"
+cp -r ~/.bash_tools "$CONFIG_SAVE_DIR/.bash_tools"
 cp -r ~/.bash_prompt "$CONFIG_SAVE_DIR/.bash_prompt"
 cp -r ~/.multiplexer "$CONFIG_SAVE_DIR/.multiplexer"
 

config-scripts/import-config.sh

@@ -51,6 +51,7 @@ cp -r "$RESTORE_PATH/.bashrc" ~/
 cp -r "$RESTORE_PATH/.bash_exports" ~/
 cp -r "$RESTORE_PATH/.bash_aliases" ~/
 cp -r "$RESTORE_PATH/.bash_prompt" ~/
+cp -r "$RESTORE_PATH/.bash_tools" ~/
 cp -r "$RESTORE_PATH/.multiplexer" ~/
 cp -r "$RESTORE_PATH/.ideavimrc" ~/
 echo 'Restored configs'

config-scripts/install-config.sh

@@ -44,6 +44,7 @@ touch "$HOME/.inputrc"
 touch "$HOME/.bashrc"
 touch "$HOME/.bash_aliases"
 touch "$HOME/.bash_private"
+touch "$HOME/.bash_tools"
 touch "$HOME/.bash_prompt"
 touch "$HOME/.multiplexer"
 cp /etc/os-release "$HOME/.os-release"
@@ -57,6 +58,7 @@ ln -sf "$HOME/.inputrc" "$HOME/.config/bash/inputrc"
 ln -sf "$HOME/.bashrc" "$HOME/.config/bash/bashrc"
 ln -sf "$HOME/.bash_aliases" "$HOME/.config/bash/bash_aliases"
 ln -sf "$HOME/.bash_private" "$HOME/.config/bash/bash_private"
+ln -sf "$HOME/.bash_tools" "$HOME/.config/bash/bash_tools"
 ln -sf "$HOME/.bash_prompt" "$HOME/.config/bash/bash_prompt"
 ln -sf "$HOME/.multiplexer" "$HOME/.config/bash/multiplexer"
 echo

config-scripts/link-bash.sh

@@ -7,6 +7,7 @@ touch ~/.bashrc
 touch ~/.bash_aliases
 touch ~/.bash_private
 touch ~/.bash_exports
+touch ~/.bash_tools
 touch ~/.bash_prompt
 touch ~/.multiplexer
 
@@ -17,5 +18,6 @@ ln -s ~/.bashrc "$bash_cfg_path/bashrc"
 ln -s ~/.bash_aliases "$bash_cfg_path/bash_aliases"
 ln -s ~/.bash_private "$bash_cfg_path/bash_private"
 ln -s ~/.bash_exports "$bash_cfg_path/bash_exports"
+ln -s ~/.bash_tools "$bash_cfg_path/bash_tools"
 ln -s ~/.bash_prompt "$bash_cfg_path/bash_prompt"
 ln -s ~/.multiplexer "$bash_cfg_path/multiplexer"

config-scripts/yadm-readd.sh

@@ -20,6 +20,7 @@ yadm add ~/.bash_profile
 yadm add ~/.bashrc
 yadm add ~/.bash_exports
 yadm add ~/.bash_aliases
+yadm add ~/.bash_tools
 yadm add ~/.bash_prompt
 yadm add ~/.multiplexer