diff --git a/home/config/alacritty/alacritty.toml b/home/config/alacritty/alacritty.toml index 7161a9b..9bfb0fe 100644 --- a/home/config/alacritty/alacritty.toml +++ b/home/config/alacritty/alacritty.toml @@ -1,8 +1,13 @@ +import = [ + "~/.config/alacritty/catppuccin-mocha.toml" +] + [window] decorations = "None" dynamic_padding = false opacity = 0.8 startup_mode = "Windowed" +dynamic_title = true [font] size = 11.0 @@ -28,82 +33,3 @@ bindings = [ { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" } #ctrl + shift + enter = open new instance in same dir ] - -# Theme -# catppuccin_mocha -# https://github.com/alacritty/alacritty-theme -[colors.primary] -background = '#1E1E2E' # base -foreground = '#CDD6F4' # text -# Bright and dim foreground colors -dim_foreground = '#CDD6F4' # text -bright_foreground = '#CDD6F4' # text - -# Cursor colors -[colors.cursor] -text = '#1E1E2E' # base -cursor = '#F5E0DC' # rosewater - -[colors.vi_mode_cursor] -text = '#1E1E2E' # base -cursor = '#B4BEFE' # lavender - -# Search colors -[colors.search.matches] -foreground = '#1E1E2E' # base -background = '#A6ADC8' # subtext0 - -[colors.search.focused_match] -foreground = '#1E1E2E' # base -background = '#A6E3A1' # green - -[colors.footer_bar] -foreground = '#1E1E2E' # base -background = '#A6ADC8' # subtext0 - -# Keyboard regex hints -[colors.hints.start] -foreground = '#1E1E2E' # base -background = '#F9E2AF' # yellow - -[colors.hints.end] -foreground = '#1E1E2E' # base -background = '#A6ADC8' # subtext0 - -# Selection colors -[colors.selection] -text = '#1E1E2E' # base -background = '#F5E0DC' # rosewater - -# Normal colors -[colors.normal] -black = '#45475A' # surface1 -red = '#F38BA8' # red -green = '#A6E3A1' # green -yellow = '#F9E2AF' # yellow -blue = '#89B4FA' # blue -magenta = '#F5C2E7' # pink -cyan = '#94E2D5' # teal -white = '#BAC2DE' # subtext1 - -# Bright colors -[colors.bright] -black = '#585B70' # surface2 -red = '#F38BA8' # red -green = '#A6E3A1' # green -yellow = '#F9E2AF' # yellow -blue = '#89B4FA' # blue -magenta = '#F5C2E7' # pink -cyan = '#94E2D5' # teal -white = '#A6ADC8' # subtext0 - -# Dim colors -[colors.dim] -black = '#45475A' # surface1 -red = '#F38BA8' # red -green = '#A6E3A1' # green -yellow = '#F9E2AF' # yellow -blue = '#89B4FA' # blue -magenta = '#F5C2E7' # pink -cyan = '#94E2D5' # teal -white = '#BAC2DE' # subtext1< \ No newline at end of file diff --git a/home/config/alacritty/catppuccin-mocha.toml b/home/config/alacritty/catppuccin-mocha.toml new file mode 100644 index 0000000..0f202c8 --- /dev/null +++ b/home/config/alacritty/catppuccin-mocha.toml @@ -0,0 +1,76 @@ +#https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml +[colors.primary] +background = "#1E1E2E" +foreground = "#CDD6F4" +dim_foreground = "#CDD6F4" +bright_foreground = "#CDD6F4" + +[colors.cursor] +text = "#1E1E2E" +cursor = "#F5E0DC" + +[colors.vi_mode_cursor] +text = "#1E1E2E" +cursor = "#B4BEFE" + +[colors.search.matches] +foreground = "#1E1E2E" +background = "#A6ADC8" + +[colors.search.focused_match] +foreground = "#1E1E2E" +background = "#A6E3A1" + +[colors.footer_bar] +foreground = "#1E1E2E" +background = "#A6ADC8" + +[colors.hints.start] +foreground = "#1E1E2E" +background = "#F9E2AF" + +[colors.hints.end] +foreground = "#1E1E2E" +background = "#A6ADC8" + +[colors.selection] +text = "#1E1E2E" +background = "#F5E0DC" + +[colors.normal] +black = "#45475A" +red = "#F38BA8" +green = "#A6E3A1" +yellow = "#F9E2AF" +blue = "#89B4FA" +magenta = "#F5C2E7" +cyan = "#94E2D5" +white = "#BAC2DE" + +[colors.bright] +black = "#585B70" +red = "#F38BA8" +green = "#A6E3A1" +yellow = "#F9E2AF" +blue = "#89B4FA" +magenta = "#F5C2E7" +cyan = "#94E2D5" +white = "#A6ADC8" + +[colors.dim] +black = "#45475A" +red = "#F38BA8" +green = "#A6E3A1" +yellow = "#F9E2AF" +blue = "#89B4FA" +magenta = "#F5C2E7" +cyan = "#94E2D5" +white = "#BAC2DE" + +[[colors.indexed_colors]] +index = 16 +color = "#FAB387" + +[[colors.indexed_colors]] +index = 17 +color = "#F5E0DC" diff --git a/home/config/btop/btop.conf b/home/config/btop/btop.conf index 3215998..76a818a 100644 --- a/home/config/btop/btop.conf +++ b/home/config/btop/btop.conf @@ -1,4 +1,4 @@ -#? Config file for btop v. 1.2.13 +#? Config file for btop v. 1.3.2 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" @@ -37,6 +37,9 @@ graph_symbol = "braille" # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". graph_symbol_cpu = "default" +# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty". +graph_symbol_gpu = "default" + # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". graph_symbol_mem = "default" @@ -46,7 +49,7 @@ graph_symbol_net = "default" # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty". graph_symbol_proc = "default" -#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. +#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. shown_boxes = "cpu mem net proc" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. @@ -86,6 +89,9 @@ proc_left = False #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). proc_filter_kernel = False +#* In tree-view, always accumulate child process resources in the parent process. +proc_aggregate = False + #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. #* Select from a list of detected attributes from the options menu. cpu_graph_upper = "total" @@ -94,6 +100,9 @@ cpu_graph_upper = "total" #* Select from a list of detected attributes from the options menu. cpu_graph_lower = "total" +#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off". +show_gpu_info = "Auto" + #* Toggles if the lower CPU graph should be inverted. cpu_invert_lower = True @@ -207,6 +216,33 @@ show_battery = True #* Which battery to use if multiple are present. "Auto" for auto detection. selected_battery = "Auto" +#* Show power stats of battery next to charge indicator. +show_battery_watts = True + #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. -log_level = "WARNING" \ No newline at end of file +log_level = "WARNING" + +#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards. +nvml_measure_pcie_speeds = True + +#* Horizontally mirror the GPU graph. +gpu_mirror_graph = True + +#* Custom gpu0 model name, empty string to disable. +custom_gpu_name0 = "" + +#* Custom gpu1 model name, empty string to disable. +custom_gpu_name1 = "" + +#* Custom gpu2 model name, empty string to disable. +custom_gpu_name2 = "" + +#* Custom gpu3 model name, empty string to disable. +custom_gpu_name3 = "" + +#* Custom gpu4 model name, empty string to disable. +custom_gpu_name4 = "" + +#* Custom gpu5 model name, empty string to disable. +custom_gpu_name5 = "" diff --git a/home/config/hypr/hl-autostart.conf b/home/config/hypr/hl-autostart.conf index bec8705..a633429 100644 --- a/home/config/hypr/hl-autostart.conf +++ b/home/config/hypr/hl-autostart.conf @@ -3,17 +3,21 @@ # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch +exec-once = hyprctl plugin load /usr/lib/libhycov.so exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = ~/.config/hypr/xdg-portal-hyprland + exec-once = lxpolkit + exec-once = waypaper --restore exec-once = waybar -exec-once = cliphist wipe +# exec-once = dunst +exec-once = swayosd-server +exec-once = swaync + exec-once = wl-paste --watch cliphist store #Stores only text data exec-once = wl-paste --type image --watch cliphist store #Stores only image data -exec-once = dunst -#exec-once = swayidle -w timeout 300 '$HOME/.local/bin/moo-lockscreen' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f' -exec-once = swayidle -w timeout 300 'swaylock -f' timeout 360 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f' -exec-once = xdg-mime default pcmanfm.desktop inode/directory -#exec-once = sway-audio-idle-inhibit \ No newline at end of file + +exec-once = hypridle +exec-once = xdg-mime default pcmanfm.desktop inode/directory \ No newline at end of file diff --git a/home/config/hypr/hl-decoration.conf b/home/config/hypr/hl-decoration.conf index f46f6df..127b897 100644 --- a/home/config/hypr/hl-decoration.conf +++ b/home/config/hypr/hl-decoration.conf @@ -31,8 +31,8 @@ decoration { # █▀█ █▀█ ▄▀█ █▀▀ █ ▀█▀ █▄█ # █▄█ █▀▀ █▀█ █▄▄ █ ░█░ ░█░ - #active_opacity=0.98 - #inactive_opacity=0.7 + active_opacity=1.00 + inactive_opacity=1.00 #fullscreen_opacity=1.05 #dim_inactive=0 #dim_strength=0.2 diff --git a/home/config/hypr/hl-general.conf b/home/config/hypr/hl-general.conf index 98353a9..8651346 100644 --- a/home/config/hypr/hl-general.conf +++ b/home/config/hypr/hl-general.conf @@ -13,4 +13,6 @@ general { layout = dwindle resize_on_border = true + + no_cursor_warps = true } \ No newline at end of file diff --git a/home/config/hypr/hl-keybindings.conf b/home/config/hypr/hl-keybindings.conf index 3e204e9..25a18a6 100644 --- a/home/config/hypr/hl-keybindings.conf +++ b/home/config/hypr/hl-keybindings.conf @@ -5,36 +5,29 @@ $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, RETURN, exec, kitty -bind = $mainMod, Q, killactive, -#bind = $mainMod, M, exit, -bind = $mainMod, E, exec, xdg-open ~ -bind = $mainMod, V, togglefloating, -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, S, togglesplit, # dwindle -bind = $mainMod, F, fullscreen -bind = $mainMod, U, exec, $HOME/.config/conky/conkytoggler - -bind = $mainMod, SPACE, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh -bind = ALT, TAB, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh window -bind = $mainMod, N, exec, pkill rofi || ~/.config/rofi/nm-vpn/nm-vpn.sh -bind = $mainMod, M, exec, pkill rofi || networkmanager_dmenu -bind = $mainMod, T, exec, pkill rofi || ~/.config/rofi/settings-menu/settings-menu.sh -bind = $mainMod, A, exec, pkill rofi || ~/.config/rofi/volume/volume.sh -bind = $mainMod, I, exec, pkill rofi || $HOME/.config/rofi/emojis/emojis.sh | rofi -dmenu -theme $HOME/.config/rofi/emojis/emojis.rasi -mesg " Emojis" -#bind = $mainMod, L, exec, swaync-client -t -sw -#bind = $mainMod, K, exec, xkill - -bind = SUPER, C, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy - +#bind = $mainMod, RETURN, exec, kitty +bind = $mainMod, RETURN, exec, alacritty bind = $mainMod, TAB, cyclenext -bind = $mainMod ALT, SHIFT, cyclenext, prev - -bind=,PRINT,exec, pkill rofi || ~/.config/rofi/screenshot/screenshot.sh - -bind = CTRL ALT, DELETE, exec, kitty btop -p 1 - -bind = $mainMod, F4, exec, ~/.config/rofi/powermenu/powermenu.sh +bind = $mainMod SHIFT, TAB, cyclenext, prev +#bind = $mainMod, M, exit, +bind = $mainMod, A, exec, pkill rofi || ~/.config/rofi/volume/volume.sh +bind = $mainMod, C, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy +bind = $mainMod, E, exec, xdg-open ~ +bind = $mainMod, F, fullscreen +bind = $mainMod, G, exec, pkill rofi || ~/.config/rofi/shortcuts/hypr.sh +bind = $mainMod, I, exec, pkill rofi || $HOME/.config/rofi/emojis/emojis.sh | rofi -dmenu -theme $HOME/.config/rofi/emojis/emojis.rasi -mesg " Emojis" +bind = $mainMod, M, exec, pkill rofi || networkmanager_dmenu +bind = $mainMod, N, exec, pkill rofi || ~/.config/rofi/nm-vpn/nm-vpn.sh +bind = $mainMod, R, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh run +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, Q, killactive, +bind = $mainMod, S, togglesplit, # dwindle +bind = $mainMod, U, exec, $HOME/.config/conky/conkytoggler +bind = $mainMod, V, togglefloating, +bind = $mainMod, SPACE, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh +# bind = $mainMod, T, exec, pkill rofi || ~/.config/rofi/settings-menu/settings-menu.sh +bind = $mainMod, T, exec, pkill rofi || rofi -show fb -modes "fb:~/.config/rofi/settings-menu/setmen.sh" -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi +bind = $mainMod, F4, exec, wlogout -P 1 -s -r 10 -c 10 bind = $mainMod, escape, exec, killall -SIGUSR1 waybar # Move focus with mainMod @@ -81,16 +74,67 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow +#bind = ALT, TAB, exec, pkill rofi || ~/.config/rofi/launcher/launcher.sh window +bind = ALT,W, exec, killall waybar && waybar & +#bind = ALT,tab,hycov:toggleoverview +bind = ALT,tab,exec, pkill rofi || rofi -show window -theme $HOME/.config/rofi/app-switcher/app-switcher.rasi +#bind = $mainMod, L, exec, swaync-client -t -sw +#bind = $mainMod, K, exec, xkill + +bind=,PRINT,exec, hyprm-screenshot +#bind=,PRINT,exec, pkill rofi || ~/.config/rofi/screenshot/screenshot.sh +bind = CTRL ALT, DELETE, exec, alacritty -t "BTOP" -e btop -p 1 +#bind = CTRL ALT, DELETE, exec, env GTK_THEME=Adwaita:dark resources + +#bind = $mainMod, F4, exec, ~/.config/rofi/powermenu/powermenu.sh + + + + + + + + + + + + + + + # MODKEYS -bindr = CAPS, Caps_Lock, exec, swayosd --caps-lock + # SPECIAL MODKEYS -binde = ,XF86AudioRaiseVolume, exec, /home/dom/.local/bin/volnote up -binde = ,XF86AudioLowerVolume, exec, /home/dom/.local/bin/volnote down -binde = ,XF86AudioMute, exec, /home/dom/.local/bin/volnote mute -binde = ,XF86MonBrightnessUp, exec, swayosd --brightness raise -binde = ,XF86MonBrightnessDown, exec, swayosd --brightness lower +# binde = ,XF86AudioRaiseVolume, exec, /home/dom/.local/bin/volnote up +# binde = $mainMod, KP_Add, exec, /home/dom/.local/bin/volnote up +# binde = $mainMod, Page_Up, exec, /home/dom/.local/bin/volnote up + +# binde = ,XF86AudioLowerVolume, exec, /home/dom/.local/bin/volnote down +# binde = $mainMod, KP_Subtract, exec, /home/dom/.local/bin/volnote down +# binde = $mainMod, Page_Down, exec, /home/dom/.local/bin/volnote down + +# binde = ,XF86AudioMute, exec, /home/dom/.local/bin/volnote mute +# binde = ,XF86MonBrightnessUp, exec, swayosd --brightness raise +# binde = ,XF86MonBrightnessDown, exec, swayosd --brightness lower binde = ,XF86AudioPlay, exec, /home/dom/.local/bin/volnote toggle binde = ,XF86AudioStop, exec, playerctl stop binde = ,XF86AudioPrev, exec, playerctl prev binde = ,XF86AudioNext, exec, playerctl next + + + +# OSD (swayosd) +binde = ,XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise +binde = $mainMod, KP_Add, exec, swayosd-client --output-volume raise +binde = $mainMod, Page_Up, exec, swayosd-client --output-volume raise + +binde = ,XF86AudioLowerVolume, exec, swayosd-client --output-volume lower +binde = $mainMod, KP_Subtract, exec, swayosd-client --output-volume lower +binde = $mainMod, Page_Down, exec, swayosd-client --output-volume lower + +binde = ,XF86AudioMute, exec, swayosd-client --output-volume mute-toggle +binde = ,XF86MonBrightnessUp, exec, swayosd --brightness raise +binde = ,XF86MonBrightnessDown, exec, swayosd --brightness lower + +bindr = CAPS, Caps_Lock, exec, swayosd --caps-lock \ No newline at end of file diff --git a/home/config/hypr/hl-layout.conf b/home/config/hypr/hl-layout.conf index 48f5834..bc8739d 100644 --- a/home/config/hypr/hl-layout.conf +++ b/home/config/hypr/hl-layout.conf @@ -4,7 +4,7 @@ dwindle { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # you probably want this - no_gaps_when_only = 1 # monocle layout + no_gaps_when_only = 0 # monocle layout } master { diff --git a/home/config/hypr/hl-misc.conf b/home/config/hypr/hl-misc.conf index e4e5535..8ef77ef 100644 --- a/home/config/hypr/hl-misc.conf +++ b/home/config/hypr/hl-misc.conf @@ -10,4 +10,5 @@ misc { animate_manual_resizes = true enable_swallow = true swallow_regex = ^(kitty)$ + force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers } \ No newline at end of file diff --git a/home/config/hypr/hl-plugins.conf b/home/config/hypr/hl-plugins.conf new file mode 100644 index 0000000..be89ca8 --- /dev/null +++ b/home/config/hypr/hl-plugins.conf @@ -0,0 +1,25 @@ +plugin { + hycov { + overview_gappo = 60 # gaps width from screen edge + overview_gappi = 24 # gaps width from clients + enable_hotarea = 0 # enable mouse cursor hotarea, when cursor enter hotarea, it will toggle overview + hotarea_monitor = all # monitor name which hotarea is in, default is all + hotarea_pos = 3 # position of hotarea (1: bottom left, 2: bottom right, 3: top left, 4: top right) + hotarea_size = 10 # hotarea size, 10x10 + swipe_fingers = 4 # finger number of gesture,move any directory + move_focus_distance = 100 # distance for movefocus,only can use 3 finger to move + enable_gesture = 0 # enable gesture + disable_workspace_change = 0 # disable workspace change when in overview mode + disable_spawn = 0 # disable bind exec when in overview mode + auto_exit = 1 # enable auto exit when no client in overview + auto_fullscreen = 0 # auto make active window maximize after exit overview + only_active_workspace = 0 # only overview the active workspace + only_active_monitor = 0 # only overview the active monitor + enable_alt_release_exit = 1 # alt swith mode arg,see readme for detail + alt_replace_key = Alt_L # alt swith mode arg,see readme for detail + alt_toggle_auto_next = 1 # auto focus next window when toggle overview in alt swith mode + click_in_cursor = 1 # when click to jump,the target windwo is find by cursor, not the current foucus window. + hight_of_titlebar = 0 # height deviation of title bar hight + } + +} \ No newline at end of file diff --git a/home/config/hypr/hl-windowrules.conf b/home/config/hypr/hl-windowrules.conf index 1b6f63f..5484988 100644 --- a/home/config/hypr/hl-windowrules.conf +++ b/home/config/hypr/hl-windowrules.conf @@ -9,10 +9,10 @@ # firefox Picture-in-Picture windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$ windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$ -windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$ +#windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$ # firefox figma micro indicator -windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$ +#windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$ windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$ # Common Dialogs @@ -22,7 +22,9 @@ windowrule = size 600 400, title:^(Öffnen von)$ windowrule = float,title:^(Choose Files)$ windowrule = float,title:^(Save As)$ windowrule = float,title:^(Confirm to replace files)$ -windowrule = float,title:^(Ersetzung)$ +windowrule = float,title:^(Ersetzung bestätigen)$ +windowrule = float,title:^(Anrufe)$ +windowrule = float,title:^(Datei ausführen)$ windowrule = float,title:^(File Operation Progress)$ windowrule = float,title:^(Teilen-Hinweis)$ windowrule = float,title:^(Lxpolkit)$ @@ -44,7 +46,6 @@ windowrule = float, title:branchdialog windowrule = float, Lxappearance windowrule = float, Resources windowrule = float, Rofi -windowrule = animation none,Rofi windowrule = float,viewnior windowrule = float,feh windowrule = float, pavucontrol-qt @@ -55,8 +56,9 @@ windowrule = idleinhibit fullscreen, firefox windowrule = float, title:^(Media viewer)$ windowrule = float, title:^(Volume Control)$ -windowrule = float, title:^(btop)$ -windowrule = size 1024 768, title:^(btop)$ +windowrule = float, title:^(BTOP)$ +#windowrule = size 1024 768, title:^(BTOP)$ +windowrule = center, title:^(BTOP)$ windowrule = float, title:^(Picture-in-Picture)$ windowrule = size 800 600, title:^(Volume Control)$ @@ -96,4 +98,5 @@ windowrule = fullscreen,title:^(Default - Wine desktop)$ #windowrulev2 = float,class:^(libreoffice)$ -#layerrule = blur,rofi \ No newline at end of file +#layerrule = blur,rofi +#windowrule = blur, title:^(kitty)$ \ No newline at end of file diff --git a/home/config/hypr/hypridle.conf b/home/config/hypr/hypridle.conf new file mode 100644 index 0000000..26a31f6 --- /dev/null +++ b/home/config/hypr/hypridle.conf @@ -0,0 +1,16 @@ +general { + lock_cmd = hyprlock + before_sleep_cmd = hyprctl dispatch dpms on + after_sleep_cmd = hyprctl dispatch dpms off +} + +listener { + timeout = 300 + on-timeout = hyprlock +} + +listener { + timeout = 360 + on-timeout = hyprctl dispatch dpms off + on-resume = hyprctl dispatch dpms on +} \ No newline at end of file diff --git a/home/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf index 7affc46..72adb3d 100644 --- a/home/config/hypr/hyprland.conf +++ b/home/config/hypr/hyprland.conf @@ -1,20 +1,24 @@ -# -# Please note not all available settings / options are set here. -# For a full list, see the wiki -# -env = XCURSOR_SIZE,24 -env = HYPRLAND_INTERACTIVE_SCREENSHOT_SAVEDIR,$HOME/Pictures/Screenshots +# Set programs that you use +$terminal = alacritty +$fileManager = pcmanfm +$menu = rofi + +#env = XCURSOR_SIZE,24 env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = WINDOW_MANAGER,Hyprland env = XDG_SESSION_TYPE,wayland +env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that #env = GTK_THEME,Catppuccin-Mocha-Standard-Lavender-Dark -source = ~/.config/hypr/hl-displays.conf -source = ~/.config/hypr/hl-general.conf +source = ~/.config/hypr/hl-displays.conf source = ~/.config/hypr/hl-autostart.conf +source = ~/.config/hypr/hl-general.conf +source = ~/.config/hypr/hl-plugins.conf source = ~/.config/hypr/hl-input.conf source = ~/.config/hypr/hl-decoration.conf source = ~/.config/hypr/hl-animation.conf source = ~/.config/hypr/hl-layout.conf -source = ~/.config/hypr/hl-windowrules.conf +source = ~/.config/hypr/hl-windowrules.conf source = ~/.config/hypr/hl-keybindings.conf source = ~/.config/hypr/hl-misc.conf \ No newline at end of file diff --git a/home/config/hypr/hyprlock.conf b/home/config/hypr/hyprlock.conf new file mode 100644 index 0000000..780078c --- /dev/null +++ b/home/config/hypr/hyprlock.conf @@ -0,0 +1,57 @@ + +general { + +} + +background { + monitor = + path = screenshot + color = rgba(25, 20, 20, 1.0) + + # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations + blur_passes = 1 # 0 disables blurring + blur_size = 4 + size = 4 + passes = 2 + ignore_opacity = true + new_optimizations = true + xray = false + noise = 0.0117 + contrast = 0.8916 + brightness = 0.8172 + #vibrancy = 0.1696 + # vibrancy_darkness = 0 + special = false + +} + +label { + monitor = + text = $TIME + color = rgba(200, 200, 200, 1.0) + font_size = 25 + font_family = Hack Nerd Font + + position = 0, 80 + halign = center + valign = center +} + +input-field { + monitor = + size = 200, 50 + outline_thickness = 3 + dots_size = 0.24 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.12 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgb(313244) + inner_color = rgb(30, 30, 46) + font_color = rgb(A6ADC8) + fade_on_empty = false + placeholder_text = Input Password... + hide_input = false + + position = 0, 0 + halign = center + valign = center +} diff --git a/home/config/rofi/app-switcher/app-switcher.rasi b/home/config/rofi/app-switcher/app-switcher.rasi new file mode 100644 index 0000000..02f4ded --- /dev/null +++ b/home/config/rofi/app-switcher/app-switcher.rasi @@ -0,0 +1,25 @@ +@import "../config.rasi" +@import "../colors.rasi" + + +listview { + columns: 1; + lines: 4; +} + +inputbar { + children: [ "textbox-prompt-colon", "entry"]; +} + +element { + orientation:horizontal; + children: ["element-icon", "element-text"]; +} +element-icon { + size: 32px; +} + +element-text { + vertical-align: 0.5; + horizontal-align: 0.5; +} diff --git a/home/config/rofi/colors copy.rasi b/home/config/rofi/colors copy.rasi new file mode 100644 index 0000000..c685de3 --- /dev/null +++ b/home/config/rofi/colors copy.rasi @@ -0,0 +1,15 @@ +/** + * @author Dominik Kressler + * @package rofi-archer + * @version 1.0.0 + **/ + +* { + background: #4c4f69; + background-alt: #404552; + foreground: #acb0d0; + selected: #4c566a; + border: #313244; + active: #98C37988; + urgent: #E06C75FF; +} \ No newline at end of file diff --git a/home/config/rofi/config.rasi b/home/config/rofi/config.rasi index 2ececb2..6661802 100644 --- a/home/config/rofi/config.rasi +++ b/home/config/rofi/config.rasi @@ -29,7 +29,6 @@ configuration { * { - border-colour: var(borders); handle-colour: var(selected); foreground-colour: var(foreground); alternate-background: var(background-alt); @@ -89,9 +88,10 @@ mainbox { enabled: true; spacing: 10px; margin: 0px; - padding: 30px; + /*padding: 30px;*/ background-color: transparent; children: [ "message", "listview", "inputbar" ]; + padding: 0 0 30px 0; } /*****----- Inputbar -----*****/ @@ -99,7 +99,7 @@ inputbar { enabled: true; spacing: 10px; margin: 0; - padding: 20px 0px 0; + padding: 20px 0 0 30px; border: 0px solid; border-radius: 0px; border-color: @borders; @@ -119,7 +119,7 @@ textbox-prompt-colon { expand: false; //font: "MonarchOS 14"; //str: ""; - str: "󰣇"; + str: "󰍉"; background-color: inherit; text-color: inherit; } @@ -170,9 +170,9 @@ listview { fixed-height: true; fixed-columns: true; - spacing: 5px; + spacing: 10px; margin: 0px; - padding: 0px; + padding: 30px 30px 0px 30px; border: 0px solid; border-radius: 0px; border-color: @borders; @@ -199,6 +199,8 @@ element { background-color: transparent; text-color: var(theme-text-color); cursor: pointer; + orientation: horizontal; + children: ["element-text"]; } element normal.normal { background-color: transparent; @@ -228,7 +230,7 @@ element selected.active { element-icon { background-color: transparent; text-color: inherit; - size: 24px; + size: 16px; cursor: inherit; } element-text { @@ -245,7 +247,7 @@ mode-switcher{ enabled: true; spacing: 10px; margin: 0px; - padding: 0px; + padding: 0px 30px 0px 0; border: 0px solid; border-radius: 0px; border-color: @borders; @@ -253,12 +255,12 @@ mode-switcher{ text-color: var(theme-text-color); } button { - padding: 7px 15px 7px 10px; + padding: 2px 14px 2px 9px; border: 0px solid; - border-radius: 100%; + border-radius: 10px; border-color: @borders; - background-color: @alternate-background; - text-color: inherit; + background-color: @theme-selected-bg-color; + text-color: var(theme-base-color); cursor: pointer; } button selected { @@ -270,7 +272,7 @@ button selected { message { enabled: true; margin: 0px; - padding: 0px; + padding: 0 0 0 0; border: 0px solid; border-radius: 0px 0px 0px 0px; border-color: @borders; @@ -278,14 +280,14 @@ message { text-color: var(theme-text-color); } textbox { - padding: 8px 10px; + padding: 30px 10px 0 10px; border: 0px solid; - border-radius: 10px; + border-radius: 10px 10px 0 0; border-color: @borders; - background-color: @alternate-background; + background-color: transparent; + font: "Hack Nerd Font 12"; text-color: var(theme-text-color); - vertical-align: 0.5; - horizontal-align: 0.0; + horizontal-align: 0.5; highlight: none; placeholder-color: var(theme-text-color); blink: true; diff --git a/home/config/rofi/cpugov/rofi-cpugov.rasi b/home/config/rofi/cpugov/rofi-cpugov.rasi index f008c40..82b16ec 100644 --- a/home/config/rofi/cpugov/rofi-cpugov.rasi +++ b/home/config/rofi/cpugov/rofi-cpugov.rasi @@ -1,152 +1,32 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Rofi Theme File - * Rofi Version: 1.7.3 - **/ - -/*****----- Configuration -----*****/ configuration { - modi: "drun,run,filebrowser,window"; - show-icons: true; + modi: "drun"; + show-icons: false; drun-display-format: "{name}"; } -/*****----- Global Properties -----*****/ @import "../config.rasi" @import "../colors.rasi" -* { - border-colour: var(border); - handle-colour: var(selected); - background-colour: var(background); - foreground-colour: var(foreground); - alternate-background: var(background-alt); - normal-background: var(background); - normal-foreground: var(foreground); - urgent-background: var(urgent); - urgent-foreground: var(background); - active-background: var(active); - active-foreground: var(background); - selected-normal-background: var(selected); - selected-normal-foreground: var(background); - selected-urgent-background: var(active); - selected-urgent-foreground: var(background); - selected-active-background: var(urgent); - selected-active-foreground: var(background); - alternate-normal-background: var(background); - alternate-normal-foreground: var(foreground); - alternate-urgent-background: var(urgent); - alternate-urgent-foreground: var(background); - alternate-active-background: var(active); - alternate-active-foreground: var(background); -} -/*****----- Main Window -----*****/ window { - /* properties for window widget */ - transparency: "real"; - location: center; - anchor: center; - fullscreen: false; - width: 600px; - x-offset: 0px; - y-offset: 0px; - - /* properties for all widgets */ enabled: true; - cursor: "default"; - /* Backgroud Colors */ - background-color: @background-colour; - /* Backgroud Image */ - //background-image: url("/path/to/image.png", none); - /* Simple Linear Gradient */ - //background-image: linear-gradient(red, orange, pink, purple); - /* Directional Linear Gradient */ - //background-image: linear-gradient(to bottom, pink, yellow, magenta); - /* Angle Linear Gradient */ - //background-image: linear-gradient(45, cyan, purple, indigo); + width: 300px; + height: 300px; } -/*****----- Main Box -----*****/ + mainbox { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 30px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; children: [ "message", "listview", "inputbar" ]; } -/*****----- Inputbar -----*****/ + inputbar { enabled: true; - spacing: 10px; - margin: 0; - padding: 20px 0px 0; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; + children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; } -prompt { - enabled: true; - background-color: inherit; - text-color: inherit; -} -textbox-prompt-colon { - enabled: true; - padding: 5px 0px 0px 15px; - expand: false; - font: "MonarchOS 14"; - str: ""; - background-color: inherit; - text-color: inherit; -} -entry { - enabled: true; - padding: 5px 0px; - background-color: inherit; - text-color: inherit; - cursor: text; - placeholder: "..."; - placeholder-color: inherit; -} -num-filtered-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -textbox-num-sep { - enabled: true; - expand: false; - str: "/"; - background-color: inherit; - text-color: inherit; -} -num-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -case-indicator { - enabled: true; - background-color: inherit; - text-color: inherit; -} - -/*****----- Listview -----*****/ listview { enabled: true; columns: 1; @@ -157,134 +37,9 @@ listview { layout: vertical; reverse: false; fixed-height: true; - fixed-columns: true; - - spacing: 5px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; - cursor: "default"; -} -scrollbar { - handle-width: 5px; - handle-color: @handle-colour; - border-radius: 10px; - background-color: transparent; -} - -/*****----- Elements -----*****/ -element { - enabled: true; - spacing: 0; - margin: 0px; - padding: 5px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; - cursor: pointer; -} -element normal.normal { - background-color: transparent; - text-color: var(normal-foreground); -} -element normal.urgent { - background-color: var(urgent-background); - text-color: var(urgent-foreground); -} -element normal.active { - background-color: var(normal-foreground); - text-color: var(normal-background); -} -element selected.normal { - background-color: var(selected-normal-background); - text-color: var(normal-foreground); -} -element selected.urgent { - background-color: var(selected-urgent-background); - text-color: var(normal-background); -} -element selected.active { - background-color: var(selected-active-background); - text-color: var(normal-background); + fixed-columns: true; } element-icon { - background-color: transparent; - text-color: inherit; - size: 0; - cursor: inherit; -} -element-text { - background-color: transparent; - text-color: inherit; - highlight: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Mode Switcher -----*****/ -mode-switcher{ - enabled: true; - spacing: 10px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; -} -button { - padding: 7px 15px 7px 10px; - border: 0px solid; - border-radius: 100%; - border-color: @border-colour; - background-color: @alternate-background; - text-color: inherit; - cursor: pointer; -} -button selected { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); -} - -/*****----- Message -----*****/ -message { - enabled: true; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; -} -textbox { - padding: 8px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: @alternate-background; - text-color: @foreground-colour; - vertical-align: 0.5; - horizontal-align: 0.0; - highlight: none; - placeholder-color: @foreground-colour; - blink: true; - markup: true; -} -error-message { - padding: 10px; - border: 2px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: @background-colour; - text-color: @foreground-colour; -} + size: 0px; +} \ No newline at end of file diff --git a/home/config/rofi/cpugov/rofi-cpugov.sh b/home/config/rofi/cpugov/rofi-cpugov.sh index 447090a..3a2cf04 100755 --- a/home/config/rofi/cpugov/rofi-cpugov.sh +++ b/home/config/rofi/cpugov/rofi-cpugov.sh @@ -45,7 +45,7 @@ function print_menu() function start() { # print_menu | rofi -dmenu -p "?=>" - print_menu | sort | rofi -theme ~/.config/rofi/cpugov/rofi-cpugov.rasi -show "CPU Mode" -dmenu -mesg " CPU Mode" -i -p "rofi-bangs: " + print_menu | sort | rofi -theme ~/.config/rofi/cpugov/rofi-cpugov.rasi -show "CPU Modes" -dmenu -mesg "󰓅 CPU Modes" -i -p "rofi-bangs: " } diff --git a/home/config/rofi/helper/rofi-bangs.sh b/home/config/rofi/helper/rofi-bangs.sh index 8423a21..af2f7c4 100755 --- a/home/config/rofi/helper/rofi-bangs.sh +++ b/home/config/rofi/helper/rofi-bangs.sh @@ -26,6 +26,9 @@ declare -A COMMANDS COMMANDS[""]="~/.config/rofi/locate/rofi-locate.sh" LABELS[""]="Locate" +COMMANDS[""]="wlogout -P 1 -s -r 10 -c 10" +LABELS[""]="Session Menu" + # open custom web searches # COMMANDS["websearch"]="~/.scripts/rofi-scripts-collection/rofi-surfraw-websearch.sh" # LABELS["websearch"]="" @@ -62,9 +65,6 @@ LABELS["󰗅"]='Sound Manager' COMMANDS[""]='~/.config/rofi/shortcuts/shortcuts.sh' LABELS[""]='Hotkey List' -COMMANDS[""]='wlogout' -LABELS[""]='Session Menu' - COMMANDS["󰍹"]='wdisplays' LABELS["󰍹"]='Display Setup' diff --git a/home/config/rofi/helper/rofi-ssh.sh b/home/config/rofi/helper/rofi-ssh.sh new file mode 100755 index 0000000..8423a21 --- /dev/null +++ b/home/config/rofi/helper/rofi-ssh.sh @@ -0,0 +1,151 @@ +#!/usr/bin/env bash +# author: unknown +# sentby: MoreChannelNoise (https://www.youtube.com/user/MoreChannelNoise) +# editby: gotbletu (https://www.youtube.com/user/gotbletu) + +# demo: https://www.youtube.com/watch?v=kxJClZIXSnM +# info: this is a script to launch other rofi scripts, +# saves us the trouble of binding multiple hotkeys for each script, +# when we can just use one hotkey for everything. + +declare -A LABELS +declare -A COMMANDS + +### +# List of defined 'bangs' + +# launch programs +# COMMANDS["apps"]="rofi -combi-modi window,drun -show combi" +# LABELS["apps"]="" + +# open bookmarks +# COMMANDS["bookmarks"]="~/.scripts/rofi-scripts-collection/rofi-surfraw-bookmarks.sh" +# LABELS["bookmarks"]="" + +# search local files +COMMANDS[""]="~/.config/rofi/locate/rofi-locate.sh" +LABELS[""]="Locate" + +# open custom web searches +# COMMANDS["websearch"]="~/.scripts/rofi-scripts-collection/rofi-surfraw-websearch.sh" +# LABELS["websearch"]="" + +# show clipboard history +# source: https://bitbucket.org/pandozer/rofi-clipboard-manager/overview +# COMMANDS["clipboard"]='rofi -modi "clipboard:~/.bin/rofi-clipboard-manager/mclip.py menu" -show clipboard && ~/.bin/rofi-clipboard-manager/mclip.py paste' +# LABELS["clipboard"]="" + +# references -------------------------- +# COMMANDS[";sr2"]="chromium 'wikipedia.org/search-redirect.php?search=\" \${input}\"" +# LABELS[";sr2"]="" + +# COMMANDS[";piratebay"]="chromium --disk-cache-dir=/tmp/cache http://thepiratebay.org/search/\" \${input}\"" +# LABELS[";piratebay"]="" + +# COMMANDS[".bin"]="spacefm -r '/home/dka/bin'" +# LABELS[".bin"]=".bin" + +# COMMANDS["#screenshot"]='/home/dka/bin/screenshot-scripts/myscreenshot.sh' +# LABELS["#screenshot"]="screenshot" + +# greenclip clipboard history +# source: https://github.com/erebe/greenclip +COMMANDS[""]='rofi -modi "clipboard:greenclip print" -show Clipboard' +LABELS[""]="Clipboard" + +COMMANDS["󰖂"]='~/.config/rofi/nm-vpn/nm-vpn.sh' +LABELS["󰖂"]='VPN Connection Manager' + +COMMANDS["󰗅"]='~/.config/rofi/volume/volume.sh' +LABELS["󰗅"]='Sound Manager' + +COMMANDS[""]='~/.config/rofi/shortcuts/shortcuts.sh' +LABELS[""]='Hotkey List' + +COMMANDS[""]='wlogout' +LABELS[""]='Session Menu' + +COMMANDS["󰍹"]='wdisplays' +LABELS["󰍹"]='Display Setup' + +COMMANDS[""]='nwg-look' +LABELS[""]='Appearance Settings' + +COMMANDS["󱘆"]='noisetorch' +LABELS["󱘆"]='Audio Noise Reduction' + +COMMANDS["󰋋"]='/home/dom/.local/share/headset-charge-indicator/headset-charge-indicator.py &' +LABELS["󰋋"]='Headset Control' + +COMMANDS[""]='~/.config/rofi/bluetooth/bluetooth.sh' +LABELS[""]='Bluetooth Control' + +COMMANDS["󰛳"]='nm-applet --indicator &' +LABELS["󰛳"]='Networker Manager' + +COMMANDS["󰴱"]='hyprpicker -f hex -a' +LABELS["󰴱"]='Color Picker' + +COMMANDS["󰚞"]='font-manager' +LABELS["󰚞"]='Font Manager' + +COMMANDS["󱨑"]='gufw' +LABELS["󱨑"]='Firewall Settings' + +COMMANDS[""]='stacer' +LABELS[" "]='System Maintenance' + + +################################################################################ +# do not edit below +################################################################################ +## +# Generate menu +## +function print_menu() +{ + for key in ${!LABELS[@]} + do + # echo "$key ${LABELS}" + echo "$key ${LABELS[$key]}" + # my top version just shows the first field in labels row, not two words side by side + done +} +## +# Show rofi. +## +function start() +{ + # print_menu | rofi -dmenu -p "?=>" + print_menu | sort | rofi -show "Tools" -dmenu -mesg " Tools" -i -p "rofi-bangs: " +} + + +# Run it +value="$(start)" + +# Split input. +# grab upto first space. +choice=${value%%\ *} +# graph remainder, minus space. +input=${value:$((${#choice}+1))} + +## +# Cancelled? bail out +## +if test -z ${choice} +then + exit +fi + +# check if choice exists +if test ${COMMANDS[$choice]+isset} +then + # Execute the choice + eval echo "Executing: ${COMMANDS[$choice]}" + eval ${COMMANDS[$choice]} +else + eval $choice | rofi + # prefer my above so I can use this same script to also launch apps like geany or leafpad etc (DK) + # echo "Unknown command: ${choice}" | rofi -dmenu -p "error" +fi diff --git a/home/config/rofi/launcher/launcher.rasi b/home/config/rofi/launcher/launcher.rasi index 35deb01..b0baf74 100644 --- a/home/config/rofi/launcher/launcher.rasi +++ b/home/config/rofi/launcher/launcher.rasi @@ -1,6 +1,16 @@ @import "../config.rasi" @import "../colors.rasi" -window { - width: 400px; + + +element { + children: ["element-icon", "element-text"]; +} +element-icon { + size: 32px; +} + +element-text { + vertical-align: 0.5; + horizontal-align: 0.0; } diff --git a/home/config/rofi/launcher/launcher.sh b/home/config/rofi/launcher/launcher.sh index 5ff7d5f..c649361 100755 --- a/home/config/rofi/launcher/launcher.sh +++ b/home/config/rofi/launcher/launcher.sh @@ -36,5 +36,3 @@ esac rofi \ -show $showmode \ -theme ~/.config/rofi/launcher/launcher.rasi - -normal-window - -matching fuzzy diff --git a/home/config/rofi/nm-vpn/nm-vpn.rasi b/home/config/rofi/nm-vpn/nm-vpn.rasi index ab8c7ae..82b16ec 100644 --- a/home/config/rofi/nm-vpn/nm-vpn.rasi +++ b/home/config/rofi/nm-vpn/nm-vpn.rasi @@ -1,224 +1,45 @@ -@import "../config.rasi" - configuration { - modi: ""; + modi: "drun"; show-icons: false; drun-display-format: "{name}"; - window-format: "{w} · {c} · {t}"; } -mainbox { +@import "../config.rasi" +@import "../colors.rasi" + + +window { enabled: true; - spacing: 10px; - margin: 0px; - padding: 30px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border; - background-color: transparent; + cursor: "default"; + width: 300px; + height: 300px; +} + + +mainbox { children: [ "message", "listview", "inputbar" ]; } + inputbar { enabled: true; - spacing: 10px; - margin: 0; - padding: 20px 0px 0; - border: 0px solid; - border-radius: 0px; - border-color: @border; - background-color: transparent; - text-color: @foreground; + children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; } -prompt { - enabled: true; - background-color: inherit; - text-color: inherit; -} -textbox-prompt-colon { - enabled: true; - padding: 5px 0px 0px 15px; - expand: false; - font: "MonarchOS 14"; - str: ""; - background-color: inherit; - text-color: inherit; -} -entry { - enabled: true; - padding: 5px 0px; - background-color: inherit; - text-color: inherit; - cursor: text; - placeholder: "..."; - placeholder-color: inherit; -} -num-filtered-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -textbox-num-sep { - enabled: true; - expand: false; - str: "/"; - background-color: inherit; - text-color: inherit; -} -num-rows { - enabled: true; - expand: false; - background-color: inherit; - text-color: inherit; -} -case-indicator { - enabled: true; - background-color: inherit; - text-color: inherit; -} - -/*****----- Listview -----*****/ listview { enabled: true; columns: 1; - lines: 2; + lines: 8; cycle: true; dynamic: true; scrollbar: false; layout: vertical; reverse: false; fixed-height: true; - fixed-columns: true; - - spacing: 5px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border; - background-color: transparent; - text-color: @foreground; - cursor: "default"; -} -scrollbar { - handle-width: 5px; - handle-color: @handle-colour; - border-radius: 10px; - background-color: transparent; -} - -/*****----- Elements -----*****/ -element { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 5px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border; - background-color: transparent; - text-color: @foreground; - cursor: pointer; -} -element normal.normal { - background-color: transparent; - text-color: var(normal-foreground); -} -element normal.urgent { - background-color: var(urgent-background); - text-color: var(urgent-foreground); -} -element normal.active { - background-color: var(normal-foreground); - text-color: var(normal-background); -} -element selected.normal { - background-color: var(selected-normal-background); - text-color: var(normal-foreground); -} -element selected.urgent { - background-color: var(selected-urgent-background); - text-color: var(normal-background); -} -element selected.active { - background-color: var(selected-active-background); - text-color: var(normal-background); + fixed-columns: true; } element-icon { - background-color: transparent; - text-color: inherit; - size: 24px; - cursor: inherit; -} -element-text { - background-color: transparent; - text-color: inherit; - highlight: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Mode Switcher -----*****/ -mode-switcher{ - enabled: true; - spacing: 10px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border; - background-color: transparent; - text-color: @foreground; -} -button { - padding: 7px 15px 7px 10px; - border: 0px solid; - border-radius: 100%; - border-color: @border; - background-color: @alternate-background; - text-color: inherit; - cursor: pointer; -} -button selected { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); -} - -/*****----- Message -----*****/ -message { - enabled: true; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border; - background-color: transparent; - text-color: @foreground; -} -textbox { - padding: 8px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border; - background-color: @alternate-background; - text-color: @foreground; - vertical-align: 0.5; - horizontal-align: 0.0; - highlight: none; - placeholder-color: @foreground; - blink: true; - markup: true; -} -error-message { - padding: 10px; - border: 2px solid; - border-radius: 10px; - border-color: @border; - background-color: @background; - text-color: @foreground; -} + size: 0px; +} \ No newline at end of file diff --git a/home/config/rofi/nm-vpn/nm-vpn.sh b/home/config/rofi/nm-vpn/nm-vpn.sh index f95cb01..0747a66 100755 --- a/home/config/rofi/nm-vpn/nm-vpn.sh +++ b/home/config/rofi/nm-vpn/nm-vpn.sh @@ -55,10 +55,13 @@ function toggle_vpn_connection() { if [[ $result = ${ACTIVE_PREFIX}* ]]; then feedback=$(nmcli connection down "$connection") dunstify "VPN Status '$connection'" "$feedback" --replace=553 + # hyprctl notify 1 5000 0 " VPN Status '$connection' " else kitty --class "kitty-vpn" --title "VPN Connection" nmcli connection --ask up "$connection" #feedback=$(nmcli connection up "$connection") dunstify "VPN Status '$connection'" "" --replace=553 + + #hyprctl notify 1 5000 0 " VPN Status '$connection' " fi } diff --git a/home/config/rofi/powermenu/powermenu copy 2.rasi b/home/config/rofi/powermenu/powermenu copy 2.rasi new file mode 100644 index 0000000..dbb9d20 --- /dev/null +++ b/home/config/rofi/powermenu/powermenu copy 2.rasi @@ -0,0 +1,121 @@ +configuration { + show-icons: false; +} + +@import "../colors.rasi" + + +window { + transparency: "real"; + location: north; + anchor: center; + fullscreen: false; + x-offset: 0px; + y-offset: -41px; + width: 100%; + + + border: none; + border-radius: 0; + border-color: transparent; + + cursor: "default"; + background-color: var(theme-bg-color); +} + +mainbox { + enabled: true; + margin: 0px; + padding: 11px; + border: 0px solid; + border-radius: 0px; + border-color: transparent; + background-color: transparent; + children: ["inputbar" ]; +} + + +inputbar { + enabled: true; + spacing: 16px; + margin: 0px; + padding: 0px; + background-color: transparent; + text-color: var(theme-text-color); + children: ["textbox-prompt-colon", "prompt", "listview"]; +} + + +textbox-prompt-colon { + enabled: true; + expand: false; + str: "󰣇"; + padding: 0 12px 0 10px; + border-radius: 100%; + background-color: var(theme-selected-bg-color); + text-color: @theme-selected-fg-color; + vertical-align: 0.5; + font: "Hack Nerd Font 12"; +} +prompt { + enabled: true; + padding: 0 12px; + border-radius: 100%; + background-color: var(theme-text-color); + text-color: var(theme-bg-color); + vertical-align: 0.5; + font: "Hack Nerd Font 9"; +} + +dummy { + background-color: inherit; +} + + +listview { + enabled: true; + columns: 2; + lines: 5; + cycle: true; + dynamic: false; + scrollbar: false; + layout: horizontal; + reverse: false; + fixed-height: false; + fixed-columns: true; + vertical-align: 0.5; + horizontal-align: 0; + spacing: 15px; + background-color: transparent; + text-color: var(theme-text-color); + cursor: "default"; +} + +element { + enabled: true; + spacing: 0px; + margin: 0px; + + border: 0px solid; + border-radius: 100%; + + background-color: transparent; + + cursor: "pointer"; +} +element-text { + font: "Hack Nerd Font 12"; + background-color: transparent; + text-color: var(text); + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0; + padding: 0 12px; + horizontal-align: 0; +} +element selected.normal { + background-color: var(theme-selected-bg-color); +} +element-text selected.normal { + text-color: var(theme-bg-color); +} \ No newline at end of file diff --git a/home/config/rofi/powermenu/powermenu.sh b/home/config/rofi/powermenu/powermenu.sh index 8723a77..f604393 100755 --- a/home/config/rofi/powermenu/powermenu.sh +++ b/home/config/rofi/powermenu/powermenu.sh @@ -89,7 +89,7 @@ case ${chosen} in betterlockscreen -l elif [[ "$DESKTOP_SESSION" == 'hyprland' ]]; then killall rofi - swaylock + wlogout -P 1 -s -r 10 -c 10 fi ;; $suspend) diff --git a/home/config/rofi/settings-menu/setmen.sh b/home/config/rofi/settings-menu/setmen.sh new file mode 100755 index 0000000..2b029e9 --- /dev/null +++ b/home/config/rofi/settings-menu/setmen.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +function get_name { + local lang=$(locale | grep LANG | cut -d= -f2 | cut -d_ -f1) + local find="Name\[$lang\]=" + + local name=$(grep "^$find" $1 | tail -1 | sed "s/^$find//" | sed 's/%.//' | sed 's/^"//g' | sed 's/" *$//g') + + if [ "${name}" = "" ] + then + find="Name=" + name=$(grep "^$find" $1 | tail -1 | sed "s/^$find//" | sed 's/%.//' | sed 's/^"//g' | sed 's/" *$//g') + fi + + echo "$name" +} + +if [ "$ROFI_RETV" = "1" ] +then + for deskfile in /usr/share/settings-menu/* + do + + match=$(grep "^Name" $deskfile | grep "$@" ) + + if [ -n "$match" ] + then + #$(gtk-launch "$deskfile") + + app=$(grep '^Exec' $deskfile | tail -1 | sed 's/^Exec=//' | sed 's/%.//' | sed 's/^"//g' | sed 's/" *$//g') + + coproc ( $app > /dev/null 2>&1 ) + + break + fi + + done + exit 0 +fi + +function init { + for file in /usr/share/settings-menu/* + do + local name=$(get_name "$file") + + local iconline=$(sed -n -e '/^Icon=/p' "$file") + local icon=${iconline/Icon=/""} + + if [ -n "$name" ] + then + echo -en "$name\0icon\x1f$icon\n" + + fi + + done +} + +init \ No newline at end of file diff --git a/home/config/rofi/settings-menu/settings-menu copy.rasi b/home/config/rofi/settings-menu/settings-menu copy.rasi new file mode 100644 index 0000000..3631cea --- /dev/null +++ b/home/config/rofi/settings-menu/settings-menu copy.rasi @@ -0,0 +1,54 @@ +configuration { + modi: "drun"; + show-icons: false; + drun-display-format: "{name}"; +} + +@import "../config.rasi" +@import "../colors.rasi" + + +window { + enabled: true; + cursor: "default"; +} + + +mainbox { + children: [ "message", "listview", "inputbar" ]; +} + + +inputbar { + enabled: true; + + children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; +} + +listview { + enabled: true; + columns: 2; + lines: 8; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + orientation: horizontal; + horizontal-align: 0.0; +} + +element { + + + children: [ "element-text" ]; +} +element-text { + horizontal-align: 0.0; +} + +span { + text-color:red; +} \ No newline at end of file diff --git a/home/config/rofi/settings-menu/settings-menu.rasi b/home/config/rofi/settings-menu/settings-menu.rasi index 3d663d1..4d83a2a 100644 --- a/home/config/rofi/settings-menu/settings-menu.rasi +++ b/home/config/rofi/settings-menu/settings-menu.rasi @@ -1,49 +1,25 @@ -configuration { - modi: "drun"; - show-icons: false; - drun-display-format: "{name}"; -} - @import "../config.rasi" @import "../colors.rasi" -window { - enabled: true; - cursor: "default"; +listview { + columns: 4; + lines: 4; } - -mainbox { - children: [ "message", "listview", "inputbar" ]; -} - - inputbar { - enabled: true; - - children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; + children: [ "textbox-prompt-colon", "entry"]; } - - - -listview { - enabled: true; - columns: 2; - lines: 8; - cycle: true; - dynamic: true; - scrollbar: false; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: true; - - - +element { + orientation:vertical; + children: ["element-icon", "element-text"]; } - element-icon { - size: 0px; -} \ No newline at end of file + size: 32px; +} + +element-text { + vertical-align: 0.5; + horizontal-align: 0.5; +} diff --git a/home/config/rofi/settings-menu/settings-menu.sh b/home/config/rofi/settings-menu/settings-menu.sh index 56a48a4..04e9499 100755 --- a/home/config/rofi/settings-menu/settings-menu.sh +++ b/home/config/rofi/settings-menu/settings-menu.sh @@ -23,30 +23,11 @@ declare -A COMMANDS # LABELS["bookmarks"]="" # search local files -COMMANDS[""]="~/.config/rofi/locate/rofi-locate.sh" -LABELS[""]="Locate" +# COMMANDS[""]="~/.config/rofi/locate/rofi-locate.sh" +# LABELS[""]="Locate" -# open custom web searches -# COMMANDS["websearch"]="~/.scripts/rofi-scripts-collection/rofi-surfraw-websearch.sh" -# LABELS["websearch"]="" - -# show clipboard history -# source: https://bitbucket.org/pandozer/rofi-clipboard-manager/overview -# COMMANDS["clipboard"]='rofi -modi "clipboard:~/.bin/rofi-clipboard-manager/mclip.py menu" -show clipboard && ~/.bin/rofi-clipboard-manager/mclip.py paste' -# LABELS["clipboard"]="" - -# references -------------------------- -# COMMANDS[";sr2"]="chromium 'wikipedia.org/search-redirect.php?search=\" \${input}\"" -# LABELS[";sr2"]="" - -# COMMANDS[";piratebay"]="chromium --disk-cache-dir=/tmp/cache http://thepiratebay.org/search/\" \${input}\"" -# LABELS[";piratebay"]="" - -# COMMANDS[".bin"]="spacefm -r '/home/dka/bin'" -# LABELS[".bin"]=".bin" - -# COMMANDS["#screenshot"]='/home/dka/bin/screenshot-scripts/myscreenshot.sh' -# LABELS["#screenshot"]="screenshot" +COMMANDS[""]="wlogout -P 1 -s -r 10 -c 10" +LABELS[""]="Session Menu" # greenclip clipboard history # source: https://github.com/erebe/greenclip @@ -56,14 +37,14 @@ LABELS[""]="Clipboard" COMMANDS["󰖂"]='~/.config/rofi/nm-vpn/nm-vpn.sh' LABELS["󰖂"]='VPN Connection Manager' +COMMANDS[""]='waypaper' +LABELS[""]='Wallpaper Settings' + COMMANDS["󰗅"]='~/.config/rofi/volume/volume.sh' LABELS["󰗅"]='Sound Manager' -COMMANDS[""]='~/.config/rofi/shortcuts/shortcuts.sh' -LABELS[""]='Hotkey List' - -COMMANDS[""]='wlogout' -LABELS[""]='Session Menu' +#COMMANDS[""]='~/.config/rofi/shortcuts/shortcuts.sh' +#LABELS[""]='Hotkey List' COMMANDS["󰍹"]='wdisplays' LABELS["󰍹"]='Display Setup' @@ -92,9 +73,20 @@ LABELS["󰚞"]='Font Manager' COMMANDS["󱨑"]='gufw' LABELS["󱨑"]='Firewall Settings' -COMMANDS[""]='stacer' -LABELS[""]='System Maintenance' +COMMANDS[""]='env GTK_THEME=Adwaita:dark resources' +LABELS[""]='System Resources' +COMMANDS["󰓅"]='$HOME/.config/rofi/cpugov/rofi-cpugov.sh' +LABELS["󰓅"]='CPU Modes' + +COMMANDS["󰓅"]='hardinfo' +LABELS["󰓅"]='System Profiler and Benchmark' + +COMMANDS["󰀠"]='alarm-clock-applet' +LABELS["󰀠"]='Alarm & Timer' + +COMMANDS["󱓞"]='~/.config/rofi/launcher/launcher.sh' +LABELS["󱓞"]='App Launcher' ################################################################################ # do not edit below @@ -117,7 +109,8 @@ function print_menu() function start() { # print_menu | rofi -dmenu -p "?=>" - print_menu | sort | rofi -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi -show "Settings x Tools" -dmenu -mesg " Settings x Tools" -i -p "rofi-bangs: " + title="MoonArch \ $USER \ $(date +"%H:%M") \ $(uptime -p | sed 's/up //')" + print_menu | sort | rofi -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi -show $title -dmenu -markup-rows -mesg "󰣇 $title" -i -p "rofi-bangs: " } diff --git a/home/config/rofi/shortcuts/hypr.sh b/home/config/rofi/shortcuts/hypr.sh index b9377d2..a415e11 100755 --- a/home/config/rofi/shortcuts/hypr.sh +++ b/home/config/rofi/shortcuts/hypr.sh @@ -1,5 +1,13 @@ #!/bin/bash -config_file=~/.config/hypr/hl-keybindings.conf -keybinds=$(grep -oP '(?<=bind = ).*' $config_file) -keybinds=$(echo "$keybinds" | sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g') -rofi -dmenu -p "Keybinds" <<< "$keybinds" \ No newline at end of file +# Format JSON proper;y +JSON=$(hyprkeys --from-ctl --json | jq -r --slurp "[.[]][0]"); + +USER_SELECTED=$(echo $JSON | jq -r 'range(0, length) as $i | "\($i) \(.[$i].mods) \(.[$i].key) \(.[$i].dispatcher) \(.[$i].arg)"' | rofi -theme ~/.config/rofi/shortcuts/shortcuts.rasi -dmenu -p 'Keybinds' | awk -F ' ' '{print $1}') + +if [ -z "$USER_SELECTED" ]; then + exit 0; +fi + +EVENT=$(echo $JSON | jq -r "[.[]] | .[$USER_SELECTED]" | jq -r '"\(.dispatcher) \(.arg)"'); + +hyprctl dispatch "$EVENT"; \ No newline at end of file diff --git a/home/config/rofi/shortcuts/shortcuts.rasi b/home/config/rofi/shortcuts/shortcuts.rasi new file mode 100644 index 0000000..6f16286 --- /dev/null +++ b/home/config/rofi/shortcuts/shortcuts.rasi @@ -0,0 +1,30 @@ +@import "../config.rasi" +@import "../colors.rasi" + +window { + width: 1024; + height: 768; +} + +listview { + columns: 1; + lines: 5; +} + +inputbar { + children: [ "textbox-prompt-colon", "entry"]; +} + +element { + orientation:horizontal; + children: ["element-icon", "element-text"]; +} +element-icon { + size: 0; +} + +element-text { + vertical-align: 0.5; + horizontal-align: 0.0; + background:red; +} diff --git a/home/config/rofi/sshfs/rofi-sshfs.sh b/home/config/rofi/sshfs/rofi-sshfs.sh new file mode 100755 index 0000000..2777263 --- /dev/null +++ b/home/config/rofi/sshfs/rofi-sshfs.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash +# author: unknown +# sentby: MoreChannelNoise (https://www.youtube.com/user/MoreChannelNoise) +# editby: gotbletu (https://www.youtube.com/user/gotbletu) + +# demo: https://www.youtube.com/watch?v=kxJClZIXSnM +# info: this is a script to launch other rofi scripts, +# saves us the trouble of binding multiple hotkeys for each script, +# when we can just use one hotkey for everything. + +declare -A LABELS +declare -A COMMANDS + +### +# List of defined 'bangs' + +COMMANDS["moonarch.de"]="fusermount3 -u $HOME/.sshfs/moonarch.de | mkdir -p $HOME/.sshfs/moonarch.de | sshfs docker@moonarch.de:/home/docker $HOME/.sshfs/moonarch.de | subl --launch-or-new-window $HOME/.sshfs/moonarch.de" +LABELS["moonarch.de"]="moonarch.de" + +COMMANDS[""]='rofi -modi "clipboard:greenclip print" -show Clipboard' +LABELS[""]="Clipboard" + + + + +################################################################################ +# do not edit below +################################################################################ +## +# Generate menu +## +function print_menu() +{ + for key in ${!LABELS[@]} + do + # echo "$key ${LABELS}" + echo "${LABELS[$key]}" + # my top version just shows the first field in labels row, not two words side by side + done +} +## +# Show rofi. +## +function start() +{ + # print_menu | rofi -dmenu -p "?=>" + print_menu | sort | rofi -show "Tools" -dmenu -mesg " Tools" -i -p "rofi-bangs: " +} + + +# Run it +value="$(start)" + +# Split input. +# grab upto first space. +choice=${value%%\ *} +# graph remainder, minus space. +input=${value:$((${#choice}+1))} + +## +# Cancelled? bail out +## +if test -z ${choice} +then + exit +fi + +# check if choice exists +if test ${COMMANDS[$choice]+isset} +then + # Execute the choice + eval echo "Executing: ${COMMANDS[$choice]}" + eval ${COMMANDS[$choice]} +else + eval $choice | rofi + # prefer my above so I can use this same script to also launch apps like geany or leafpad etc (DK) + # echo "Unknown command: ${choice}" | rofi -dmenu -p "error" +fi diff --git a/home/config/rofi/volume/volume.rasi b/home/config/rofi/volume/volume.rasi index 301fe12..ed6f979 100644 --- a/home/config/rofi/volume/volume.rasi +++ b/home/config/rofi/volume/volume.rasi @@ -1,224 +1,43 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Rofi Theme File - * Rofi Version: 1.7.3 - **/ - -/*****----- Configuration -----*****/ configuration { - modi: ""; + modi: "drun"; show-icons: false; + drun-display-format: "{name}"; } -/*****----- Global Properties -----*****/ @import "../config.rasi" @import "../colors.rasi" -* { - border-colour: var(border); - handle-colour: var(selected); - background-colour: var(background); - foreground-colour: var(foreground); - alternate-background: var(background-alt); - normal-background: var(background); - normal-foreground: var(foreground); - urgent-background: var(urgent); - urgent-foreground: var(background); - active-background: var(active); - active-foreground: var(background); - selected-normal-background: var(selected); - selected-normal-foreground: var(background); - selected-urgent-background: var(active); - selected-urgent-foreground: var(background); - selected-active-background: var(urgent); - selected-active-foreground: var(background); - alternate-normal-background: var(background); - alternate-normal-foreground: var(foreground); - alternate-urgent-background: var(urgent); - alternate-urgent-foreground: var(background); - alternate-active-background: var(active); - alternate-active-foreground: var(background); -} -/*****----- Main Window -----*****/ window { - /* properties for window widget */ - transparency: "real"; - location: center; - anchor: center; - fullscreen: false; - width: 600px; - x-offset: 0px; - y-offset: 0px; - border-radius: 10px; - /* properties for all widgets */ enabled: true; - cursor: "default"; - background-color: @background-colour; } -/*****----- Main Box -----*****/ + mainbox { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 30px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; children: [ "message", "listview", "inputbar" ]; } -/*****----- Inputbar -----*****/ + inputbar { - enabled: false; + enabled: true; + + children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; } -/*****----- Listview -----*****/ listview { enabled: true; - columns: 6; + columns: 1; lines: 8; cycle: true; dynamic: true; scrollbar: false; layout: vertical; reverse: false; - fixed-height: false; - fixed-columns: false; - - spacing: 5px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; - cursor: "default"; - align: center; -} -scrollbar { - handle-width: 5px; - handle-color: @handle-colour; - border-radius: 10px; - background-color: transparent; -} - -/*****----- Elements -----*****/ -element { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 5px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; - cursor: pointer; -} -element normal.normal { - background-color: transparent; - text-color: var(normal-foreground); -} -element normal.urgent { - background-color: var(normal-background); - text-color: var(normal-foreground); -} -element normal.active { - background-color: var(normal-foreground); - text-color: var(normal-background); -} -element selected.normal { - background-color: var(selected-normal-background); - text-color: var(normal-foreground); -} -element selected.urgent { - background-color: var(selected-normal-background); - text-color: var(normal-background); -} -element selected.active { - background-color: var(selected-normal-background); - text-color: var(normal-foreground); + fixed-height: true; + fixed-columns: true; } element-icon { - background-color: transparent; - text-color: inherit; - size: 24px; - cursor: inherit; -} -element-text { - background-color: transparent; - text-color: inherit; - highlight: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Mode Switcher -----*****/ -mode-switcher{ - enabled: true; - spacing: 10px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; -} -button { - padding: 7px 15px 7px 10px; - border: 0px solid; - border-radius: 100%; - border-color: @border-colour; - background-color: @alternate-background; - text-color: inherit; - cursor: pointer; -} -button selected { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); -} - -/*****----- Message -----*****/ -message { - enabled: true; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @border-colour; - background-color: transparent; - text-color: @foreground-colour; -} -textbox { - padding: 8px 10px; - border: 0px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: @alternate-background; - text-color: @foreground-colour; - vertical-align: 0.5; - horizontal-align: 0.0; - highlight: none; - placeholder-color: @foreground-colour; - blink: true; - markup: true; -} -error-message { - padding: 10px; - border: 2px solid; - border-radius: 10px; - border-color: @border-colour; - background-color: @background-colour; - text-color: @foreground-colour; -} + size: 0px; +} \ No newline at end of file diff --git a/home/config/rofi/volume/volume.sh b/home/config/rofi/volume/volume.sh index 8b2fa75..dd6bc12 100755 --- a/home/config/rofi/volume/volume.sh +++ b/home/config/rofi/volume/volume.sh @@ -64,7 +64,6 @@ option_6="󰍯 Noise Torch" #-theme-str "listview {columns: $list_col; lines: $list_row;}" \ rofi_cmd() { rofi -theme-str "window {width: $win_width;}" \ - -theme-str 'textbox-prompt-colon {str: "";}' \ -dmenu \ -p "$prompt" \ -mesg "$mesg" \ diff --git a/home/config/swaync/config.json b/home/config/swaync/config.json index 3f7d894..ceb30e3 100644 --- a/home/config/swaync/config.json +++ b/home/config/swaync/config.json @@ -2,196 +2,78 @@ "$schema": "/etc/xdg/swaync/configSchema.json", "positionX": "right", "positionY": "top", - "control-center-margin-top": 20, - "control-center-margin-bottom": 20, - "control-center-margin-right": 20, - "control-center-margin-left": 0, - "notification-icon-size": 48, - "notification-body-image-height": 160, - "notification-body-image-width": 90, - "timeout": 6, - "timeout-low": 4, + "control-center-margin-top": 10, + "control-center-margin-bottom": 10, + "control-center-margin-right": 10, + "notification-icon-size": 24, + "notification-body-image-height": 100, + "notification-body-image-width": 200, + "timeout": 10, + "timeout-low": 5, "timeout-critical": 0, - "fit-to-screen": true, - "control-center-width": 380, - "notification-window-width": 366, + "fit-to-screen": false, + "control-center-width": 500, + "control-center-height": 800, + "notification-window-width": 500, "keyboard-shortcuts": true, "image-visibility": "when-available", - "transition-time": 100, + "transition-time": 200, "hide-on-clear": false, "hide-on-action": true, "script-fail-notify": true, - "scripts": { - "example-script": { - "exec": "echo 'Do something...'", - "urgency": "Normal" - } - }, - "notification-visibility": { - "example-name": { - "state": "muted", - "urgency": "Low", - "app-name": "Spotify" - } - }, - "widgets": [ - "menubar", - "buttons-grid", - "volume", - "mpris", - "title", - "dnd", - "notifications" - ], + "widgets": ["title", "dnd", "volume", "backlight", "notifications", "mpris", "buttons-grid"], "widget-config": { "title": { - "text": "Notifications", + "text": "Notification Center", "clear-all-button": true, - "button-text": "Clear All" + "button-text": "󰆴 Clear All" }, "dnd": { "text": "Do Not Disturb" }, "label": { "max-lines": 1, - "text": "Control Center" + "text": "Notification Center" }, "mpris": { "image-size": 96, - "image-radius": 10 - }, - "backlight": { - "label": "", - "device": "intel_backlight", - "min": 10 - }, - "backlight#KB": { - "label": " ", - "device": "asus::kbd_backlight", - "subsystem": "leds" + "image-radius": 7 }, "volume": { - "label": "" + "label": "󰕾" }, - "menubar": { - "menu#power-buttons": { - "label": "", - "position": "right", - "actions": [ - { - "label": " Reboot", - "command": "systemctl reboot" - }, - { - "label": " Lock", - "command": "swaylock.sh" - }, - { - "label": " Logout", - "command": "loginctl terminate-session ${XDG_SESSION_ID-}" - }, - { - "label": " Shut down", - "command": "systemctl poweroff" - } - ] - }, - "menu#powermode-buttons": { - "label": "", - "position": "right", - "actions": [ - { - "label": "Performance", - "command": "powerprofilesctl set performance" - }, - { - "label": "Balanced", - "command": "powerprofilesctl set balanced" - }, - { - "label": "Power-saver", - "command": "powerprofilesctl set power-saver" - } - ] - }, - "menu#screenshot-buttons": { - "label": "", - "position": "left", - "actions": [ - { - "label": " Entire screen", - "command": "swaync-client -cp && sleep 1 && hyprshot -m output" - }, - { - "label": " Select a region", - "command": "swaync-client -cp && sleep 1 && hyprshot -m region" - }, - { - "label": " Open screenshot menu", - "command": "swaync-client -cp && rofi-screenshot" - }, - { - "label": " Open screenshot folder", - "command": "exo-open $HYPRSHOT_DIR" - } - ] - }, - "menu#screencast-buttons": { - "label": "", - "position": "left", - "actions": [ - { - "label": " Entire screen", - "command": "swaync-client -cp && sleep 1 && recording.sh toggle fullscreen" - }, - { - "label": " Select a region", - "command": "swaync-client -cp && sleep 1 && recording.sh toggle region" - }, - { - "label": " Stop", - "command": "swaync-client -cp && recording.sh stop" - }, - { - "label": " Open screencast folder", - "command": "$XDG_VIDEOS_DIR/Screencasts" - } - ] - } + "backlight": { + "label": "󰃟" }, "buttons-grid": { "actions": [ { - "label": "", - "command": "nm-connection-editor" + "label": "󰐥", + "command": "wlogout -P 1 -s -r 10 -c 10" }, { - "label": "", - "command": "blueman" + "label": "󰕾", + "command": "pactl set-sink-mute @DEFAULT_SINK@ toggle" }, { - "label": "", - "command": "nwg-look" + "label": "󰍬", + "command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle" }, { - "label": "", - "command": "exo-open ~/ConfigHub" + "label": "󰖩", + "command": "iwgtk" }, { - "label": "", - "command": "ymuse" + "label": "󰂯", + "command": "blueberry" }, { - "label": "", - "command": "orage" + "label": "", + "command": "rofi -show fb -modes 'fb:~/.config/rofi/settings-menu/setmen.sh' -theme ~/.config/rofi/settings-menu/settings-menu.rasi" }, { - "label": "", - "command": "pamac-manager" - }, - { - "label": "", - "command": "firefox" + "label": "󱓞", + "command": "rofi -show drun -theme ~/.config/rofi/launcher/launcher.rasi" } ] } diff --git a/home/config/swaync/style.css b/home/config/swaync/style.css index 7d21749..d40089a 100644 --- a/home/config/swaync/style.css +++ b/home/config/swaync/style.css @@ -1,245 +1,272 @@ +@import url("/usr/share/themes/Catppuccin-Mocha-Standard-Lavender-Dark/gtk-3.0/gtk.css"); + +@define-color cc-bg rgba(26, 27, 38, .95); @define-color noti-border-color rgba(255, 255, 255, 0.15); -@define-color noti-bg #2a293a; -@define-color noti-bg-hover-alt #454545; -@define-color noti-bg-alt rgba(38,37,53,1); -@define-color noti-fg #acb0d0; -@define-color noti-bg-hover rgba(255, 255, 255, 0.1); -@define-color noti-bg-focus rgba(255, 255, 255, 0.1); +@define-color noti-bg rgb(17, 17, 27); +@define-color noti-bg-darker rgba(43, 43, 57,.5); +@define-color noti-bg-hover rgb(27, 27, 43); +@define-color noti-bg-focus rgba(27, 27, 27, 0.6); @define-color noti-close-bg rgba(255, 255, 255, 0.1); @define-color noti-close-bg-hover rgba(255, 255, 255, 0.15); -@define-color noti-urgent rgba(255,0,80,0.8); -@define-color bg-selected #26A69A; +@define-color text-color-disabled rgb(150, 150, 150); +@define-color bg-selected rgb(0, 128, 255); -*{ - font-family: "Hack Nerd Font"; - color: @noti-fg; +* { + font-family: Hack Nerd Font; +} + +.control-center .notification-row:focus, +.control-center .notification-row:hover { + opacity: 1; + background: @noti-bg-darker; } .notification-row { outline: none; -} - -.notification-row:focus, -.notification-row:hover { - background: @noti-bg-focus; + margin: 0px; + padding: 0px; } .notification { - border: 1px solid @bg-selected; - border-radius: 4px; - margin: 6px 12px; + background: @theme_base_color; + border: 2px solid rgba(180,190,254, 0.1); + border-radius: 10px; + margin: 3px -2px 3px 0px; + padding:10px; box-shadow: none; - padding: 0; } -/* Uncomment to enable specific urgency colors */ -/* .low { - background: yellow; -} - -.normal { - background: green; -} */ - -.critical { - border: 1px solid @noti-urgent; -} - - .notification-content { - background: transparent; - padding: 6px; - border-radius: 4px; + background: @theme_base_color; +} + +.summary { + margin-bottom:5px; +} +.notification-content .body { + font-size: 14px; +} + +.notification-default-action { + margin: 0; + padding: 0; + border-radius: 10px; } .close-button { - background: @noti-close-bg; - color: white; + background: #f7768e; + color: @theme_base_color; text-shadow: none; - padding: 0; - border-radius: 100%; - margin-top: 10px; - margin-right: 16px; - box-shadow: none; - border: none; - min-width: 24px; - min-height: 24px; + padding: 0px; + border-radius: 10px; + margin-top: 5px; + margin-right: 0px; } .close-button:hover { box-shadow: none; - background: @noti-close-bg-hover; + background: #f7768e; transition: all 0.15s ease-in-out; border: none; } -.notification-default-action, .notification-action { - padding: 4px; - margin: 0; - box-shadow: none; - background: @noti-bg; - border: 1px solid @noti-border-color; - color: white; + border: 2px solid rgba(180,190,254, 0.5); + border-top: none; + border-radius: 10px; } .notification-default-action:hover, .notification-action:hover { - -gtk-icon-effect: none; - background: @noti-bg-alt; + color: rgba(180,190,254, 0.6); + background: @theme_base_color; } .notification-default-action { - border-radius: 4px; + border-radius: 10px; + margin: 0px; } -/* When alternative actions are visible */ .notification-default-action:not(:only-child) { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; + border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; } -.notification-action { - border-radius: 0px; - border-top: none; - border-right: none; -} - -/* add bottom border radius to eliminate clipping */ .notification-action:first-child { - border-bottom-left-radius: 4px; + border-bottom-left-radius: 10px; + background: #1b1b2b; } .notification-action:last-child { - border-bottom-right-radius: 4px; - border-right: 1px solid @noti-border-color; + border-bottom-right-radius: 10px; + background: #1b1b2b; } -.image {} +.inline-reply { + margin-top: 8px; +} -.body-image { - margin-top: 6px; - background-color: white; - border-radius: 6px; +.inline-reply-entry { + background: @noti-bg-darker; + color: @theme_text_color; + caret-color: @theme_text_color; + border: 1px solid @noti-border-color; + border-radius: 10px; +} + +.inline-reply-button { + margin-left: 4px; + background: @noti-bg; + border: 1px solid @noti-border-color; + border-radius: 10px; + color: @theme_text_color; +} + +.inline-reply-button:disabled { + background: initial; + color: @text-color-disabled; + border: 1px solid transparent; +} + +.inline-reply-button:hover { + background: @noti-bg-hover; +} + +.image { + border-radius: 10px; + margin-right: 10px; } .summary { - font-size: 14px; - font-weight: bold; + font-size: 16px; + font-weight: 700; background: transparent; - color: white; + color: @theme_text_color; text-shadow: none; } .time { - font-size: 13px; - font-weight: bold; + font-size: 16px; + font-weight: 700; background: transparent; - color: white; + color: @theme_text_color; text-shadow: none; margin-right: 18px; } .body { - font-size: 12px; - font-weight: normal; + font-size: 15px; + font-weight: 400; background: transparent; - color: white; - text-shadow: none; -} - -/* The "Notifications" and "Do Not Disturb" text widget */ -.top-action-title { - color: white; + color: @theme_text_color; text-shadow: none; } .control-center { - background-color: @noti-bg-alt; + background: @theme_base_color; + border: 2px solid rgba(180,190,254, 0.2); border-radius: 10px; - padding-top:5px; + } .control-center-list { background: transparent; } +.control-center-list-placeholder { + opacity: 0.5; +} + .floating-notifications { background: transparent; } -/* Window behind control center and on all other monitors */ .blank-window { - background: transparent; + background: alpha(black, 0.1); } -/*** Widgets ***/ - -/* Title widget */ .widget-title { - margin: 8px; - font-size: 16px; -} - -.widget-title>button { - font-size: 10px; - color: white; - text-shadow: none; - background: @noti-bg; - border: 1px solid @noti-border-color; - box-shadow: none; - border-radius: 20px; -} - -.widget-title>button:hover { - background: @noti-bg-hover; -} - -/* DND widget */ -.widget-dnd { - margin: 8px; + color: #fff; + background: @noti-bg-darker; + padding: 5px 10px; + margin: 10px 10px 5px 10px; font-size: 1.1rem; - border-radius: 20px; -} - -.widget-dnd>switch { - font-size: initial; - border-radius: 20px; - background: @noti-bg; - border: 1px solid @noti-border-color; - box-shadow: none; -} - -.widget-dnd>switch:checked { - background: @noti-bg; -} - -.widget-dnd>switch slider { - background: @noti-bg-hover; border-radius: 10px; } -/* Label widget */ +.widget-title>button { + font-size: 0.9rem; + color: @theme_text_color; + text-shadow: none; + background: @noti-bg; + box-shadow: none; + border-radius: 10px; +} + +.widget-title>button:hover { + background: #f7768e; + color: @theme_base_color; +} + +.widget-dnd { + background: @noti-bg-darker; + padding: 5px 10px; + margin: 5px 10px; + border-radius: 10px; + font-size: 1rem; + color: #fff; +} + +.widget-dnd>switch { + border-radius: 10px; + background: rgba(180,190,254, 0.7); +} + +.widget-dnd>switch:checked { + background: #f7768e; + border: 1px solid #f7768e; +} + +.widget-dnd>switch slider { + background: @theme_base_color; + border-radius: 10px; +} + +.widget-dnd>switch:checked slider { + background: @theme_base_color; + border-radius: 10px; +} + .widget-label { - margin: 4px 8px 8px; + margin: 10px 10px 5px 10px; } .widget-label>label { - font-size: 16px; + font-size: 1rem; + color: @theme_text_color; } -/* Mpris widget */ .widget-mpris { - /* The parent to all players */ + color: @theme_text_color; + background: @noti-bg-darker; + padding: 5px 10px; + margin: 5px 10px 5px 10px; + border-radius: 10px; + box-shadow:none; +} + +.widget-mpris>box>button { + border-radius: 10px; } .widget-mpris-player { - padding: 8px; - margin: 8px; + padding: 5px 10px; + margin: 10px; + box-shadow: none; } .widget-mpris-title { - font-weight: bold; + font-weight: 700; font-size: 1.25rem; } @@ -247,81 +274,50 @@ font-size: 1.1rem; } -/* Volume and Brightness Widget*/ - -.widget-volume { - background-color: @noti-bg; - padding: 4px 4px 4px 20px; - margin: 0px 8px 8px 8px; - border-radius: 20px; - font-size: 14px; -} - -.widget-backlight { - background-color: @noti-bg; - padding: 8px 8px 4px 8px; - margin: 8px 8px 0px 8px; - border-top-left-radius: 12px; - border-top-right-radius: 12px; -} - -.KB { - padding: 4px 8px 4px 8px; - margin: 0px 8px 0px 8px; - border-radius: 0; -} - -.widget-menubar>box{ - padding: 8px 0px 4px; - margin: 0px 8px; - border-radius: 10px 10px 0px 0px; - background-color: @noti-bg; -} - -.widget-menubar>box>.menu-button-bar>button{ - border: 1px solid @noti-border-color; - background: @noti-bg; +.widget-buttons-grid { + font-size: x-large; + padding: 5px; + margin: 5px 10px 10px 10px; border-radius: 10px; - margin: 4px 12px; + background: @noti-bg-darker; } -.widget-buttons-grid{ - padding: 0px 8px 8px; - margin: 0px 8px 8px; - border-radius: 0px 0px 10px 10px; - background-color: @noti-bg; - font-size: 14px; -} - -.widget-buttons-grid>flowbox>flowboxchild>button{ - background: @noti-bg; - border-radius: 20px; +.widget-buttons-grid>flowbox>flowboxchild>button { + margin: 3px; + background: @theme_base_color; + border-radius: 10px; + color: @theme_text_color; } .widget-buttons-grid>flowbox>flowboxchild>button:hover { - background: @noti-bg-hover; + background: rgba(180,190,254, 1); + color: @theme_base_color; } -.screenshot-buttons, -.screencast-buttons, -.powermode-buttons, -.power-buttons{ - border-radius: 20px; -} - -.screenshot-buttons>button, -.screencast-buttons>button, -.powermode-buttons>button, -.power-buttons>button{ +.widget-menubar>box>.menu-button-bar>button { + border: none; background: transparent; - padding: 2px 0px; - margin: 5px 70px 3px; - border: 1px solid @noti-border-color; } -.screenshot-buttons>button:hover, -.screencast-buttons>button:hover, -.powermode-buttons>button:hover, -.power-buttons>button:hover{ - background: @noti-bg-hover; +.topbar-buttons>button { + border: none; + background: transparent; } + +.widget-volume { + background: @noti-bg-darker; + padding: 5px 10px 5px 12px; + margin: 5px 10px; + border-radius: 10px; + font-size: 1.5rem; + color: #fff; +} + +.widget-backlight { + background: @noti-bg-darker; + padding: 5px; + margin: 5px 10px; + border-radius: 10px; + font-size: 2rem; + color: #fff; +} \ No newline at end of file diff --git a/home/config/waybar/config b/home/config/waybar/config index a966544..76df08a 100644 --- a/home/config/waybar/config +++ b/home/config/waybar/config @@ -1,10 +1,16 @@ { "layer": "top", - "margin-top": 0, - "spacing": 0, + "margin-top": 5, + "spacing": 5, "modules-left": ["group/sys", "tray", "hyprland/workspaces"], "modules-center": ["mpris", "wlr/taskbar"], - "modules-right": ["group/stats", "group/net", "group/sound", "cava", "battery", "custom/updates","idle_inhibitor"], + "modules-right": ["group/stats", "group/net", "group/sound", "cava", "battery", "group/indicators", "custom/notification"], + "group/indicators": { + "orientation": "inherit", + "modules": [ + "gamemode", "privacy", "custom/updates", "idle_inhibitor" + ] + }, "group/net": { "orientation": "inherit", "modules": [ @@ -19,8 +25,7 @@ "custom/cpugov", "cpu", "memory", - "custom/gpu-usage", - "gamemode" + "custom/gpu-usage" ], "drawer": { "transition-duration": 500, @@ -30,7 +35,7 @@ "group/sound": { "orientation": "inherit", "modules": [ - "pulseaudio", "pulseaudio/slider", "custom/audio_idle_inhibitor" + "pulseaudio", "pulseaudio/slider" ], "drawer": { "transition-duration": 500, @@ -99,10 +104,10 @@ "open-on-click": false }, "pulseaudio": { - "format": "{format_source} | {icon} {volume}%", + "format": "{format_source} {icon} {volume}%", "format-bluetooth": "{icon} {volume}% {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": "{icon} 0%", + "format-bluetooth-muted": "{icon} {format_source}", + "format-muted": "{icon} 0%", "format-source": "", "format-source-muted": "", "format-icons": { @@ -112,7 +117,7 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", ""] + "default": ["", "", "󰕾"] }, "on-click": "$HOME/.config/rofi/audio/rofi-sink-switcher.sh &", "on-click-right": "pavucontrol", @@ -124,18 +129,6 @@ "max": 99, "orientation": "horizontal" }, - "custom/audio_idle_inhibitor": { - "format": "{icon}", - "exec": "sway-audio-idle-inhibit --dry-print-both-waybar", - "exec-if": "which sway-audio-idle-inhibit", - "return-type": "json", - "format-icons": { - "output": "", - "input": "", - "output-input": "", - "none": "" - } - }, "mpris": { "format": "⏸ {title:.10}", "format-paused": "▶ {player}", @@ -151,7 +144,7 @@ }, "custom/power": { "format": "󰣇", - "on-click": "$HOME/.config/rofi/powermenu/powermenu.sh" + "on-click": "wlogout -P 1 -s -r 10 -c 10" }, "gamemode": { "format": "{glyph}{count}", @@ -160,8 +153,8 @@ "hide-not-running": true, "use-icon": true, "icon-name": "input-gaming-symbolic", - "icon-spacing": 4, - "icon-size": 14, + "icon-spacing": 1, + "icon-size": 12, "tooltip": true, "tooltip-format": "Games running: {count}" }, @@ -173,20 +166,22 @@ "sort-by-app-id": true, "on-click": "activate", "on-click-middle": "close", + "on-right-middle": "minimize-raise", + "active-first": false, "ignore-list": [ - "Alacritty" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition" }, "rewrite": { - "Firefox Web Browser": "Firefox", + "Mozilla Firefox": "Firefox", "Visual Studio Code": "Code", - "Nemo": "Dateien" + "Alacritty": "Terminal" } }, "hyprland/workspaces": { "format": "{name}{windows}", + "active-only": false, "window-rewrite-default": " 󰘔", "on-click": "activate", "format-window-separator": " ", @@ -205,10 +200,10 @@ "rust": " ", "private browsing": " ", "google": " ", - "foot": " ", "chrome": " ", "Chromium": " ", "nemo": " ", + "pcmanfm": " ", "libreoffice calc": " ", "libreoffice writer": " 󰈙", "libreoffice": " 󰈙", @@ -225,7 +220,11 @@ "Steam": " 󰓓", "Teams": " 󰊻", "kitty": " ", - "code": " 󰨞" + "alacritty": " ", + "foot": " ", + "code": " 󰨞", + "codium": " 󰅨", + "subl": " " }, "sort-by-number": true }, @@ -234,7 +233,8 @@ "rewrite": { "(.*) — firefox": "🌎 $1", "(.*) - zsh": "> [$1]", - "(.*) - kitty": "> [$1]" + "(.*) - kitty": "> [$1]", + "(.*) - alacritty": "> [$1]" }, "separate-outputs": false }, @@ -246,28 +246,21 @@ "updated": "󰂪" }, "exec-if": "which waybar-module-pacman-updates", - "exec": "waybar-module-pacman-updates" - }, - "custom/pacman": { - "format": "{} ", - "interval": 3600, // every hour - "exec": "checkupdates | wc -l", // # of updates - "exec-if": "exit 0", // always run; consider advanced run conditions - "on-click": "kitty 'sudo pacman -Syu'; pkill -SIGRTMIN+8 waybar", // update system - "signal": 8 + "exec": "waybar-module-pacman-updates", + "on-click": "paru" }, "custom/notification": { "tooltip": false, "format": "{icon} {}", "format-icons": { - "notification": "", - "none": "", - "dnd-notification": "", - "dnd-none": "", - "inhibited-notification": "", - "inhibited-none": "", - "dnd-inhibited-notification": "", - "dnd-inhibited-none": "" + "notification": "󰂞", + "none": "󰂜", + "dnd-notification": "󰂛", + "dnd-none": "󰂛", + "inhibited-notification": "󰂜", + "inhibited-none": "󰂜", + "dnd-inhibited-notification": "󰂛", + "dnd-inhibited-none": "󰂛" }, "return-type": "json", "exec-if": "which swaync-client", @@ -336,7 +329,7 @@ "return-type": "json", "restart-interval": 10, "on-click": "$HOME/.config/rofi/cpugov/rofi-cpugov.sh", - "on-click-right": "resources" + "on-click-right": "env GTK_THEME=Adwaita:dark resources" }, "custom/gpu-usage": { "exec": "$HOME/.config/waybar/waybar-gpustat", @@ -358,20 +351,20 @@ // "controller": "controller1", // specify the alias of the controller if there are more than 1 on the system "format": " {status}", "format-disabled": "󰂲", // an empty format will hide the module - "format-connected": " {num_connections}", + "format-connected": "{num_connections}", "tooltip-format": "{controller_alias}\t{controller_address}", - "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}", + "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}\t{device_battery_percentage}%", "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}", "on-click": "blueberry" }, "idle_inhibitor": { "format": "{icon}", "format-icons": { - "activated": "", - "deactivated": "" + "activated": "󱎴", + "deactivated": "󱩛" }, - "tooltip-format-activated": " Idle Inhibitor activated", - "tooltip-format-deactivated": " Idle Inhibitor deactivated" + "tooltip-format-activated": "󱎴 Active: No Lockscreen on idle", + "tooltip-format-deactivated": "󱩛 Active: Lockscreen on idle" }, "custom/vpn": { "format": "󰖂", @@ -379,6 +372,39 @@ "exec-if": "test -d /proc/sys/net/ipv4/conf/tun0", "return-type": "json", "interval": 5 + }, + "power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "󰓅", + "performance": "󰓅", + "balanced": "󰾅", + "power-saver": "󰌪" + } + }, + "privacy": { + "icon-spacing": 4, + "icon-size": 12, + "transition-duration": 250, + "modules": [ + { + "type": "screenshare", + "tooltip": true, + "tooltip-icon-size": 12 + }, + { + "type": "audio-out", + "tooltip": true, + "tooltip-icon-size": 12 + }, + { + "type": "audio-in", + "tooltip": true, + "tooltip-icon-size": 12 + } + ] } } diff --git a/home/config/waybar/style copy.css b/home/config/waybar/style copy.css new file mode 100644 index 0000000..3177c93 --- /dev/null +++ b/home/config/waybar/style copy.css @@ -0,0 +1,232 @@ +* { + border: none; + font-family: "Hack Nerd Font", sans-serif; + font-size: 13px; + color:alpha(@theme_text_color, 0.8); +} +window#waybar { + background: @theme_bg_color; +} +/*-----main groups----*/ +.modules-right { + margin: 0 0 0 0; + background-color:alpha(@theme_selected_bg_color, 0.15); +} +.modules-center { + margin: 0 0 0 0; +} +.modules-left { + margin: 0 0 0 0; + background-color:alpha(@theme_selected_bg_color, 0.15); +} + +/** +## ALL MODULES +**/ +#clock, +#battery, +#backlight, +#cpu, +#memory, +#bluetooth, +#temperature, +#network, +#pulseaudio, +#tray, +#mode, +#idle_inhibitor, +#workspaces, +#custom-power, +#custom-menu, +#custom-media, +#custom-notification, +#custom-updates, +#custom-pacman, +#user, +#cava, +#custom-gpu-usage, +#custom-cpugov, +#custom-vpn.connected{ + padding:0px 10px; + +} + +/** +* GROUPS +**/ +#sys, #stats, #net, #sound { + margin: 0; + padding:2px 5px 1px 5px; + border-radius:0; + color:alpha(@theme_text_color, 0.5); +} + + +/** +* SYS +**/ +#sys { + background-color:alpha(@theme_selected_bg_color, 0.1); +} +#custom-power { + margin-left:0; + margin-right:0; +} +#user { + padding-left:0; + font-weight:bold; +} + + +#stats .drawer-child { + padding-left: 10px; + padding-right: 10px; +} + +#tray { + padding-right:0 +} + +/** +* SOUND +**/ + +#cava { + background-color: transparent; + padding-left: 0; +} +#pulseaudio-slider { + padding-left: 10px; + padding-right: 10px; +} +#pulseaudio-slider slider { + min-height: 0px; + min-width: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; + background-color: @insensitive_bg_color; + border:2px solid @theme_selected_bg_color; +} +#pulseaudio-slider trough { + min-height: 4px; + min-width: 80px; + border-radius: 5px; + background-color: #11111b; +} +#pulseaudio-slider highlight { + + min-width: 5px; + border-radius: 5px; + background-color: #6c7086; +} + +#custom-updates { + background-color:alpha(@theme_selected_bg_color, 0.2); + padding-right:12px +} + + +/** +* MISC +**/ +#mpris { + background-color: rgba(172,176,208, .3); + border-radius:20px; + margin: 8px 10px 8px 0px; + padding:0 10px; +} + +/** +* WORKSPACES +**/ +#workspaces { + padding:0 10px 0 10px; +} +#workspaces button { + padding: 0px 10px; + background-color: transparent; + outline:none; + border-radius: 20px; + margin: 8px 5px 8px 0px; +} +#workspaces button:last-child { + margin-right: 0; +} +#workspaces button.empty { + color:inherit; +} +#workspaces button.active { + background-color: transparent; +} +#workspaces button.visible { + background-color:alpha(@theme_selected_bg_color, 0.3); +} +#workspaces button.urgent { + color: #cc3436; +} +#workspaces button:hover { + background-color:alpha(@theme_selected_bg_color, 0.4); + box-shadow: inherit; + text-shadow: inherit; +} + + +/** +## INDICATORS +**/ +#pulseaudio.muted { + color: #cc3436; +} +#battery.charging { + color: #2dcc36; +} +#battery.warning:not(.charging) { + color: #e6e600; +} +#battery.critical:not(.charging) { + color: #cc3436; +} +#temperature.critical { + color: #cc3436; +} +#idle_inhibitor { + padding-right: 14px; + background-color:alpha(@theme_selected_bg_color, 0.2); +} +#idle_inhibitor.activated { + color:alpha(@theme_selected_bg_color, 0.9); +} + + +/** +* TASKBAR +**/ +#taskbar { + font-size:8px; + background: transparent; + opacity: 1; + padding:0; +} +#taskbar button { + border-bottom: 2px solid alpha(@borders, 0.9); + padding:6px 10px 3px 10px; + background: transparent; + transition:100ms border ease-in-out; + margin-left:4px; + border-radius:0; + font-size:8px; +} +#taskbar button:first-child { + margin-left:0; +} +#taskbar button:hover { + + background-color:alpha(@theme_selected_bg_color, 0.2); +} +#taskbar button.active { + background-color:alpha(@theme_selected_bg_color, 0.1); + border-bottom: 2px solid @borders; + opacity:1; +} \ No newline at end of file diff --git a/home/config/waybar/style.css b/home/config/waybar/style.css index 98af64f..bccbd3a 100644 --- a/home/config/waybar/style.css +++ b/home/config/waybar/style.css @@ -5,17 +5,28 @@ color:alpha(@theme_text_color, 0.8); } window#waybar { - background: @theme_bg_color; + background: transparent; + } /*-----main groups----*/ .modules-right { - margin: 0 0 0 0; + margin: 0 5px 0 0; + padding-left:5px; + padding-right:10px; + border-radius: 10px; + /* background-color:alpha(@theme_selected_bg_color, 0.15); */ + background: @theme_bg_color } .modules-center { margin: 0 0 0 0; + border-radius: 10px; } .modules-left { - margin: 0 0 0 0; + margin: 0 0 0 5px; + /* background-color:alpha(@theme_selected_bg_color, 0.15); + background: @theme_bg_color */ + border-radius: 10px; + margin-left: 5px; } /** @@ -44,8 +55,12 @@ window#waybar { #cava, #custom-gpu-usage, #custom-cpugov, -#custom-vpn.connected{ +#custom-vpn.connected, +#power-profiles-daemon, +#privacy, +#gamemode{ padding:0px 10px; + } /** @@ -53,20 +68,22 @@ window#waybar { **/ #sys, #stats, #net, #sound { margin: 0; - padding:2px 5px 1px 5px; - border-radius:0; + + border-radius:10px; color:alpha(@theme_text_color, 0.5); - background-color:alpha(@theme_selected_fg_color, 0.3); + background-color: @theme_bg_color; } /** * SYS **/ +#sys { + padding:0 10px 0 10px; +} #custom-power { margin-left:0; margin-right:0; - /*font-family: "MonarchOS", sans-serif;*/ } #user { padding-left:0; @@ -79,16 +96,22 @@ window#waybar { padding-right: 10px; } +#tray { + background-color: @theme_bg_color; + border-radius:10px; + margin: 0; +} + /** * SOUND **/ #cava { - background-color:alpha(@theme_selected_fg_color, 0.3); + background-color: transparent; padding-left: 0; } #pulseaudio-slider { - padding-left: 10px; + padding-left: 0px; padding-right: 10px; } #pulseaudio-slider slider { @@ -115,12 +138,9 @@ window#waybar { } #custom-updates { - background-color:alpha(@theme_selected_fg_color, 0.3); padding-right:12px } -#tray { - background-color:alpha(@theme_selected_fg_color, 0.1); -} + /** * MISC @@ -136,15 +156,14 @@ window#waybar { * WORKSPACES **/ #workspaces { - background-color: transparent; - padding:0; - margin-left:10px + padding:0 10px 0 0px; + border-radius:10px } #workspaces button { padding: 0px 10px; - background-color: transparent; + background-color: shade(@theme_bg_color, 1); outline:none; - border-radius: 20px; + border-radius: 10px; margin: 8px 5px 8px 0px; } #workspaces button:last-child { @@ -157,7 +176,7 @@ window#waybar { background-color: transparent; } #workspaces button.visible { - background-color:alpha(@theme_selected_bg_color, 0.3); + background-color: shade(@theme_bg_color, 1.5); } #workspaces button.urgent { color: #cc3436; @@ -187,14 +206,19 @@ window#waybar { #temperature.critical { color: #cc3436; } -#idle_inhibitor { - padding-right: 14px; - background-color:alpha(@theme_selected_fg_color, 0.3); -} + #idle_inhibitor.activated { color:alpha(@theme_selected_bg_color, 0.9); } +#indicators { + padding-right:5px; + padding-left:5px; + background-color:shade(@theme_bg_color, 1.5); + border-radius:10px; + margin:10px 0; +} + /** * TASKBAR @@ -204,25 +228,37 @@ window#waybar { background: transparent; opacity: 1; padding:0; + border-radius:10px; + background: @theme_bg_color; +} +#taskbar.empty { + background: transparent; } #taskbar button { - border-bottom: 2px solid alpha(@borders, 0.9); - padding:6px 10px 3px 10px; - background: transparent; + padding:3px 10px 3px 10px; transition:100ms border ease-in-out; - margin-left:4px; - border-radius:0; + border-radius:10px; font-size:8px; } -#taskbar button:first-child { - margin-left:0; + +#taskbar button:not(:first-child) { + border-radius:0px; } +#taskbar button:first-child { + border-radius: 10px 0 0 10px; +} +#taskbar button:last-child { + border-radius: 0 10px 10px 0; +} +#taskbar button:last-child:first-child { + border-radius: 10px; +} + #taskbar button:hover { background-color:alpha(@theme_selected_bg_color, 0.2); } #taskbar button.active { background-color:alpha(@theme_selected_bg_color, 0.1); - border-bottom: 2px solid @borders; opacity:1; } \ No newline at end of file diff --git a/home/config/wlogout/layout b/home/config/wlogout/layout new file mode 100644 index 0000000..976b6c0 --- /dev/null +++ b/home/config/wlogout/layout @@ -0,0 +1,36 @@ +{ + "label" : "lock", + "action" : "sleep .5 && hyprlock", + "text" : "Lock", + "keybind" : "l" +} +{ + "label" : "hibernate", + "action" : "systemctl hibernate", + "text" : "Hibernate", + "keybind" : "h" +} +{ + "label" : "logout", + "action" : "hyprctl dispatch exit", + "text" : "Logout", + "keybind" : "e" +} +{ + "label" : "shutdown", + "action" : "systemctl poweroff", + "text" : "Shutdown", + "keybind" : "s" +} +{ + "label" : "suspend", + "action" : "systemctl suspend", + "text" : "Suspend", + "keybind" : "u" +} +{ + "label" : "reboot", + "action" : "systemctl reboot", + "text" : "Reboot", + "keybind" : "r" +} diff --git a/home/config/wlogout/style.css b/home/config/wlogout/style.css new file mode 100644 index 0000000..57aadff --- /dev/null +++ b/home/config/wlogout/style.css @@ -0,0 +1,45 @@ +* { + background-image: none; +} +window { + background-color: rgba(12, 12, 12, 0.9); +} +button { + color: #acb0d0; + background-color: #1E1E1E; + border-radius: 10px; + border:none; + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + outline-style: none; +} + +button:focus, button:active, button:hover { + background-color: #2e3440; + outline-style: none; +} + +#lock { + background-image: image(url("/usr/share/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png")); +} + +#logout { + background-image: image(url("/usr/share/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png")); +} + +#suspend { + background-image: image(url("/usr/share/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png")); +} + +#hibernate { + background-image: image(url("/usr/share/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png")); +} + +#shutdown { + background-image: image(url("/usr/share/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png")); +} + +#reboot { + background-image: image(url("/usr/share/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png")); +} diff --git a/setup.sh b/setup.sh index 3398aba..bbb4cd9 100755 --- a/setup.sh +++ b/setup.sh @@ -96,8 +96,9 @@ function inst_zsh { done sudo install -C $MOONARCH_DIR/home/.zshrc $HOME/.zshrc - sudo mkdir -p $HOME/.zsh/ - git clone https://github.com/zsh-users/zsh-autosuggestions $HOME/.zsh/zsh-autosuggestions + git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k chsh -s /usr/bin/zsh fi } @@ -382,7 +383,7 @@ function inst_hypr { read confirm_hypr if [[ $confirm_hypr == "Y" ]]; then - declare -a pkg_list=(wayland xorg-xwayland hyprland hypridle hyprlock swww waypaper-git xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout) + declare -a pkg_list=(wayland xorg-xwayland hyprland-git hypridle hyprlock hyprcursor-git hyprkeys hyprpicker swww waypaper-git xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout) for key in "${pkg_list[@]}" do pkg_inst $key