From c6ae5d6a0cc492628877f80a8d0092482073de5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 30 Aug 2023 14:11:02 +0200 Subject: [PATCH] Squash changes --- alacritty/alacritty.yml | 4 ++-- awesome/components/top-panel.lua | 8 +++++--- awesome/rc.lua | 3 +-- awesome/theme.lua | 6 +++--- awesome/utils/powerline.lua | 2 +- polybar/config.ini | 26 ++++++++++++++------------ polybar/powerline-for-polybar.config | 4 ++-- rofi/material-ocean.rasi | 2 +- xmodmap/.Xmodmap | 3 --- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 17423c9..4df0807 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -15,13 +15,13 @@ font: family: Source Code Pro style: Bold Italic - size: 14 + size: 13 # Colors (Molokai Dark) colors: # Default colors primary: - background: '#000010' + background: '#000030' foreground: '#F8F8F2' normal: diff --git a/awesome/components/top-panel.lua b/awesome/components/top-panel.lua index c754fe2..4d2114d 100644 --- a/awesome/components/top-panel.lua +++ b/awesome/components/top-panel.lua @@ -41,7 +41,7 @@ local updates_indicator = wibox.widget{ forced_width = 18, widget = wibox.widget.imagebox, }, - top = 5, bottom = 0, left = 5, right = 0, + top = 4, bottom = 0, left = 5, right = 0, widget = wibox.container.margin } }, @@ -118,12 +118,14 @@ top_panel.create = function(s) pl(wibox.widget{}, theme.bg_normal .. "00", theme.top_panel_powerline), pl(wibox.container.margin(wibox.widget.systray(), 0, 0, 5, 5), theme.top_panel_powerline, theme.bg_normal), pl(volume_widget({widget_type='icon_and_text'}), theme.bg_normal, theme.top_panel_powerline), - pl(awful.widget.watch('bash -c "sensors | grep Tctl | cut -f 10 -d \' \' | cut -c 2-"', 5), theme.top_panel_powerline, theme.bg_normal), + pl(governor_selector, theme.top_panel_powerline, theme.bg_normal), + pl(current_layout_box, theme.bg_normal, theme.top_panel_powerline), + pl(awful.widget.watch('bash -c "sensors | grep Package | cut -f 5 -d \' \' | cut -c 2-"', 5), theme.top_panel_powerline, theme.bg_normal), pl(memory_widget, theme.bg_normal, theme.top_panel_powerline), pl(cpu_widget, theme.top_panel_powerline, theme.bg_normal), pl(frequency_widget, theme.bg_normal, theme.top_panel_powerline), pl(updates_indicator, theme.top_panel_powerline, theme.bg_normal), - pl(current_layout_box, theme.bg_normal, theme.top_panel_powerline), + pl(battery_widget({font=theme.font, display_notification=true}), theme.bg_normal, theme.top_panel_powerline), pl(clock, theme.top_panel_powerline, theme.top_panel_powerline), } } diff --git a/awesome/rc.lua b/awesome/rc.lua index 70ca91d..1e36a89 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -25,8 +25,7 @@ local run_on_start_up = { "nm-applet", "xcape -e \"Super_L=Super_L|XF86Launch5\" -t 5000", "xmodmap /home/user/.Xmodmap", - os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh", - "feh --no-fehbg --bg-fill " .. gears.filesystem.get_configuration_dir() .. "/images/wallpaper.png", + "feh --no-fehbg --bg-fill " .. gears.filesystem.get_configuration_dir() .. "/images/wallpaper.png", -- "/opt/power/powersave.sh", -- os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh" } diff --git a/awesome/theme.lua b/awesome/theme.lua index a74637b..6b6677a 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -2,8 +2,8 @@ local dpi = require("beautiful.xresources").apply_dpi local theme = {} -- Font -theme.font = "Ubuntu 12" -theme.title_font = "Ubuntu 12" +theme.font = "Ubuntu 9" +theme.title_font = "Ubuntu 10" -- Background theme.bg_normal = "#1f2430" @@ -31,7 +31,7 @@ theme.border_focus = "#002F5F" theme.border_marked = theme.fg_urgent -- Panel Sizing -theme.top_panel_height = dpi(30) +theme.top_panel_height = dpi(27) theme.top_panel_powerline = "#002F5F" -- Taglist diff --git a/awesome/utils/powerline.lua b/awesome/utils/powerline.lua index fc274f4..56297d0 100644 --- a/awesome/utils/powerline.lua +++ b/awesome/utils/powerline.lua @@ -19,7 +19,7 @@ local function powerline(widget, bgcolor, adjacentcolor, right) { layout = wibox.layout.fixed.horizontal, { - wibox.container.margin(widget, dpi(6), dpi(10), dpi(0), dpi(1)), + wibox.container.margin(widget, dpi(6), dpi(6), dpi(0), dpi(1)), bg = bgcolor, widget = wibox.container.background diff --git a/polybar/config.ini b/polybar/config.ini index 3833912..3956b98 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -15,7 +15,7 @@ include-file = ~/.config/polybar/colors.config [bar/example] ; Generic options width = 100% -height = 32 +height = 26 dpi-x = 96 dpi-y = 96 @@ -29,19 +29,20 @@ background = #9912151c foreground = ${colors.white} ; Set bar's fonts list -font-0 = "Noto Sans:size=13:weight=85:antialias=true;3" +font-0 = "Ubuntu:size=10.2:weight=85:antialias=true;3" font-1 = "Source Code Pro:pixelsize=20:antialias=true;6" font-2 = "Source Code Pro:size=11:weight=bold:antialias=true;3" -font-3 = "Font Awesome 6 Free Solid:size=10:antialias=true;3" -font-4 = "Font Awesome 6 Free:size=10:antialias=true;3" -font-5 = "Font Awesome 6 Brands:size=10:antialias=true;3" -font-6 = "Font Awesome v4 Compatibility:size=10:antialias=true;3" +font-3 = "Font Awesome 6 Free Solid:size=11:antialias=true;3" +font-4 = "Font Awesome 6 Free:size=11:antialias=true;3" +font-5 = "Font Awesome 6 Brands:size=11:antialias=true;3" +font-6 = "Font Awesome v4 Compatibility:size=11:antialias=true;3" ; Set modules list modules-left = xwindow modules-center = i3 -modules-right = updates temperature memory clockspeed cpu pulseaudio date startarrow +modules-right = governor temperature memory clockspeed cpu pulseaudio battery updates date startarrow fixed-center = true +monitor = eDP-1 ;======================================= ; Modules @@ -101,16 +102,17 @@ label = " %used% " [module/updates] ; Powerline settings inherit = powerline-templates/right-to-left-item -background = ${colors.background} -background-next = ${root.background} +background = ${colors.blue} +background-next = ${colors.background} ; Other settings type = custom/script format-background = ${self.background} format-foreground = ${colors.white} format-warn-background = ${self.background} -exec = checkupdates | wc -l +exec = checkupdates 2> /dev/null | wc -l format = " 