diff --git a/home/.config/Kvantum/kvantum.kvconfig b/home/.config/Kvantum/kvantum.kvconfig
index 14c5b92..9de65ca 100644
--- a/home/.config/Kvantum/kvantum.kvconfig
+++ b/home/.config/Kvantum/kvantum.kvconfig
@@ -1,2 +1,2 @@
[General]
-theme=KvGnomeDark
+theme=Matcha-sea-dark
diff --git a/home/.config/awesome/configurations/autorun b/home/.config/awesome/configurations/autorun
deleted file mode 100644
index 44c26cd..0000000
--- a/home/.config/awesome/configurations/autorun
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-autostart="nm-applet xfce4-power-manager"
-for program in $autostart; do
- pidof -s "$program" || setsid -f "$program"
-done >/dev/null 2>&1
-
-# Applets :
-#nm-applet &
-#blueman-applet &
-#volumeicon &
-#xfce4-power-manager &
-
-# Polkit :
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-
-# Keybord auto-repeat :
-xset r rate 300 50 &
-
-# Clipordmanager :
-clipmenud &
-
-# Wallpaper :
-nitrogen --restore &
-
-# conky
-#conky -c ~/.config/conky/otis-forest.conkyrc\ &
-
-# Sevices info :
-#echo "false" > /tmp/blue_light_state
-
-# Compositor :
-#autostart="picom"
-#for program in $autostart; do
-# pidof -s "$program" || setsid -f "$program"
-#done >/dev/null 2>&1
-
-# Updates :
-#notify-send -t 8000 "You have $(checkupdates | wc -l) update 📦" &
-
diff --git a/home/.config/awesome/rc.lua b/home/.config/awesome/rc.lua
index db677cc..35c175e 100644
--- a/home/.config/awesome/rc.lua
+++ b/home/.config/awesome/rc.lua
@@ -20,6 +20,8 @@ require("configurations.layouts")
-- # Rules :
require("configurations.rules")
+-- # Signals :
+require("signals")
-- ### UI ### --
@@ -32,18 +34,12 @@ require("ui.titlebar")
-- # Menu :
require("ui.menu")
--- # Signals :
-require("signals")
-
--- # Sidebar :
-require("ui.sidebar")
-
-- # Bar :
require("ui.bar")
-- Autorun at startup
-awful.spawn.with_shell("bash ~/.config/awesome/configurations/autorun")
+awful.spawn.with_shell("bash ~/.config/awesome/configurations/autostart")
--- Enable for lower memory consumption
collectgarbage("setpause", 110)
diff --git a/home/.config/awesome/signals/init.lua b/home/.config/awesome/signals/init.lua
index a54cbb7..1ec4cc8 100644
--- a/home/.config/awesome/signals/init.lua
+++ b/home/.config/awesome/signals/init.lua
@@ -1,13 +1,13 @@
req = {
- "volume",
- "brightness",
- "wifi",
- "bluetooth",
- "airplane",
+ --"volume",
+ --"brightness",
+ --"wifi",
+ --"bluetooth",
+ --"airplane",
"weather",
"battery",
- "player",
- "disk"
+ --"player",
+ --"disk"
}
for _, x in pairs(req) do
diff --git a/home/.config/awesome/themes/icons/other/pfp.jpg b/home/.config/awesome/themes/icons/other/pfp.jpg
index b778664..e02ac26 100644
Binary files a/home/.config/awesome/themes/icons/other/pfp.jpg and b/home/.config/awesome/themes/icons/other/pfp.jpg differ
diff --git a/home/.config/awesome/themes/init.lua b/home/.config/awesome/themes/init.lua
index 9083191..3b44d05 100644
--- a/home/.config/awesome/themes/init.lua
+++ b/home/.config/awesome/themes/init.lua
@@ -50,12 +50,13 @@ theme = {}
--theme.font = "JetBrains Mono Bold 10"
--theme.font = "JetBrainsMono Nerd Font Bold 10"
--theme.font = "RobotoMono Nerd Font Bold 11"
-theme.font = "Roboto Regular 11"
-theme.taglist_font = "Font Awesome 6 Free Solid 16"
-theme.icon_font = "Font Awesome 6 Free Solid 11"
+theme.font = "Roboto Regular 12"
+--theme.taglist_font = "Font Awesome 6 Free Solid 16"
+theme.taglist_font = "RobotoMono Nerd Font Medium 16"
+theme.icon_font = "Font Awesome 6 Free Solid 12"
theme.sidebar_font = "Font Awesome 6 Free Solid 16"
theme.ui_font = "RobotoMono Nerd Font Medium 16"
-theme.menu_font = "RobotoMono Nerd Font Bold 11"
+theme.menu_font = "RobotoMono Nerd Font 11"
-- # Background Colors :
diff --git a/home/.config/awesome/ui/bar/init.lua b/home/.config/awesome/ui/bar/init.lua
index faaa14d..52ece71 100644
--- a/home/.config/awesome/ui/bar/init.lua
+++ b/home/.config/awesome/ui/bar/init.lua
@@ -23,8 +23,6 @@ mylauncher = wibox.container.margin(mylauncher, dpi(0), dpi(0), dpi(6), dpi(6))
-- # Widgets :
-- ~~~~~~~~~~~
--- # Sidebar button :
-local sidebar_button = require('ui.widgets.sidebar_button')
-- # Systray :
local systray = require('ui.widgets.systray')
-- # Clock :
@@ -40,7 +38,6 @@ local temprature_widget = require('ui.widgets.temprature')
-- # Launcher :
local launcher = require('ui.widgets.launcher')
-
-- # Status widgets :
local status_widgets = wibox.widget {
{
@@ -55,14 +52,15 @@ local status_widgets = wibox.widget {
-- # Keybord :
keyboard_widget,
-- # Clock :
- clock_widget,
- spacing = dpi(20),
+ clock_widget,
+ spacing = dpi(15),
layout = wibox.layout.fixed.horizontal,
},
margins = {top = dpi(4), bottom = dpi(4)},
widget = wibox.container.margin,
}
+
-- Bar :
local function get_bar(s)
-- Create the wibox
@@ -74,58 +72,52 @@ local function get_bar(s)
visible = true,
height = dpi(42),
width = s.geometry.width,
- --width = s.geometry.width - dpi(120),
+ --width = s.geometry.width - dpi(20),
screen = s,
bg = colors.black,
--bg = colors.main_transparent,
--bg = colors.transparent,
--opacity = 0.85,
})
-
- --awful.placement.bottom(s.mywibar, { margins = theme.useless_gap * 1 })
- --s.mywibar:struts { bottom = dpi(45), top = dpi(0), left = dpi(0), right = dpi(0) }
+
+ --awful.placement.bottom(s.mywibar, { margins = theme.useless_gap * 2 })
+ --s.mywibar:struts { bottom = dpi(50), top = dpi(5)}
-- Bar setup :
s.mywibar:setup {
{
{
{
- {
- launcher,
- taglist(s),
- --tasklist(s),
- spacing = dpi(10),
- layout = wibox.layout.fixed.horizontal
- },
- --nil,
- -- # Tasks in middel :
- {
- tasklist(s),
- --clock_widget,
- layout = wibox.layout.fixed.horizontal
- },
- {
- status_widgets,
- systray,
- sidebar_button,
- layoutbox(s),
- layout = wibox.layout.fixed.horizontal,
- spacing = dpi(10)
- },
- layout = wibox.layout.align.horizontal,
- expand = "none"
+ launcher,
+ taglist(s),
+ --tasklist(s),
+ spacing = dpi(10),
+ layout = wibox.layout.fixed.horizontal
},
- widget = wibox.container.margin,
- margins = {left = dpi(15), right = dpi(15), top = dpi(2), bottom = dpi(2)}
+ --nil,
+ -- # Tasks in middel :
+ {
+ tasklist(s),
+ layout = wibox.layout.fixed.horizontal
+ },
+ {
+ status_widgets,
+ systray,
+ layoutbox(s),
+ layout = wibox.layout.fixed.horizontal,
+ spacing = dpi(10)
+ },
+ layout = wibox.layout.align.horizontal,
+ expand = "none"
},
- widget = wibox.container.background,
- bg = colors.bg_color,
- forced_height = s.mywibar.height
+ widget = wibox.container.margin,
+ margins = {left = dpi(15), right = dpi(15), top = dpi(0), bottom = dpi(0)}
},
layout = wibox.layout.fixed.vertical,
spacing = dpi(10)
}
+
-- function to remove the bar in maxmized/fullscreen apps
local function remove_wibar(c)
if c.fullscreen or c.maximized then
diff --git a/home/.config/awesome/ui/bar/layoutbox.lua b/home/.config/awesome/ui/bar/layoutbox.lua
index ee0e171..d28f22a 100644
--- a/home/.config/awesome/ui/bar/layoutbox.lua
+++ b/home/.config/awesome/ui/bar/layoutbox.lua
@@ -21,6 +21,6 @@ return function(s)
awful.button({ }, 5, function () awful.layout.inc( 1) end),
}
}
- layoutbox = wibox.container.margin(layoutbox, dpi(4), dpi(4), dpi(10), dpi(10))
+ layoutbox = wibox.container.margin(layoutbox, dpi(2), dpi(2), dpi(11), dpi(11))
return layoutbox
end
diff --git a/home/.config/awesome/ui/bar/taglist.lua b/home/.config/awesome/ui/bar/taglist.lua
index ce944bc..8b0c4b5 100644
--- a/home/.config/awesome/ui/bar/taglist.lua
+++ b/home/.config/awesome/ui/bar/taglist.lua
@@ -24,15 +24,27 @@ screen.connect_signal("request::desktop_decoration", function(s)
awful.tag(awful.util.tagnames, s, awful.layout.layouts[1])
end)
+--local function update_tag(item, tag, index)
+-- if tag.selected then
+-- item.markup = helpers.colorize_text(" ", colors.main_scheme)
+-- elseif tag.urgent then
+-- item.markup = helpers.colorize_text(" ", colors.red)
+-- elseif #tag:clients() > 0 then
+-- item.markup = helpers.colorize_text(" ", colors.white)
+-- else
+-- item.markup = helpers.colorize_text(" ", colors.white)
+-- end
+--end
+
local function update_tag(item, tag, index)
if tag.selected then
- item.markup = helpers.colorize_text(" ", colors.main_scheme)
- elseif tag.urgent then
- item.markup = helpers.colorize_text(" ", colors.red)
- elseif #tag:clients() > 0 then
- item.markup = helpers.colorize_text(" ", colors.white)
- else
- item.markup = helpers.colorize_text(" ", colors.white)
+ item.markup = helpers.colorize_text(" ", colors.main_scheme)
+ elseif tag.urgent then
+ item.markup = helpers.colorize_text(" ", colors.red)
+ elseif #tag:clients() > 0 then
+ item.markup = helpers.colorize_text(" ", colors.white)
+ else
+ item.markup = helpers.colorize_text(" ", colors.white)
end
end
@@ -69,11 +81,11 @@ return function(s)
layout = wibox.layout.fixed.horizontal,
},
style = {
- spacing = dpi(-4),
+ spacing = dpi(-2),
},
widget_template = {
id = "tag",
- font = theme.ui_font,
+ font = theme.taglist_font,
widget = wibox.widget.textbox,
create_callback = function(self, c3, index, object)
@@ -92,16 +104,16 @@ return function(s)
taglist,
top = dpi(0),
bottom = dpi(0),
- left = dpi(8),
- right = dpi(8),
+ left = dpi(0),
+ right = dpi(4),
widget = wibox.container.margin
},
- bg = colors.container,
- shape = helpers.rrect(theme.rounded - 4),
+ bg = colors.black,
+ shape = helpers.rrect(theme.rounded),
widget = wibox.container.background
},
- top = dpi(4),
- bottom = dpi(4),
+ top = dpi(6),
+ bottom = dpi(6),
left = dpi(0),
right = dpi(0),
widget = wibox.container.margin
diff --git a/home/.config/awesome/ui/bar/tasklist.lua b/home/.config/awesome/ui/bar/tasklist.lua
index 324793a..0766dbb 100644
--- a/home/.config/awesome/ui/bar/tasklist.lua
+++ b/home/.config/awesome/ui/bar/tasklist.lua
@@ -80,10 +80,7 @@ return function(s)
id = "background_role",
widget = wibox.container.background,
},
- top = dpi(4),
- bottom = dpi(4),
- left = dpi(2),
- right = dpi(2),
+ margins = dpi(4),
widget = wibox.container.margin
}
}
diff --git a/home/.config/awesome/ui/menu/init.lua b/home/.config/awesome/ui/menu/init.lua
index a6ad9da..d3d0143 100644
--- a/home/.config/awesome/ui/menu/init.lua
+++ b/home/.config/awesome/ui/menu/init.lua
@@ -14,29 +14,29 @@ local hotkeys_popup = require('awful.hotkeys_popup')
-- # Menu
-- Create a launcher widget and a main menu
myawesomemenu = {
- { " Hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
- { " Manual", terminal .. " -e man awesome" },
+ {" Hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
+ {" Manual", terminal .. " -e man awesome" },
--{ " Edit config", editor_cmd .. " " .. awesome.conffile },
- { " Restart", awesome.restart },
- { " Quit", function() awesome.quit() end },
+ {" Restart", awesome.restart },
+ {" Quit", function() awesome.quit() end },
}
powermenu = {
- { " Lock", function() awful.spawn.with_shell('notify-send "👉 Locking system " && sleep 1 && betterlockscreen -l') end },
- { " Logout", function() awful.spawn.with_shell('notify-send "👉 Loging out " && sleep 1 && loginctl terminate-session ${XDG_SESSION_ID-}') end },
- { " Sleep", function() awful.spawn.with_shell('notify-send "👉 Suspending 鈴" && sleep 1 && systemctl suspend') end },
- { " Hibernate", function() awful.spawn.with_shell('notify-send "👉 Hibernateing " && sleep 1 && systemctl hibernate') end },
- { " Reboot", function() awful.spawn.with_shell('notify-send "👉 Rebooting " && sleep 1 && reboot') end },
- { " Poweroff", function() awful.spawn.with_shell('notify-send "👉 Powering Off " && sleep 1 && poweroff') end },
+ {" Lock", function() awful.spawn.with_shell('notify-send "👉 Locking system " && sleep 1 && betterlockscreen -l') end },
+ {" Logout", function() awful.spawn.with_shell('notify-send "👉 Loging out " && sleep 1 && loginctl terminate-session ${XDG_SESSION_ID-}') end },
+ {" Sleep", function() awful.spawn.with_shell('notify-send "👉 Suspending 鈴" && sleep 1 && systemctl suspend') end },
+ {" Hibernate", function() awful.spawn.with_shell('notify-send "👉 Hibernateing " && sleep 1 && systemctl hibernate') end },
+ {" Reboot", function() awful.spawn.with_shell('notify-send "👉 Rebooting " && sleep 1 && reboot') end },
+ {" Poweroff", function() awful.spawn.with_shell('notify-send "👉 Powering Off " && sleep 1 && poweroff') end },
}
mymainmenu = awful.menu(
{ items = {
- { " Awesome", myawesomemenu },
- { " Terminal", terminal },
- { " Power Menu", powermenu }
+ {" Awesome", myawesomemenu },
+ {" Terminal", terminal },
+ {" Power Menu", powermenu }
}
})
diff --git a/home/.config/awesome/ui/notifications/init.lua b/home/.config/awesome/ui/notifications/init.lua
index 71ced5a..77885f5 100644
--- a/home/.config/awesome/ui/notifications/init.lua
+++ b/home/.config/awesome/ui/notifications/init.lua
@@ -7,6 +7,7 @@ local menubar = require("menubar")
local awful = require('awful')
local wibox = require('wibox')
local gears = require('gears')
+local ruled = require("ruled")
local beautiful = require('beautiful')
local dpi = beautiful.xresources.apply_dpi
local naughty = require("naughty")
@@ -15,128 +16,61 @@ local naughty = require("naughty")
-- ~~~~~~~~
local helpers = require("libs.helpers")
+-- Defaults
naughty.config.defaults.ontop = true
naughty.config.defaults.screen = awful.screen.focused()
-naughty.config.defaults.timeout = 5
+
+naughty.config.defaults.icon_size = dpi(32)
naughty.config.defaults.title = "Notification"
-naughty.config.defaults.position = "top_right"
+naughty.config.defaults.margin = 50
naughty.config.defaults.border_width = 0
+naughty.config.defaults.position = "top_right"
+naughty.config.defaults.max_notifications = 5
+naughty.config.icon_dirs = {
+ "/usr/share/icons/Papirus-Dark/24x24/apps/",
+ "/usr/share/pixmaps/"
+}
+naughty.config.icon_formats = {"svg", "png", "jpg", "gif"}
-local function create_notifcation(n)
- local time = os.date "%H:%M"
- local icon_visibility
+-- Timeouts
+naughty.config.defaults.timeout = 2
+naughty.config.presets.low.timeout = 1
+naughty.config.presets.critical.timeout = 0
- if n.icon == nil then
- icon_visibility = false
- else
- icon_visibility = true
- end
+-- naughty normal preset
+naughty.config.presets.normal = {
+ font = "Roboto Medium 10",
+ fg = colors.brightwhite,
+ bg = colors.container
+}
- -- Action widget
- local action_widget = {
- {
- {
- id = "text_role",
- align = "center",
- font = "Roboto Mono 10",
- widget = wibox.widget.textbox,
- },
- margins = {left = dpi(6), right = dpi(6)},
- widget = wibox.container.margin,
- },
- widget = wibox.container.background,
- }
+-- naughty low preset
+naughty.config.presets.low = {
+ font ="Roboto Medium 10",
+ fg = colors.brightwhite,
+ bg = colors.container
+}
- -- Apply action widget ^
- local actions = wibox.widget {
- notification = n,
- base_layout = wibox.widget {
- spacing = dpi(8),
- layout = wibox.layout.flex.horizontal,
- },
- widget_template = action_widget,
- widget = naughty.list.actions,
- }
+-- naughty critical preset
+naughty.config.presets.critical = {
+ font = "Roboto Bold 12",
+ fg = colors.brightred,
+ bg = colors.container,
+ timeout = 0
+}
- local function space_h(length, circumstances)
- return wibox.widget {
- forced_width = length,
- visible = circumstances,
- layout = wibox.layout.fixed.horizontal,
- }
- end
+-- apply preset
+naughty.config.presets.ok = naughty.config.presets.normal
+naughty.config.presets.info = naughty.config.presets.normal
+naughty.config.presets.warn = naughty.config.presets.critical
- -- Make other widgets
- local title = wibox.widget.textbox()
- title.font = "Roboto bold 14"
- title.align = 'left'
- title.markup = n.title
-
- local message = wibox.widget.textbox()
- message.font = "Roboto Medium 11"
- message.align = 'left'
- message.markup = n.message
-
- local icon = wibox.widget {
- nil,
- {
- {
- image = n.icon,
- visible = icon_visibility,
- widget = wibox.widget.imagebox,
- },
- strategy = "max",
- width = dpi(30),
- height = dpi(30),
- widget = wibox.container.constraint,
- },
- expand = 'none',
- layout = wibox.layout.align.vertical,
- }
-
- local container = wibox.widget {
- {
- title,
- {
- icon,
- space_h(dpi(10), icon_visibility),
- message,
- layout = wibox.layout.fixed.horizontal,
- },
- actions,
- spacing = dpi(10),
- layout = wibox.layout.fixed.vertical,
- },
- margins = dpi(20),
- widget = wibox.container.margin,
- }
-
- naughty.layout.box {
- notification = n,
- type = "notification",
- bg = colors.black,
- border_width = 0,
- shape = helpers.rrect(theme.rounded),
- widget_template = {
- {
- {
- {
- widget = container,
- },
- strategy = "max",
- width = dpi(420),
- widget = wibox.container.constraint,
- },
- strategy = "min",
- width = dpi(160),
- height = dpi(80),
- widget = wibox.container.constraint,
- },
- bg = colors.container,
- widget = wibox.container.background,
- }
- }
-end
+-- ruled notification
+ruled.notification.connect_signal("request::rules", function()
+ ruled.notification.append_rule {
+ rule = {},
+ properties = {screen = awful.screen.preferred, implicit_timeout = 6}
+ }
+end)
-- # Error handling :
naughty.connect_signal("request::display_error", function(message, startup)
@@ -147,8 +81,180 @@ naughty.connect_signal("request::display_error", function(message, startup)
}
end)
-naughty.connect_signal("request::display", function(n)
- create_notifcation(n)
+-- connect to each display
+-- ~~~~~~~~~~~~~~~~~~~~~~~
+naughty.connect_signal("request::display", function(n)
+
+ -- action widget
+ local action_widget = {
+ {
+ {
+ id = "text_role",
+ align = "center",
+ valign = "center",
+ font = "Roboto 10",
+ widget = wibox.widget.textbox
+ },
+ left = dpi(6),
+ right = dpi(6),
+ widget = wibox.container.margin
+ },
+ bg = colors.container,
+ shape = helpers.rrect(dpi(5)),
+ widget = wibox.container.background
+ }
+ -- actions
+ local actions = wibox.widget {
+ notification = n,
+ base_layout = wibox.widget {
+ spacing = dpi(8),
+ layout = wibox.layout.flex.horizontal
+ },
+ widget_template = action_widget,
+ style = {underline_normal = false, underline_selected = true},
+ widget = naughty.list.actions
+ }
+
+ -- image
+ local image_n = wibox.widget {
+ {
+ image = n.icon,
+ resize = true,
+ clip_shape = helpers.rrect(theme.rounded),
+ halign = "center",
+ valign = "center",
+ widget = wibox.widget.imagebox,
+ },
+ strategy = "exact",
+ height = dpi(72),
+ width = dpi(72),
+ widget = wibox.container.constraint,
+ }
+
+ -- title
+ local title_n = wibox.widget{
+ {
+ {
+ markup = n.title,
+ font = "Roboto bold 14",
+ align = "left",
+ valign = "center",
+ widget = wibox.widget.textbox
+ },
+ widget = wibox.container.scroll.horizontal,
+ step_function = wibox.container.scroll.step_functions.waiting_nonlinear_back_and_forth,
+ speed = 50
+ },
+ margins = {right = 15},
+ widget = wibox.container.margin
+ }
+
+ local message_n = wibox.widget{
+ {
+ {
+ markup = helpers.colorize_text("" .. n.message .. "", colors.brightwhite),
+ font = "Roboto Medium 11",
+ align = "left",
+ valign = "center",
+ wrap = "char",
+ widget = wibox.widget.textbox
+ },
+ layout = wibox.layout.fixed.horizontal
+ },
+ margins = {right = 15},
+ widget = wibox.container.margin
+ }
+
+ -- app name
+ local app_name_n = wibox.widget{
+ markup = helpers.colorize_text(n.app_name, colors.brightwhite),
+ font = "Roboto Medium 12",
+ align = "left",
+ valign = "center",
+ widget = wibox.widget.textbox
+ }
+
+ local time_n = wibox.widget{
+ {
+ markup = helpers.colorize_text(os.date "%H:%M", colors.brightwhite),
+ font = "Roboto Medium 12",
+ align = "right",
+ valign = "center",
+ widget = wibox.widget.textbox
+ },
+ margins = {left = dpi(6)},
+ widget = wibox.container.margin
+ }
+
+ -- extra info
+ local notif_info = wibox.widget{
+ app_name_n,
+ {
+ widget = wibox.widget.separator,
+ shape = gears.shape.circle,
+ forced_height = dpi(4),
+ forced_width = dpi(4),
+ color = colors.brightwhite
+ },
+ time_n,
+ layout = wibox.layout.fixed.horizontal,
+ spacing = dpi(7)
+ }
+
+ -- init
+ naughty.layout.box {
+ notification = n,
+ type = "notification",
+ bg = colors.container,
+ shape = helpers.rrect(theme.rounded),
+ widget_template = {
+ {
+ {
+ {
+ {
+ {
+ {
+ notif_info,
+ {
+ {
+ title_n,
+ message_n,
+ layout = wibox.layout.fixed.vertical,
+ spacing = dpi(3)
+ },
+ margins = {left = dpi(6)},
+ widget = wibox.container.margin
+ },
+ layout = wibox.layout.fixed.vertical,
+ spacing = dpi(16)
+ },
+ nil,
+ image_n,
+ layout = wibox.layout.align.horizontal,
+ expand = "none"
+ },
+ {
+ {actions, layout = wibox.layout.fixed.vertical},
+ margins = {top = dpi(20)},
+ visible = n.actions and #n.actions > 0,
+ widget = wibox.container.margin
+ },
+ layout = wibox.layout.fixed.vertical,
+ },
+ margins = dpi(18),
+ widget = wibox.container.margin
+ },
+ strategy = "max",
+ width = dpi(500),
+ widget = wibox.container.constraint,
+ },
+ strategy = "min",
+ width = dpi(200),
+ height = dpi(80),
+ widget = wibox.container.constraint,
+ },
+ shape = helpers.rrect(theme.rounded),
+ widget = wibox.container.background,
+ },
+ }
end)
-
-
diff --git a/home/.config/awesome/ui/sidebar/calendar.lua b/home/.config/awesome/ui/sidebar/calendar.lua
index f9ab426..3cd4737 100644
--- a/home/.config/awesome/ui/sidebar/calendar.lua
+++ b/home/.config/awesome/ui/sidebar/calendar.lua
@@ -16,19 +16,19 @@ local dpi = beautiful.xresources.apply_dpi
local styles = {}
styles.month = {
- bg_color = colors.brightblack,
+ bg_color = colors.container,
fg_color = colors.white,
- padding = dpi(3),
+ padding = dpi(6),
}
styles.normal = {
- bg_color = colors.brightblack,
+ bg_color = colors.container,
fg_color = colors.white,
- padding = dpi(3),
+ padding = dpi(2),
}
styles.focus = {
fg_color = colors.yellow,
markup = function(t) return '' .. t .. '' end,
- padding = dpi(3),
+ padding = dpi(2),
}
styles.header = {
fg_color = colors.brightblue,
diff --git a/home/.config/awesome/ui/sidebar/init.lua b/home/.config/awesome/ui/sidebar/init.lua
index e7c9340..e48bc41 100644
--- a/home/.config/awesome/ui/sidebar/init.lua
+++ b/home/.config/awesome/ui/sidebar/init.lua
@@ -50,19 +50,19 @@ end
-- Get widgets
local profile_widget = require("ui.sidebar.profile")
-local player_widget = require("ui.sidebar.player")
local sliders_widget = require("ui.sidebar.sliders")
local weather_widget = require("ui.sidebar.weather")
local calendar_widget = require("ui.sidebar.calendar")
-local services_widget = require("ui.sidebar.services")
+--local player_widget = require("ui.sidebar.player")
+--local services_widget = require("ui.sidebar.services")
-- Combine some widgets
local profile = box_widget(profile_widget, 380, 150)
local sliders = box_widget(sliders_widget, 380, 120)
local weather = box_widget(weather_widget, 380, 180)
-local player = box_widget(player_widget, 380, 150)
-local calendar = box_widget(calendar_widget, 380, 330)
-local services = box_widget(services_widget, 380, 200)
+local calendar = box_widget(calendar_widget, 380, 320)
+--local player = box_widget(player_widget, 380, 150)
+--local services = box_widget(services_widget, 380, 200)
-- Spacing
local space = function(height)
@@ -94,9 +94,9 @@ sidebar : setup {
profile,
sliders,
weather,
- player,
- --calendar,
- services,
+ --player,
+ calendar,
+ --services,
spacing = dpi(20),
layout = wibox.layout.fixed.vertical,
@@ -105,14 +105,58 @@ sidebar : setup {
widget = wibox.container.margin,
}
+-- Left Side :
+-- Slide animation
+--local slide = rubato.timed {
+-- pos = helpers.screen.geometry.height,
+-- rate = 60,
+-- intro = 0.2,
+-- duration = 0.4,
+-- subscribed = function(pos)
+-- sidebar.y = helpers.screen.geometry.y + pos
+-- end
+--}
+--
+---- Timer of sidebar's death
+--sidebar.timer = gears.timer {
+-- timeout = 0.5,
+-- single_shot = true,
+-- callback = function()
+-- sidebar.visible = not sidebar.visible
+-- end
+--}
+--
+---- Toggle function
+--sidebar.toggle = function()
+-- if sidebar.visible then
+-- slide.target = helpers.screen.geometry.y - sidebar.height
+-- sidebar.timer:start()
+-- else
+-- slide.target = helpers.screen.geometry.y + dpi(10)
+-- sidebar.visible = not sidebar.visible
+-- end
+--
+--end
+--awful.placement.top_right(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
+
+
+--awful.mouse.append_global_mousebindings({
+-- awful.button({ }, 1, function () sidebar.toggle() end)
+--})
+--awful.keyboard.append_global_keybindings({
+-- awful.key({alt}, "c", function() awesome.emit_signal("sidebar::toggle") end), -- Sidebar
+--})
+
+
+-- Right Side :
-- Slide animation
local slide = rubato.timed {
- pos = helpers.screen.geometry.height,
+ pos = helpers.screen.geometry.x - sidebar.width,
rate = 60,
intro = 0.2,
duration = 0.4,
subscribed = function(pos)
- sidebar.y = helpers.screen.geometry.y + pos
+ sidebar.x = helpers.screen.geometry.x + pos
end
}
@@ -128,23 +172,15 @@ sidebar.timer = gears.timer {
-- Toggle function
sidebar.toggle = function()
if sidebar.visible then
- slide.target = helpers.screen.geometry.y - sidebar.height
+ slide.target = helpers.screen.geometry.x - sidebar.width
sidebar.timer:start()
else
- slide.target = helpers.screen.geometry.y + dpi(10)
+ slide.target = helpers.screen.geometry.x + dpi(10)
sidebar.visible = not sidebar.visible
end
-
end
-awful.placement.top_right(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
-
---awful.mouse.append_global_mousebindings({
--- awful.button({ }, 1, function () sidebar.toggle() end)
---})
---awful.keyboard.append_global_keybindings({
--- awful.key({alt}, "c", function() awesome.emit_signal("sidebar::toggle") end), -- Sidebar
---})
+awful.placement.top_left(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
-- Get signal to execute the function (if that makes sense)
awesome.connect_signal("sidebar::toggle", function(s)
sidebar.toggle(s)
diff --git a/home/.config/awesome/ui/sidebar/sliders.lua b/home/.config/awesome/ui/sidebar/sliders.lua
index a432bcd..44901a9 100644
--- a/home/.config/awesome/ui/sidebar/sliders.lua
+++ b/home/.config/awesome/ui/sidebar/sliders.lua
@@ -113,13 +113,13 @@ local mic = wibox.widget {
}
local update_mic = function()
- awful.spawn.easy_async_with_shell("pamixer --source 5891 --get-volume", function(stdout)
+ awful.spawn.easy_async_with_shell("pamixer --source alsa_input.usb-1c1f_USB_PnP_Audio_Device-00.mono-fallback --get-volume", function(stdout)
mic_slider.value = tonumber(stdout:match("%d+"))
end)
end
mic_slider:connect_signal("property::value", function(_, mic_vol)
- awful.spawn("pamixer --source 5891 --set-volume ".. mic_vol, false)
+ awful.spawn("pamixer --source alsa_input.usb-1c1f_USB_PnP_Audio_Device-00.mono-fallback --set-volume ".. mic_vol, false)
-- Update textbox widget text
mic_osd_value.text = mic_vol .. "%"
awesome.emit_signal("module::mic_osd_value", mic_vol)
diff --git a/home/.config/awesome/ui/titlebar/init.lua b/home/.config/awesome/ui/titlebar/init.lua
index 49dedef..b983688 100644
--- a/home/.config/awesome/ui/titlebar/init.lua
+++ b/home/.config/awesome/ui/titlebar/init.lua
@@ -50,18 +50,22 @@ client.connect_signal("request::titlebars", function(c)
},
{-- Right
- --awful.titlebar.widget.floatingbutton (c),
- awful.titlebar.widget.minimizebutton (c),
- awful.titlebar.widget.maximizedbutton(c),
- awful.titlebar.widget.closebutton (c),
- --awful.titlebar.widget.stickybutton (c),
- --awful.titlebar.widget.ontopbutton (c),
- spacing = dpi(4),
- layout = wibox.layout.fixed.horizontal,
+ {
+ --awful.titlebar.widget.floatingbutton (c),
+ awful.titlebar.widget.minimizebutton (c),
+ awful.titlebar.widget.maximizedbutton(c),
+ awful.titlebar.widget.closebutton (c),
+ --awful.titlebar.widget.stickybutton (c),
+ --awful.titlebar.widget.ontopbutton (c),
+ spacing = dpi(4),
+ layout = wibox.layout.fixed.horizontal,
+ },
+ margins = dpi(2),
+ widget = wibox.container.margin,
},
layout = wibox.layout.align.horizontal,
},
- margins = dpi(6),
+ margins = dpi(4),
widget = wibox.container.margin,
},
id = 'background_role',
diff --git a/home/.config/awesome/ui/widgets/launcher.lua b/home/.config/awesome/ui/widgets/launcher.lua
index 56b9d98..5b9f93f 100644
--- a/home/.config/awesome/ui/widgets/launcher.lua
+++ b/home/.config/awesome/ui/widgets/launcher.lua
@@ -6,6 +6,9 @@
local gears = require("gears")
local awful = require("awful")
local wibox = require("wibox")
+local beautiful = require('beautiful')
+local dpi = require('beautiful').xresources.apply_dpi
+local sidebar = require("ui.sidebar")
-- # Libs :
-- ~~~~~~~~
@@ -20,11 +23,25 @@ local launcher = wibox.widget{
valign = "center",
}
-launcher:buttons(gears.table.join({
- awful.button({ }, 1, function ()
- awful.spawn.with_shell(require("libs.misc").rofiCommand, false)
- end)
+--launcher:buttons(gears.table.join({
+-- awful.button({ }, 1, function ()
+-- awful.spawn.with_shell(require("libs.misc").rofiCommand, false)
+-- end)
+--
+--}))
-}))
+launcher:connect_signal(
+ "button::press",
+ function()
+ launcher.opacity = 0.6
+ sidebar.toggle(s)
+end)
+launcher:connect_signal(
+ "button::release",
+ function()
+ launcher.opacity = 1
+end)
+
+--return awful.widget.only_on_screen(launcher, 'primary')
return launcher
diff --git a/home/.config/awesome/ui/widgets/sidebar_button.lua b/home/.config/awesome/ui/widgets/sidebar_button.lua
deleted file mode 100644
index fe33d6e..0000000
--- a/home/.config/awesome/ui/widgets/sidebar_button.lua
+++ /dev/null
@@ -1,41 +0,0 @@
--- ## Sidebar button ##
--- ~~~~~~~~~~~~~~~~~~~~
-
-
--- Requirements :
--- ~~~~~~~~~~~~~~
-local gears = require("gears")
-local awful = require("awful")
-local wibox = require("wibox")
-local beautiful = require('beautiful')
-local dpi = require('beautiful').xresources.apply_dpi
-local sidebar = require("ui.sidebar")
-
-
-local sidebar_icon = wibox.widget{
- markup = "",
- font = theme.taglist_font,
- valign = "center",
- align = "center",
- widget = wibox.widget.textbox
-}
-
---sidebar_icon:buttons{gears.table.join(
--- awful.button({ }, 1, function ()
--- sidebar.toggle(s)
--- end)
---)}
-sidebar_icon:connect_signal(
- "button::press",
- function()
- sidebar_icon.opacity = 0.6
- sidebar.toggle(s)
-end)
-sidebar_icon:connect_signal(
- "button::release",
- function()
- sidebar_icon.opacity = 1
-end)
-
---return sidebar_icon
-return awful.widget.only_on_screen(sidebar_icon, 'primary')
diff --git a/home/.config/awesome/ui/widgets/systray.lua b/home/.config/awesome/ui/widgets/systray.lua
index f096680..e91099d 100644
--- a/home/.config/awesome/ui/widgets/systray.lua
+++ b/home/.config/awesome/ui/widgets/systray.lua
@@ -21,7 +21,7 @@ local systray = wibox.widget {
wibox.widget.systray,
layout = wibox.layout.fixed.horizontal,
},
- margins = {top = dpi(6), bottom = dpi(6), left = dpi(6), right = dpi(6)},
+ margins = {top = dpi(8), bottom = dpi(8), left = dpi(2), right = dpi(2)},
widget = wibox.container.margin,
},
margins = {top = dpi(2), bottom = dpi(2)},
diff --git a/home/.config/gtk-2.0/gtkfilechooser.ini b/home/.config/gtk-2.0/gtkfilechooser.ini
index ab82094..a32c995 100644
--- a/home/.config/gtk-2.0/gtkfilechooser.ini
+++ b/home/.config/gtk-2.0/gtkfilechooser.ini
@@ -2,8 +2,8 @@
LocationMode=path-bar
ShowHidden=false
ShowSizeColumn=true
-GeometryX=380
-GeometryY=114
+GeometryX=1863
+GeometryY=180
GeometryWidth=840
GeometryHeight=630
SortColumn=name
diff --git a/home/.config/gtk-3.0/settings.ini b/home/.config/gtk-3.0/settings.ini
index 3b2770e..a716380 100644
--- a/home/.config/gtk-3.0/settings.ini
+++ b/home/.config/gtk-3.0/settings.ini
@@ -1,10 +1,10 @@
[Settings]
gtk-theme-name=Gruvbox
gtk-icon-theme-name=Papirus-Dark
-gtk-font-name=Roboto 11
+gtk-font-name=Roboto 12
gtk-cursor-theme-name=Qogir-cursors
-gtk-cursor-theme-size=24
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-button-images=1
gtk-menu-images=1
diff --git a/home/.config/kitty/kitty.conf b/home/.config/kitty/kitty.conf
index 569cd62..c4b05b3 100644
--- a/home/.config/kitty/kitty.conf
+++ b/home/.config/kitty/kitty.conf
@@ -6,7 +6,7 @@ font_family JetBrainsMono Nerd Font
bold_font auto
italic_font auto
bold_italic_font auto
-font_size 14.0
+font_size 16.0
adjust_line_height 0
adjust_column_width 0
diff --git a/home/.config/qt5ct/qt5ct.conf b/home/.config/qt5ct/qt5ct.conf
index d62cbef..0099430 100644
--- a/home/.config/qt5ct/qt5ct.conf
+++ b/home/.config/qt5ct/qt5ct.conf
@@ -6,8 +6,8 @@ standard_dialogs=default
style=kvantum-dark
[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\f\0R\0o\0\x62\0o\0t\0o@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\f\0R\0o\0\x62\0o\0t\0o@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+fixed="Roboto,12,-1,5,50,0,0,0,0,0,Regular"
+general="Roboto,12,-1,5,50,0,0,0,0,0,Regular"
[Interface]
activate_item_on_single_click=1
@@ -25,7 +25,7 @@ underline_shortcut=1
wheel_scroll_lines=3
[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x7f\0\0\0L\0\0\x4\xc0\0\0\x3\r\0\0\x1\x81\0\0\0N\0\0\x4\xbe\0\0\x3\v\0\0\0\0\0\0\0\0\x6@\0\0\x1\x81\0\0\0N\0\0\x4\xbe\0\0\x3\v)
+geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1l\0\0\0\x39\0\0\x4r\0\0\x3\x12\0\0\x1n\0\0\0;\0\0\x4p\0\0\x3\x10\0\0\0\0\0\0\0\0\x6@\0\0\x1n\0\0\0;\0\0\x4p\0\0\x3\x10)"
[Troubleshooting]
force_raster_widgets=1
diff --git a/home/.config/qt6ct/qt6ct.conf b/home/.config/qt6ct/qt6ct.conf
index 03622cd..358af73 100644
--- a/home/.config/qt6ct/qt6ct.conf
+++ b/home/.config/qt6ct/qt6ct.conf
@@ -6,8 +6,8 @@ standard_dialogs=default
style=kvantum-dark
[Fonts]
-fixed="Roboto,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"
-general="Roboto,11,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"
+fixed="Roboto,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"
+general="Roboto,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"
[Interface]
activate_item_on_single_click=1
diff --git a/install b/install
index 8b826df..dbd69ad 100755
--- a/install
+++ b/install
@@ -23,7 +23,7 @@ fi
# ~~~~~~~~~~~~~~~
echo -e "${Cyan}Installing Packeges ...${No}"
#sudo pacman -Rns sudo
-sudo pacman -Sy --needed --noconfirm xcompmgr xdotool acpi xsel clipmenu xfce4-power-manager lxappearance nitrogen feh viewnior man-db kitty pacman-contrib xclip rsync arandr sxhkd pcmanfm-gtk3 obs-studio pamixer brightnessctl playerctl redshift maim gnome-disk-utility cups xcalib exa lsd ghex cherrytree mpv audacious gst-libav net-tools gpick gdb curl wget alacritty terminator python-pip tk xterm tor cmatrix htop neofetch zsh veracrypt engrampa p7zip unzip cdrtools gufw android-tools ranger ueberzug rofi rofi-emoji geany neovim inetutils dnsutils macchanger zathura zathura-ps zathura-djvu zathura-pdf-poppler qt5ct qt6ct kvantum-qt5 ffmpegthumbnailer tumbler grub-customizer mtpfs gvfs-mtp gvfs-gphoto2 qbittorrent btop qalculate-gtk volumeicon remmina freerdp qt5-tools python-pyqt5 qt6-tools python-pyqt6 qt5-quickcontrols2 qt5-graphicaleffects qt5-svg mesa-utils intel-media-driver rhash libva-utils gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly #firefox
+sudo pacman -Sy --needed --noconfirm xcompmgr xdotool acpi xsel clipmenu tlp xfce4-power-manager lxappearance nitrogen feh viewnior man-db kitty pacman-contrib xclip rsync arandr sxhkd pcmanfm-gtk3 obs-studio pamixer brightnessctl playerctl redshift maim gnome-disk-utility cups xcalib exa lsd ghex cherrytree mpv audacious gst-libav net-tools gpick gdb curl wget alacritty terminator python-pip tk xterm tor cmatrix htop neofetch zsh veracrypt engrampa p7zip unzip cdrtools gufw android-tools ranger ueberzug jq rofi rofi-emoji geany neovim inetutils dnsutils macchanger zathura zathura-ps zathura-djvu zathura-pdf-poppler qt5ct qt6ct kvantum-qt5 ffmpegthumbnailer tumbler grub-customizer mtpfs gvfs-mtp gvfs-gphoto2 qbittorrent btop qalculate-gtk volumeicon remmina freerdp qt5-tools python-pyqt5 qt6-tools python-pyqt6 qt5-quickcontrols2 qt5-graphicaleffects qt5-svg mesa-utils intel-media-driver rhash libva-utils gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly #firefox
echo -e "QT_QPA_PLATFORMTHEME=qt5ct\nexport CM_LAUNCHER=rofi\nexport CM_HISTLENGTH=50\nexport CM_DIR=/tmp/clipmenu" | sudo tee -a /etc/environment
echo -e "${Green}Installing Packages Done ${No}"
echo ""
@@ -32,7 +32,7 @@ echo ""
# Aur Packages :
# ~~~~~~~~~~~~~~
echo -e "${Cyan}Installing Aur Packeges ... ${No}"
-yay -Sy --needed --noconfirm bcm43142a0-firmware aic94xx-firmware xkb-switch scrcpy jmtpfs papirus-icon-theme papirus-folders yt-dlp picom-jonaburg-git sddm-config-editor-git matcha-gtk-theme kvantum-theme-matcha-git kvantum-theme-nordic-git brave-bin
+yay -Sy --needed --noconfirm bcm43142a0-firmware aic94xx-firmware xkb-switch scrcpy jmtpfs papirus-icon-theme bibata-cursor-theme papirus-folders yt-dlp picom-jonaburg-git sddm-config-editor-git matcha-gtk-theme kvantum-theme-matcha-git kvantum-theme-nordic-git brave-bin
#sudo papirus-folders -C yaru --theme Papirus-Dark
sudo papirus-folders -C bluegrey --theme Papirus-Dark
echo -e "${Green}Installing Aur Packeges Done ${No}"
@@ -72,6 +72,16 @@ echo -e "${Cyan}Bluetooth Enabled${No}"
echo ""
echo ""
+# Setting up TLP :
+# ~~~~~~~~~~~~~~~~~~~~~~
+echo -e "${Cyan}Enabling TLP ... ${No}"
+sudo systemctl enable tlp.service
+sudo systemctl start tlp.service
+sudo tlp start
+echo -e "${Cyan}TLP Enabled${No}"
+echo ""
+echo ""
+
# Making Zsh Deafult Shell :
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "${Cyan}Switching to zsh Shell ...${No}"
diff --git a/themes/install b/themes/install
index f94d4a7..43e6864 100755
--- a/themes/install
+++ b/themes/install
@@ -1,16 +1,16 @@
#!/bin/sh
# cursors :
-doas cp -r cursors/* /usr/share/icons/
+sudo cp -r cursors/* /usr/share/icons/
# gtk :
-doas cp -r gtk/* /usr/share/themes/
+sudo cp -r gtk/* /usr/share/themes/
# grub :
-doas cp grub/* -r /boot/grub/themes/
+sudo cp grub/* -r /boot/grub/themes/
# kvantum :
-doas cp -r kvantum/* /usr/share/Kvantum/
+sudo cp -r kvantum/* /usr/share/Kvantum/
# sddm !
-doas cp -r sddm/* /usr/share/sddm
+sudo cp -r sddm/* /usr/share/sddm
diff --git a/themes/sddm/faces/luca.face.icon b/themes/sddm/faces/luca.face.icon
index b778664..e02ac26 100644
Binary files a/themes/sddm/faces/luca.face.icon and b/themes/sddm/faces/luca.face.icon differ
diff --git a/x11/install b/x11/install
index a27c8a1..267b2d5 100755
--- a/x11/install
+++ b/x11/install
@@ -1,11 +1,11 @@
#!/bin/sh
# Display :
-doas cp -r 20-modesetting.conf /etc/X11/xorg.conf.d/
-doas cp -r modesetting.conf /etc/X11/xorg.conf.d/
+sudo cp -r 20-modesetting.conf /etc/X11/xorg.conf.d/
+sudo cp -r modesetting.conf /etc/X11/xorg.conf.d/
# Mouse :
-doas cp -r 40-libinput.conf /etc/X11/xorg.conf.d/
+sudo cp -r 40-libinput.conf /etc/X11/xorg.conf.d/
# Keybord :
-doas cp -r 00-keyboard.conf /etc/X11/xorg.conf.d/
+sudo cp -r 00-keyboard.conf /etc/X11/xorg.conf.d/
# Video Driver :
-doas cp -r i915.conf /etc/modprobe.d/
+sudo cp -r i915.conf /etc/modprobe.d/