diff --git a/awesome/awesome b/awesome/awesome new file mode 120000 index 0000000..819b77a --- /dev/null +++ b/awesome/awesome @@ -0,0 +1 @@ +./awesome/ \ No newline at end of file diff --git a/awesome/rc.lua b/awesome/rc.lua index 5661f52..656b1a5 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -61,7 +61,6 @@ end -- Autostart programs run_once({ "xcompmgr", - "/home/kadet/.local/share/JetBrains/Toolbox/bin/jetbrains-toolbox" }) -- Choose the theme @@ -203,7 +202,6 @@ awful.util.mymainmenu = freedesktop.menu.build({ } }) - -- Screen -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) screen.connect_signal("property::geometry", function(s) @@ -217,6 +215,7 @@ screen.connect_signal("property::geometry", function(s) gears.wallpaper.maximized(wallpaper, s, true) end end) + -- Create a wibox for each screen and add it awful.screen.connect_for_each_screen(function(s) beautiful.connect(s) end) @@ -498,7 +497,8 @@ awful.rules.rules = { screen = awful.screen.preferred, placement = awful.placement.no_overlap+awful.placement.no_offscreen, size_hints_honor = false, - floating = false + floating = false, + } }, @@ -514,14 +514,13 @@ awful.rules.rules = { -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, - properties = { screen = 1, maximized = true, titlebars_enabled = false, switchtotag = true, tag = awful.util.tagnames[3] } }, + properties = { screen = 2, maximized = true, titlebars_enabled = false, switchtotag = true, tag = awful.util.tagnames[3] } }, + -- Caja is floating with fixed sizes. Titelbar enabled for Caja { rule = { class = "jetbrains-phpstorm" }, properties = { screen = 1, tag = awful.util.tagnames[1], floating = false } }, { rule = { class = "jetbrains-idea" }, - properties = { screen = 1, maximized = true, tag = awful.util.tagnames[1] } }, - { rule = { class = "jetbrains-pycharm" }, - properties = { screen = 1, maximized = true, tag = awful.util.tagnames[1] } }, + properties = { screen = 1, maximized = true, tag = awful.util.tagnames[2] } }, -- dialogs { rule = { type = "dialog" }, @@ -533,7 +532,7 @@ awful.rules.rules = { client.connect_signal("manage", function (c) -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. - -- if not awesome.startup then awful.client.setslave(c) end + if not awesome.startup then awful.client.setslave(c) end if awesome.startup and not c.size_hints.user_position diff --git a/awesome/themes/kadet/theme.lua b/awesome/themes/kadet/theme.lua index 53ff183..d755a75 100644 --- a/awesome/themes/kadet/theme.lua +++ b/awesome/themes/kadet/theme.lua @@ -14,7 +14,8 @@ fonts.widget = "Fira Code Bold 7" local colors = { dark = "#161616", light = "#dedede", - accent = "#ff9700", + accent = "#003056", + accent_fg = "#dedede", attention = "#fc5d19", transparent = "#00000000", @@ -27,7 +28,7 @@ colors.widget_bg = colors.transparent local theme = {} theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/kadet" -theme.wallpaper = theme.dir .. "/wallpapers/wall_0.png" +theme.wallpaper = theme.dir .. "/wallpapers/make.jpg" theme.font = fonts.mono_regular theme.taglist_font = fonts.mono_bold theme.tasklist_font = fonts.mono_regular @@ -46,11 +47,11 @@ theme.fg_urgent = colors.light theme.fg_widget = colors.light -theme.taglist_bg_focus = colors.accent -theme.taglist_fg_focus = colors.dark +theme.taglist_bg_focus = colors.dark .. "aa" +theme.taglist_fg_focus = colors.acceng_fg theme.taglist_bg_occupied = colors.dark .. "66" theme.taglist_fg_occupied = colors.light -theme.taglist_bg_empty = colors.tramsparent +theme.taglist_bg_empty = colors.transparent theme.taglist_fg_empty = colors.light theme.taglist_bg_urgent = "#C92132" theme.taglist_fg_urgent = "#282828" @@ -78,7 +79,7 @@ theme.notification_bg = colors.dark .. "dd" theme.notification_fg = theme.fg_normal theme.notification_border_width = 1 theme.notification_border_color = colors.dark -theme.notification_shape = gears.shape.infobubble +-- theme.notification_shape = gears.shape.infobubble theme.notification_opacity = 1 theme.notification_margin = 30 --theme.warning = theme.dir .. "/icons/status/warning.png" @@ -163,7 +164,7 @@ local clock_widget = wibox.container.background(wibox.container.margin(wibox.wid -- Calendar local calendar = lain.widget.calendar({ - cal = "cal --color=always", + cal = "cal -h", attach_to = { clock_widget }, notification_preset = { font = fonts.mono_regular, @@ -201,15 +202,15 @@ local temp_widget = wibox.container.background(wibox.container.margin(wibox.wid -- FS -local fs_icon = wibox.widget.imagebox(theme.widget_hdd) -local fs = lain.widget.fs({ - notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = fonts.widget }, - settings = function() - local fsp = string.format(" %3.2f %s ", fs_now["/home"].free, fs_now["/home"].units) - widget:set_markup(markup.font(fonts.widget, markup.fg.color(theme.fg_widget, fsp))) - end -}) -local fs_widget = wibox.container.background(wibox.container.margin(wibox.widget { image.icons.hdd, fs.widget, layout = wibox.layout.align.horizontal }, 0, 0), colors.widget_bg) +-- local fs_icon = wibox.widget.imagebox(theme.widget_hdd) +-- local fs = lain.widget.fs({ +-- notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = fonts.widget }, +-- settings = function() +-- local fsp = string.format(" %3.2f %s ", fs_now["/home"].free, fs_now["/home"].units) +-- widget:set_markup(markup.font(fonts.widget, markup.fg.color(theme.fg_widget, fsp))) +-- end +-- }) +-- local fs_widget = wibox.container.background(wibox.container.margin(wibox.widget { image.icons.hdd, fs.widget, layout = wibox.layout.align.horizontal }, 0, 0), colors.widget_bg) function theme.connect(s) -- Quake application @@ -220,7 +221,7 @@ function theme.connect(s) if type(wallpaper) == "function" then wallpaper = wallpaper(s) end - gears.wallpaper.maximized(wallpaper, 1, true) + gears.wallpaper.maximized(wallpaper, s, true) -- Tags --awful.tag(awful.util.tagnames, s, awful.layout.layouts[1]) @@ -228,7 +229,7 @@ function theme.connect(s) awful.layout.layouts[3], awful.layout.layouts[10], awful.layout.layouts[8], - awful.layout.layouts[6], + awful.layout.layouts[7], awful.layout.layouts[10], awful.layout.layouts[10], } diff --git a/awesome/themes/kadet/wallpapers/make.jpg b/awesome/themes/kadet/wallpapers/make.jpg new file mode 100644 index 0000000..50b67f5 Binary files /dev/null and b/awesome/themes/kadet/wallpapers/make.jpg differ