summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--home/jon/home.nix1
-rw-r--r--programs/dotfiles/awesome/rc.lua60
-rw-r--r--programs/dotfiles/awesome/theme.lua50
3 files changed, 80 insertions, 31 deletions
diff --git a/home/jon/home.nix b/home/jon/home.nix
index e3e0300..08737ca 100644
--- a/home/jon/home.nix
+++ b/home/jon/home.nix
@@ -28,6 +28,7 @@ in
mpc-cli
pavucontrol
qbittorrent
+ ffmpeg
];
home.activation.installAwesomeWMConfig = ''
diff --git a/programs/dotfiles/awesome/rc.lua b/programs/dotfiles/awesome/rc.lua
index e2b8cb7..f8cc3d6 100644
--- a/programs/dotfiles/awesome/rc.lua
+++ b/programs/dotfiles/awesome/rc.lua
@@ -68,6 +68,7 @@ end
-- This is used later as the default terminal and editor to run.
terminal = "kitty"
+webbrowser = "firefox"
editor = os.getenv("EDITOR") or "nvim"
editor_cmd = terminal .. " -e " .. editor
@@ -123,7 +124,14 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
-- {{{ Wibar
-- Create a textclock widget
-mytextclock = wibox.widget.textclock()
+toptextclock = wibox.widget {
+ {
+ widget = wibox.widget.textclock
+ },
+ bg = beautiful.bg_normal,
+ widget = wibox.container.background,
+ shape = gears.shape.rounded_rect
+}
-- Create a wibox for each screen and add it
local taglist_buttons = gears.table.join(
@@ -317,8 +325,8 @@ awful.screen.connect_for_each_screen(function(s)
s.mytasklist, -- Middle widget
{ -- Right widgets
layout = wibox.layout.fixed.horizontal,
- wibox.container.margin(s.systray, 0, 0, 3, 3),
- mytextclock,
+ wibox.container.margin(s.systray, 0, 0, 4, 4),
+ toptextclock,
s.mylayoutbox,
},
}
@@ -356,8 +364,6 @@ globalkeys = gears.table.join(
end,
{description = "focus previous by index", group = "client"}
),
- awful.key({ modkey, }, "w", function () mymainmenu:show() end,
- {description = "show main menu", group = "awesome"}),
-- Layout manipulation
awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end,
@@ -382,6 +388,9 @@ globalkeys = gears.table.join(
-- Standard program
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
{description = "open a terminal", group = "launcher"}),
+ awful.key({ modkey, }, "w", function () awful.spawn(webbrowser) end,
+ {description = "open the web browser", group = "launcher"}),
+
awful.key({ modkey, "Control" }, "r", awesome.restart,
{description = "reload awesome", group = "awesome"}),
awful.key({ modkey, "Shift" }, "q", awesome.quit,
@@ -650,7 +659,46 @@ client.connect_signal("request::titlebars", function(c)
},
{ -- Right
awful.titlebar.widget.maximizedbutton(c),
- awful.titlebar.widget.closebutton (c),
+ {
+ {
+ {
+ {
+ widget = awful.titlebar.widget.maximizedbutton(c),
+ },
+ widget = wibox.container.background,
+ shape = gears.shape.circle,
+ shape_border_width = 1,
+ shape_border_color = "#12ac28",
+ bg = "#28c940",
+ },
+ width = 16,
+ strategy = "min",
+ layout = wibox.layout.constraint
+ },
+ right = 8,
+ widget = wibox.container.margin,
+ align = "center",
+ },
+ {
+ {
+ {
+ {
+ widget = awful.titlebar.widget.closebutton(c),
+ },
+ widget = wibox.container.background,
+ shape = gears.shape.circle,
+ shape_border_width = 1,
+ shape_border_color = "#ad3934",
+ bg = "#bf4943",
+ },
+ width = 16,
+ strategy = "min",
+ layout = wibox.layout.constraint
+ },
+ right = 8,
+ widget = wibox.container.margin,
+ align = "center",
+ },
layout = wibox.layout.fixed.horizontal()
},
shape = gears.shape.rounded_rect,
diff --git a/programs/dotfiles/awesome/theme.lua b/programs/dotfiles/awesome/theme.lua
index 241ea2e..c2da65a 100644
--- a/programs/dotfiles/awesome/theme.lua
+++ b/programs/dotfiles/awesome/theme.lua
@@ -77,31 +77,31 @@ theme.menu_width = dpi(100)
-- Define the image to load
-theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png"
-theme.titlebar_close_button_focus = themes_path.."zenburn/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus = themes_path.."zenburn/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive = themes_path.."zenburn/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active = themes_path.."zenburn/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive = themes_path.."zenburn/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active = themes_path.."zenburn/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive = themes_path.."zenburn/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active = themes_path.."zenburn/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive = themes_path.."zenburn/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active = themes_path.."zenburn/titlebar/maximized_focus_active.png"
+-- theme.titlebar_close_button_normal = themes_path.."zenburn/titlebar/close_normal.png"
+-- theme.titlebar_close_button_focus = themes_path.."zenburn/titlebar/close_focus.png"
+
+-- theme.titlebar_minimize_button_normal = themes_path.."zenburn/titlebar/minimize_normal.png"
+-- theme.titlebar_minimize_button_focus = themes_path.."zenburn/titlebar/minimize_focus.png"
+
+-- theme.titlebar_ontop_button_normal_inactive = themes_path.."zenburn/titlebar/ontop_normal_inactive.png"
+-- theme.titlebar_ontop_button_focus_inactive = themes_path.."zenburn/titlebar/ontop_focus_inactive.png"
+-- theme.titlebar_ontop_button_normal_active = themes_path.."zenburn/titlebar/ontop_normal_active.png"
+-- theme.titlebar_ontop_button_focus_active = themes_path.."zenburn/titlebar/ontop_focus_active.png"
+
+-- theme.titlebar_sticky_button_normal_inactive = themes_path.."zenburn/titlebar/sticky_normal_inactive.png"
+-- theme.titlebar_sticky_button_focus_inactive = themes_path.."zenburn/titlebar/sticky_focus_inactive.png"
+-- theme.titlebar_sticky_button_normal_active = themes_path.."zenburn/titlebar/sticky_normal_active.png"
+-- theme.titlebar_sticky_button_focus_active = themes_path.."zenburn/titlebar/sticky_focus_active.png"
+
+-- theme.titlebar_floating_button_normal_inactive = themes_path.."zenburn/titlebar/floating_normal_inactive.png"
+-- theme.titlebar_floating_button_focus_inactive = themes_path.."zenburn/titlebar/floating_focus_inactive.png"
+-- theme.titlebar_floating_button_normal_active = themes_path.."zenburn/titlebar/floating_normal_active.png"
+-- theme.titlebar_floating_button_focus_active = themes_path.."zenburn/titlebar/floating_focus_active.png"
+
+-- theme.titlebar_maximized_button_normal_inactive = themes_path.."zenburn/titlebar/maximized_normal_inactive.png"
+-- theme.titlebar_maximized_button_focus_inactive = themes_path.."zenburn/titlebar/maximized_focus_inactive.png"
+-- theme.titlebar_maximized_button_normal_active = themes_path.."zenburn/titlebar/maximized_normal_active.png"
+-- theme.titlebar_maximized_button_focus_active = themes_path.."zenburn/titlebar/maximized_focus_active.png"
theme.wallpaper = themes_path.."zenburn/zenburn-background.png"