diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf index e4f428b..545b26f 100644 --- a/config/hypr/configs/Execs.conf +++ b/config/hypr/configs/Execs.conf @@ -22,7 +22,7 @@ exec-once = $scriptsDir/Polkit.sh #gnome polkit for nixos #exec-once = $scriptsDir/Polkit-NixOS.sh -# Portal Hyprland (should be auto starting. However, you can force to start) +# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start) #exec-once = $scriptsDir/PortalHyprland.sh # starup apps diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 2c4a048..f264cd7 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -16,8 +16,8 @@ $volume = $scriptsDir/Volume.sh # see https://wiki.hyprland.org/Configuring/Binds/ for more # rofi launcher -bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser -bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser +bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun +bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi run,filebrowser,drun bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 bind = $mainMod SHIFT, R, exec, hyprctl reload @@ -41,6 +41,7 @@ bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh bind = CTRL, W, exec, $scriptsDir/WaybarStyles.sh bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh bind = ALT, W, exec, $scriptsDir/WaybarLayout.sh +bind = ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh bind = $mainMod CTRL, D, layoutmsg, removemaster bind = $mainMod, Escape, exec, hyprctl kill @@ -66,7 +67,7 @@ bind = , xf86audioraisevolume, exec, $volume --inc #volume up bind = , xf86audiolowervolume, exec, $volume --dec #volume down bind = , xf86AudioMicMute, exec, $volume --toggle-mic #mute mic bind = , xf86audiomute, exec, $volume --toggle #FN+F1 -bind = , xf86Sleep, exec, $LockScreen #FN+F11 (sleep button) +bind = , xf86Sleep, exec, systemctl suspend #FN+F11 (sleep button) bind = , xf86Rfkill, exec, $AirplaneMode #Airplane mode FN+F12 # media controls using keyboards @@ -122,32 +123,32 @@ bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 # Move active window and follow to workspace -bind = $mainMod CTRL, 1, movetoworkspace, 1 -bind = $mainMod CTRL, 2, movetoworkspace, 2 -bind = $mainMod CTRL, 3, movetoworkspace, 3 -bind = $mainMod CTRL, 4, movetoworkspace, 4 -bind = $mainMod CTRL, 5, movetoworkspace, 5 -bind = $mainMod CTRL, 6, movetoworkspace, 6 -bind = $mainMod CTRL, 7, movetoworkspace, 7 -bind = $mainMod CTRL, 8, movetoworkspace, 8 -bind = $mainMod CTRL, 9, movetoworkspace, 9 -bind = $mainMod CTRL, 0, movetoworkspace, 10 -bind = $mainMod CTRL, bracketleft, movetoworkspace, -1 -bind = $mainMod CTRL, bracketright, movetoworkspace, +1 +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 +bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 +bind = $mainMod SHIFT, bracketright, movetoworkspace, +1 # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 -bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 -bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 -bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 -bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 -bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 -bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 -bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 -bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 -bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 -bind = $mainMod SHIFT, bracketleft, movetoworkspacesilent, -1 -bind = $mainMod SHIFT, bracketright, movetoworkspacesilent, +1 +bind = $mainMod CTRL, 1, movetoworkspacesilent, 1 +bind = $mainMod CTRL, 2, movetoworkspacesilent, 2 +bind = $mainMod CTRL, 3, movetoworkspacesilent, 3 +bind = $mainMod CTRL, 4, movetoworkspacesilent, 4 +bind = $mainMod CTRL, 5, movetoworkspacesilent, 5 +bind = $mainMod CTRL, 6, movetoworkspacesilent, 6 +bind = $mainMod CTRL, 7, movetoworkspacesilent, 7 +bind = $mainMod CTRL, 8, movetoworkspacesilent, 8 +bind = $mainMod CTRL, 9, movetoworkspacesilent, 9 +bind = $mainMod CTRL, 0, movetoworkspacesilent, 10 +bind = $mainMod CTRL, bracketleft, movetoworkspacesilent, -1 +bind = $mainMod CTRL, bracketright, movetoworkspacesilent, +1 # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -159,6 +160,7 @@ bind = $mainMod, comma, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + # Screenshot keybindings NOTE: #bind = , Print, exec, $screenshot --now bind = $mainMod, Print, exec, $screenshot --now diff --git a/config/hypr/configs/LaptopDisplay.conf b/config/hypr/configs/LaptopDisplay.conf new file mode 100644 index 0000000..d50c911 --- /dev/null +++ b/config/hypr/configs/LaptopDisplay.conf @@ -0,0 +1,4 @@ +## NOTE, THIS FILE IS BEING USED by disabling Laptop display monitor behaviour when closing lid. +## See notes on Laptops.conf + +#monitor = eDP-1, preferred, auto, 1 diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf index 0b27433..58cdccd 100644 --- a/config/hypr/configs/Laptops.conf +++ b/config/hypr/configs/Laptops.conf @@ -2,6 +2,7 @@ # Setting variables # This configs are mostly for laptops. This is addemdum to Keybinds.conf +$configs = $HOME/.config/hypr/configs $mainMod = SUPER $scriptsDir = $HOME/.config/hypr/scripts @@ -13,25 +14,40 @@ $LidSwitch = $scriptsDir/LidSwitch.sh $screenshot = $scriptsDir/ScreenShot.sh $touchpad = $scriptsDir/TouchPad.sh -bind = , xf86KbdBrightnessDown, exec, $kbacklight --dec #FN+F2 Keyboard brightness Down -bind = , xf86KbdBrightnessUp, exec, $kbacklight --inc #FN+F3 Keyboard brightnes up +bind = , xf86KbdBrightnessDown, exec, $kbacklight --dec #Keyboard brightness Down +bind = , xf86KbdBrightnessUp, exec, $kbacklight --inc #Keyboard brightness up bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button bind = , xf86Launch3, exec, asusctl led-mode -n #FN+F4 Switch keyboard RGB profile bind = , xf86Launch4, exec, asusctl profile -n #FN+F5 change of fan profiles (Quite, Balance, Performance) -bind = , xf86MonBrightnessDown, exec, $backlight --dec #FN+F7 -bind = , xf86MonBrightnessUp, exec, $backlight --inc #FN+F8 -bind = , xf86TouchpadToggle, exec, $touchpad #FN+10 disable touchpad +bind = , xf86MonBrightnessDown, exec, $backlight --dec +bind = , xf86MonBrightnessUp, exec, $backlight --inc +bind = , xf86TouchpadToggle, exec, $touchpad #disable touchpad -# triggered when external monitor is connected and closing lid (For Laptop) -# bindl=,switch:Lid Switch, exec, $LidSwitch -# NOTE: (12-Nov-2023) This use to work before but seems below is ok now +# Screenshot keybindings for Asus G15 (no PrinSrc button) +bind = $mainMod, F6, exec, $screenshot --now +bind = $mainMod SHIFT, F6, exec, $screenshot --area +bind = $mainMod CTRL SHIFT, F6, exec, $screenshot --in5 +bind = $mainMod ALT, F6, exec, $screenshot --in10 + +# Below are useful when you are connecting your laptop in external display +# Suggest you edit below for your laptop display # From WIKI This is to disable laptop monitor when lid is closed. # consult https://wiki.hyprland.org/hyprland-wiki/pages/Configuring/Binds/#switches bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, auto, 1" bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable" -# Screenshot keybindings for Asus G15 (no PrinSrc button) -bind = $mainMod, F6, exec, $screenshot --now -bind = $mainMod SHIFT, F6, exec, $screenshot --area -bind = $mainMod CTRL SHIFT, F6, exec, $screenshot --in5 -bind = $mainMod ALT, F6, exec, $screenshot --in10 \ No newline at end of file +############################################################################# +### WARNING! Using this method has some caveats!! USE THIS PART WITH SOME CAUTION! +# CONS of doing this, is that you need to set up your wallpaper (SUPER W) and choose wallpaper. +# CAVEATS! Sometimes the Main Laptop Monitor DOES NOT have display that it needs to re-connect your external monitor +# One work around is to ensure that before shutting down laptop, MAKE SURE your laptop lid is OPEN!! +# Make sure to comment (put # on the both the bindl = , switch ......) above +# NOTE: Display for laptop are being generated into LaptopDisplay.conf +# This part is to be use if you do not want your main laptop monitor to wake up during say wallpaper change etc + +#bindl = , switch:off:Lid Switch,exec,echo "monitor = eDP-1, preferred, auto, 1" > $configs/LaptopDisplay.conf +#bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $configs/LaptopDisplay.conf + +# for laptop-lid action (to erase the last entry) +#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/configs/LaptopDisplay.conf +############################################################################## diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf index b8ea829..6481942 100644 --- a/config/hypr/configs/Monitors.conf +++ b/config/hypr/configs/Monitors.conf @@ -11,7 +11,10 @@ xwayland { # Monitors monitor=,preferred,auto,1 -# my G15 Laptop +# NOTE: for laptop, kindly check notes in Laptops.conf regarding display +# Created this inorder for the monitor display to not wake up if not intended. +# See here: https://github.com/hyprwm/Hyprland/issues/4090 + #monitor = eDP-1, preferred, auto, 1 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen #monitor = DP-2, preferred, auto, 1 diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 65f0b83..c09e6f7 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -5,6 +5,7 @@ source=$configs/ENVariables.conf source=$configs/Execs.conf source=$configs/Keybinds.conf source=$configs/Laptops.conf +source=$configs/LaptopDisplay.conf source=$configs/Monitors.conf source=$configs/WindowRules.conf source=$configs/Settings.conf diff --git a/config/hypr/v2.1.17 b/config/hypr/v2.1.18 similarity index 100% rename from config/hypr/v2.1.17 rename to config/hypr/v2.1.18 diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index 8430cc8..cee7b92 100644 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -3,13 +3,13 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; + modi: "drun,run,filebrowser"; font: "Fira Code SemiBold 12"; show-icons: true; display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: ""; + display-run: ""; + display-filebrowser: ""; + display-window: "󱂬"; drun-display-format: "{name}"; hover-select: true; me-select-entry: "MouseSecondary"; @@ -84,7 +84,7 @@ inputbar { border-radius: 12px; border-color: @foreground; background-color: @background; - children: [ "mode-switcher", "textbox-prompt-colon", "entry" ]; + children: [ "mode-switcher", "entry" ]; border: 1px; border-color: @active-background; } @@ -103,7 +103,7 @@ entry { padding: 10px 0px 10px 0px; text-color: inherit; cursor: text; - placeholder: "Search"; + placeholder: "Search (ctrl tab to choose mode)"; placeholder-color: inherit; background-color: transparent; } @@ -117,7 +117,7 @@ mode-switcher{ } button { - padding: 2px 24px 2px 24px; + padding: 1px 12px 1px 12px; border-radius: 12px; background-color: @background; text-color: inherit; diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi index 8430cc8..cee7b92 100644 --- a/config/rofi/resolution/1080p/config.rasi +++ b/config/rofi/resolution/1080p/config.rasi @@ -3,13 +3,13 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; + modi: "drun,run,filebrowser"; font: "Fira Code SemiBold 12"; show-icons: true; display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: ""; + display-run: ""; + display-filebrowser: ""; + display-window: "󱂬"; drun-display-format: "{name}"; hover-select: true; me-select-entry: "MouseSecondary"; @@ -84,7 +84,7 @@ inputbar { border-radius: 12px; border-color: @foreground; background-color: @background; - children: [ "mode-switcher", "textbox-prompt-colon", "entry" ]; + children: [ "mode-switcher", "entry" ]; border: 1px; border-color: @active-background; } @@ -103,7 +103,7 @@ entry { padding: 10px 0px 10px 0px; text-color: inherit; cursor: text; - placeholder: "Search"; + placeholder: "Search (ctrl tab to choose mode)"; placeholder-color: inherit; background-color: transparent; } @@ -117,7 +117,7 @@ mode-switcher{ } button { - padding: 2px 24px 2px 24px; + padding: 1px 12px 1px 12px; border-radius: 12px; background-color: @background; text-color: inherit; diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi index dca52fd..f486a42 100644 --- a/config/rofi/resolution/1440p/config.rasi +++ b/config/rofi/resolution/1440p/config.rasi @@ -3,13 +3,13 @@ /* ---- Configuration ---- */ configuration { - modi: "drun,run"; + modi: "drun,run,filebrowser"; font: "Fira Code SemiBold 14"; show-icons: true; display-drun: ""; - display-run: ""; - display-filebrowser: ""; - display-window: ""; + display-run: ""; + display-filebrowser: ""; + display-window: "󱂬"; drun-display-format: "{name}"; hover-select: true; me-select-entry: "MouseSecondary"; @@ -84,7 +84,7 @@ inputbar { border-radius: 12px; border-color: @foreground; background-color: @background; - children: [ "mode-switcher", "textbox-prompt-colon", "entry" ]; + children: [ "mode-switcher", "entry" ]; border: 1px; border-color: @active-background; } @@ -103,7 +103,7 @@ entry { padding: 10px 0px 10px 0px; text-color: inherit; cursor: text; - placeholder: "Search"; + placeholder: "Search (ctrl tab to choose mode)"; placeholder-color: inherit; background-color: transparent; } @@ -117,7 +117,7 @@ mode-switcher{ } button { - padding: 2px 24px 2px 24px; + padding: 1px 12px 1px 12px; border-radius: 12px; background-color: @background; text-color: inherit; diff --git a/config/waybar/configs/Bottom & Left b/config/waybar/configs/Bottom & Left index ce9f8d7..27bec45 100644 --- a/config/waybar/configs/Bottom & Left +++ b/config/waybar/configs/Bottom & Left @@ -67,6 +67,7 @@ ], "modules-right": [ + "mpris", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/Bottom & Right b/config/waybar/configs/Bottom & Right index 3687834..68629cb 100644 --- a/config/waybar/configs/Bottom & Right +++ b/config/waybar/configs/Bottom & Right @@ -67,6 +67,7 @@ ], "modules-right": [ + "mpris", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/Camellia [Bottom] index a7b995c..0e2305a 100644 --- a/config/waybar/configs/Camellia [Bottom] +++ b/config/waybar/configs/Camellia [Bottom] @@ -20,7 +20,12 @@ //"margin-left": 0, //"margin-right": 0, -"modules-left": ["hyprland/workspaces#cam","custom/separator#line","tray#cam", "wlr/taskbar"], +"modules-left": [ + "hyprland/workspaces#cam", + "custom/separator#line", + "mpris", + "tray#cam", + "wlr/taskbar"], "modules-center": ["hyprland/window#cam"], diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP] index 2aa21cb..beeb80b 100644 --- a/config/waybar/configs/Camellia [TOP] +++ b/config/waybar/configs/Camellia [TOP] @@ -20,7 +20,13 @@ //"margin-left": 0, //"margin-right": 0, -"modules-left": ["hyprland/workspaces#cam","custom/separator#line","tray#cam", "wlr/taskbar"], +"modules-left": [ + "hyprland/workspaces#cam", + "custom/separator#line", + "mpris", + "tray#cam", + "wlr/taskbar" + ], "modules-center": ["hyprland/window#cam"], @@ -31,7 +37,8 @@ "pulseaudio/slider", "battery#cam", "clock#cam", - "network#cam"], + "network#cam" + ], // Additional modules // diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/Chrysanthemum [Bottom] index d87fd24..68bff67 100644 --- a/config/waybar/configs/Chrysanthemum [Bottom] +++ b/config/waybar/configs/Chrysanthemum [Bottom] @@ -17,7 +17,7 @@ "margin-left": 5, "margin-right": 5, -"modules-left": ["clock#gar","tray"], +"modules-left": ["clock#gar", "mpris", "tray"], "modules-center": ["hyprland/workspaces"], @@ -60,7 +60,7 @@ }, "backlight#gar": { - "device": "intel_backlight", + //"device": "intel_backlight", "format": "{icon} {percent}%", "format-icons": ["", ""] }, diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/Chrysanthemum [TOP] index 9761e87..b869184 100644 --- a/config/waybar/configs/Chrysanthemum [TOP] +++ b/config/waybar/configs/Chrysanthemum [TOP] @@ -18,7 +18,7 @@ "margin-right": 5, "margin-top": 0, -"modules-left": ["clock#gar","tray"], +"modules-left": ["clock#gar", "mpris", "tray"], "modules-center": ["hyprland/workspaces"], @@ -62,7 +62,7 @@ }, "backlight#gar": { - "device": "intel_backlight", + //"device": "intel_backlight", "format": "{icon} {percent}%", "format-icons": ["", ""] }, diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop index 47df83c..fb8f148 100644 --- a/config/waybar/configs/Def[Bottom]-Laptop +++ b/config/waybar/configs/Def[Bottom]-Laptop @@ -43,8 +43,8 @@ ], "modules-right": [ - //"hyprland/window", "tray", + "mpris", "custom/separator#dot-line", "bluetooth", "custom/separator#dot-line", diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop index b322a75..d82b0da 100644 --- a/config/waybar/configs/Def[TOP]-Laptop +++ b/config/waybar/configs/Def[TOP]-Laptop @@ -43,8 +43,8 @@ ], "modules-right": [ - //"hyprland/window", "tray", + "mpris", "custom/separator#dot-line", "bluetooth", "custom/separator#dot-line", diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 35ff7f2..9e520d6 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -43,8 +43,8 @@ ], "modules-right": [ - //"hyprland/window", "tray", + "mpris", "custom/separator#dot-line", "bluetooth", "custom/separator#dot-line", diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index 69e1046..51af0ae 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -43,8 +43,8 @@ ], "modules-right": [ - //"hyprland/window", "tray", + "mpris", "custom/separator#dot-line", "bluetooth", "custom/separator#dot-line", diff --git a/config/waybar/configs/Gardenia [Bottom] b/config/waybar/configs/Gardenia [Bottom] index 5b5a089..ce46042 100644 --- a/config/waybar/configs/Gardenia [Bottom] +++ b/config/waybar/configs/Gardenia [Bottom] @@ -20,7 +20,7 @@ "margin-bottom": 5, "width": 768, -"modules-left": ["clock#gar","tray"], +"modules-left": ["clock#gar", "mpris", "tray"], "modules-center": ["hyprland/workspaces#kanji"], diff --git a/config/waybar/configs/Gardenia [TOP] b/config/waybar/configs/Gardenia [TOP] index 358db1c..293c985 100644 --- a/config/waybar/configs/Gardenia [TOP] +++ b/config/waybar/configs/Gardenia [TOP] @@ -19,7 +19,7 @@ //"margin-bottom": 5, "width": 768, -"modules-left": ["clock#gar","tray"], +"modules-left": ["clock#gar", "mpris", "tray"], "modules-center": ["hyprland/workspaces#kanji"], diff --git a/config/waybar/configs/Left b/config/waybar/configs/Left index 99c3405..1458b43 100644 --- a/config/waybar/configs/Left +++ b/config/waybar/configs/Left @@ -25,6 +25,7 @@ ], "modules-right": [ + "mpris", "tray", //"network", "backlight#vertical", diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom] index 159cf34..8406c30 100644 --- a/config/waybar/configs/Peony [Bottom] +++ b/config/waybar/configs/Peony [Bottom] @@ -19,7 +19,7 @@ "margin-bottom": 5, "width": 1444, -"modules-left": ["hyprland/workspaces#roman", "tray#peony"], +"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"], "modules-center": ["clock#peony"], diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP] index c9e5fce..037d05a 100644 --- a/config/waybar/configs/Peony [TOP] +++ b/config/waybar/configs/Peony [TOP] @@ -19,7 +19,7 @@ //"margin-bottom": 5, "width": 1444, -"modules-left": ["hyprland/workspaces#roman", "tray#peony"], +"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"], "modules-center": ["clock#peony"], diff --git a/config/waybar/configs/Right b/config/waybar/configs/Right index 69d4795..4fc258c 100644 --- a/config/waybar/configs/Right +++ b/config/waybar/configs/Right @@ -25,6 +25,7 @@ ], "modules-right": [ + "mpris", "tray", //"network", "backlight#vertical", diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP] index 8c331e3..dc519ad 100644 --- a/config/waybar/configs/Simple-L [TOP] +++ b/config/waybar/configs/Simple-L [TOP] @@ -21,6 +21,7 @@ "custom/separator#blank_2", "hyprland/workspaces#pacman", "custom/separator#blank_2", + "mpris", "tray", ], "modules-center": [ diff --git a/config/waybar/configs/Simple-S [TOP] b/config/waybar/configs/Simple-S [TOP] index d05af59..1368667 100644 --- a/config/waybar/configs/Simple-S [TOP] +++ b/config/waybar/configs/Simple-S [TOP] @@ -20,7 +20,8 @@ "modules-right": [ "custom/menu", - "tray", + "tray", + "mpris", "network", "bluetooth", "backlight", diff --git a/config/waybar/configs/Top & Bottom b/config/waybar/configs/Top & Bottom index 6b04e5c..5ea91ad 100644 --- a/config/waybar/configs/Top & Bottom +++ b/config/waybar/configs/Top & Bottom @@ -67,6 +67,7 @@ "modules-right": [ "hyprland/window", "tray", + "mpris", "keyboard-state", "pulseaudio", //"wireplumber", diff --git a/config/waybar/configs/Top & Left b/config/waybar/configs/Top & Left index e1d13df..6fc8464 100644 --- a/config/waybar/configs/Top & Left +++ b/config/waybar/configs/Top & Left @@ -63,6 +63,7 @@ ], "modules-right": [ + "mpris", "tray", "custom/light_dark", ], diff --git a/config/waybar/configs/Top & Right b/config/waybar/configs/Top & Right index fd594c6..f2e1fe5 100644 --- a/config/waybar/configs/Top & Right +++ b/config/waybar/configs/Top & Right @@ -64,6 +64,7 @@ ], "modules-right": [ + "mpris", "tray", "custom/light_dark", ], diff --git a/config/waybar/modules b/config/waybar/modules index 093d188..ef61f9c 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -1,10 +1,10 @@ //* ---- 💫 https://github.com/JaKooLit 💫 ---- *// { - // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs - // CIRCLES Style - "hyprland/workspaces": { - "active-only": false, +// HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs +// CIRCLES Style +"hyprland/workspaces": { + "active-only": false, "all-outputs": true, "format": "{icon}", "show-special": false, @@ -21,10 +21,11 @@ "format-icons": { "active": "", "default": "", - }, - }, - // ROMAN Numerals style - "hyprland/workspaces#roman": { + }, +}, + +// ROMAN Numerals style +"hyprland/workspaces#roman": { "active-only":false, "all-outputs": true, "format": "{icon}", @@ -52,8 +53,9 @@ "10": "X", }, - }, - // PACMAN Style +}, + +// PACMAN Style "hyprland/workspaces#pacman": { "active-only":false, "all-outputs": true, @@ -75,9 +77,9 @@ "default": "󰊠", "persistent":"󰊠", }, - }, +}, - "hyprland/workspaces#kanji": { +"hyprland/workspaces#kanji": { "disable-scroll": true, "all-outputs": true, "format": "{icon}", @@ -100,10 +102,10 @@ "9": "九", "10": "十", } - }, +}, - // NUMBERS and ICONS style - "hyprland/workspaces#4": { +// NUMBERS and ICONS style +"hyprland/workspaces#4": { "format": "{name}", "format": " {name} {icon} ", //"format": " {icon} ", @@ -127,11 +129,11 @@ "focused": "", "default": "", }, - }, +}, + +// GROUP - // GROUP - - "group/motherboard": { +"group/motherboard": { "orientation": "horizontal", "modules": [ "cpu", @@ -139,32 +141,32 @@ "temperature", "disk", ] - }, +}, - "group/laptop": { +"group/laptop": { "orientation": "horizontal", "modules": [ "backlight", "battery", ] - }, +}, - "group/audio": { +"group/audio": { "orientation": "horizontal", "modules": [ "pulseaudio", "pulseaudio#microphone", ] - }, - - "backlight": { +}, + +"backlight": { "interval": 2, "align": 0, "rotate": 0, //"format": "{icon} {percent}%", - //"format-icons": ["󰃞", "󰃟", "󰃠"], + "format-icons": ["", "", "", "󰃝", "󰃞", "󰃟", "󰃠"], "format": "{icon}", - "format-icons": ["","","","","","","","","","","","","","",""], + //"format-icons": ["","","","","","","","","","","","","","",""], "tooltip-format": "backlight {percent}%", "icon-size": 10, "on-click": "", @@ -174,9 +176,9 @@ "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc", "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec", "smooth-scrolling-threshold": 1, - }, +}, - "battery": { +"battery": { "interval": 60, "align": 0, "rotate": 0, @@ -200,9 +202,9 @@ "tooltip-format": "{timeTo} {power}w", "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", "on-click-right": "~/.config/hypr/scripts/RofiPower.sh", - }, +}, - "bluetooth": { +"bluetooth": { "format": "", "format-disabled": "󰂳", "format-connected": "󰂱 {num_connections}", @@ -211,9 +213,9 @@ "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%", "tooltip": true, "on-click": "blueman-manager", - }, +}, - "cava": { +"cava": { //"cava_config": "$XDG_CONFIG_HOME/cava/cava.conf", "framerate": 30, "autosens": 1, @@ -234,9 +236,9 @@ "actions": { "on-click-right": "mode" } - }, +}, - "clock": { +"clock": { "interval": 1, //"format": " {:%I:%M %p}", "format": " {:%H:%M:%S}", @@ -262,18 +264,18 @@ "on-click-backward": "tz_down", "on-scroll-up": "shift_up", "on-scroll-down": "shift_down" - }, +}, - "cpu": { +"cpu": { "format": "{usage}% 󰍛", "interval": 1, "format-alt-click": "click", "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛", "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"], "on-click-right": "gnome-system-monitor", - }, +}, - "disk": { +"disk": { "interval": 30, //"format": "󰋊", "path": "/", @@ -281,22 +283,22 @@ "format": "{percentage_used}% 󰋊", //"tooltip": true, "tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)", - }, +}, - "hyprland/language": { +"hyprland/language": { "format": "Lang: {}", "format-en": "US", "format-tr": "Korea", "keyboard-name": "at-translated-set-2-keyboard", "on-click": "hyprctl switchxkblayout $SET_KB next" - }, +}, - "hyprland/submap": { +"hyprland/submap": { "format": " {}", // Icon: expand-arrows-alt "tooltip": false, - }, +}, - "hyprland/window": { +"hyprland/window": { "format": "{}", "max-length": 40, "separate-outputs": true, @@ -308,17 +310,17 @@ "(.*) - zsh": "> [$1]", "(.*) - kitty": "> [$1]", }, - }, +}, - "idle_inhibitor": { +"idle_inhibitor": { "format": "{icon}", "format-icons": { "activated": " ", "deactivated": " ", } - }, +}, - "keyboard-state": { +"keyboard-state": { //"numlock": true, "capslock": true, "format": { @@ -329,9 +331,9 @@ "locked": "", "unlocked": "" }, - }, +}, - "memory": { +"memory": { "interval": 10, "format": "{used:0.1f}G 󰾆", "format-alt": "{percentage}% 󰾆", @@ -339,9 +341,23 @@ "tooltip": true, "tooltip-format": "{used:0.1f}GB/{total:0.1f}G", "on-click-right": "kitty --title btop sh -c 'btop'" - }, +}, + +"mpris": { + "format": "{player_icon}", + "format-paused": "{status_icon} {dynamic}", + "player-icons": { + "default": "▶", + "mpv": "📻", + }, + "status-icons": { + "paused": "⏸" + }, + // "ignored-players": ["firefox"] + "max-length": 30, +}, - "network": { +"network": { "format": "{ifname}", "format-wifi": "{icon}", "format-ethernet": "󰌘", @@ -353,9 +369,9 @@ "tooltip-format-disconnected": "󰌙 Disconnected", "max-length": 50, "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] - }, +}, - "network#speed": { +"network#speed": { "interval": 1, "format": "{ifname}", "format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}", @@ -368,9 +384,9 @@ "tooltip-format-disconnected": "󰌙 Disconnected", "max-length": 50, "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] - }, +}, - "pulseaudio": { +"pulseaudio": { "format": "{icon}", "format-bluetooth": "{icon} 󰂰 {volume}%", "format-muted": "󰖁", @@ -390,9 +406,9 @@ "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", "smooth-scrolling-threshold": 1, - }, +}, - "pulseaudio#microphone": { +"pulseaudio#microphone": { "format": "{format_source}", "format-source": " {volume}%", "format-source-muted": "", @@ -401,9 +417,9 @@ "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc", "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec", "scroll-step": 5, - }, +}, - "temperature": { +"temperature": { "interval": 10, "tooltip": false, "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], @@ -413,14 +429,14 @@ "format": "{temperatureC}°C {icon}", "format-icons": ["󰈸"], "on-click-right": "kitty --title nvtop sh -c 'nvtop'" - }, +}, - "tray": { +"tray": { "icon-size": 14, "spacing": 8, - }, +}, - "wireplumber": { +"wireplumber": { "format": "{icon} {volume} %", "format-muted": " Mute", "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", @@ -428,9 +444,9 @@ "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", "format-icons": ["", "", "󰕾", ""], - }, +}, - "wlr/taskbar": { +"wlr/taskbar": { "format": "{icon} {name} ", "icon-size": 16, "all-outputs": false, @@ -441,55 +457,54 @@ "wofi", "rofi", ] - }, +}, - "custom/cycle_wall":{ +"custom/cycle_wall":{ "format":" ", "on-click": "~/.config/hypr/scripts/WallpaperSelect.sh", "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh", "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh", "tooltip": true, "tooltip-format": "Change wallpaper or style" - }, +}, - "custom/keybinds": { +"custom/keybinds": { "format":"󰺁 HINT!", "tooltip": false, "on-click": "~/.config/hypr/scripts/KeyHints.sh", - }, - - "custom/keyboard": { - "exec": "cat ~/.cache/kb_layout", - "interval": 1, - "format": " {}", - "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", - "tooltip": false, - }, +}, +"custom/keyboard": { + "exec": "cat ~/.cache/kb_layout", + "interval": 1, + "format": " {}", + "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh", + "tooltip": false, + }, - "custom/light_dark": { +"custom/light_dark": { "format": "", "on-click": "~/.config/hypr/scripts/DarkLight.sh", "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh", "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh", "tooltip": false, - }, +}, - "custom/lock": { +"custom/lock": { "format": "", "on-click": "~/.config/hypr/scripts/LockScreen.sh", "tooltip": false, - }, +}, - "custom/menu": { +"custom/menu": { "format": "", "tooltip": false, "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser", "on-click-middle": "~/.config/hypr/scripts/WallpaperSelect.sh", "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh", - }, +}, - "custom/playerctl": { +"custom/playerctl": { "format": "{}", "return-type": "json", "max-length": 35, @@ -501,25 +516,25 @@ "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", "smooth-scrolling-threshold": 1, - }, +}, - "custom/power": { +"custom/power": { "format": "⏻ ", "tooltip": false, "on-click": "~/.config/hypr/scripts/Wlogout.sh", "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", - }, +}, - // NOTE:! This is only for Arch and Arch Based Distros - "custom/updater":{ +// NOTE:! This is only for Arch and Arch Based Distros +"custom/updater":{ "format": " {}", "exec": "checkupdates | wc -l", "exec-if": "[[ $(checkupdates | wc -l) ]]", "interval": 15, "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'", - }, +}, - "custom/weather": { +"custom/weather": { "format": "{}", "format-alt": "{alt}: {}", "format-alt-click": "click", @@ -529,61 +544,62 @@ //"exec": "~/.config/hypr/scripts/Weather.py", "exec-if": "ping wttr.in -c1", "tooltip" : true, - }, +}, - // Separators - "custom/separator#dot": { +// Separators +"custom/separator#dot": { "format": "", "interval": "once", "tooltip": false - }, +}, - "custom/separator#dot-line": { +"custom/separator#dot-line": { "format": "", "interval": "once", "tooltip": false - }, +}, - "custom/separator#line": { +"custom/separator#line": { "format": "|", "interval": "once", "tooltip": false - }, +}, - "custom/separator#blank": { +"custom/separator#blank": { "format": "", "interval": "once", "tooltip": false - }, +}, - "custom/separator#blank_2": { - "format": " ", +"custom/separator#blank_2": { + "format": " ", "interval": "once", "tooltip": false - }, +}, - // Modules below are for vertical layout +// Modules below are for vertical layout - "backlight#vertical": { - "interval": 2, - "align": 0.35, - "rotate": 1, - "format": "{icon}", - "format-icons": ["󰃞", "󰃟", "󰃠"], - "on-click": "", - "on-click-middle": "", - "on-click-right": "", - "on-update": "", - "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc", - "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec", - "smooth-scrolling-threshold": 1, - //"tooltip-format": "{percent}%", - }, +"backlight#vertical": { + "interval": 2, + "align": 0.35, + "rotate": 1, + "format": "{icon}", + //"format-icons": ["󰃞", "󰃟", "󰃠"], + "format-icons": ["","","","","","","","","","","","","","",""], + "on-click": "", + "on-click-middle": "", + "on-click-right": "", + "on-update": "", + "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec", + "smooth-scrolling-threshold": 1, + //"tooltip-format": "{percent}%", +}, - "clock#vertical": { - "format": "{:\n%H\n%M\n%S\n\n \n%d\n%m\n%y}", - "interval": 1, +"clock#vertical": { + "format": "{:\n%H\n%M\n%S\n\n \n%d\n%m\n%y}", + "interval": 1, //"format": "{:\n%I\n%M\n%p\n\n \n%d\n%m\n%y}", "tooltip": true, "tooltip-format": "{calendar}", @@ -594,14 +610,15 @@ "today": "{}", } } - }, - "cpu#vertical": { +}, + +"cpu#vertical": { "format": "󰍛\n{usage}%", "interval": 1, "on-click-right": "gnome-system-monitor", - }, +}, - "memory#vertical": { +"memory#vertical": { "interval": 10, "format": "󰾆\n{percentage}%", "format-alt": "󰾆\n{used:0.1f}G", @@ -609,9 +626,9 @@ "tooltip": true, "tooltip-format": "{used:0.1f}GB/{total:0.1f}G", "on-click-right": "kitty --title btop sh -c 'btop'", - }, +}, - "pulseaudio#vertical": { +"pulseaudio#vertical": { "format": "{icon}", "format-bluetooth": "󰂰", "format-muted": "󰖁", @@ -624,16 +641,16 @@ "car": "", "default": ["", "", "󰕾", ""], "ignored-sinks": ["Easy Effects Sink"], - }, + }, "scroll-step": 5.0, "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", "on-click-right": "pavucontrol -t 3", "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", "smooth-scrolling-threshold": 1, - }, +}, - "pulseaudio#microphone_vertical": { +"pulseaudio#microphone_vertical": { "format": "{format_source}", "format-source": "󰍬", "format-source-muted": "󰍭", @@ -644,28 +661,28 @@ "max-volume": 100, "tooltip": true, "tooltip-format": "{icon} {desc} {volume}%", - }, +}, - "temperature#vertical": { +"temperature#vertical": { "interval": 10, "tooltip": true, - "hwmon-path": ["/sys/class/hwmon/hwmon6/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], + "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], //"thermal-zone": 0, "critical-threshold": 80, "format-critical": "{icon}\n{temperatureC}°C", "format": " {icon}", "format-icons": ["󰈸"], "on-click-right": "kitty --title nvtop sh -c 'nvtop'" - }, +}, - "custom/power_vertical": { +"custom/power_vertical": { "format": "⏻", "tooltip": false, "on-click": "~/.config/hypr/scripts/RofiPower.sh", "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", - }, +}, - } +} \ No newline at end of file diff --git a/copy.sh b/copy.sh index a2585be..0c960a0 100755 --- a/copy.sh +++ b/copy.sh @@ -8,16 +8,12 @@ if [[ $EUID -eq 0 ]]; then exit 1 fi -echo " - - ██╗ █████╗ ██╗ ██╗ ██████╗ ██████╗ ██╗ ██╗████████╗ ██████╗ ██████╗ ████████╗███████╗ - ██║██╔══██╗ ██║ ██╔╝██╔═══██╗██╔═══██╗██║ ██║╚══██╔══╝ ██╔══██╗██╔═══██╗╚══██╔══╝██╔════╝ - ██║███████║ █████╔╝ ██║ ██║██║ ██║██║ ██║ ██║ █████╗██║ ██║██║ ██║ ██║ ███████╗ -██ ██║██╔══██║ ██╔═██╗ ██║ ██║██║ ██║██║ ██║ ██║ ╚════╝██║ ██║██║ ██║ ██║ ╚════██║ -╚█████╔╝██║ ██║██╗██║ ██╗╚██████╔╝╚██████╔╝███████╗██║ ██║ ██████╔╝╚██████╔╝ ██║ ███████║ - ╚════╝ ╚═╝ ╚═╝╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝ - -" +printf "\n%.0s" {1..3} +echo " _ _ ___ __ " +echo " | _. |/ _ _ | o _|_ __ | \ / \ | (_ " +echo " \_| (_| o |\ (_) (_) |_ | |_ |_/ \_/ | __) " +printf "\n%.0s" {1..2} + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" @@ -182,12 +178,8 @@ chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" -printf "\n\n" -# adding user to input group -printf " adding user to input group...\n" -sudo gpasswd -a $(whoami) input 2>&1 | tee -a "$LOG" -printf "\n\n" +#printf "\n\n" # Additional wallpaper echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0)" read -n1 -rep "${CAT} Would you like to download additional wallpapers? (y/n)" WALL