Added/Implemented machi-editor

src/global_keys.lua

@@ -1,14 +1,15 @@
 local gears = require('gears')
 local awful = require('awful')
-local lain = require('lain')
 local hotkeys_popup = require('awful.hotkeys_popup')
+local machi = require('layout-machi')
+local lain = require('lain')
 local globals = require('src.globals')
+local mpris = require('src.util.mpris')
+local volume = require('src.util.volume')
 
 local modkey = globals.modkey
 local altkey = globals.altkey
 
-local mpris = require('src.util.mpris')
-local volume = require('src.util.volume')
 
 local quake_terminal_name = 'QuakeTerminal'
 local quake = lain.util.quake({
@@ -102,6 +103,8 @@ local globalkeys = gears.table.join(
 	awful.key({ modkey, 'Control' }, 'l', function() awful.tag.incncol(-1, nil, true) end, { description = 'decrease the number of columns', group = 'layout' }),
 	awful.key({ modkey }, 'space', function() awful.layout.inc(1) end, { description = 'select next', group = 'layout' }),
 	awful.key({ modkey, 'Shift' }, 'space', function() awful.layout.inc(-1) end, { description = 'select previous', group = 'layout' }),
+	awful.key({ modkey }, '.', function () machi.default_editor.start_interactive() end, { description = 'start machi editor', group = 'layout' }),
+	awful.key({ modkey }, '+', function () machi.default_editor.start_interactive() end, { description = 'switch between windows for a machi', group = 'layout' }),
 
 	---- AUDIO KEYS ----
 	awful.key({}, "XF86AudioMute", volume.toggle_mute),

src/layouts/init.lua

@@ -1,9 +1,7 @@
 local awful = require('awful')
-local fair_col = require('src.layouts.fair_col')
-local tile_col = require('src.layouts.tile_col')
 
 tag.connect_signal("request::default_layouts", function()
-    awful.layout.append_default_layouts({
+    awful.layout.append_default_layouts {
         awful.layout.suit.fair,
         awful.layout.suit.fair.horizontal,
         awful.layout.suit.tile,
@@ -11,7 +9,8 @@ tag.connect_signal("request::default_layouts", function()
         awful.layout.suit.tile.bottom,
         awful.layout.suit.tile.top,
         awful.layout.suit.floating,
-        fair_col,
-        --tile_col
-    })
+        require('src.layouts.fair_col'),
+        --require('src.layouts.tile_col'),
+        require('layout-machi.layout').create {}
+    }
 end)

src/theme/init.lua

@@ -40,6 +40,11 @@ return {
     fg_focus = '#ff8c00',
     fg_urgent = '#af1d18',
     fg_minimize = '#ffffff',
+    machi_editor_border_color = '#606060',
+    machi_editor_active_color = '#002200',
+    machi_editor_open_color = '#000000',
+    machi_editor_done_color = '#000022',
+    machi_editor_closed_color = '#000022',
     border_width = 1,
     border_normal = '#1c2022',
     border_focus = '#606060',
@@ -86,6 +91,7 @@ return {
     layout_magnifier = confdir .. '/icons/magnifier.png',
     layout_floating = confdir .. '/icons/floating.png',
     layout_fairc = confdir .. '/icons/fairc.png',
+    layout_machi = confdir .. '/lib/layout-machi/icon.png',
     titlebar_close_button_normal = confdir .. '/icons/titlebar/close_normal.png',
     titlebar_close_button_focus = confdir .. '/icons/titlebar/close_focus.png',
     titlebar_minimize_button_normal = confdir .. '/icons/titlebar/minimize_normal.png',