Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to Main #453

Merged
merged 10 commits into from
Sep 20, 2024
16 changes: 8 additions & 8 deletions config/ags/user/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/hypr/UserConfigs/00-Readme
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Hyprland-Dots v2.2.2

1.) Suggest not to rename any files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr

2.) This folder, along with UserScripts folder will NOT be touch during update.
2.) This folder, along with UserScripts folder will NOT be touch when running upgrade.sh

3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change.

Expand Down
10 changes: 8 additions & 2 deletions config/hypr/UserConfigs/WorkspaceRules.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@

# https://wiki.hyprland.org/Configuring/Workspace-Rules/

# Assigning workspace to a certain monitor
# Assigning workspace to a certain monitor. Below are just examples
# workspace = 1, monitor:eDP-1
# workspace = 2, monitor:DP-2
# workspace = 2, monitor:eDP-1
# workspace = 3, monitor:eDP-1
# workspace = 4, monitor:eDP-1
# workspace = 5, monitor:DP-2
# workspace = 6, monitor:DP-2
# workspace = 7, monitor:DP-2
# workspace = 8, monitor:DP-2


# example rules (from wiki)
Expand Down
4 changes: 3 additions & 1 deletion config/hypr/UserScripts/00-Readme
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
a) Place your new scripts here. If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
# Place your new scripts here.
# If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit.
# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
1 change: 1 addition & 0 deletions config/hypr/UserScripts/QuickEdit.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# Rofi menu for Quick Edit/View of Settings (SUPER E)

# Define preferred text editor and terminal
Expand Down
2 changes: 2 additions & 0 deletions config/hypr/UserScripts/RainbowBorders.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# for rainbow borders animation

function random_hex() {
random_hex=("0xff$(openssl rand -hex 3)")
Expand Down
2 changes: 2 additions & 0 deletions config/hypr/UserScripts/Weather.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env python3
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #
# weather using python

import subprocess
from pyquery import PyQuery # install using `pip install pyquery`
Expand Down
3 changes: 3 additions & 0 deletions config/hypr/UserScripts/Weather.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# weather info from wttr. https://github.com/chubin/wttr.in
# Remember to add city

city=
cachedir=~/.cache/rbn
Expand Down
1 change: 0 additions & 1 deletion config/hypr/UserScripts/ZshChangeTheme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Script for Oh my ZSH theme ( CTRL SHIFT O)

# preview of theme can be view here: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes

# after choosing theme, TTY need to be closed and re-open

themes_dir="$HOME/.oh-my-zsh/themes"
Expand Down
2 changes: 1 addition & 1 deletion config/hypr/configs/Keybinds.conf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to
bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagickWW
bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers
bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle #disable opacity to active window

bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # searchable keybinds
# Waybar / Bar related
bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar
bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu
Expand Down
1 change: 1 addition & 0 deletions config/hypr/hyprland.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #
# Sourcing external config files

# Default Configs
Expand Down
6 changes: 3 additions & 3 deletions config/hypr/hyprlock-1080p.conf
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ label {
monitor =
text = cmd[update:1000] echo "$(date +"%H")"
# text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
color = rgba(255, 185, 0, .6)
color = rgba(255, 185, 0, .8)
font_size = 150
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -200
Expand All @@ -77,7 +77,7 @@ label {
label {
monitor =
text = cmd[update:1000] echo "$(date +"%M")"
color = rgba(255, 255, 255, .6)
color = rgba(15, 10, 222, .8)
font_size = 150
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -450
Expand All @@ -90,7 +90,7 @@ label {
monitor =
text = cmd[update:1000] echo "$(date +"%S")"
# text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
color = $color12
color = $color7
font_size = 20
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -450
Expand Down
8 changes: 4 additions & 4 deletions config/hypr/hyprlock.conf
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ label {
monitor =
text = cmd[update:1000] echo "$(date +"%H")"
# text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
color = rgba(255, 185, 0, .6)
color = rgba(255, 185, 0, .8)
font_size = 200
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -200
Expand All @@ -77,7 +77,7 @@ label {
label {
monitor =
text = cmd[update:1000] echo "$(date +"%M")"
color = rgba(255, 255, 255, .6)
color = rgba(15, 10, 222, .8)
font_size = 200
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -500
Expand All @@ -90,7 +90,7 @@ label {
monitor =
text = cmd[update:1000] echo "$(date +"%S")"
# text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
color = $color12
color = $color7
font_size = 40
font_family = JetBrains Mono Nerd Font Mono ExtraBold
position = 0, -500
Expand All @@ -102,7 +102,7 @@ label {
label {
monitor =
text =  $USER
color = $color12
color = $color10
font_size = 18
font_family = Inter Display Medium

Expand Down
4 changes: 3 additions & 1 deletion config/hypr/initial-boot.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #
# A bash script designed to run only once dotfiles installed

# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Settings.conf
# not necessary to do since this script is only designed to run only once as long as the marker exists
# NOT necessary to do since this script is only designed to run only once as long as the marker exists
# marker file is located at ~/.config/hypr/.initial_startup_done
# However, I do highly suggest not to touch it since again, as long as the marker exist, script wont run

# Variables
Expand Down
30 changes: 30 additions & 0 deletions config/hypr/scripts/KeyBinds.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# Searchable enabled keybinds using rofi

# Kill yad to not interfere with this binds
pkill yad || true


# Define the config files
KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf"
USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf"
LAPTOP_CONF="$HOME/.config/hypr/UserConfigs/Laptop.conf"

# Combine the contents of the keybinds files and filter for keybinds
KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|binde|bindm)')

# Check if Laptop.conf exists and add its keybinds if present
if [[ -f "$LAPTOP_CONF" ]]; then
LAPTOP_BINDS=$(grep -E '^(bind|bindl|binde|bindm)' "$LAPTOP_CONF")
KEYBINDS+=$'\n'"$LAPTOP_BINDS"
fi

# Check if we have any keybinds to display
if [[ -z "$KEYBINDS" ]]; then
echo "No keybinds found."
exit 1
fi

# Use rofi to display the keybinds
echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi
6 changes: 6 additions & 0 deletions config/hypr/scripts/KeyHints.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
# GDK BACKEND. Change to either wayland or x11 if having issues
BACKEND=wayland

# Check if rofi is running and kill it if it is
if pgrep -x "rofi" > /dev/null; then
pkill rofi
fi

# Detect monitor resolution and scale
x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width')
y_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .height')
Expand Down Expand Up @@ -43,6 +48,7 @@ GDK_BACKEND=$BACKEND yad --width=$dynamic_width --height=$dynamic_height \
"ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \
" enter" "Terminal" "(kitty)" \
" SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \
" SHIFT K" "Searchable Keybinds" "(Keybinds)" \
" A" "Desktop Overview" "(AGS Overview)" \
" D" "App Launcher" "(rofi-wayland)" \
" T" "Open File Manager" "(Thunar)" \
Expand Down
2 changes: 1 addition & 1 deletion config/hypr/scripts/PortalHyprland.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##
# For manually starting xdg-desktop-portal
# For manually starting xdg-desktop-portal-hyprland

sleep 1
killall xdg-desktop-portal-hyprland
Expand Down
4 changes: 2 additions & 2 deletions config/hypr/scripts/RefreshNoWaybar.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##

# Modified version of Refresh but no waybar refresh
# Modified version of Refresh.sh but no waybar refreshing
# Used by automatic wallpaper change
# Modified inorder to refresh rofi background, Wallust, SwayNC
# Modified inorder to refresh rofi background, Wallust, SwayNC only

SCRIPTSDIR=$HOME/.config/hypr/scripts
UserScripts=$HOME/.config/hypr/UserScripts
Expand Down
1 change: 0 additions & 1 deletion config/hypr/scripts/WaybarCava.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##

# Not my own work. This was added through Github PR. Credit to original author

#----- Optimized bars animation without much CPU usage increase --------
Expand Down
4 changes: 2 additions & 2 deletions config/hypr/scripts/Wlogout.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ##

# wlogout (Power, Screen Lock, Suspend, etc)

# Set variables for parameters
# Set variables for parameters. First numbers corresponts to Monitor Resolution
# i.e 2160 means 2160p
A_2160=700
B_2160=700
A_1600=480
Expand Down
2 changes: 2 additions & 0 deletions config/kitty/kitty.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ #

font_family Fira Code SemiBold
font_size 16.0
bold_font auto
Expand Down
20 changes: 20 additions & 0 deletions config/rofi/config-keybinds.rasi
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
/* Main Config - For Keybinds generation */

@import "~/.config/rofi/master-config.rasi"

/* ---- Entry ---- */
entry {
width: 80%;
placeholder: " 🧮 Search Keybinds ☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function";
}

/* ---- Listview ---- */
listview {
columns: 2;
lines: 12;
}

window {
width: 90%;
}
2 changes: 1 addition & 1 deletion config/rofi/config-rofi-Beats-menu.rasi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
/* Rofi Beats Config (compact) */
/* Main config Rofi Beats Config (compact) */

@import "~/.config/rofi/master-config.rasi"

Expand Down
Loading