This commit is contained in:
Stephan Raabe 2023-08-30 14:45:03 +02:00
parent 726b9ab296
commit b5c936e484
12 changed files with 157 additions and 126 deletions

View File

@ -66,7 +66,7 @@ done
echo "" echo ""
echo "-> Install main packages" echo "-> Install main packages"
packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler"); packagesPacman=("picom" "alacritty" "rofi" "rofi-calc" "chromium" "scrot" "nitrogen" "dunst" "starship" "slock" "neovim" "mpv" "freerdp" "xfce4-power-manager" "thunar" "mousepad" "ttf-font-awesome" "ttf-fira-sans" "ttf-fira-code" "ttf-firacode-nerd" "figlet" "lxappearance" "breeze" "breeze-gtk" "vlc" "exa" "python-pip" "python-psutil" "python-rich" "python-click" "xdg-desktop-portal-gtk" "pavucontrol" "tumbler" "xautolock");
packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme"); packagesYay=("brave-bin" "pfetch" "bibata-cursor-theme");

View File

@ -46,9 +46,9 @@ echo ""
# ------------------------------------------------------ # ------------------------------------------------------
echo "" echo ""
echo "-> Install main packages" echo "-> Install main packages"
packagesPacman=("waybar" "grim" "slurp"); packagesPacman=("hyprland" "xdg-desktop-portal-hyprland" "waybar" "grim" "slurp");
packagesYay=("hyprland-git" "swww" "swaylock"); packagesYay=("swww" "swaylock");
# ------------------------------------------------------ # ------------------------------------------------------
# Install required packages # Install required packages

View File

@ -167,7 +167,7 @@ font:
#style: Bold Italic #style: Bold Italic
# Point size # Point size
size: 11.0 size: 12.0
# Offset is the extra space around each character. `offset.y` can be thought # Offset is the extra space around each character. `offset.y` can be thought
# of as modifying the line spacing, and `offset.x` as modifying the letter # of as modifying the line spacing, and `offset.x` as modifying the letter

View File

@ -24,6 +24,7 @@ exec-once = swww init
exec-once = ~/dotfiles/scripts/updatewal-swww.sh exec-once = ~/dotfiles/scripts/updatewal-swww.sh
exec-once = dunst exec-once = dunst
exec-once = ~/dotfiles/hypr/gtk.sh exec-once = ~/dotfiles/hypr/gtk.sh
exec-once = ~/dotfiles/scripts/autolock.sh &
# ----------------------------------------------------- # -----------------------------------------------------
# Load pywal color file # Load pywal color file
@ -55,14 +56,11 @@ input {
# General window layout and colors # General window layout and colors
# ----------------------------------------------------- # -----------------------------------------------------
general { general {
gaps_in = 10 gaps_in = 7
gaps_out = 20 gaps_out = 14
border_size = 3 border_size = 3
# Single Color for active window col.active_border = $color11
col.active_border = rgba(ffffffee) col.inactive_border = rgba(ffffffff)
# Color Gradient for active window
# col.active_border = $color11 $background $background $color14 45deg
col.inactive_border = $color11
layout = dwindle layout = dwindle
} }
@ -73,13 +71,15 @@ decoration {
rounding = 10 rounding = 10
blur { blur {
enabled = true enabled = true
size = 3 size = 6
passes = 1 passes = 2
new_optimizations = on new_optimizations = on
blurls = waybar ignore_opacity = true
xray = true
# blurls = waybar
} }
active_opacity = 1.0 active_opacity = 1.0
inactive_opacity = 0.9 inactive_opacity = 0.8
fullscreen_opacity = 1.0 fullscreen_opacity = 1.0
drop_shadow = true drop_shadow = true

13
scripts/autolock.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
# _ _ _ _
# / \ _ _| |_ ___ | | ___ ___| | __
# / _ \| | | | __/ _ \| |/ _ \ / __| |/ /
# / ___ \ |_| | || (_) | | (_) | (__| <
# /_/ \_\__,_|\__\___/|_|\___/ \___|_|\_\
#
# by Stephan Raabe (2023)
# -----------------------------------------------------
pkill xautolock
xautolock -time 10 -locker "swaylock -i ~/.cache/current_wallpaper.jpg" -notify 30 -notifier "notify-send 'Screen will be locked soon.' 'Locking screen in 30 seconds'"

View File

@ -23,6 +23,7 @@ source "$HOME/.cache/wal/colors.sh"
# Copy color file to waybar folder # Copy color file to waybar folder
# ----------------------------------------------------- # -----------------------------------------------------
cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/ cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/
cp $wallpaper ~/.cache/current_wallpaper.jpg
# ----------------------------------------------------- # -----------------------------------------------------
# get wallpaper iamge name # get wallpaper iamge name

View File

@ -31,6 +31,7 @@ if [ "$selected" ]; then
# Copy color file to waybar folder # Copy color file to waybar folder
# ----------------------------------------------------- # -----------------------------------------------------
cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/ cp ~/.cache/wal/colors-waybar.css ~/dotfiles/waybar/
cp $wallpaper ~/.cache/current_wallpaper.jpg
newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g") newwall=$(echo $wallpaper | sed "s|$HOME/wallpaper/||g")

View File

@ -1,20 +1,20 @@
@define-color foreground #c0c1c1; @define-color foreground #bfbfc0;
@define-color background #06090a; @define-color background #000204;
@define-color cursor #c0c1c1; @define-color cursor #bfbfc0;
@define-color color0 #06090a; @define-color color0 #000204;
@define-color color1 #536768; @define-color color1 #26506F;
@define-color color2 #656D6A; @define-color color2 #496773;
@define-color color3 #868570; @define-color color3 #0F588A;
@define-color color4 #798D85; @define-color color4 #186DA7;
@define-color color5 #98A19D; @define-color color5 #157DBF;
@define-color color6 #D7DADA; @define-color color6 #2597DB;
@define-color color7 #c0c1c1; @define-color color7 #bfbfc0;
@define-color color8 #444647; @define-color color8 #3f4142;
@define-color color9 #536768; @define-color color9 #26506F;
@define-color color10 #656D6A; @define-color color10 #496773;
@define-color color11 #868570; @define-color color11 #0F588A;
@define-color color12 #798D85; @define-color color12 #186DA7;
@define-color color13 #98A19D; @define-color color13 #157DBF;
@define-color color14 #D7DADA; @define-color color14 #2597DB;
@define-color color15 #c0c1c1; @define-color color15 #bfbfc0;

View File

@ -10,18 +10,20 @@
// //
{ {
"layer": "top", "layer": "top",
"height": 30, "height": 16,
"spacing": 4, "margin-top": 14,
"margin-top": 0, "margin-bottom": 0,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0,
"include": ["~/dotfiles/waybar/modules.json"], "include": ["~/dotfiles/waybar/modules.json"],
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/brave", "custom/brave",
"hyprland/window"
], ],
"modules-center": [ "modules-center": [
"wlr/workspaces", "wlr/workspaces"
], ],
"modules-right": [ "modules-right": [
"keyboard-state", "keyboard-state",
@ -30,8 +32,7 @@
"cpu", "cpu",
"memory", "memory",
"battery", "battery",
"clock",
"custom/exit", "custom/exit",
"tray" "clock"
], ],
} }

View File

@ -16,9 +16,9 @@
"all-outputs": true, "all-outputs": true,
"format": "{icon}", "format": "{icon}",
"format-icons": { "format-icons": {
"urgent": "", "urgent": "",
"active": "", "active": "",
"default": "", "default": "",
"sort-by-number": true "sort-by-number": true
} }
}, },
@ -27,7 +27,7 @@
"custom/youtube": { "custom/youtube": {
"format": " {}", "format": " {}",
"exec": "python ~/private/youtube.py", "exec": "python ~/private/youtube.py",
"interval": "300", "restart-interval": 60,
"on-click": "brave https://studio.youtube.com", "on-click": "brave https://studio.youtube.com",
"tooltip": false "tooltip": false
}, },
@ -41,7 +41,7 @@
// Teams Launcher // Teams Launcher
"custom/teams": { "custom/teams": {
"format": "", "format": "",
"on-click": "brave --app=https://teams.microsoft.com/go", "on-click": "brave --app=https://teams.microsoft.com/go",
"tooltip": false "tooltip": false
}, },
@ -76,7 +76,7 @@
// Rofi Application Launcher // Rofi Application Launcher
"custom/appmenu": { "custom/appmenu": {
"format": "", "format": "Apps",
"on-click": "~/dotfiles/scripts/applauncher.sh", "on-click": "~/dotfiles/scripts/applauncher.sh",
"tooltip": false "tooltip": false
}, },
@ -114,19 +114,18 @@
// CPU // CPU
"cpu": { "cpu": {
"format": " {usage}%", "format": "/ {usage}% ",
"tooltip": false
}, },
// Memory // Memory
"memory": { "memory": {
"format": " {}%" "format": "/ {}% "
}, },
// Harddisc space used // Harddisc space used
"disk": { "disk": {
"interval": 30, "interval": 30,
"format": " {percentage_used}%", "format": " {percentage_used}% ",
"path": "/" "path": "/"
}, },
@ -170,8 +169,6 @@
"user": { "user": {
"format": "{user}", "format": "{user}",
"interval": 60, "interval": 60,
"height": 30,
"width": 30,
"icon": false, "icon": false,
} }
} }

View File

@ -10,24 +10,23 @@
// //
{ {
"layer": "top", "layer": "top",
"height": 30, "height": 16,
"spacing": 4, "margin-top": 14,
"margin-top": 0, "margin-bottom": 0,
"margin-left": 0, "margin-left": 0,
"margin-right": 0, "margin-right": 0,
"spacing": 0,
"include": ["~/dotfiles/waybar/modules.json"], "include": ["~/dotfiles/waybar/modules.json"],
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/brave",
"custom/outlook", "custom/outlook",
"custom/teams", "custom/teams",
"custom/calculator",
"custom/chatgpt", "custom/chatgpt",
"custom/lookingglass" "custom/lookingglass",
// "hyprland/window" "hyprland/window"
], ],
"modules-center": [ "modules-center": [
"wlr/workspaces", "wlr/workspaces"
], ],
"modules-right": [ "modules-right": [
"custom/youtube", "custom/youtube",
@ -37,9 +36,7 @@
"cpu", "cpu",
"memory", "memory",
"battery", "battery",
"clock",
"user",
"custom/exit", "custom/exit",
"tray" "clock"
], ],
} }

View File

@ -21,61 +21,76 @@
* { * {
font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
font-size: 14px; border: none;
border-radius: 20px; border-radius: 0px;
} }
window#waybar { window#waybar {
background-color: rgba(0,0,0,0.8); background-color: rgba(0,0,0,0.8);
/* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */ border-bottom: 0px solid #ffffff;
/* color: #FFFFFF; */ /* color: #FFFFFF; */
background: transparent; background: transparent;
transition-property: background-color; transition-property: background-color;
transition-duration: .5s; transition-duration: .5s;
border-radius: 20;
} }
/*
button {
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 0;
}
*/
/* ----------------------------------------------------- /* -----------------------------------------------------
* Workspaces * Workspaces
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#workspaces {
background: #FFFFFF;
margin: 5px 5px 5px 5px;
padding: 4px 1px;
border-radius: 12px;
font-weight: normal;
font-style: normal;
opacity:0.8;
}
#workspaces button { #workspaces button {
padding: 0px 10px; padding: 0px 10px;
border-radius: 10px; margin: 0px 3px;
border:0; border-radius: 12px;
margin:0;
font-weight:bold;
color: @color11; color: @color11;
background-color: @color11;
transition: all 0.3s ease-in-out;
opacity:0.4;
font-size:13px;
} }
#workspaces button.active { #workspaces button.active {
color: #FFFFFF; color: #cdd6f4;
border-radius: 15px; background-color: @color11;
font-weight:bold; border-radius: 10px;
border:0; min-width: 30px;
background-size: 400% 400%;
transition: all 0.3s ease-in-out;
opacity:1.0;
} }
#workspaces button:hover { #workspaces button:hover {
color: @color11; background-color: @color1;
border-radius: 15px; color: #cdd6f4;
border:0; border-radius: 10px;
} min-width: 30px;
#workspaces button.focused { background-size: 400% 400%;
color: @color11;
border-radius: 15px;
font-weight:bold;
} }
#workspaces button.urgent { /* -----------------------------------------------------
background-color: #eb4d4b; * Tooltips
* ----------------------------------------------------- */
tooltip {
border-radius: 10px;
background-color: #FFFFFF;
opacity:0.8;
padding:20px;
margin:0px;
}
tooltip label {
color: @color11;
} }
#mode { #mode {
@ -99,21 +114,13 @@ button {
#idle_inhibitor, #idle_inhibitor,
#scratchpad, #scratchpad,
#language, #language,
#custom-youtube,
#user, #user,
#window,
#mpd { #mpd {
margin: 6px 10px 6px 0px; margin: 0px 20px 0px 10px;
padding: 0 0px; padding: 0 0px;
color: #FFFFFF; color: #FFFFFF;
font-size:16; font-size:16px;
}
#window,
#workspaces {
margin: 4 10px 5 10px;
background-color:#000000;
opacity:0.5;
padding:0;
} }
.modules-left > widget:first-child > #workspaces { .modules-left > widget:first-child > #workspaces {
@ -125,24 +132,44 @@ button {
} }
#custom-appmenu { #custom-appmenu {
margin-left:16; background-color: #FFFFFF;
font-size:16; font-size: 18px;
font-weight:bold; color: @background;
border-radius: 12px;
padding: 2px 10px 0px 10px;
margin: 5px 10px 5px 20px;
opacity:0.8;
} }
#custom-appmenu, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { #disk,#memory,#cpu {
margin:0px;
padding:0px;
}
#custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
margin-right:10px; margin-right:10px;
font-size:16px; font-size:16px;
} }
#user {
margin-right:10px;
font-size:20px;
}
#custom-exit { #custom-exit {
margin-right: 10px; margin: 0px 10px 0px 10px;
font-size:14px; font-size:20px;
} }
#clock { #clock {
background-color: transparent; background-color: #FFFFFF;
font-size:16; font-size: 18px;
color: @background;
border-radius: 12px;
padding: 2px 10px 0px 10px;
margin: 5px 20px 5px 10px;
opacity:0.8;
} }
#battery { #battery {
@ -311,10 +338,4 @@ label:focus {
margin:0; margin:0;
} }
#scratchpad {
background: rgba(0, 0, 0, 0.2);
}
#scratchpad.empty {
background-color: transparent;
}