Scale for slightly lower screen densityHEADmaster

26 files changed, 26 insertions, 22 deletions

diff --git a/README.md b/README.md
index 3e05259..5c29902 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Dotfiles of my Debian and NixOS systems, managed by GNU Stow.
 
-![Screenshot](screenshot.png)
+![Screenshot](https://trong.loang.net/~cnx/dotfiles/plain/screenshot.png)
 
 Both uses awesome, bash, Git, Firefox, ranger, Vim, URxvt
 and Zathura. Most of these applications are themed with the
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 5dd0c1a..392dbae 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -1,5 +1,6 @@
 -- Standard library
 local io = {open = io.open}
+local math = {floor = math.floor, pi = math.pi}
 local pi = math.pi
 
 -- Awesome library
@@ -173,7 +174,7 @@ end
 
 -- Menubar configuration
 -- Set geometry so it would overlay the wibox
-menubar.geometry = {y = 0, height = 28}
+menubar.geometry = {y = 0, height = beautiful.menu_height}
 -- Set the terminal for applications that require it
 menubar.utils.terminal = terminal
 -- }}}
@@ -335,14 +336,16 @@ local function restore()
 end
 
 local function arrow(fg, bg)
-  local img = cairo.ImageSurface.create(cairo.Format.ARGB32, 14, 28)
+  local height = beautiful.menu_height
+  local width = height / 2
+  local img = cairo.ImageSurface.create(cairo.Format.ARGB32, width, height)
   local cr = cairo.Context(img)
   cr:set_source(gears.color(bg))
-  cr:rectangle(0, 0, 14, 28)
+  cr:rectangle(0, 0, width, height)
   cr:fill()
   cr:set_source(gears.color(fg))
   local trigon = shape.transform(shape.isosceles_triangle)
-  trigon:translate(0, 14):rotate_at(14, 14, pi/2)(cr, 28, 14)
+  trigon:translate(0, width):rotate_at(width, width, pi/2)(cr, height, width)
   cr:fill()
   return img
 end
@@ -354,13 +357,10 @@ awful.screen.connect_for_each_screen(function (s)
   set_wallpaper(s)
   -- Each screen has its own tag table.
   -- Wallpaper
-  if s.geometry.width > s.geometry.height then
-    awful.tag({"1", "2", "3", "4", "5", "6", "7", "8", "9"},
-              s, awful.layout.suit.fair)
-  else
-    awful.tag({"1", "2", "3", "4", "5", "6", "7", "8", "9"},
-              s, awful.layout.suit.tile)
-    for _, t in ipairs(s.tags) do t.master_count = 0 end
+  awful.tag({"1", "2", "3", "4", "5", "6", "7", "8", "9"},
+            s, awful.layout.suit.tile.bottom)
+  for _, t in ipairs(s.tags) do
+    t.master_count = math.floor(s.geometry.width / 800)
   end
 
   -- Create a promptbox for each screen
@@ -388,7 +388,9 @@ awful.screen.connect_for_each_screen(function (s)
   -- )
 
   -- Create the wibox
-  s.mywibox = awful.wibar{position = "top", height = "28", screen = s}
+  s.mywibox = awful.wibar{position = "top",
+                          height = beautiful.menu_height,
+                          screen = s}
 
   -- Virtual keyboard
   --s.vkb = boardary(s)
@@ -818,7 +820,7 @@ client.connect_signal(
                    end)
     )
 
-    awful.titlebar(c, {size=28}):setup{
+    awful.titlebar(c, {size=beautiful.menu_height}):setup{
       {-- Left
        awful.titlebar.widget.closebutton(c),
        awful.titlebar.widget.ontopbutton(c),
diff --git a/awesome/.config/awesome/themes/tempus-fugit/awesome.png b/awesome/.config/awesome/themes/tempus-fugit/awesome.png
index b3981f1..098561b 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/awesome.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/awesome.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerne.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerne.png
index 54b880f..ed80f94 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerne.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerne.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornernw.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornernw.png
index 0f748c7..1e5ea67 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornernw.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornernw.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerse.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerse.png
index 2f64fba..e36290c 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerse.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornerse.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornersw.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornersw.png
index a363e38..5d31daa 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/cornersw.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/cornersw.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/dwindle.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/dwindle.png
index a636b80..3db56dc 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/dwindle.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/dwindle.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/fairh.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/fairh.png
index 615e5f8..e735bc0 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/fairh.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/fairh.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/fairv.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/fairv.png
index f705817..2932785 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/fairv.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/fairv.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/floating.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/floating.png
index 3ed3d1c..5ad9e26 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/floating.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/floating.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/fullscreen.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/fullscreen.png
index d0b3050..d1824ba 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/fullscreen.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/fullscreen.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/magnifier.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/magnifier.png
index aebbbca..860ea97 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/magnifier.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/magnifier.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/max.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/max.png
index 5051aeb..d54c351 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/max.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/max.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/spiral.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/spiral.png
index 31e8d7d..a27e727 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/spiral.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/spiral.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/tile.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/tile.png
index a00efbe..95ce252 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/tile.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/tile.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/tilebottom.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/tilebottom.png
index e57a5c7..354bcec 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/tilebottom.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/tilebottom.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/tileleft.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/tileleft.png
index 0eb153f..2e852e0 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/tileleft.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/tileleft.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/layouts/tiletop.png b/awesome/.config/awesome/themes/tempus-fugit/layouts/tiletop.png
index f001ec1..c304422 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/layouts/tiletop.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/layouts/tiletop.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/submenu.png b/awesome/.config/awesome/themes/tempus-fugit/submenu.png
index ed1429b..082d94c 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/submenu.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/submenu.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/taglist/square.png b/awesome/.config/awesome/themes/tempus-fugit/taglist/square.png
index bafc155..9e74834 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/taglist/square.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/taglist/square.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/taglist/squaref.png b/awesome/.config/awesome/themes/tempus-fugit/taglist/squaref.png
index 08fe492..9a750e2 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/taglist/squaref.png
+++ b/awesome/.config/awesome/themes/tempus-fugit/taglist/squaref.png
diff --git a/awesome/.config/awesome/themes/tempus-fugit/theme.lua b/awesome/.config/awesome/themes/tempus-fugit/theme.lua
index e3c13ea..a71c218 100644
--- a/awesome/.config/awesome/themes/tempus-fugit/theme.lua
+++ b/awesome/.config/awesome/themes/tempus-fugit/theme.lua
@@ -21,8 +21,8 @@ local theme = {}
 local wd = '~/.config/awesome/themes/tempus-fugit/'
 local function abspath(relative) return wd .. relative end
 
-theme.font          = 'Latin Modern Mono 15'
-theme.hotkeys_font  = 'Latin Modern Mono Bold 15'
+theme.font          = 'Latin Modern Mono 13'
+theme.hotkeys_font  = 'Latin Modern Mono Bold 13'
 theme.hotkeys_description_font = theme.font
 
 -- Auxiliary colors
@@ -80,8 +80,8 @@ theme.taglist_squares_unsel = abspath'taglist/square.png'
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]
 theme.menu_submenu_icon = abspath'submenu.png'
-theme.menu_height = 28
-theme.menu_width  = 210
+theme.menu_height = 24
+theme.menu_width  = 200
 
 -- You can add as many variables as
 -- you wish and access them by using
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
index ad38c7c..ead27c1 100644
--- a/gtk/.config/gtk-3.0/settings.ini
+++ b/gtk/.config/gtk-3.0/settings.ini
@@ -1,5 +1,4 @@
 [Settings]
-gtk-cursor-theme-name = LHackneyed
-gtk-cursor-theme-size = 28
-gtk-font-name = Latin Modern Sans 12
+gtk-decoration-layout = menu
+gtk-font-name = Latin Modern Sans 13
 gtk-key-theme-name = Emacs
diff --git a/gtk/.config/gtk-4.0/settings.ini b/gtk/.config/gtk-4.0/settings.ini
new file mode 100644
index 0000000..49d2ff4
--- /dev/null
+++ b/gtk/.config/gtk-4.0/settings.ini
@@ -0,0 +1,3 @@
+[Settings]
+gtk-decoration-layout = close:menu
+gtk-font-name = Latin Modern Sans 13
diff --git a/gtk/.gtkrc-2.0 b/gtk/.gtkrc-2.0
index 1cbe816..1bcf03e 100644
--- a/gtk/.gtkrc-2.0
+++ b/gtk/.gtkrc-2.0
@@ -1,2 +1,2 @@
-gtk-font-name = "Latin Modern Sans 12"
+gtk-font-name = "Latin Modern Sans 13"
 gtk-key-theme-name = "Emacs"