From 2845d99010e8779a489f8274d2e4ee8b5cab185e Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 12 Jan 2014 14:31:19 +0100
Subject: [PATCH] Revert "layouts: use termfair layout for terminals"

This reverts commit eb309fd35b28091a8dfe33163e709a99a8dffaf6. While this
seemed a good idea, I find easier the regular fair layout.
---
 .gitmodules  | 3 ---
 README.md    | 6 ------
 lain         | 1 -
 rc/tags.lua  | 5 +----
 rc/theme.lua | 2 --
 5 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 lain

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0042997..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lain"]
-	path = lain
-	url = https://github.com/copycat-killer/lain.git
diff --git a/README.md b/README.md
index 2b9da8b..68a63e9 100644
--- a/README.md
+++ b/README.md
@@ -58,9 +58,3 @@ way to load them is to use:
 
 	require("lib/quake")
 	local quake = package.loaded["vbe/quake"]
-
-I am using [lain][] for additional layouts. It is included as a
-submodule. I would have preferred to put it in `lib/`, but this does
-not seem possible. Don't forget to run `git submodule update`.
-
-[lain]: https://github.com/copycat-killer/lain/
diff --git a/lain b/lain
deleted file mode 160000
index fddeeff..0000000
--- a/lain
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fddeeff66466ca8f8bd7d06099eabd1feda10675
diff --git a/rc/tags.lua b/rc/tags.lua
index 9494df1..4602d69 100644
--- a/rc/tags.lua
+++ b/rc/tags.lua
@@ -2,7 +2,6 @@
 
 local shifty = loadrc("shifty", "vbe/shifty")
 local keydoc = loadrc("keydoc", "vbe/keydoc")
-local lain = require("lain")
 
 local tagicon = function(icon)
    if screen.count() > 1 then
@@ -31,9 +30,7 @@ shifty.config.tags = {
    },
    xterm = {
       position = 1,
-      layout = lain.layout.termfair,
-      nmaster = math.floor(screen[1].geometry.width / 500),
-      ncol = 1,
+      layout = awful.layout.suit.fair,
       exclusive = true,
       slave = true,
       spawn = config.terminal,
diff --git a/rc/theme.lua b/rc/theme.lua
index 9f623e1..9ebab42 100644
--- a/rc/theme.lua
+++ b/rc/theme.lua
@@ -40,8 +40,6 @@ theme.taglist_squares_unsel = icons .. "/taglist/squarew.png"
 for _, l in pairs(config.layouts) do
    theme["layout_" .. l.name] = icons .. "/layouts/" .. l.name .. ".png"
 end
-local lain_icons = awful.util.getdir("config") .. "/lain/icons/layout/zenburn"
-theme.layout_termfair    = lain_icons .. "/termfair.png"
 
 -- Naughty
 naughty.config.presets.normal.bg = theme.bg_widget