From c697c5e352b7fd672e9e96d6f5e9ea888a195b8e Mon Sep 17 00:00:00 2001 From: Ayush Dumasia Date: Fri, 6 Jun 2025 18:54:56 +0530 Subject: [PATCH] =?UTF-8?q?refactor=20=F0=9F=94=A8:=20Too=20many?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastfetch/config.jsonc | 120 ++++++++++++++++++++++++----------------- hypr/hyprland.conf | 8 +-- hypr/hyprlock.conf | 90 +++++++++++++++---------------- zsh/.zshrc | 21 +++++--- 4 files changed, 134 insertions(+), 105 deletions(-) diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc index 36f747b..0c424ee 100644 --- a/fastfetch/config.jsonc +++ b/fastfetch/config.jsonc @@ -1,78 +1,98 @@ +// Inspired by Catnap { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", "logo": { "type": "small", "padding": { - "top": 1, - "bottom": 1, - "left": 5, - "right": 5 + "top": 2, + "right": 2 } - // "source": "~/.config/fastfetch/icons/arch.txt" }, "display": { - "separator": " " + "separator": " ", + "key": { + "width": 16 + } }, "modules": [ { - "type": "os", - "key": " ", - "keyColor": "blue" + "key": "╭───────────╮", + "type": "custom" }, { - "type": "users", - "key": " ", - "keyColor": "blue" + // draw borders first to make colors of left and right border consistant + "key": "│ │\u001b[11D{#31} user", + "type": "title", + "format": "{1}" }, { - "type": "kernel", - "key": " ", - "keyColor": "black" - }, - { - "type": "packages", - "key": " ", - "keyColor": "cyan" - }, - { - "type": "shell", - "key": " ", - "keyColor": "dim_" + "key": "├───────────┤", + "type": "custom" }, // { - // "type": "terminal", - // "key": " ", - // "keyColor": "green" + // "key": "│ │\u001b[11D{#32}󰇅 hname", + // "type": "title", + // "format": "{2}" + // }, + // { + // "key": "│ │\u001b[11D{#33}󰅐 uptime", + // "type": "uptime" // }, { - "type": "wm", - "key": " ", - "keyColor": "red" + "key": "│ │\u001b[11D{#34}󰟾 distro", + "type": "os" + }, + { + "key": "│ │\u001b[11D{#35} kernel", + "type": "kernel" + }, + { + "key": "│ │\u001b[11D{#36}󰇄 desktop", + "type": "de" + }, + { + "key": "│ │\u001b[11D{#31} term", + "type": "terminal" + }, + { + "key": "│ │\u001b[11D{#31} wm", + "type": "wm" + }, + { + "key": "│ │\u001b[11D{#32} shell", + "type": "shell" }, // { - // "type": "uptime", - // "key": " ", - // "keyColor": "cyan" + // "key": "│ │\u001b[11D{#33}󰍛 cpu", + // "type": "cpu", + // "showPeCoreCount": true // }, { - "type": "cpu", - "key": " ", - "keyColor": "blue" - }, - // { - // "type": "btrfs", - // "key": " ", - // "keyColor": "red" - // }, - { - "type": "gpu", - "key": " ", - "keyColor": "green" + "key": "│ │\u001b[11D{#34}󰉉 disk", + "type": "disk", + "folders": "/" }, { - "type": "memory", - "key": "󰍛 ", - "keyColor": "yellow" + "key": "│ │\u001b[11D{#35} memory", + "type": "memory" + }, + { + "key": "│ │\u001b[11D{#36}󰩟 network", + "type": "localip", + "format": "{1} ({4})" + }, + { + "key": "├───────────┤", + "type": "custom" + }, + { + "key": "│ │\u001b[11D{#39} colors", + "type": "colors", + "symbol": "circle" + }, + { + "key": "╰───────────╯", + "type": "custom" } ] } diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 71a2b58..c5cdaba 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -10,7 +10,7 @@ monitor=DP-1,1920x1080@144,auto,auto $terminal = kitty $fileManager = yazi $menu = rofi -show run -$browser = app.zen_browser.zen +$browser = app.zen_browser.zen $taskManager = btop $colorpicker = hyprpicker @@ -25,8 +25,8 @@ exec-once = wl-paste --type text --watch cliphist store exec-once = wl-paste --type image --watch cliphist store exec-once = hyprpaper & waybar exec-once = hypridle -exec-once = [workspace 1] $browser -exec-once = [workspace 2] $terminal +exec-once = [workspace 1] $browser +exec-once = [workspace 2] $terminal @@ -34,7 +34,7 @@ exec-once = [workspace 2] $terminal ### Windows Rules ### ############################# # windowrule = opacity 1 override 1 override 1.0 override, class:Code -#windowrule = opacity 1 override 1 override 1.0 override, class:zen +#windowrule = opacity 1 override 1 override 1.0 override, class:zen windowrulev2 = workspace 1, class:zen windowrulev2 = workspace 1, class:firefox-bin windowrulev2 = workspace 1, class:obsidian diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index b9b2090..5dedb93 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -31,28 +31,28 @@ # # } # # TIME -# label { -# monitor = -# text = $TIME -# color = $text -# font_size = 90 -# font_family = $font -# position = -30, 0 -# halign = right -# valign = top -# } +label { + monitor = + text = $TIME + color = $text + font_size = 90 + font_family = JetBrainsMono Nerd Font + position = -40, 10 + halign = right + valign = top +} # # DATE -# label { -# monitor = -# text = cmd[update:43200000] date +"%A, %d %B %Y" -# color = $text -# font_size = 20 -# font_family = $font -# position = -30, -150 -# halign = right -# valign = top -# } +label { + monitor = + text = cmd[update:43200000] date +"%A, %d %B %Y" + color = $text + font_size = 20 + font_family = JetBrainsMono Nerd Font + position = -30, -150 + halign = right + valign = top +} # # USER AVATAR # # image { @@ -92,7 +92,7 @@ background { monitor = - path = /home/arcadian/Pictures/Wallpaper/nw9975ixkyqe1.png + path = /home/arcadian/Pictures/Wallpaper/0297.jpg # only png supported for now } @@ -126,31 +126,31 @@ input-field { valign = center } -label { - monitor = - text = cmd[update:1000] echo "$TIME" - color = rgba(a6adc8) - font_size = 55 - font_family = JetBrainsMono Nerd Font - position = -100, 40 - halign = right - valign = bottom - shadow_passes = 5 - shadow_size = 10 -} +# label { +# monitor = +# text = cmd[update:1000] echo "$TIME" +# color = rgba(a6adc8) +# font_size = 55 +# font_family = JetBrainsMono Nerd Font +# position = -100, 40 +# halign = right +# valign = bottom +# shadow_passes = 5 +# shadow_size = 10 +# } -label { - monitor = - text = Hello - color = rgba(a6adc8) - font_size = 20 - font_family = JetBrainsMono Nerd Font - position = -100, 160 - halign = right - valign = bottom - shadow_passes = 5 - shadow_size = 10 -} +# label { +# monitor = +# text = Hello +# color = rgba(a6adc8) +# font_size = 20 +# font_family = JetBrainsMono Nerd Font +# position = -100, 160 +# halign = right +# valign = bottom +# shadow_passes = 5 +# shadow_size = 10 +# } # image { # monitor = diff --git a/zsh/.zshrc b/zsh/.zshrc index 215b6f3..590e5c6 100755 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -93,19 +93,19 @@ alias vim='nvim' alias gh-create='gh repo create --private --source=. --remote=origin && git push -u --all && gh browse' add(){ - git add --patch + git add --patch } commit(){ - bash ~/work/main/dotsh/gh/commit + bash ~/work/main/dotsh/gh/commit } push(){ - git push + git push } ms(){ - touch "$1" && chmod +x "$1" + touch "$1" && chmod +x "$1" } alias kls='kubectl get all' @@ -194,7 +194,7 @@ c() { } music() { - xdg-open https://music.youtube.com/ + xdg-open https://music.youtube.com/ } autoload -U +X bashcompinit && bashcompinit @@ -210,4 +210,13 @@ export PATH="$HOME/.cargo/bin:$PATH" alias todo='~/.todo/todo_tui.sh' alias todocli='~/.todo/todo_cli.sh' -fastfetch +# fastfetch + +if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then + if tmux has-session -t default 2>/dev/null; then + tmux new-window -t default + tmux attach-session -t default + else + tmux new-session -s default + fi +fi