From e9b41a7e215e82be18851ef93d7dfd5a95ee4e9f Mon Sep 17 00:00:00 2001 From: coolnsx Date: Fri, 9 Feb 2024 17:21:56 +0530 Subject: [PATCH] Actual final build before release --- dunst/dunstrc | 6 +++--- eww/eww.yuck | 2 +- eww/script | 2 +- hypr/bkmark | 10 +++++++--- hypr/bluetooth | 2 +- hypr/dmenu_run_history | 2 +- hypr/hyprland.conf | 32 +++++++++++++++++++------------- hypr/launch | 15 --------------- hypr/workspace | 2 +- nvim/lazy-lock.json | 28 ++++++++++++++-------------- zsh/zshrc | 2 +- 11 files changed, 49 insertions(+), 54 deletions(-) delete mode 100755 hypr/launch diff --git a/dunst/dunstrc b/dunst/dunstrc index eaa9d44..ff02e7a 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -80,7 +80,7 @@ # Padding between text and separator. padding = 8 - highlight = "#D81860" + highlight = "#00D8CE" # Horizontal padding. horizontal_padding = 8 @@ -93,7 +93,7 @@ frame_width = 3 # Defines color of the frame around the notification window. - frame_color = "#D81860" + frame_color = "#00D8CE" # Size of gap to display between notifications - requires a compositor. # If value is greater than 0, separator_height will be ignored and a border @@ -229,7 +229,7 @@ ### Misc/Advanced ### # dmenu path. - dmenu = "/sbin/bemenu -i --fn 'IBM Plex Sans 15' -l 10 -c -W 0.4 -B 3 -p 'dunst:'" + dmenu = "/sbin/bemenu -i --fn 'IBM Plex Sans 15' -l 10 -c -W 0.4 -B 3 -p 'dunst:' --bdr="#$GLOBAL_ACCENT" --tf="#$GLOBAL_ACCENT" --hf="#$GLOBAL_ACCENT"" # Browser for opening urls in context menu. browser = /usr/bin/xdg-open diff --git a/eww/eww.yuck b/eww/eww.yuck index ea3ae23..6bf0967 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -76,7 +76,7 @@ (box :orientation "v" :spacing 20 :space-evenly "false" :vexpand "false" :hexpand "false" (label :tooltip "${song.name}" :halign "center" :class "song" :wrap "false" :limit-width 20 :text "${song.name}") (label :halign "center" :class "artist" :wrap "false" :limit-width 20 :text "${song.artist}") - (box :orientation "h" :spacing 35 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false" + (box :orientation "h" :spacing 80 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false" (button :class "btn_controls" :tooltip "History : ${song.prev}" :onclick "./script prev" "󰒮") (button :class "btn_controls" :tooltip "Seek -1%" :onclick "./script seek '-1'" "") (button :class "btn_play" :onclick "./script play_toggle" STATUS) diff --git a/eww/script b/eww/script index 27c4898..0eb07e3 100755 --- a/eww/script +++ b/eww/script @@ -5,7 +5,7 @@ case $1 in songdata) if [ -f "$datadir/current" ];then out=$(printf '{ "command": ["get_property", "pause"]}\n' | socat - "$datadir/yt-music-mpvsocket" 2>/dev/null) - printf '{"name":"%s","artist":"%s","cover":"%s","next":"%s","prev":"%s"}' "$(cut -d'>' -f1 < "$datadir/current" | cut -d':' -f2- | sed 's|[^-]*$||;s|-$||;s| $||;s|^ ||')" "$(cut -d'>' -f1 < "$datadir/current" | sed 's_.* - __;s| $||')" "$datadir/default.jpg" "$(sed -n "/$(cut -d'>' -f2 < "$datadir/current" )/{n;p}" $datadir/next | cut -f1)" "$(sed -n "$(cat $datadir/counter)p" $datadir/next | cut -f1)" + printf '{"name":"%s","artist":"%s","cover":"%s","next":"%s","prev":"%s"}' "$(cut -d'>' -f1 < "$datadir/current" | cut -d':' -f2- | sed 's|[^-]*$||g;s|-$||g;s| $||g;s|^ ||g')" "$(cut -d'>' -f1 < "$datadir/current" | sed 's_.* - __;s| $||')" "$datadir/default.jpg" "$(sed -n "/$(cut -d'>' -f2 < "$datadir/current" )/{n;p}" $datadir/next | cut -f1)" "$(sed -n "$(cat $datadir/counter)p" $datadir/next | cut -f1)" else printf '{"name":"OFFLINE","artist":"offline","cover":"%s/.config/eww/music.png"}' "$HOME" fi diff --git a/hypr/bkmark b/hypr/bkmark index d06c889..0e7964c 100755 --- a/hypr/bkmark +++ b/hypr/bkmark @@ -7,6 +7,10 @@ data="$(wl-paste -p | tr '\n' '\`' | sed 's/$/ /g')" file="$HOME/.cache/bookmarks" oshi_file="$HOME/.cache/oshi-urls" +menu(){ + bemenu --fn 'Roboto 15' -i -c -W 0.6 -B 3 -l 30 -p "$1" --bdr="#$GLOBAL_ACCENT" --tf="#$GLOBAL_ACCENT" --hf="#$GLOBAL_ACCENT" +} + case $1 in add) if [ -z "$data" ]; then @@ -21,14 +25,14 @@ case $1 in rm) data="$(sed '/^$/d' "$file" | nl -n'ln')" [ -z "$data" ] && notify-send "Bookmark is empty" && exit 0 - del=$(printf "%s" "$data" | bemenu --fn 'Roboto 15' -i -c -W 0.6 -B 3 -l 30 -p "delete-bookmark :" | cut -f1) + del=$(printf "%s" "$data" | menu "delete-bookmark :" | cut -f1) [ -z "$del" ] || (sed -i "${del}d" "$file" && notify-send -i "bookmark-missing" "Bookmark deleted" -u critical) ;; copy) - sed '/^$/d' "$file" "$oshi_file" | sed -E 's/.*DL: ([^|]*).*/\1/g' | bemenu --fn 'Roboto 15' -i -c -W 0.6 -B 3 -l 30 -p "Put-bookmark :" | tr '\`' '\n' | wl-copy && notify-send "Copied to clipboard" -i "com.github.davidmhewitt.clipped" + sed '/^$/d' "$file" "$oshi_file" | sed -E 's/.*DL: ([^|]*).*/\1/g' | menu "COPY-bookmark :" | tr '\`' '\n' | wl-copy && notify-send "Copied to clipboard" -i "com.github.davidmhewitt.clipped" ;; *) - result="$(sed '/^$/d' "$file" "$oshi_file" | sed -E 's/.*DL: ([^|]*).*/\1/g' | bemenu --fn 'Roboto 15' -i -c -W 0.6 -B 3 -l 30 -p "Put-bookmark :" | tr '\`' '\n')" + result="$(sed '/^$/d' "$file" "$oshi_file" | sed -E 's/.*DL: ([^|]*).*/\1/g' | menu "Put-bookmark :" | tr '\`' '\n')" if printf '%s' "$result" | grep -q 'B>'; then google-chrome-stable "$(printf '%s' "$result" | cut -d'>' -f2- | tr -d '\n ')" else diff --git a/hypr/bluetooth b/hypr/bluetooth index ef546aa..335b581 100755 --- a/hypr/bluetooth +++ b/hypr/bluetooth @@ -304,7 +304,7 @@ original_args=("$@") # dmenu command to pipe into. Extra arguments to dmenu-bluetooth are passed through to dmenu. This # allows the user to set fonts, sizes, colours, etc. run_dmenu() { - bemenu "${original_args[@]}" --fn 'Roboto 16' -i -l 10 -c -W 0.4 -B 3 -p "$1" + bemenu "${original_args[@]}" --fn 'Roboto 16' -i -l 10 -c -W 0.4 -B 3 -p "$1" --bdr="#$GLOBAL_ACCENT" --tf="#$GLOBAL_ACCENT" --hf="#$GLOBAL_ACCENT" } case "$1" in diff --git a/hypr/dmenu_run_history b/hypr/dmenu_run_history index 6c6ae7a..e4606f5 100755 --- a/hypr/dmenu_run_history +++ b/hypr/dmenu_run_history @@ -6,7 +6,7 @@ historyfile=$cachedir/dmenu_history ls /bin > "$cache" -cut -f2 "$historyfile" "$cache" | bemenu --fixed-height --fn 'JetBrainsMono Nerd Font 15' -i -c -W 0.5 -B 3 -p "RUN: " -l 15 -P ">>" \ +cut -f2 "$historyfile" "$cache" | bemenu --fixed-height --fn 'JetBrainsMono Nerd Font 15' -i -c -W 0.5 -B 3 -p "RUN: " -l 15 -P ">>" --bdr="#$GLOBAL_ACCENT" --tf="#$GLOBAL_ACCENT" --hf="#$GLOBAL_ACCENT" \ | awk -v histfile=$historyfile ' BEGIN { FS=OFS="\t" diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index b5067e8..fbe0b86 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,14 +1,16 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,highrr,auto,1 $hypr_dir="$HOME/.config/hypr" - +$accent=00D8CE #envs -env = LIBVA_DRIVER_NAME,nvidia +#env = LIBVA_DRIVER_NAME,nvidia env = XDG_SESSION_TYPE,wayland -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia +#env = GBM_BACKEND,nvidia-drm +#env = __GLX_VENDOR_LIBRARY_NAME,nvidia env = WLR_NO_HARDWARE_CURSORS,1 +env = GLOBAL_ACCENT,$accent + # See https://wiki.hyprland.org/Configuring/Keywords/ for more # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ @@ -34,9 +36,9 @@ general { gaps_in = 2 gaps_out = 4 border_size = 3 - col.active_border = rgba(D81860FF) + col.active_border = rgb($accent) col.inactive_border = rgba(595959aa) - resize_on_border=true + resize_on_border=false layout = dwindle } @@ -50,9 +52,9 @@ decoration { shadow_render_power = 3 col.shadow = rgba(1a1a1aee) blur { - enabled = false + enabled = yes size = 8 - passes = 2 + passes = 3 } } @@ -83,6 +85,10 @@ gestures { workspace_swipe_fingers = 3 } +misc { + force_default_wallpaper = 0 +} + # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -131,7 +137,6 @@ bindm = $mainMod, mouse:273, resizewindow #applications shortcuts bind = $mainMod, F4, exec, $HOME/repos_scripts/ani-new bind = $mainMod, F5, exec, $hypr_dir/wifi -bind = $mainMod, R, exec, $hypr_dir/launch bind = $mainMod, return, exec, [workspace 2] foot bind = $mainMod, Q, exec, $hypr_dir/dmenu_run_history bind = $mainMod, A, exec, [workspace 1] google-chrome-stable @@ -170,16 +175,17 @@ windowrulev2=workspace 4,class:^(Google-chrome)$ windowrulev2=workspace 3,class:^(mpv)$ windowrulev2=workspace 3,class:^([c|C]ode) windowrulev2=workspace 4,class:^(pavucontrol)$ -windowrulev2=workspace 4,class:^(org.freedesktop.Xwayland)$ -windowrulev2=fullscreen,class:^(org.freedesktop.Xwayland)$ -windowrulev2 = bordercolor rgba(64f2a4ff), xwayland: 1 +#windowrulev2=workspace 4,class:^(org.freedesktop.Xwayland)$ +#windowrulev2=fullscreen,class:^(org.freedesktop.Xwayland)$ +windowrulev2=workspace 4,class:^(virt-manager)$ +windowrulev2 = bordercolor rgba(D81860FF), xwayland: 1 #startup applications exec-once=dbus-update-activation-environment --systemd --all exec-once=ssh-agent exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once=node $HOME/github/arrpc/src > /tmp/arrpc-log -exec-once=swaybg -i $HOME/.config/wall/9.png +#exec-once=swaybg -i $HOME/.config/wall/9.png exec-once=xrdb -merge $HOME/.config/.Xresource exec-once=$hypr_dir/workspace 'focus' exec-once=sleep 2 && $hypr_dir/workspace diff --git a/hypr/launch b/hypr/launch deleted file mode 100755 index 85e0f89..0000000 --- a/hypr/launch +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -menu() { - bemenu --fn 'IBM Plex Sans 15' -i -c -W "0.${2:-5}" -B 3 -p "$1" -l 25 -P ">>" -} - -[ -z "$1" ] && dir="$HOME/repos_scripts" || dir="$1" - -[ -d "$dir" ] || exit 0 - -script=$(find "$dir" -maxdepth 1 -type f ! -name '*.md' ! -name ".*" -printf "%f\n" | menu "Run Script: " "2") - -[ -z "$script" ] && exit 0 - -sh -c "$dir/$script" diff --git a/hypr/workspace b/hypr/workspace index 4e8fdcc..96c36ec 100755 --- a/hypr/workspace +++ b/hypr/workspace @@ -16,7 +16,7 @@ setup_dual_monitor() { handle_it() { [ -z "$1" ] || notify-send "$1" - choice=$(printf "Mirror\nExtend" | bemenu --fn 'Roboto 15' -i -c -W 0.2 -B 3 -l 20 -p "what to do??: " -m 1) + choice=$(printf "Mirror\nExtend" | bemenu --fn 'Roboto 15' -i -c -W 0.2 -B 3 -l 20 -p "what to do??: " -m 1 --bdr="#$GLOBAL_ACCENT" --tf="#$GLOBAL_ACCENT" --hf="#$GLOBAL_ACCENT") [ -z "$choice" ] && return 0 notify-send "${choice}ing screen" if [ "$choice" = "Extend" ]; then diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index a4eea58..1dcd075 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,25 +1,25 @@ { - "LuaSnip": { "branch": "master", "commit": "f03089854a8e15594a01562fa7192d0009a6fbe7" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4eb8e15e3c0757303d4c6dea64d2981fc679e990" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "monokai-pro.nvim": { "branch": "main", "commit": "8ba1fea7774e7c522b006091a9adb32b5cef95b9" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, - "nvim-dap-python": { "branch": "master", "commit": "e0be843877e7ae756ef1ee7a441ca0b9e1677da9" }, - "nvim-lspconfig": { "branch": "master", "commit": "694aaec65733e2d54d393abf80e526f86726c988" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" }, + "nvim-lspconfig": { "branch": "master", "commit": "d12140c5687a1186b95b3f42dbc6cc769df0cf0d" }, "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, - "nvim-treesitter": { "branch": "master", "commit": "80a16deb5146a3eb4648effccda1ab9f45e43e76" }, + "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" }, "packer.nvim": { "branch": "master", "commit": "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3" }, - "telescope.nvim": { "branch": "master", "commit": "e90fdba90d29d0284cefa4ef5833ef3e56602057" } + "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" } } \ No newline at end of file diff --git a/zsh/zshrc b/zsh/zshrc index 93511b2..ce35646 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -51,7 +51,7 @@ b64() { } mkvcinemas() { - local base_url="https://mkvcinemas.foo" + local base_url="https://mkvcinemas.zip" local agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36" [ -z "$*" ] && printf "Search> " && read -r query || query="$*"