Browse Source

Merge pull request #100 from JaKooLit/Development

Development
pull/101/head^2
Ja.KooLit 2 years ago committed by GitHub
parent
commit
90e6b78fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 27
      config/hypr/configs/Keybinds.conf
  2. 8
      config/hypr/configs/Laptops.conf
  3. 2
      config/hypr/configs/Settings.conf
  4. 2
      config/hypr/scripts/Wallpaper.sh
  5. 5
      config/waybar/configs/[TOP & BOT] SummitSplit
  6. 6
      config/waybar/modules
  7. 3
      config/waybar/style/Catppuccin-Latte.css
  8. 3
      config/waybar/style/[Black & White] Monochrome.css
  9. 20
      config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
  10. 13
      config/waybar/style/[Colorful] Rainbow Spectrum.css
  11. 3
      config/waybar/style/[Pywal] Chroma Edge.css
  12. 9
      config/waybar/style/[Pywal] Chroma Fusion.css
  13. 11
      config/waybar/style/[Retro] Simple Style.css

27
config/hypr/configs/Keybinds.conf

@ -12,7 +12,7 @@ $scriptsDir = $HOME/.config/hypr/scripts
bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run
bind = $mainMod, Return, exec, $term bind = $mainMod, Return, exec, $term # Launch terminal
bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
bind = $mainMod SHIFT, Q, closewindow, bind = $mainMod SHIFT, Q, closewindow,
bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod SHIFT, F, togglefloating,
@ -23,29 +23,29 @@ bind = $mainMod, T, exec, $files
bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
# FEATURES # FEATURES / EXTRAS
bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, dunst, rofi bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh # Refresh waybar, dunst, rofi
bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh # online music bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh # online music
bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh # emoji
bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh # Small help file
bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh # Quick Edit Hyprland Settings
bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings
bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh # animations ON/OFF
bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh # Switch Keyboard Layout
bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh # Toggle Master or Dwindle Layout
bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh # Clipboard Manager
# MISC (Miscellaneous Keybinds) # MISC (Miscellaneous Keybinds)
bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme bind = $mainMod SHIFT, O, exec, $scriptsDir/ZshChangeTheme.sh # Change oh-my-zsh theme
# Wallpaper related keybinds # Wallpaper related keybinds
bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh # Select wallpaper to apply
bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh # Random wallpapers
# Waybar / Bar related # Waybar / Bar related
bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar
bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh # Waybar Layout Menu
# Master Layout # Master Layout
bind = $mainMod CTRL, D, layoutmsg, removemaster bind = $mainMod CTRL, D, layoutmsg, removemaster
@ -139,7 +139,7 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [ or ] bind = $mainMod SHIFT, bracketleft, movetoworkspace, -1 # brackets [ or ]
bind = $mainMod SHIFT, bracketright, movetoworkspace, +1 bind = $mainMod SHIFT, bracketright, movetoworkspace, +1
# Move active window to a workspace with mainMod + SHIFT + [0-9] # Move active window to a workspace silently
bind = $mainMod CTRL, 1, movetoworkspacesilent, 1 bind = $mainMod CTRL, 1, movetoworkspacesilent, 1
bind = $mainMod CTRL, 2, movetoworkspacesilent, 2 bind = $mainMod CTRL, 2, movetoworkspacesilent, 2
bind = $mainMod CTRL, 3, movetoworkspacesilent, 3 bind = $mainMod CTRL, 3, movetoworkspacesilent, 3
@ -163,12 +163,11 @@ bind = $mainMod, comma, workspace, e-1
bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow bindm = $mainMod, mouse:273, resizewindow
# Screenshot keybindings NOTE: # Screenshot keybindings NOTE: You may need to press Fn key as well
#bind = , Print, exec, $scriptsDir/ScreenShot.sh --now
bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now bind = $mainMod, Print, exec, $scriptsDir/ScreenShot.sh --now
bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area bind = $mainMod SHIFT, Print, exec, $scriptsDir/ScreenShot.sh --area
bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs bind = $mainMod CTRL, Print, exec, $scriptsDir/ScreenShot.sh --in5 #screenshot in 5 secs
bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 5 secs bind = $mainMod ALT, Print, exec, $scriptsDir/ScreenShot.sh --in10 #screenshot in 10 secs
# screenshot with swappy (another screenshot tool) # screenshot with swappy (another screenshot tool)

8
config/hypr/configs/Laptops.conf

@ -16,10 +16,10 @@ bind = , xf86MonBrightnessUp, exec, $scriptsDir/Brightness.sh --inc
bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad bind = , xf86TouchpadToggle, exec, $scriptsDir/TouchPad.sh #disable touchpad
# Screenshot keybindings for Asus G15 (no PrinSrc button) # Screenshot keybindings for Asus G15 (no PrinSrc button)
bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now bind = $mainMod, F6, exec, $scriptsDir/ScreenShot.sh --now # Fullscreen
bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area bind = $mainMod SHIFT, F6, exec, $scriptsDir/ScreenShot.sh --area
bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in 5 secs
bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs
# Below are useful when you are connecting your laptop in external display # Below are useful when you are connecting your laptop in external display
# Suggest you edit below for your laptop display # Suggest you edit below for your laptop display

2
config/hypr/configs/Settings.conf

@ -2,8 +2,8 @@
## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
# Sourcing colors generated by pywal
source = $HOME/.cache/wal/colors-hyprland source = $HOME/.cache/wal/colors-hyprland
# blurls = waybar # blurls = waybar
# blurls = rofi # blurls = rofi

2
config/hypr/scripts/Wallpaper.sh

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DIR="$HOME/Pictures/wallpapers/" DIR="$HOME/Pictures/wallpapers"
SCRIPTSDIR="$HOME/.config/hypr/scripts" SCRIPTSDIR="$HOME/.config/hypr/scripts"
PICS=($(find ${DIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \))) PICS=($(find ${DIR} -type f \( -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -o -name "*.gif" \)))

5
config/waybar/configs/[TOP & BOT] SummitSplit

@ -25,7 +25,7 @@
"modules-center": [ "modules-center": [
"idle_inhibitor", "idle_inhibitor",
"clock", "hyprland/workspaces#4",
"custom/light_dark", "custom/light_dark",
], ],
@ -51,6 +51,7 @@
"spacing": 5, "spacing": 5,
"fixed-center": true, "fixed-center": true,
"ipc": true, "ipc": true,
"height": 0,
"margin-left": 8, "margin-left": 8,
"margin-right": 8, "margin-right": 8,
//"margin-bottom": 0, //"margin-bottom": 0,
@ -61,7 +62,7 @@
], ],
"modules-center": [ "modules-center": [
"hyprland/workspaces#4", "clock",
], ],
"modules-right": [ "modules-right": [

6
config/waybar/modules

@ -451,7 +451,7 @@
}, },
"tray": { "tray": {
"icon-size": 14, "icon-size": 15,
"spacing": 8, "spacing": 8,
}, },
@ -490,7 +490,7 @@
"custom/keybinds": { "custom/keybinds": {
"format":"󰺁 HINT!", "format":"󰺁 HINT!",
"exec": "echo ; echo Key Hints", "exec": "echo ; echo Key Hints SUPER H",
"on-click": "~/.config/hypr/scripts/KeyHints.sh", "on-click": "~/.config/hypr/scripts/KeyHints.sh",
"interval" : 86400, // once every day "interval" : 86400, // once every day
"tooltip": true, "tooltip": true,
@ -546,7 +546,7 @@
}, },
"custom/power": { "custom/power": {
"format": "⏻{}", "format": "⏻ ",
"exec": "echo ; echo 󰟡 power // blur", "exec": "echo ; echo 󰟡 power // blur",
"on-click": "~/.config/hypr/scripts/Wlogout.sh", "on-click": "~/.config/hypr/scripts/Wlogout.sh",
"on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh", "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",

3
config/waybar/style/Catppuccin-Latte.css

@ -74,9 +74,8 @@ window#waybar.hidden {
#custom-light_dark, #custom-light_dark,
#custom-lock, #custom-lock,
#custom-menu, #custom-menu,
#custom-power_vertical,
#custom-power, #custom-power,
#custom-speaker, #custom-power_vertical,
#custom-updater, #custom-updater,
#custom-weather, #custom-weather,
#custom-weather.clearNight, #custom-weather.clearNight,

3
config/waybar/style/[Black & White] Monochrome.css

@ -154,9 +154,6 @@ tooltip label{
padding-right: 6px; padding-right: 6px;
padding-left: 6px; padding-left: 6px;
} }
#custom-power {
padding: 1px 3px;
}
/*-----Indicators----*/ /*-----Indicators----*/
#idle_inhibitor.activated { #idle_inhibitor.activated {
color: #2dcc36; color: #2dcc36;

20
config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css

@ -63,12 +63,10 @@ window#waybar.empty #window {
#pulseaudio, #pulseaudio,
#pulseaudio-slider, #pulseaudio-slider,
#taskbar button, #taskbar button,
#taskbar,
#temperature, #temperature,
#tray, #tray,
#window, #window,
#wireplumber, #wireplumber,
#workspaces,
#custom-backlight, #custom-backlight,
#custom-cycle_wall, #custom-cycle_wall,
#custom-keybinds, #custom-keybinds,
@ -78,7 +76,6 @@ window#waybar.empty #window {
#custom-menu, #custom-menu,
#custom-power_vertical, #custom-power_vertical,
#custom-power, #custom-power,
#custom-speaker,
#custom-updater, #custom-updater,
#custom-weather, #custom-weather,
#custom-weather.clearNight, #custom-weather.clearNight,
@ -101,10 +98,13 @@ window#waybar.empty #window {
} }
#custom-power { #custom-power {
color: @red; color: @red;
padding: 0px 0px 0px 6px; padding: 0px 0px 0px 7px;
opacity:1.0; opacity:1.0;
} }
#backlight {
padding: 0px 2px 0px 6px;
}
#custom-light_dark,
#custom-menu{ #custom-menu{
color: @flamingo; color: @flamingo;
padding: 0px 8px 0px 4px; padding: 0px 8px 0px 4px;
@ -149,7 +149,7 @@ window#waybar.empty #window {
} }
#workspaces { #workspaces {
margin: 3px 3px 3px 3px; margin: 1px 1px 1px 1px;
padding: 0px 1px; padding: 0px 1px;
border-radius: 25px; border-radius: 25px;
border:2px solid @border-color; border:2px solid @border-color;
@ -165,8 +165,8 @@ window#waybar.empty #window {
border-radius: 15px; border-radius: 15px;
border:0px; border:0px;
color: @color13; color: @color13;
padding-left: 4px; padding-left: 2px;
padding-right: 4px; padding-right: 2px;
animation: gradient_f 20s ease-in infinite; animation: gradient_f 20s ease-in infinite;
transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
opacity:0.8; opacity:0.8;
@ -178,8 +178,8 @@ window#waybar.empty #window {
background: @button-color; background: @button-color;
border-radius: 15px; border-radius: 15px;
border: 1px solid @border-color; border: 1px solid @border-color;
padding-left: 8px; padding-left: 4px;
padding-right: 8px; padding-right: 4px;
animation: gradient_f 20s ease-in infinite; animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
opacity:1.0; opacity:1.0;

13
config/waybar/style/[Colorful] Rainbow Spectrum.css

@ -93,7 +93,7 @@ tooltip label{
#custom-weather.showyIcyDay, #custom-weather.showyIcyDay,
#custom-weather.snowyIcyNight, #custom-weather.snowyIcyNight,
#custom-weather.sunnyDay { #custom-weather.sunnyDay {
border-radius: 10px; border-radius: 16px;
color: #3A3B3C; color: #3A3B3C;
border: 1px solid #b4befe; border: 1px solid #b4befe;
padding-top: 3px; padding-top: 3px;
@ -189,8 +189,8 @@ tooltip label{
#workspaces button:hover { #workspaces button:hover {
background: #eb6f92; background: #eb6f92;
color: #f6c177; color: #f6c177;
padding-left: 2px; padding-left: 3px;
padding-right: 2px; padding-right: 3px;
animation: gradient_f 20s ease-in infinite; animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
} }
@ -204,8 +204,8 @@ tooltip label{
#taskbar button.active { #taskbar button.active {
background-color: #b4befe; background-color: #b4befe;
color: #3A3B3C; color: #3A3B3C;
padding-left: 12px; padding-left: 8px;
padding-right: 12px; padding-right: 8px;
animation: gradient_f 20s ease-in infinite; animation: gradient_f 20s ease-in infinite;
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
} }
@ -221,13 +221,14 @@ tooltip label{
background-color: #f5c2e7; background-color: #f5c2e7;
/*padding: 1px;*/ /*padding: 1px;*/
padding-right: 10px; padding-right: 10px;
border-radius: 8px; border-radius: 16px;
color: #3A3B3C; color: #3A3B3C;
border: 1px solid #b4befe; border: 1px solid #b4befe;
} }
#custom-power { #custom-power {
background-color: #f38ba8; background-color: #f38ba8;
padding: 0px 0px 0px 6px;
} }
#custom-updater { #custom-updater {

3
config/waybar/style/[Pywal] Chroma Edge.css

@ -134,7 +134,7 @@ tooltip label{
/* color: #bf616a; */ /* color: #bf616a; */
border-radius: 12px; border-radius: 12px;
background-color: rgba(50, 50, 50, 0.1); background-color: rgba(50, 50, 50, 0.1);
border: 2px solid @color2; border: 1px solid @color2;
padding: 5px; padding: 5px;
} }
@ -171,6 +171,7 @@ tooltip label{
#custom-power { #custom-power {
color: #cc3436; color: #cc3436;
padding: 0px 0px 0px 6px;
} }
#custom-launcher { #custom-launcher {

9
config/waybar/style/[Pywal] Chroma Fusion.css

@ -68,7 +68,6 @@ window#waybar.empty #window {
#window, #window,
#wireplumber, #wireplumber,
#workspaces, #workspaces,
#custom-backlight,
#custom-cycle_wall, #custom-cycle_wall,
#custom-keybinds, #custom-keybinds,
#custom-keyboard, #custom-keyboard,
@ -77,7 +76,6 @@ window#waybar.empty #window {
#custom-menu, #custom-menu,
#custom-power_vertical, #custom-power_vertical,
#custom-power, #custom-power,
#custom-speaker,
#custom-updater, #custom-updater,
#custom-weather, #custom-weather,
#custom-weather.clearNight, #custom-weather.clearNight,
@ -96,12 +94,15 @@ window#waybar.empty #window {
margin: 5px 5px 5px 5px; margin: 5px 5px 5px 5px;
opacity:0.8; opacity:0.8;
} }
#backlight {
padding: 0px 2px 0px 6px;
}
#custom-power { #custom-power {
color: @red; color: @red;
padding: 0px 0px 0px 6px; padding: 0px 0px 0px 6px;
opacity:1.0; opacity:1.0;
} }
#custom-light_dark,
#custom-menu{ #custom-menu{
color: @flamingo; color: @flamingo;
padding: 0px 8px 0px 4px; padding: 0px 8px 0px 4px;
@ -109,7 +110,7 @@ window#waybar.empty #window {
} }
#custom-weather, #custom-weather,
#custom-updates { #custom-updater {
color: @yellow; color: @yellow;
} }

11
config/waybar/style/[Retro] Simple Style.css

@ -24,17 +24,19 @@ window#waybar {
transition-duration: 0.5s; transition-duration: 0.5s;
} }
#taskbar button,
#workspaces button { #workspaces button {
padding: 0 10px;
color: @foreground; color: @foreground;
} }
#taskbar button.active,
#workspaces button.active { #workspaces button.active {
border-bottom: 1px solid @green; border-bottom: 1px solid @green;
} }
#taskbar button.urgent,
#workspaces button.urgent { #workspaces button.urgent {
border-bottom: 2px solid @yellow; border-bottom: 2px solid @red;
} }
#submap { #submap {
@ -87,10 +89,7 @@ window#waybar {
#custom-weather.snowyIcyNight, #custom-weather.snowyIcyNight,
#custom-weather.sunnyDay { #custom-weather.sunnyDay {
color: @foreground; color: @foreground;
padding-top: 3px; padding: 5px 8px 5px 8px;
padding-bottom: 3px;
padding-right: 6px;
padding-left: 6px;
} }
#battery.warning, #battery.warning,

Loading…
Cancel
Save