My Awesome Config is almost usable now

2 files changed, 47 insertions, 17 deletions

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 37dc176..739bf81 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -58,7 +58,6 @@ not_modkey = "Mod1"
 
 -- Table of layouts to cover with awful.layout.inc, order matters.
 awful.layout.layouts = {
-    awful.layout.suit.floating,
     awful.layout.suit.tile,
     awful.layout.suit.tile.left,
     awful.layout.suit.tile.bottom,
@@ -71,9 +70,10 @@ awful.layout.layouts = {
     awful.layout.suit.max.fullscreen,
     awful.layout.suit.magnifier,
     awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
+    awful.layout.suit.corner.ne,
+    awful.layout.suit.corner.sw,
+    awful.layout.suit.corner.se,
+    awful.layout.suit.floating,
 }
 -- }}}
 
@@ -166,7 +166,7 @@ awful.screen.connect_for_each_screen(function(s)
     set_wallpaper(s)
 
     -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" }, s, awful.layout.layouts[1])
+    awful.tag({ " 一 ", " 二 ", " 三 ", " 四 ", " 五 ", " 六 ", " 七 ", " 八 ", " 九 ", " 十 " }, s, awful.layout.layouts[1])
 
     -- Create a promptbox for each screen
     s.mypromptbox = awful.widget.prompt()
@@ -193,14 +193,14 @@ awful.screen.connect_for_each_screen(function(s)
     }
 
     -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s })
+    s.mywibox = awful.wibar({ position = "bottom", screen = s })
 
     -- Add widgets to the wibox
     s.mywibox:setup {
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
             layout = wibox.layout.fixed.horizontal,
-            mylauncher,
+            -- mylauncher,
             s.mytaglist,
             s.mypromptbox,
         },
@@ -208,8 +208,8 @@ awful.screen.connect_for_each_screen(function(s)
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
             mykeyboardlayout,
-            wibox.widget.systray(),
             mytextclock,
+            wibox.widget.systray(),
             s.mylayoutbox,
         },
     }
@@ -488,11 +488,14 @@ awful.rules.rules = {
           "DTA",  -- Firefox addon DownThemAll.
           "copyq",  -- Includes session name in class.
           "pinentry",
+          "GIMP"
         },
         class = {
           "Arandr",
           "Blueman-manager",
           "Gpick",
+          "Gimp",
+          "Nitrogen",
           "Kruler",
           "MessageWin",  -- kalarm.
           "Sxiv",
@@ -511,16 +514,22 @@ awful.rules.rules = {
           "ConfigManager",  -- Thunderbird's about:config.
           "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
         }
-      }, properties = { floating = true }},
+      }, properties = { floating = true, titlebars_enabled = true }},
 
-    -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
+    -- Add titlebars to dialogs
+    { rule_any = {type = { "dialog", "floating" }
       }, properties = { titlebars_enabled = true }
     },
 
+    -- Remove titlebars from normal clients
+    { rule_any = {type = { "normal" }
+      }, properties = { titlebars_enabled = false }
+    },
+
     -- Set Firefox to always map on the tag named "2" on screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { screen = 1, tag = "2" } },
+    { rule = { class = "Firefox", "Librewolf" },
+      properties = { screen = 1, tag = " 二 " } },
+    -- Tag Names for ease " 一 ", " 二 ", " 三 ", " 四 ", " 五 ", " 六 ", " 七 ", " 八 ", " 九 ", " 十 "
 }
 -- }}}
 
@@ -539,6 +548,16 @@ client.connect_signal("manage", function (c)
     end
 end)
 
+
+-- dynamically show/hide titlebar on floating/tiled clients
+client.connect_signal("property::floating", function(c)
+    if c.floating then
+        awful.titlebar.show(c)
+    else
+        awful.titlebar.hide(c)
+    end
+end)
+
 -- Add a titlebar if titlebars_enabled is set to true in the rules.
 client.connect_signal("request::titlebars", function(c)
     -- buttons for the titlebar
diff --git a/.config/awesome/themes/default/theme.lua b/.config/awesome/themes/default/theme.lua
index cd41ce5..de7464e 100644
--- a/.config/awesome/themes/default/theme.lua
+++ b/.config/awesome/themes/default/theme.lua
@@ -11,7 +11,8 @@ local themes_path = gfs.get_themes_dir()
 
 local theme = {}
 
-theme.font          = "Source Code Pro:style=Regular"
+-- theme.font          = "Source Han Sans JP:style=Regular:fontsize=6"
+theme.font          = "Source Code Pro Medium:style=Medium"
 
 theme.bg_normal     = "#171520"
 -- theme.bg_focus      = "#130F23"
@@ -20,16 +21,26 @@ theme.bg_urgent     = "#ff0000"
 theme.bg_minimize   = "#444444"
 theme.bg_systray    = theme.bg_normal
 
-theme.fg_normal     = "#02FC45"
+theme.fg_normal     = "#FFFFFF"
 theme.fg_focus      = "#FFFFFF"
 theme.fg_urgent     = "#ffffff"
 theme.fg_minimize   = "#ffffff"
 
-theme.useless_gap   = dpi(4)
+theme.useless_gap   = dpi(6)
 theme.border_width  = dpi(2)
 theme.border_normal = "#130F23"
 theme.border_focus  = "#BF00FF"
-theme.border_marked = "#02FC45"
+theme.border_marked = "#5b76b7"
+
+theme.taglist_bg_focus = "#D33682"
+theme.taglist_bg_occupied = "#130F23"
+theme.taglist_bg_empty = "#171520"
+-- theme.taglist_bg_urgent = "#FF0000"
+
+theme.taglist_fg_focus = "#FFFFFF"
+theme.taglist_fg_occupied = "#268BD2"
+theme.taglist_fg_empty = "#02FC45"
+-- theme.taglist_fg_urgent = "#FF0000"
 
 -- There are other variable sets
 -- overriding the default one when