This commit is contained in:
Stephan Raabe 2023-08-31 09:05:39 +02:00
parent b5c936e484
commit 1ab7f13373
6 changed files with 152 additions and 192 deletions

View File

@ -126,6 +126,7 @@ device:epic-mouse-v1 {
# Window rules # Window rules
# ----------------------------------------------------- # -----------------------------------------------------
windowrule = tile,^(Brave-browser)$ windowrule = tile,^(Brave-browser)$
windowrule = tile,^(chromium)$
# ----------------------------------------------------- # -----------------------------------------------------
# Key bindings # Key bindings

View File

@ -1,20 +1,20 @@
@define-color foreground #bfbfc0; @define-color foreground #bfc0c0;
@define-color background #000204; @define-color background #020305;
@define-color cursor #bfbfc0; @define-color cursor #bfc0c0;
@define-color color0 #000204; @define-color color0 #020305;
@define-color color1 #26506F; @define-color color1 #0F325B;
@define-color color2 #496773; @define-color color2 #5A2E4A;
@define-color color3 #0F588A; @define-color color3 #084B6F;
@define-color color4 #186DA7; @define-color color4 #6B5156;
@define-color color5 #157DBF; @define-color color5 #A13E45;
@define-color color6 #2597DB; @define-color color6 #0B658F;
@define-color color7 #bfbfc0; @define-color color7 #bfc0c0;
@define-color color8 #3f4142; @define-color color8 #414243;
@define-color color9 #26506F; @define-color color9 #0F325B;
@define-color color10 #496773; @define-color color10 #5A2E4A;
@define-color color11 #0F588A; @define-color color11 #084B6F;
@define-color color12 #186DA7; @define-color color12 #6B5156;
@define-color color13 #157DBF; @define-color color13 #A13E45;
@define-color color14 #2597DB; @define-color color14 #0B658F;
@define-color color15 #bfbfc0; @define-color color15 #bfc0c0;

View File

@ -18,7 +18,8 @@
"spacing": 0, "spacing": 0,
"include": ["~/dotfiles/waybar/modules.json"], "include": ["~/dotfiles/waybar/modules.json"],
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"wlr/taskbar",
"custom/brave", "custom/brave",
"hyprland/window" "hyprland/window"
], ],
@ -26,13 +27,18 @@
"wlr/workspaces" "wlr/workspaces"
], ],
"modules-right": [ "modules-right": [
"keyboard-state",
"pulseaudio", "pulseaudio",
"disk", "group/hardware",
"cpu",
"memory",
"battery", "battery",
"custom/exit", "custom/exit",
"clock" "clock"
], ],
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -23,6 +23,25 @@
} }
}, },
// Taskbar
"wlr/taskbar": {
"format": "{icon}",
"icon-size": 16,
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
"ignore-list": [
"Alacritty"
],
"app_ids-mapping": {
"firefoxdeveloperedition": "firefox-developer-edition"
},
"rewrite": {
"Firefox Web Browser": "Firefox",
"Foot Server": "Terminal"
}
},
// Youtube Subscriber Count // Youtube Subscriber Count
"custom/youtube": { "custom/youtube": {
"format": " {}", "format": " {}",
@ -42,7 +61,7 @@
// Teams Launcher // Teams Launcher
"custom/teams": { "custom/teams": {
"format": "", "format": "",
"on-click": "brave --app=https://teams.microsoft.com/go", "on-click": "chromium --app=https://teams.microsoft.com/go",
"tooltip": false "tooltip": false
}, },

View File

@ -18,9 +18,8 @@
"spacing": 0, "spacing": 0,
"include": ["~/dotfiles/waybar/modules.json"], "include": ["~/dotfiles/waybar/modules.json"],
"modules-left": [ "modules-left": [
"custom/appmenu", "custom/appmenu",
"custom/outlook", "wlr/taskbar",
"custom/teams",
"custom/chatgpt", "custom/chatgpt",
"custom/lookingglass", "custom/lookingglass",
"hyprland/window" "hyprland/window"
@ -30,13 +29,18 @@
], ],
"modules-right": [ "modules-right": [
"custom/youtube", "custom/youtube",
"keyboard-state",
"pulseaudio", "pulseaudio",
"disk", "group/hardware",
"cpu",
"memory",
"battery", "battery",
"custom/exit", "custom/exit",
"clock" "clock"
], ],
"group/hardware": {
"orientation": "horizontal",
"modules": [
"disk",
"cpu",
"memory"
]
}
} }

View File

@ -93,36 +93,44 @@ tooltip label {
color: @color11; color: @color11;
} }
#mode { /* -----------------------------------------------------
background-color: #64727D; * Window
border-bottom: 3px solid #ffffff; * ----------------------------------------------------- */
#window {
background: #FFFFFF;
margin: 5px 15px 5px 5px;
padding: 2px 10px 0px 10px;
border-radius: 12px;
color:@background;
font-size:16px;
font-weight:normal;
opacity:0.8;
} }
#clock, /* -----------------------------------------------------
#battery, * Taskbar
#cpu, * ----------------------------------------------------- */
#memory,
#disk, #taskbar {
#temperature, background: #FFFFFF;
#backlight, margin: 5px 15px 5px 5px;
#network, padding: 0px 1px;
#pulseaudio, border-radius: 12px;
#wireplumber, font-weight: normal;
#custom-media, font-style: normal;
#tray, opacity:0.8;
#mode,
#idle_inhibitor,
#scratchpad,
#language,
#user,
#window,
#mpd {
margin: 0px 20px 0px 10px;
padding: 0 0px;
color: #FFFFFF;
font-size:16px;
} }
#taskbar button {
margin:0;
padding: 0px 5px 0px 5px;
}
/* -----------------------------------------------------
* Modules
* ----------------------------------------------------- */
.modules-left > widget:first-child > #workspaces { .modules-left > widget:first-child > #workspaces {
margin-left: 0; margin-left: 0;
} }
@ -131,47 +139,73 @@ tooltip label {
margin-right: 0; margin-right: 0;
} }
/* -----------------------------------------------------
* Custom Modules
* ----------------------------------------------------- */
#custom-appmenu { #custom-appmenu {
background-color: #FFFFFF; background-color: #FFFFFF;
font-size: 18px; font-size: 16px;
color: @background; color: @background;
border-radius: 12px; border-radius: 12px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 5px 10px 5px 20px; margin: 5px 10px 5px 14px;
opacity:0.8; opacity:0.8;
} }
#disk,#memory,#cpu {
margin:0px;
padding:0px;
}
#custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { #custom-youtube, #custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass {
margin-right:10px; margin-right:15px;
font-size:16px; font-size:16px;
} }
#user {
margin-right:10px;
font-size:20px;
}
#custom-exit { #custom-exit {
margin: 0px 10px 0px 10px; margin: 0px 10px 0px 10px;
font-size:20px; font-size:20px;
} }
/* -----------------------------------------------------
* Hardware Group
* ----------------------------------------------------- */
#disk,#memory,#cpu {
margin:0px;
padding:0px;
font-size:16px;
}
/* -----------------------------------------------------
* Clock
* ----------------------------------------------------- */
#clock { #clock {
background-color: #FFFFFF; background-color: #FFFFFF;
font-size: 18px; font-size: 16px;
color: @background; color: @background;
border-radius: 12px; border-radius: 12px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 5px 20px 5px 10px; margin: 5px 14px 5px 10px;
opacity:0.8; opacity:0.8;
} }
/* -----------------------------------------------------
* Pulseaudio
* ----------------------------------------------------- */
#pulseaudio {
font-size:16px;
margin-right:15px;
}
#pulseaudio.muted {
background-color: #90b1b1;
color: #2a5c45;
}
/* -----------------------------------------------------
* Battery
* ----------------------------------------------------- */
#battery { #battery {
color: @color11; color: @color11;
} }
@ -198,75 +232,9 @@ tooltip label {
animation-direction: alternate; animation-direction: alternate;
} }
label:focus { /* -----------------------------------------------------
background-color: #000000; * Tray
} * ----------------------------------------------------- */
#cpu {
background-color: transparent;
}
#memory {
background-color: transparent;
}
#disk {
background-color: transparent;
}
#backlight {
background-color: #90b1b1;
}
#network {
background-color: #2980b9;
}
#network.disconnected {
background-color: #f53c3c;
}
#pulseaudio {
background-color: transparent;
}
#pulseaudio.muted {
/*
background-color: #90b1b1;
color: #2a5c45;
*/
}
#wireplumber {
background-color: #fff0f5;
color: #000000;
}
#wireplumber.muted {
background-color: #f53c3c;
}
#custom-media {
background-color: #66cc99;
color: #2a5c45;
min-width: 100px;
}
#custom-media.custom-spotify {
background-color: #66cc99;
}
#custom-media.custom-vlc {
background-color: #ffa000;
}
#temperature {
background-color: #f0932b;
}
#temperature.critical {
background-color: #eb4d4b;
}
#tray { #tray {
background-color: #2980b9; background-color: #2980b9;
@ -281,61 +249,23 @@ label:focus {
background-color: #eb4d4b; background-color: #eb4d4b;
} }
#idle_inhibitor { /* -----------------------------------------------------
background-color: #2d3436; * Other
* ----------------------------------------------------- */
label:focus {
background-color: #000000;
} }
#idle_inhibitor.activated { #backlight {
background-color: #ecf0f1;
color: #2d3436;
}
#mpd {
background-color: #66cc99;
color: #2a5c45;
}
#mpd.disconnected {
background-color: #f53c3c;
}
#mpd.stopped {
background-color: #90b1b1; background-color: #90b1b1;
} }
#mpd.paused { #network {
background-color: #51a37a; background-color: #2980b9;
} }
#language { #network.disconnected {
color:#FFFFFF; background-color: #f53c3c;
/*
background: #00b093;
color: #740864;
padding: 0 5px;
margin: 0 5px;
min-width: 16px;
*/
} }
#keyboard-state {
background: #97e1ad;
color: #000000;
padding: 0 0px;
margin: 0 5px;
min-width: 16px;
}
#keyboard-state > label {
padding: 0 5px;
}
#keyboard-state > label.locked {
background: rgba(0, 0, 0, 0.2);
}
#window {
margin:0;
}