diff --git a/awesome/default.nix b/awesome/default.nix
deleted file mode 100644
index 8a3ce55..0000000
--- a/awesome/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
- let
-   pkgs = import <nixpkgs> {};
-   stdenv = pkgs.stdenv;
- in rec {
-   luathing = stdenv.mkDerivation rec {
-     name = "lua-dev";
-     src = ./.;
-     buildInputs = with pkgs.luaPackages; [ lua lgi ];
-   };
- }
diff --git a/awesome/icons/lambda.png b/awesome/icons/lambda.png
deleted file mode 100644
index c60d7a5..0000000
Binary files a/awesome/icons/lambda.png and /dev/null differ
diff --git a/awesome/icons/lambda.xbm b/awesome/icons/lambda.xbm
deleted file mode 100644
index 5caf843..0000000
--- a/awesome/icons/lambda.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define lambda_width 8
-#define lambda_height 10
-static char lambda_bits[] = {
- 0x06,0x0a,0x08,0x08,0x14,0x14,0x12,0x22,0xa1,0xc1};
diff --git a/awesome/icons/png/bat_empty_01.png b/awesome/icons/png/bat_empty_01.png
deleted file mode 100644
index b6d81b0..0000000
Binary files a/awesome/icons/png/bat_empty_01.png and /dev/null differ
diff --git a/awesome/icons/png/bat_full_01.png b/awesome/icons/png/bat_full_01.png
deleted file mode 100644
index eee7183..0000000
Binary files a/awesome/icons/png/bat_full_01.png and /dev/null differ
diff --git a/awesome/icons/png/bat_low_01.png b/awesome/icons/png/bat_low_01.png
deleted file mode 100644
index ed545d0..0000000
Binary files a/awesome/icons/png/bat_low_01.png and /dev/null differ
diff --git a/awesome/icons/png/clock.png b/awesome/icons/png/clock.png
deleted file mode 100644
index b0b5940..0000000
Binary files a/awesome/icons/png/clock.png and /dev/null differ
diff --git a/awesome/icons/png/half.png b/awesome/icons/png/half.png
deleted file mode 100644
index bef8ab4..0000000
Binary files a/awesome/icons/png/half.png and /dev/null differ
diff --git a/awesome/icons/png/spkr_01.png b/awesome/icons/png/spkr_01.png
deleted file mode 100644
index f3aa98f..0000000
Binary files a/awesome/icons/png/spkr_01.png and /dev/null differ
diff --git a/awesome/icons/png/spkr_02.png b/awesome/icons/png/spkr_02.png
deleted file mode 100644
index b1fa555..0000000
Binary files a/awesome/icons/png/spkr_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/ac.png b/awesome/icons/png_unused/ac.png
deleted file mode 100644
index e244c3f..0000000
Binary files a/awesome/icons/png_unused/ac.png and /dev/null differ
diff --git a/awesome/icons/png_unused/ac_01.png b/awesome/icons/png_unused/ac_01.png
deleted file mode 100644
index 74e9676..0000000
Binary files a/awesome/icons/png_unused/ac_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/arch.png b/awesome/icons/png_unused/arch.png
deleted file mode 100644
index b675f52..0000000
Binary files a/awesome/icons/png_unused/arch.png and /dev/null differ
diff --git a/awesome/icons/png_unused/arch_10x10.png b/awesome/icons/png_unused/arch_10x10.png
deleted file mode 100644
index c357567..0000000
Binary files a/awesome/icons/png_unused/arch_10x10.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bat_empty_02.png b/awesome/icons/png_unused/bat_empty_02.png
deleted file mode 100644
index 5ecfb00..0000000
Binary files a/awesome/icons/png_unused/bat_empty_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bat_full_02.png b/awesome/icons/png_unused/bat_full_02.png
deleted file mode 100644
index 3718cff..0000000
Binary files a/awesome/icons/png_unused/bat_full_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bat_low_02.png b/awesome/icons/png_unused/bat_low_02.png
deleted file mode 100644
index 543bf34..0000000
Binary files a/awesome/icons/png_unused/bat_low_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bluetooth.png b/awesome/icons/png_unused/bluetooth.png
deleted file mode 100644
index c074442..0000000
Binary files a/awesome/icons/png_unused/bluetooth.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bug_01.png b/awesome/icons/png_unused/bug_01.png
deleted file mode 100644
index 3a7f744..0000000
Binary files a/awesome/icons/png_unused/bug_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/bug_02.png b/awesome/icons/png_unused/bug_02.png
deleted file mode 100644
index 95ce057..0000000
Binary files a/awesome/icons/png_unused/bug_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/cat.png b/awesome/icons/png_unused/cat.png
deleted file mode 100644
index 048ba7c..0000000
Binary files a/awesome/icons/png_unused/cat.png and /dev/null differ
diff --git a/awesome/icons/png_unused/cpu.png b/awesome/icons/png_unused/cpu.png
deleted file mode 100644
index 3532939..0000000
Binary files a/awesome/icons/png_unused/cpu.png and /dev/null differ
diff --git a/awesome/icons/png_unused/dish.png b/awesome/icons/png_unused/dish.png
deleted file mode 100644
index fb97f24..0000000
Binary files a/awesome/icons/png_unused/dish.png and /dev/null differ
diff --git a/awesome/icons/png_unused/diskette.png b/awesome/icons/png_unused/diskette.png
deleted file mode 100644
index 24b8275..0000000
Binary files a/awesome/icons/png_unused/diskette.png and /dev/null differ
diff --git a/awesome/icons/png_unused/empty.png b/awesome/icons/png_unused/empty.png
deleted file mode 100644
index f78432e..0000000
Binary files a/awesome/icons/png_unused/empty.png and /dev/null differ
diff --git a/awesome/icons/png_unused/eye_l.png b/awesome/icons/png_unused/eye_l.png
deleted file mode 100644
index 9c64073..0000000
Binary files a/awesome/icons/png_unused/eye_l.png and /dev/null differ
diff --git a/awesome/icons/png_unused/eye_r.png b/awesome/icons/png_unused/eye_r.png
deleted file mode 100644
index bbba901..0000000
Binary files a/awesome/icons/png_unused/eye_r.png and /dev/null differ
diff --git a/awesome/icons/png_unused/fox.png b/awesome/icons/png_unused/fox.png
deleted file mode 100644
index 1e0616b..0000000
Binary files a/awesome/icons/png_unused/fox.png and /dev/null differ
diff --git a/awesome/icons/png_unused/fs_01.png b/awesome/icons/png_unused/fs_01.png
deleted file mode 100644
index a84906f..0000000
Binary files a/awesome/icons/png_unused/fs_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/fs_02.png b/awesome/icons/png_unused/fs_02.png
deleted file mode 100644
index 0c87d68..0000000
Binary files a/awesome/icons/png_unused/fs_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/full.png b/awesome/icons/png_unused/full.png
deleted file mode 100644
index 85a1011..0000000
Binary files a/awesome/icons/png_unused/full.png and /dev/null differ
diff --git a/awesome/icons/png_unused/fwd.png b/awesome/icons/png_unused/fwd.png
deleted file mode 100644
index 82caa98..0000000
Binary files a/awesome/icons/png_unused/fwd.png and /dev/null differ
diff --git a/awesome/icons/png_unused/info_01.png b/awesome/icons/png_unused/info_01.png
deleted file mode 100644
index e7e5988..0000000
Binary files a/awesome/icons/png_unused/info_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/info_02.png b/awesome/icons/png_unused/info_02.png
deleted file mode 100644
index fc66ec0..0000000
Binary files a/awesome/icons/png_unused/info_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/info_03.png b/awesome/icons/png_unused/info_03.png
deleted file mode 100644
index e80edd0..0000000
Binary files a/awesome/icons/png_unused/info_03.png and /dev/null differ
diff --git a/awesome/icons/png_unused/mail.png b/awesome/icons/png_unused/mail.png
deleted file mode 100644
index e4291e9..0000000
Binary files a/awesome/icons/png_unused/mail.png and /dev/null differ
diff --git a/awesome/icons/png_unused/mem.png b/awesome/icons/png_unused/mem.png
deleted file mode 100644
index 1c94c26..0000000
Binary files a/awesome/icons/png_unused/mem.png and /dev/null differ
diff --git a/awesome/icons/png_unused/mouse_01.png b/awesome/icons/png_unused/mouse_01.png
deleted file mode 100644
index afbb2b3..0000000
Binary files a/awesome/icons/png_unused/mouse_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_down_01.png b/awesome/icons/png_unused/net_down_01.png
deleted file mode 100644
index 61222a8..0000000
Binary files a/awesome/icons/png_unused/net_down_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_down_02.png b/awesome/icons/png_unused/net_down_02.png
deleted file mode 100644
index ab822d0..0000000
Binary files a/awesome/icons/png_unused/net_down_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_down_03.png b/awesome/icons/png_unused/net_down_03.png
deleted file mode 100644
index 3db09e0..0000000
Binary files a/awesome/icons/png_unused/net_down_03.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_up_01.png b/awesome/icons/png_unused/net_up_01.png
deleted file mode 100644
index 955d5bc..0000000
Binary files a/awesome/icons/png_unused/net_up_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_up_02.png b/awesome/icons/png_unused/net_up_02.png
deleted file mode 100644
index 6d146eb..0000000
Binary files a/awesome/icons/png_unused/net_up_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_up_03.png b/awesome/icons/png_unused/net_up_03.png
deleted file mode 100644
index 7e6d784..0000000
Binary files a/awesome/icons/png_unused/net_up_03.png and /dev/null differ
diff --git a/awesome/icons/png_unused/net_wired.png b/awesome/icons/png_unused/net_wired.png
deleted file mode 100644
index e3612b0..0000000
Binary files a/awesome/icons/png_unused/net_wired.png and /dev/null differ
diff --git a/awesome/icons/png_unused/next.png b/awesome/icons/png_unused/next.png
deleted file mode 100644
index 76bbe0c..0000000
Binary files a/awesome/icons/png_unused/next.png and /dev/null differ
diff --git a/awesome/icons/png_unused/note.png b/awesome/icons/png_unused/note.png
deleted file mode 100644
index 3527ee4..0000000
Binary files a/awesome/icons/png_unused/note.png and /dev/null differ
diff --git a/awesome/icons/png_unused/pacman.png b/awesome/icons/png_unused/pacman.png
deleted file mode 100644
index 5575219..0000000
Binary files a/awesome/icons/png_unused/pacman.png and /dev/null differ
diff --git a/awesome/icons/png_unused/pause.png b/awesome/icons/png_unused/pause.png
deleted file mode 100644
index 245cb10..0000000
Binary files a/awesome/icons/png_unused/pause.png and /dev/null differ
diff --git a/awesome/icons/png_unused/phones.png b/awesome/icons/png_unused/phones.png
deleted file mode 100644
index 25917e7..0000000
Binary files a/awesome/icons/png_unused/phones.png and /dev/null differ
diff --git a/awesome/icons/png_unused/play.png b/awesome/icons/png_unused/play.png
deleted file mode 100644
index db9ec28..0000000
Binary files a/awesome/icons/png_unused/play.png and /dev/null differ
diff --git a/awesome/icons/png_unused/plug.png b/awesome/icons/png_unused/plug.png
deleted file mode 100644
index 58a16bf..0000000
Binary files a/awesome/icons/png_unused/plug.png and /dev/null differ
diff --git a/awesome/icons/png_unused/prev.png b/awesome/icons/png_unused/prev.png
deleted file mode 100644
index ceb4b7e..0000000
Binary files a/awesome/icons/png_unused/prev.png and /dev/null differ
diff --git a/awesome/icons/png_unused/rwd.png b/awesome/icons/png_unused/rwd.png
deleted file mode 100644
index 9616094..0000000
Binary files a/awesome/icons/png_unused/rwd.png and /dev/null differ
diff --git a/awesome/icons/png_unused/scorpio.png b/awesome/icons/png_unused/scorpio.png
deleted file mode 100644
index ad49618..0000000
Binary files a/awesome/icons/png_unused/scorpio.png and /dev/null differ
diff --git a/awesome/icons/png_unused/shroom.png b/awesome/icons/png_unused/shroom.png
deleted file mode 100644
index 91453c5..0000000
Binary files a/awesome/icons/png_unused/shroom.png and /dev/null differ
diff --git a/awesome/icons/png_unused/spkr_03.png b/awesome/icons/png_unused/spkr_03.png
deleted file mode 100644
index 1b7b75a..0000000
Binary files a/awesome/icons/png_unused/spkr_03.png and /dev/null differ
diff --git a/awesome/icons/png_unused/stop.png b/awesome/icons/png_unused/stop.png
deleted file mode 100644
index ad3f68b..0000000
Binary files a/awesome/icons/png_unused/stop.png and /dev/null differ
diff --git a/awesome/icons/png_unused/temp.png b/awesome/icons/png_unused/temp.png
deleted file mode 100644
index 387baea..0000000
Binary files a/awesome/icons/png_unused/temp.png and /dev/null differ
diff --git a/awesome/icons/png_unused/test.png b/awesome/icons/png_unused/test.png
deleted file mode 100644
index 60cb1b7..0000000
Binary files a/awesome/icons/png_unused/test.png and /dev/null differ
diff --git a/awesome/icons/png_unused/usb.png b/awesome/icons/png_unused/usb.png
deleted file mode 100644
index e79fe4f..0000000
Binary files a/awesome/icons/png_unused/usb.png and /dev/null differ
diff --git a/awesome/icons/png_unused/usb_02.png b/awesome/icons/png_unused/usb_02.png
deleted file mode 100644
index 4f84cc8..0000000
Binary files a/awesome/icons/png_unused/usb_02.png and /dev/null differ
diff --git a/awesome/icons/png_unused/wifi_01.png b/awesome/icons/png_unused/wifi_01.png
deleted file mode 100644
index b300c05..0000000
Binary files a/awesome/icons/png_unused/wifi_01.png and /dev/null differ
diff --git a/awesome/icons/png_unused/wifi_02.png b/awesome/icons/png_unused/wifi_02.png
deleted file mode 100644
index 48df58e..0000000
Binary files a/awesome/icons/png_unused/wifi_02.png and /dev/null differ
diff --git a/awesome/icons/squarefw.png b/awesome/icons/squarefw.png
deleted file mode 100644
index c1b678d..0000000
Binary files a/awesome/icons/squarefw.png and /dev/null differ
diff --git a/awesome/icons/squarefw_big.png b/awesome/icons/squarefw_big.png
deleted file mode 100644
index 2a86430..0000000
Binary files a/awesome/icons/squarefw_big.png and /dev/null differ
diff --git a/awesome/icons/squarew.png b/awesome/icons/squarew.png
deleted file mode 100644
index bacca8e..0000000
Binary files a/awesome/icons/squarew.png and /dev/null differ
diff --git a/awesome/icons/squarew_big.png b/awesome/icons/squarew_big.png
deleted file mode 100644
index 913f2ca..0000000
Binary files a/awesome/icons/squarew_big.png and /dev/null differ
diff --git a/awesome/icons/xbm8x8/README b/awesome/icons/xbm8x8/README
deleted file mode 100644
index eb0e735..0000000
--- a/awesome/icons/xbm8x8/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This set of icons is mostly created keeping dzen2 in mind.
-If you're missing an icon or have suggestions how to improve
-the ones already existing, please contact me at
-<sm4tik@yahoo.com>
-
-Thanks for downloading!
diff --git a/awesome/icons/xbm8x8/ac.xbm b/awesome/icons/xbm8x8/ac.xbm
deleted file mode 100755
index b6dacef..0000000
--- a/awesome/icons/xbm8x8/ac.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_width 8
-#define ac_height 8
-static unsigned char ac_bits[] = {
- 0xFF, 0xF8, 0xF0, 0xF6, 0x6F, 0x0F, 0x1F, 0xFF };
diff --git a/awesome/icons/xbm8x8/ac_01.xbm b/awesome/icons/xbm8x8/ac_01.xbm
deleted file mode 100755
index 66592d7..0000000
--- a/awesome/icons/xbm8x8/ac_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_01_width 8
-#define ac_01_height 8
-static unsigned char ac_01_bits[] = {
- 0x30, 0x28, 0xE4, 0x27, 0x27, 0xE4, 0x28, 0x30 };
diff --git a/awesome/icons/xbm8x8/arch.xbm b/awesome/icons/xbm8x8/arch.xbm
deleted file mode 100755
index 11cfe5a..0000000
--- a/awesome/icons/xbm8x8/arch.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define arch_width 8
-#define arch_height 8
-static unsigned char arch_bits[] = {
- 0x08, 0x08, 0x1C, 0x1C, 0x36, 0x22, 0x77, 0x41 };
diff --git a/awesome/icons/xbm8x8/arch_10x10.xbm b/awesome/icons/xbm8x8/arch_10x10.xbm
deleted file mode 100755
index c3ee46d..0000000
--- a/awesome/icons/xbm8x8/arch_10x10.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_10x10_width 10
-#define arch_10x10_height 10
-static unsigned char arch_10x10_bits[] = {
- 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7C, 0x00, 0x7C, 0x00,
- 0xEE, 0x00, 0xC6, 0x00, 0xC7, 0x01, 0x01, 0x01 };
diff --git a/awesome/icons/xbm8x8/bat_empty_01.xbm b/awesome/icons/xbm8x8/bat_empty_01.xbm
deleted file mode 100755
index cb916db..0000000
--- a/awesome/icons/xbm8x8/bat_empty_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_01_width 8
-#define bat_empty_01_height 8
-static unsigned char bat_empty_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E };
diff --git a/awesome/icons/xbm8x8/bat_empty_02.xbm b/awesome/icons/xbm8x8/bat_empty_02.xbm
deleted file mode 100755
index e26be8c..0000000
--- a/awesome/icons/xbm8x8/bat_empty_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_02_width 8
-#define bat_empty_02_height 8
-static unsigned char bat_empty_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC1, 0xC1, 0x41, 0x7F, 0x00 };
diff --git a/awesome/icons/xbm8x8/bat_full_01.xbm b/awesome/icons/xbm8x8/bat_full_01.xbm
deleted file mode 100755
index 701149e..0000000
--- a/awesome/icons/xbm8x8/bat_full_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_width 8
-#define bat_full_height 8
-static unsigned char bat_full_bits[] = {
- 0x18, 0x7E, 0x42, 0x5A, 0x5A, 0x5A, 0x42, 0x7E };
diff --git a/awesome/icons/xbm8x8/bat_full_02.xbm b/awesome/icons/xbm8x8/bat_full_02.xbm
deleted file mode 100755
index 93d2327..0000000
--- a/awesome/icons/xbm8x8/bat_full_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_02_width 8
-#define bat_full_02_height 8
-static unsigned char bat_full_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xDD, 0xDD, 0x41, 0x7F, 0x00 };
diff --git a/awesome/icons/xbm8x8/bat_low_01.xbm b/awesome/icons/xbm8x8/bat_low_01.xbm
deleted file mode 100755
index 29e974d..0000000
--- a/awesome/icons/xbm8x8/bat_low_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_01_width 8
-#define bat_low_01_height 8
-static unsigned char bat_low_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x5A, 0x42, 0x7E };
diff --git a/awesome/icons/xbm8x8/bat_low_02.xbm b/awesome/icons/xbm8x8/bat_low_02.xbm
deleted file mode 100755
index d80a464..0000000
--- a/awesome/icons/xbm8x8/bat_low_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_02_width 8
-#define bat_low_02_height 8
-static unsigned char bat_low_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC5, 0xC5, 0x41, 0x7F, 0x00 };
diff --git a/awesome/icons/xbm8x8/bluetooth.xbm b/awesome/icons/xbm8x8/bluetooth.xbm
deleted file mode 100755
index 3cc42d5..0000000
--- a/awesome/icons/xbm8x8/bluetooth.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bluetooth_width 8
-#define bluetooth_height 8
-static unsigned char bluetooth_bits[] = {
- 0x18, 0x2A, 0x6C, 0x38, 0x38, 0x6C, 0x2A, 0x18 };
diff --git a/awesome/icons/xbm8x8/bug_01.xbm b/awesome/icons/xbm8x8/bug_01.xbm
deleted file mode 100755
index 8974034..0000000
--- a/awesome/icons/xbm8x8/bug_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_width 8
-#define bug_height 8
-static unsigned char bug_bits[] = {
- 0xC3, 0x24, 0x18, 0xDB, 0x3C, 0x7E, 0xBD, 0x99 };
diff --git a/awesome/icons/xbm8x8/bug_02.xbm b/awesome/icons/xbm8x8/bug_02.xbm
deleted file mode 100755
index 051f2f5..0000000
--- a/awesome/icons/xbm8x8/bug_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_02_width 8
-#define bug_02_height 8
-static unsigned char bug_02_bits[] = {
- 0xC3, 0x24, 0x24, 0xDB, 0x3C, 0x7E, 0x99, 0x42 };
diff --git a/awesome/icons/xbm8x8/cat.xbm b/awesome/icons/xbm8x8/cat.xbm
deleted file mode 100755
index d0bc6ab..0000000
--- a/awesome/icons/xbm8x8/cat.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define cat_width 8
-#define cat_height 8
-static unsigned char cat_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xFF, 0x7E, 0xBD };
diff --git a/awesome/icons/xbm8x8/clock.xbm b/awesome/icons/xbm8x8/clock.xbm
deleted file mode 100755
index cd2fad2..0000000
--- a/awesome/icons/xbm8x8/clock.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define clock_width 8
-#define clock_height 8
-static unsigned char clock_bits[] = {
- 0x3C, 0x5E, 0xEF, 0xF7, 0x87, 0xFF, 0x7E, 0x3C };
diff --git a/awesome/icons/xbm8x8/cpu.xbm b/awesome/icons/xbm8x8/cpu.xbm
deleted file mode 100755
index 4c34d58..0000000
--- a/awesome/icons/xbm8x8/cpu.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define cpu_width 8
-#define cpu_height 8
-static unsigned char cpu_bits[] = {
- 0xDB, 0x81, 0x3C, 0xBD, 0xBD, 0x3C, 0x81, 0xDB };
diff --git a/awesome/icons/xbm8x8/dish.xbm b/awesome/icons/xbm8x8/dish.xbm
deleted file mode 100755
index 75e9f88..0000000
--- a/awesome/icons/xbm8x8/dish.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define dish_width 8
-#define dish_height 8
-static unsigned char dish_bits[] = {
- 0x81, 0x7B, 0x46, 0x4E, 0x5C, 0x3E, 0x77, 0xC3 };
diff --git a/awesome/icons/xbm8x8/diskette.xbm b/awesome/icons/xbm8x8/diskette.xbm
deleted file mode 100755
index 48e641b..0000000
--- a/awesome/icons/xbm8x8/diskette.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define diskette_width 8
-#define diskette_height 8
-static unsigned char diskette_bits[] = {
- 0xFF, 0x81, 0x81, 0x81, 0xBD, 0xB5, 0xB5, 0xFE };
diff --git a/awesome/icons/xbm8x8/empty.xbm b/awesome/icons/xbm8x8/empty.xbm
deleted file mode 100755
index 1086137..0000000
--- a/awesome/icons/xbm8x8/empty.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define empty_width 8
-#define empty_height 8
-static unsigned char empty_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C };
diff --git a/awesome/icons/xbm8x8/eye_l.xbm b/awesome/icons/xbm8x8/eye_l.xbm
deleted file mode 100755
index 3de8e26..0000000
--- a/awesome/icons/xbm8x8/eye_l.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_l_width 8
-#define eye_l_height 8
-static unsigned char eye_l_bits[] = {
- 0x00, 0x00, 0x1B, 0x02, 0x02, 0x84, 0xF9, 0x02 };
diff --git a/awesome/icons/xbm8x8/eye_r.xbm b/awesome/icons/xbm8x8/eye_r.xbm
deleted file mode 100755
index 7a04951..0000000
--- a/awesome/icons/xbm8x8/eye_r.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_r_width 8
-#define eye_r_height 8
-static unsigned char eye_r_bits[] = {
- 0x00, 0x00, 0xD8, 0x40, 0x40, 0x21, 0x9F, 0x40 };
diff --git a/awesome/icons/xbm8x8/fox.xbm b/awesome/icons/xbm8x8/fox.xbm
deleted file mode 100755
index 46735c3..0000000
--- a/awesome/icons/xbm8x8/fox.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fox_width 8
-#define fox_height 8
-static unsigned char fox_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xDB, 0x7E, 0x18 };
diff --git a/awesome/icons/xbm8x8/fs_01.xbm b/awesome/icons/xbm8x8/fs_01.xbm
deleted file mode 100755
index 1d012d2..0000000
--- a/awesome/icons/xbm8x8/fs_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_01_width 8
-#define fs_01_height 8
-static unsigned char fs_01_bits[] = {
- 0x46, 0x99, 0xBC, 0x66, 0x66, 0x3D, 0x99, 0x62 };
diff --git a/awesome/icons/xbm8x8/fs_02.xbm b/awesome/icons/xbm8x8/fs_02.xbm
deleted file mode 100755
index 603e3a7..0000000
--- a/awesome/icons/xbm8x8/fs_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_02_width 8
-#define fs_02_height 8
-static unsigned char fs_02_bits[] = {
- 0xF1, 0x5B, 0x3D, 0x67, 0xE6, 0xBC, 0xDA, 0x8F };
diff --git a/awesome/icons/xbm8x8/full.xbm b/awesome/icons/xbm8x8/full.xbm
deleted file mode 100755
index b5a026f..0000000
--- a/awesome/icons/xbm8x8/full.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define full_width 8
-#define full_height 8
-static unsigned char full_bits[] = {
- 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C };
diff --git a/awesome/icons/xbm8x8/fwd.xbm b/awesome/icons/xbm8x8/fwd.xbm
deleted file mode 100755
index 3f52ea9..0000000
--- a/awesome/icons/xbm8x8/fwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fwd_width 8
-#define fwd_height 8
-static unsigned char fwd_bits[] = {
- 0x00, 0x12, 0x36, 0x7E, 0x7E, 0x36, 0x12, 0x00 };
diff --git a/awesome/icons/xbm8x8/half.xbm b/awesome/icons/xbm8x8/half.xbm
deleted file mode 100755
index 874323b..0000000
--- a/awesome/icons/xbm8x8/half.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define half_width 8
-#define half_height 8
-static unsigned char half_bits[] = {
- 0x3C, 0x4E, 0x8F, 0x8F, 0x8F, 0x8F, 0x4E, 0x3C };
diff --git a/awesome/icons/xbm8x8/info_01.xbm b/awesome/icons/xbm8x8/info_01.xbm
deleted file mode 100755
index f08c2fd..0000000
--- a/awesome/icons/xbm8x8/info_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_01_width 8
-#define info_01_height 8
-static unsigned char info_01_bits[] = {
- 0x3C, 0x66, 0xFF, 0xE7, 0xE7, 0xE7, 0x66, 0x3C };
diff --git a/awesome/icons/xbm8x8/info_02.xbm b/awesome/icons/xbm8x8/info_02.xbm
deleted file mode 100755
index 00b4df0..0000000
--- a/awesome/icons/xbm8x8/info_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_02_width 8
-#define info_02_height 8
-static unsigned char info_02_bits[] = {
- 0xFF, 0xE7, 0xFF, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF };
diff --git a/awesome/icons/xbm8x8/info_03.xbm b/awesome/icons/xbm8x8/info_03.xbm
deleted file mode 100755
index 50103f8..0000000
--- a/awesome/icons/xbm8x8/info_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_width 8
-#define info_height 8
-static unsigned char info_bits[] = {
- 0x38, 0x38, 0x00, 0x3C, 0x38, 0x38, 0x38, 0x7C };
diff --git a/awesome/icons/xbm8x8/mail.xbm b/awesome/icons/xbm8x8/mail.xbm
deleted file mode 100755
index 295eb73..0000000
--- a/awesome/icons/xbm8x8/mail.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mail_width 8
-#define mail_height 8
-static unsigned char mail_bits[] = {
- 0x00, 0xFF, 0x7E, 0xBD, 0xDB, 0xE7, 0xFF, 0x00 };
diff --git a/awesome/icons/xbm8x8/mem.xbm b/awesome/icons/xbm8x8/mem.xbm
deleted file mode 100755
index a1c354e..0000000
--- a/awesome/icons/xbm8x8/mem.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mem_width 8
-#define mem_height 8
-static unsigned char mem_bits[] = {
- 0xAA, 0x00, 0xFE, 0xFE, 0xFE, 0xFE, 0x00, 0xAA };
diff --git a/awesome/icons/xbm8x8/mouse_01.xbm b/awesome/icons/xbm8x8/mouse_01.xbm
deleted file mode 100755
index 05e91b5..0000000
--- a/awesome/icons/xbm8x8/mouse_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mouse_01_width 8
-#define mouse_01_height 8
-static unsigned char mouse_01_bits[] = {
- 0xEE, 0xEE, 0xEE, 0x82, 0xFE, 0xFE, 0xFE, 0x7C };
diff --git a/awesome/icons/xbm8x8/net_down_01.xbm b/awesome/icons/xbm8x8/net_down_01.xbm
deleted file mode 100755
index 0940355..0000000
--- a/awesome/icons/xbm8x8/net_down_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_01_width 8
-#define net_down_01_height 8
-static unsigned char net_down_01_bits[] = {
- 0x1E, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/awesome/icons/xbm8x8/net_down_02.xbm b/awesome/icons/xbm8x8/net_down_02.xbm
deleted file mode 100755
index 750ada5..0000000
--- a/awesome/icons/xbm8x8/net_down_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_02_width 8
-#define net_down_02_height 8
-static unsigned char net_down_02_bits[] = {
- 0x78, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/awesome/icons/xbm8x8/net_down_03.xbm b/awesome/icons/xbm8x8/net_down_03.xbm
deleted file mode 100755
index 0502235..0000000
--- a/awesome/icons/xbm8x8/net_down_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_03_width 8
-#define net_down_03_height 8
-static unsigned char net_down_03_bits[] = {
- 0x38, 0x38, 0x38, 0x38, 0xFE, 0x7C, 0x38, 0x10 };
diff --git a/awesome/icons/xbm8x8/net_up_01.xbm b/awesome/icons/xbm8x8/net_up_01.xbm
deleted file mode 100755
index aac47a3..0000000
--- a/awesome/icons/xbm8x8/net_up_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_01_width 8
-#define net_up_01_height 8
-static unsigned char net_up_01_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x78 };
diff --git a/awesome/icons/xbm8x8/net_up_02.xbm b/awesome/icons/xbm8x8/net_up_02.xbm
deleted file mode 100755
index 9a53392..0000000
--- a/awesome/icons/xbm8x8/net_up_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_02_width 8
-#define net_up_02_height 8
-static unsigned char net_up_02_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x1E };
diff --git a/awesome/icons/xbm8x8/net_up_03.xbm b/awesome/icons/xbm8x8/net_up_03.xbm
deleted file mode 100755
index b21c007..0000000
--- a/awesome/icons/xbm8x8/net_up_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_03_width 8
-#define net_up_03_height 8
-static unsigned char net_up_03_bits[] = {
- 0x10, 0x38, 0x7C, 0xFE, 0x38, 0x38, 0x38, 0x38 };
diff --git a/awesome/icons/xbm8x8/net_wired.xbm b/awesome/icons/xbm8x8/net_wired.xbm
deleted file mode 100755
index 25cd20b..0000000
--- a/awesome/icons/xbm8x8/net_wired.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_wired_width 8
-#define net_wired_height 8
-static unsigned char net_wired_bits[] = {
- 0x00, 0x1C, 0x1C, 0x7F, 0x7F, 0x7F, 0x55, 0x7F };
diff --git a/awesome/icons/xbm8x8/next.xbm b/awesome/icons/xbm8x8/next.xbm
deleted file mode 100755
index 3937532..0000000
--- a/awesome/icons/xbm8x8/next.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define next_width 8
-#define next_height 8
-static unsigned char next_bits[] = {
- 0x00, 0x42, 0x4E, 0x7E, 0x7E, 0x4E, 0x42, 0x00 };
diff --git a/awesome/icons/xbm8x8/note.xbm b/awesome/icons/xbm8x8/note.xbm
deleted file mode 100755
index 21ba22b..0000000
--- a/awesome/icons/xbm8x8/note.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define note_width 8
-#define note_height 8
-static unsigned char note_bits[] = {
- 0xFC, 0xFC, 0x84, 0x84, 0x84, 0x84, 0xE7, 0xE7 };
diff --git a/awesome/icons/xbm8x8/pacman.xbm b/awesome/icons/xbm8x8/pacman.xbm
deleted file mode 100755
index 0f4fd22..0000000
--- a/awesome/icons/xbm8x8/pacman.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pacman_width 8
-#define pacman_height 8
-static unsigned char pacman_bits[] = {
- 0x3C, 0x6E, 0xE7, 0xFF, 0x07, 0x1F, 0x7E, 0x3C };
diff --git a/awesome/icons/xbm8x8/pause.xbm b/awesome/icons/xbm8x8/pause.xbm
deleted file mode 100755
index 6bb2251..0000000
--- a/awesome/icons/xbm8x8/pause.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pause_width 8
-#define pause_height 8
-static unsigned char pause_bits[] = {
- 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00 };
diff --git a/awesome/icons/xbm8x8/phones.xbm b/awesome/icons/xbm8x8/phones.xbm
deleted file mode 100755
index cab8c58..0000000
--- a/awesome/icons/xbm8x8/phones.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define phones_width 8
-#define phones_height 8
-static unsigned char phones_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xA5, 0xE7, 0xE7, 0x66 };
diff --git a/awesome/icons/xbm8x8/play.xbm b/awesome/icons/xbm8x8/play.xbm
deleted file mode 100755
index d42ad52..0000000
--- a/awesome/icons/xbm8x8/play.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define play_width 8
-#define play_height 8
-static unsigned char play_bits[] = {
- 0x00, 0x06, 0x1E, 0x7E, 0x7E, 0x1E, 0x06, 0x00 };
diff --git a/awesome/icons/xbm8x8/plug.xbm b/awesome/icons/xbm8x8/plug.xbm
deleted file mode 100755
index 92da02d..0000000
--- a/awesome/icons/xbm8x8/plug.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define plug_width 8
-#define plug_height 8
-static unsigned char plug_bits[] = {
- 0x03, 0x0F, 0x1E, 0x3E, 0x3C, 0x58, 0xA0, 0xC0 };
diff --git a/awesome/icons/xbm8x8/prev.xbm b/awesome/icons/xbm8x8/prev.xbm
deleted file mode 100755
index 8774315..0000000
--- a/awesome/icons/xbm8x8/prev.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define prev_width 8
-#define prev_height 8
-static unsigned char prev_bits[] = {
- 0x00, 0x42, 0x72, 0x7E, 0x7E, 0x72, 0x42, 0x00 };
diff --git a/awesome/icons/xbm8x8/rwd.xbm b/awesome/icons/xbm8x8/rwd.xbm
deleted file mode 100755
index 5170b21..0000000
--- a/awesome/icons/xbm8x8/rwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define rwd_width 8
-#define rwd_height 8
-static unsigned char rwd_bits[] = {
- 0x00, 0x48, 0x6C, 0x7E, 0x7E, 0x6C, 0x48, 0x00 };
diff --git a/awesome/icons/xbm8x8/scorpio.xbm b/awesome/icons/xbm8x8/scorpio.xbm
deleted file mode 100755
index befc2ca..0000000
--- a/awesome/icons/xbm8x8/scorpio.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define scorpio_width 8
-#define scorpio_height 8
-static unsigned char scorpio_bits[] = {
- 0x42, 0x81, 0xDB, 0x3C, 0xDB, 0x5A, 0x99, 0x30 };
diff --git a/awesome/icons/xbm8x8/shroom.xbm b/awesome/icons/xbm8x8/shroom.xbm
deleted file mode 100755
index 62df79f..0000000
--- a/awesome/icons/xbm8x8/shroom.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define shroom_width 8
-#define shroom_height 8
-static unsigned char shroom_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xFF, 0x3C, 0x3C, 0x3C };
diff --git a/awesome/icons/xbm8x8/spkr_01.xbm b/awesome/icons/xbm8x8/spkr_01.xbm
deleted file mode 100755
index 7c2ffc4..0000000
--- a/awesome/icons/xbm8x8/spkr_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_01_width 8
-#define spkr_01_height 8
-static unsigned char spkr_01_bits[] = {
- 0x08, 0x4C, 0x8F, 0xAF, 0xAF, 0x8F, 0x4C, 0x08 };
diff --git a/awesome/icons/xbm8x8/spkr_02.xbm b/awesome/icons/xbm8x8/spkr_02.xbm
deleted file mode 100755
index 8265bf8..0000000
--- a/awesome/icons/xbm8x8/spkr_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_02_width 8
-#define spkr_02_height 8
-static unsigned char spkr_02_bits[] = {
- 0x08, 0x0C, 0x0F, 0x1F, 0x1F, 0x0F, 0x0C, 0x08 };
diff --git a/awesome/icons/xbm8x8/spkr_03.xbm b/awesome/icons/xbm8x8/spkr_03.xbm
deleted file mode 100755
index fd45a6c..0000000
--- a/awesome/icons/xbm8x8/spkr_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ysick_width 8
-#define ysick_height 8
-static unsigned char ysick_bits[] = {
- 0x4C, 0x93, 0x93, 0x97, 0x97, 0x93, 0x93, 0x4C };
diff --git a/awesome/icons/xbm8x8/stop.xbm b/awesome/icons/xbm8x8/stop.xbm
deleted file mode 100755
index f92b64d..0000000
--- a/awesome/icons/xbm8x8/stop.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define stop_width 8
-#define stop_height 8
-static unsigned char stop_bits[] = {
- 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x00 };
diff --git a/awesome/icons/xbm8x8/temp.xbm b/awesome/icons/xbm8x8/temp.xbm
deleted file mode 100755
index b03d2f1..0000000
--- a/awesome/icons/xbm8x8/temp.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define temp_width 8
-#define temp_height 8
-static unsigned char temp_bits[] = {
- 0xC8, 0xE0, 0x72, 0x28, 0x16, 0x09, 0x09, 0x06 };
diff --git a/awesome/icons/xbm8x8/test.xbm b/awesome/icons/xbm8x8/test.xbm
deleted file mode 100755
index 756e899..0000000
--- a/awesome/icons/xbm8x8/test.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define test_width 8
-#define test_height 8
-static unsigned char test_bits[] = {
- 0x0E, 0x13, 0x21, 0x41, 0x82, 0x84, 0xC8, 0x70 };
diff --git a/awesome/icons/xbm8x8/usb.xbm b/awesome/icons/xbm8x8/usb.xbm
deleted file mode 100755
index 9b0eb08..0000000
--- a/awesome/icons/xbm8x8/usb.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_width 8
-#define usb_height 8
-static unsigned char usb_bits[] = {
- 0x70, 0x88, 0xC4, 0xE2, 0x7E, 0x32, 0x09, 0x07 };
diff --git a/awesome/icons/xbm8x8/usb_02.xbm b/awesome/icons/xbm8x8/usb_02.xbm
deleted file mode 100755
index 77eeda0..0000000
--- a/awesome/icons/xbm8x8/usb_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_02_width 8
-#define usb_02_height 8
-static unsigned char usb_02_bits[] = {
- 0x10, 0x50, 0x54, 0x54, 0x34, 0x18, 0x10, 0x10 };
diff --git a/awesome/icons/xbm8x8/wifi_01.xbm b/awesome/icons/xbm8x8/wifi_01.xbm
deleted file mode 100755
index 315d0f7..0000000
--- a/awesome/icons/xbm8x8/wifi_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_01_width 8
-#define wifi_01_height 8
-static unsigned char wifi_01_bits[] = {
- 0x80, 0xA0, 0xA8, 0xAB, 0xAB, 0xA8, 0xA0, 0x80 };
diff --git a/awesome/icons/xbm8x8/wifi_02.xbm b/awesome/icons/xbm8x8/wifi_02.xbm
deleted file mode 100755
index bd2b3ee..0000000
--- a/awesome/icons/xbm8x8/wifi_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_02_width 8
-#define wifi_02_height 8
-static unsigned char wifi_02_bits[] = {
- 0x40, 0x90, 0xA4, 0xA9, 0xA9, 0xA4, 0x90, 0x40 };
diff --git a/awesome/lain_patch.diff b/awesome/lain_patch.diff
deleted file mode 100644
index 24e0ca8..0000000
--- a/awesome/lain_patch.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/layout/centerfair.lua b/layout/centerfair.lua
-index 5022726..5c63cfa 100644
---- a/layout/centerfair.lua
-+++ b/layout/centerfair.lua
-@@ -70,6 +70,7 @@ function centerfair.arrange(p)
-     if #cls < num_x
-     then
-         -- Less clients than the number of columns, let's center it!
-+        if #cls == 1 then width = width * 1.5 end
-         local offset_x = wa.x + (wa.width - #cls*width - (#cls - 1)*useless_gap) / 2
-         local g = {}
-         g.y = wa.y + useless_gap
diff --git a/awesome/rc.lua b/awesome/rc.lua
deleted file mode 100644
index a861eb4..0000000
--- a/awesome/rc.lua
+++ /dev/null
@@ -1,463 +0,0 @@
--- fix the package location
-do
-  confFolder = awesome.conffile:match("(/.+)/.+$")
-  package.path = package.path .. ";" .. confFolder .. "/?.lua" .. ";" .. confFolder .. "/?/init.lua"
-end
-
--- Standard awesome library
-local gears = require("gears")
-local awful = require("awful")
-awful.rules = require("awful.rules")
-require("awful.autofocus")
--- Widget and layout library
-local wibox = require("wibox")
--- Theme handling library
-local beautiful = require("beautiful")
--- Notification library
-local naughty = require("naughty")
--- widget library
-local drop = require("scratchdrop")
-local lain = require("lain")
-
-
-markup      = lain.util.markup
-
-
--- {{{ Error handling
--- Check if awesome encountered an error during startup and fell back to
--- another config (This code will only ever execute for the fallback config)
-if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
-end
-
--- Handle runtime errors after startup
-do
-    local in_error = false
-    awesome.connect_signal("debug::error", function (err)
-        -- Make sure we don't go into an endless error loop
-        if in_error then return end
-        in_error = true
-
-        naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = err })
-        in_error = false
-    end)
-end
--- }}}
-
--- {{{ Variable definitions
--- Themes define colours, icons, and wallpapers
-beautiful.init(confFolder .. "/theme.lua")
-
--- This is used later as the default terminal and editor to run.
-terminal = "urxvt"
-editor = os.getenv("EDITOR") or "nano"
-editor_cmd = terminal .. " -e " .. editor
-
-icon_dir = confFolder .. "/icons/png"
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-local layouts =
-{
-    awful.layout.suit.floating,
-    lain.layout.uselesstile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    lain.layout.termfair,
-    lain.layout.centerwork,
-    lain.layout.centerfair
-}
-
---lain.layout.termfair.nmaster = 3
--- }}}
-
--- {{{ Wallpaper
--- if beautiful.wallpaper then
---     for s = 1, screen.count() do
---         gears.wallpaper.maximized(beautiful.wallpaper, s, true)
---     end
--- end
--- awful.util.spawn("/home/yorick/builds/bitday-linux/update.sh")
--- }}}
-
--- {{{ Tags
--- Define a tag table which hold all screen tags.
-tags = {}
-if screen.count() == 1 then
-  for s = 1, screen.count() do
-      -- Each screen has its own tag table.
-      local tagNames = { "term", "web", "work1", "irc", "work2", "media", 7, "skype", 9 }
-      local tagLayouts  = {   13,     2,     2,      2,     1,     1,       1, 1, 1 }
-      for i,l in ipairs(tagLayouts) do
-        tagLayouts[i] = layouts[l]
-      end
-      tags[s] = awful.tag(tagNames, s, tagLayouts)
-  end
-else
-  local tagNames1 = {"term", "web", "work1", 4, "work2", "media", 7, 8, 9}
-  local tagLayouts1 = {13,      15,      15,    1,   2,        1,    1, 1, 1}
-  local tagNames2 = {"term", 2, 3, "chat", 5, "music", 7, "skype", 9}
-  local tagLayouts2 = {  13, 15, 2,     2, 1,       2, 1,       2, 1}
-  for s = 1, screen.count() do
-    local tagNames = tagNames1; local tagLayouts = tagLayouts1;
-    if s == 2 then
-      tagNames = tagNames2
-      tagLayouts = tagLayouts2
-    end
-    for i,l in ipairs(tagLayouts) do
-      tagLayouts[i] = layouts[l]
-    end
-    tags[s] = awful.tag(tagNames, s, tagLayouts)
-    awful.tag.setnmaster(3, tags[s][1])
-    awful.tag.setnmaster(2, tags[s][2])
-  end
-end
--- }}}
-
-
--- {{{ Wibox
-
--- stolen spacers
-spacer = wibox.widget.textbox()
-spacer:set_text(" ")
-sqb_right = wibox.widget.textbox()
-sqb_right:set_markup("<span color='" .. beautiful.dgrey .. "'>]</span>")
-sqb_left = wibox.widget.textbox()
-sqb_left:set_markup("<span color='" .. beautiful.dgrey .. "'>[</span>")
-
-
--- clock
-clock = awful.widget.textclock('<span color="#d0d0d0">%a %d/%m %H:%M</span>')
-clock_icon = wibox.widget.imagebox()
-clock_icon:set_image(icon_dir .. "/clock.png")
-
-
-local battery    = require("widgets.battery")
-local brightness = require("widgets.brightness")
-local volume     = require("widgets.volume")
-
-function taglist_filter(t, args)
-    if t.selected or #t:clients() > 0 then
-        return awful.widget.taglist.filter.all(t, args)
-    end
-end
-
-
--- Create a wibox for each screen and add it
-mywibox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, awful.client.toggletag),
-                    awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
-                    )
-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  -- Without this, the following
-                                                  -- :isvisible() makes no sense
-                                                  c.minimized = false
-                                                  if not c:isvisible() then
-                                                      awful.tag.viewonly(c:tags()[1])
-                                                  end
-                                                  -- This will also un-minimize
-                                                  -- the client, if needed
-                                                  client.focus = c
-                                                  c:raise()
-                                              end
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              end
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                              if client.focus then client.focus:raise() end
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                              if client.focus then client.focus:raise() end
-                                          end))
-
-local function add(layout, widget1, widget2)
-  layout:add(sqb_left)
-  if widget1 then layout:add(widget1) end
-  if widget2 then layout:add(widget2) end
-  layout:add(sqb_right)
-end
-
-for s = 1, screen.count() do
-    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    mylayoutbox[s] = awful.widget.layoutbox(s)
-    mylayoutbox[s]:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
-    -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(s, taglist_filter, mytaglist.buttons)
-
-    -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
-
-    -- Create the wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s })
-
-    -- Widgets that are aligned to the left
-    local left_layout = wibox.layout.fixed.horizontal()
-    add(left_layout, mytaglist[s])
-
-    -- Widgets that are aligned to the right
-    local right_layout = wibox.layout.fixed.horizontal()
-    if s == 1 then
-      add(right_layout, wibox.widget.systray())
-      right_layout:add(spacer)
-    end
-    add(right_layout, brightness.icon, brightness.widget)
-    right_layout:add(spacer)
-    add(right_layout, volume.icon, volume.widget)
-    right_layout:add(spacer)
-    add(right_layout, battery.icon, battery.widget)
-    right_layout:add(spacer)
-    add(right_layout, clock_icon, clock)
-    right_layout:add(spacer)
-    right_layout:add(mylayoutbox[s])
-
-    -- Now bring it all together (with the tasklist in the middle)
-    local layout = wibox.layout.align.horizontal()
-    layout:set_left(left_layout)
-    layout:set_middle(mytasklist[s])
-    layout:set_right(right_layout)
-
-    mywibox[s]:set_widget(layout)
-end
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(awful.util.table.join(
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-))
--- }}}
-
--- {{{ Key bindings
-globalkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
-    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
-
-    -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
-    awful.key({ modkey,           }, "Tab",
-        function ()
-            awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
-        end),
-
-    -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control" }, "r", awesome.restart),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit),
-
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
-    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
-
-    awful.key({ modkey, "Control" }, "n", awful.client.restore),
-
-    -- Prompt
-    awful.key({ modkey },            "z",     function () drop("urxvt", nil, nil, nil, 0.3, true) end),
-
-    -- dmenu launcher
-    awful.key({ modkey },            "e",     function () awful.util.spawn("/home/yorick/dotfiles/bin/dlaunch.sh") end),
-    awful.key({ modkey },            "=",     function () awful.util.spawn("/home/yorick/dotfiles/bin/dcalc.sh") end),
-
-    -- locking
-    awful.key({ modkey, "Control", "Shift" }, "l", function () awful.util.spawn("/home/yorick/dotfiles/bin/lock.sh") end),
-    -- brightness, volume
-    awful.key({ }, "XF86MonBrightnessDown", brightness.down),
-    awful.key({ }, "XF86MonBrightnessUp", brightness.up),
-    awful.key({ }, "XF86AudioMute", volume.mute),
-    awful.key({ }, "XF86AudioLowerVolume", volume.down),
-    awful.key({ }, "XF86AudioRaiseVolume", volume.up),
-    -- awesome screenshotness
-    awful.key({ modkey }, "s", function() awful.util.spawn("/home/yorick/dotfiles/bin/screenshot_public.sh") end)
-)
-
-clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
-    awful.key({ modkey,           }, "n",
-        function (c)
-            -- The client currently has the input focus, so it cannot be
-            -- minimized, since minimized clients can't have the focus.
-            c.minimized = true
-        end),
-    awful.key({ modkey,           }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end),
-    awful.key({ modkey, "Control" }, "m", lain.util.magnify_client)
-)
-
--- Compute the maximum number of digit we need, limited to 9
-keynumber = 0
-for s = 1, screen.count() do
-   keynumber = math.min(9, math.max(#tags[s], keynumber))
-end
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it works on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, keynumber do
-    globalkeys = awful.util.table.join(globalkeys,
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = mouse.screen
-                        if tags[screen][i] then
-                            awful.tag.viewonly(tags[screen][i])
-                        end
-                  end),
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = mouse.screen
-                      if tags[screen][i] then
-                          awful.tag.viewtoggle(tags[screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.movetotag(tags[client.focus.screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.toggletag(tags[client.focus.screen][i])
-                      end
-                  end))
-end
-
-clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
-
-local snd_screen = screen.count() > 1 and 2 or 1
--- {{{ Rules
-awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { instance = "plugin-container" },
-      properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    { rule = { class = "Firefox" },
-      properties = { tag = tags[1][2] } },
-    { rule = { class = "Skype" },
-      properties = { size_hints_honor = false, -- skype.
-      tag = tags[snd_screen][8] } },
-    { rule = { class = "Spotify" },
-      properties = { tag = tags[snd_screen][6] } },
-    { rule = { class = "Quasselclient" },
-      properties = { tag = tags[snd_screen][4] } },
-}
--- }}}
-
--- {{{ Signals
--- Signal function to execute when a new client appears.
-client.connect_signal("manage", function (c, startup)
-    -- Enable sloppy focus
-    c:connect_signal("mouse::enter", function(c)
-        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-            and awful.client.focus.filter(c) then
-            client.focus = c
-        end
-    end)
-
-    if not startup then
-        -- Set the windows at the slave,
-        -- i.e. put it at the end of others instead of setting it master.
-        -- awful.client.setslave(c)
-
-        -- Put windows in a smart way, only if they does not set an initial position.
-        if not c.size_hints.user_position and not c.size_hints.program_position then
-            awful.placement.no_overlap(c)
-            awful.placement.no_offscreen(c)
-        end
-    end
-
-end)
-
-client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
--- }}}
diff --git a/awesome/scratchdrop/init.lua b/awesome/scratchdrop/init.lua
deleted file mode 100644
index 8bfed7e..0000000
--- a/awesome/scratchdrop/init.lua
+++ /dev/null
@@ -1,133 +0,0 @@
--------------------------------------------------------------------
--- Drop-down applications manager for the awesome window manager
--------------------------------------------------------------------
--- Coded  by: * Lucas de Vries <lucas@glacicle.com>
--- Hacked by: * Adrian C. (anrxc) <anrxc@sysphere.org>
--- Licensed under the WTFPL version 2
---   * http://sam.zoy.org/wtfpl/COPYING
--------------------------------------------------------------------
--- To use this module add:
---   local scratchdrop = require("scratchdrop")
--- to the top of your rc.lua, and call it from a keybinding:
---   scratchdrop(prog, vert, horiz, width, height, sticky, screen)
---
--- Parameters:
---   prog   - Program to run; "urxvt", "gmrun", "thunderbird"
---   vert   - Vertical; "bottom", "center" or "top" (default)
---   horiz  - Horizontal; "left", "right" or "center" (default)
---   width  - Width in absolute pixels, or width percentage
---            when <= 1 (1 (100% of the screen) by default)
---   height - Height in absolute pixels, or height percentage
---            when <= 1 (0.25 (25% of the screen) by default)
---   sticky - Visible on all tags, false by default
---   screen - Screen (optional), mouse.screen by default
--------------------------------------------------------------------
-
--- Grab environment
-local pairs        = pairs
-local awful        = require("awful")
-local setmetatable = setmetatable
-local capi         = {
-    mouse  = mouse,
-    client = client,
-    screen = screen
-}
-
--- Scratchdrop: drop-down applications manager for the awesome window manager
-local scratchdrop = {} -- module scratch.drop
-
-local dropdown = {}
-
--- Create a new window for the drop-down application when it doesn't
--- exist, or toggle between hidden and visible states when it does
-function toggle(prog, vert, horiz, width, height, sticky, screen)
-    vert   = vert   or "top"
-    horiz  = horiz  or "center"
-    width  = width  or 1
-    height = height or 0.25
-    sticky = sticky or false
-    screen = screen or capi.mouse.screen
-
-    -- Determine signal usage in this version of awesome
-    local attach_signal = capi.client.connect_signal    or capi.client.add_signal
-    local detach_signal = capi.client.disconnect_signal or capi.client.remove_signal
-
-    if not dropdown[prog] then
-        dropdown[prog] = {}
-
-        -- Add unmanage signal for scratchdrop programs
-        attach_signal("unmanage", function (c)
-            for scr, cl in pairs(dropdown[prog]) do
-                if cl == c then
-                    dropdown[prog][scr] = nil
-                end
-            end
-        end)
-    end
-
-    if not dropdown[prog][screen] then
-        spawnw = function (c)
-            dropdown[prog][screen] = c
-
-            -- Scratchdrop clients are floaters
-            awful.client.floating.set(c, true)
-
-            -- Client geometry and placement
-            local screengeom = capi.screen[screen].workarea
-
-            if width  <= 1 then width  = screengeom.width  * width  end
-            if height <= 1 then height = screengeom.height * height end
-
-            if     horiz == "left"  then x = screengeom.x
-            elseif horiz == "right" then x = screengeom.width - width
-            else   x =  screengeom.x+(screengeom.width-width)/2 end
-
-            if     vert == "bottom" then y = screengeom.height + screengeom.y - height
-            elseif vert == "center" then y = screengeom.y+(screengeom.height-height)/2
-            else   y =  screengeom.y - screengeom.y end
-
-            -- Client properties
-            c:geometry({ x = x, y = y + mywibox[mouse.screen].height, width = width - 2, height = height })
-            c.ontop = true
-            c.above = true
-            c.skip_taskbar = true
-            if sticky then c.sticky = true end
-            if c.titlebar then awful.titlebar.remove(c) end
-
-            c:raise()
-            capi.client.focus = c
-            detach_signal("manage", spawnw)
-        end
-
-        -- Add manage signal and spawn the program
-        attach_signal("manage", spawnw)
-        awful.util.spawn(prog, false)
-    else
-        -- Get a running client
-        c = dropdown[prog][screen]
-
-        -- Switch the client to the current workspace
-        if c:isvisible() == false then c.hidden = true
-            awful.client.movetotag(awful.tag.selected(screen), c)
-        end
-
-        -- Focus and raise if hidden
-        if c.hidden then
-            -- Make sure it is centered
-            --if vert  == "center" then awful.placement.center_vertical(c)   end
-            --if horiz == "center" then awful.placement.center_horizontal(c) end
-            c.hidden = false
-            c:raise()
-            capi.client.focus = c
-        else -- Hide and detach tags if not
-            c.hidden = true
-            local ctags = c:tags()
-            for i, t in pairs(ctags) do
-                ctags[i] = nil
-            end
-            c:tags(ctags)
-        end
-    end
-end
-
-return setmetatable(scratchdrop, { __call = function(_, ...) return toggle(...) end })
diff --git a/awesome/theme.lua b/awesome/theme.lua
deleted file mode 100644
index f72b9b3..0000000
--- a/awesome/theme.lua
+++ /dev/null
@@ -1,149 +0,0 @@
----------------------------
--- Default awesome theme --
--- with a slightly different colour scheme
----------------------------
-
--- pale_white: #E0D0AA
--- bluegreen: #8DA893
--- base: #1D1E24
--- orange: #C18E44
--- brown: #493227
-
--- solarized
-solar_base03 =   "#002b36" -- background
-solar_base02 =   "#073642" -- bg hl
-solar_base01 =   "#586e75" -- comments
-solar_base00 =   "#657b83" -- base 0
-solar_base0 =    "#839496" -- standard text
-solar_base1 =    "#93a1a1" -- emph
-solar_base2 =    "#eee8d5" -- wow
-solar_base3 =    "#fdf6e3" -- very white
-solar_yellow =   "#b58900"
-solar_orange =   "#cb4b16"
-solar_red =      "#dc322f"
-solar_magenta =  "#d33682"
-solar_violet =   "#6c71c4"
-solar_blue =     "#268bd2"
-solar_cyan =     "#2aa198"
-solar_green =    "#859900"
-transparent = "#00000000"
---
-
-theme = {}
-
-theme.font          = "Source Code Pro 9"
-
-theme.bg_normal     = solar_base03 .. "d9"
-theme.bg_focus      = solar_base02
-theme.bg_urgent     = "#b0b0b0"
-theme.bg_minimize   = transparent
-theme.bg_systray    = "#202020aa"
-
-theme.fg_normal     = solar_base0
-theme.fg_focus      = solar_base1
-theme.fg_urgent     = "#000000"
-theme.fg_minimize   = solar_base01
-
-
-theme.useless_gap_width = 10
-
-theme.dgrey = solar_base0
-theme.lpink = solar_orange
-theme.dgreen = solar_green
-theme.magenta = solar_magenta
-theme.blue = solar_blue
-theme.white = solar_base3
--- end temp, stolen
-
-theme.border_width  = 2
-theme.border_normal = solar_base03
-theme.border_focus  = solar_base02
-theme.border_marked = solar_red
--- theme.border_normal = theme.fg_normal
--- theme.border_normal = theme.bg_normal
-
-theme.tasklist_bg_normal = transparent
-awesome_path = "/home/yorick/.nix-profile/share/awesome/themes/default/"
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
---theme.bg_focus = theme.bg_normal
--- theme.taglist_fg_focus = "#C18E44"
-
--- Display the taglist squares
-theme.taglist_squares_sel   = "/home/yorick/dotfiles/awesome/icons/squarefw.png"
-theme.taglist_squares_unsel = "/home/yorick/dotfiles/awesome/icons/squarew.png"
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = awesome_path .. "submenu.png"
-theme.menu_height = 15
-theme.menu_width  = 100
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Define the image to load
-theme.titlebar_close_button_normal = awesome_path .. "titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = awesome_path .. "titlebar/close_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = awesome_path .. "titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = awesome_path .. "titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = awesome_path .. "titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = awesome_path .. "titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = awesome_path .. "titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = awesome_path .. "titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = awesome_path .. "titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = awesome_path .. "titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = awesome_path .. "titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = awesome_path .. "titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = awesome_path .. "titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = awesome_path .. "titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = awesome_path .. "titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = awesome_path .. "titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = awesome_path .. "titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = awesome_path .. "titlebar/maximized_focus_active.png"
-
-theme.wallpaper = "/home/yorick/dotfiles/awesome/wallpaper.png"
-
--- You can use your own layout icons like this:
-theme.layout_fairh = awesome_path .. "layouts/fairhw.png"
-theme.layout_fairv = awesome_path .. "layouts/fairvw.png"
-theme.layout_floating  = awesome_path .. "layouts/floatingw.png"
-theme.layout_magnifier = awesome_path .. "layouts/magnifierw.png"
-theme.layout_max = awesome_path .. "layouts/maxw.png"
-theme.layout_fullscreen = awesome_path .. "layouts/fullscreenw.png"
-theme.layout_tilebottom = awesome_path .. "layouts/tilebottomw.png"
-theme.layout_tileleft   = awesome_path .. "layouts/tileleftw.png"
-theme.layout_uselesstile = awesome_path .. "layouts/tilew.png"
-theme.layout_tiletop = awesome_path .. "layouts/tiletopw.png"
-theme.layout_spiral  = awesome_path .. "layouts/spiralw.png"
-theme.layout_dwindle = awesome_path .. "layouts/dwindlew.png"
-
-theme.awesome_icon = "/home/yorick/dotfiles/awesome/icons/lambda.png"
-
--- Define the icon theme for application icons. If not set then the icons 
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
-theme.lain_icons         = "/home/yorick/dotfiles/awesome/lain/icons/layout/default/"
-theme.layout_termfair    = theme.lain_icons .. "termfairw.png"
-theme.layout_centerfair    = theme.lain_icons .. "centerfairw.png"
-theme.layout_cascade     = theme.lain_icons .. "cascadew.png"
-theme.layout_cascadetile = theme.lain_icons .. "cascadetilew.png"
-theme.layout_centerwork  = theme.lain_icons .. "centerworkw.png"
-
-return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome/wallpaper.jpg b/awesome/wallpaper.jpg
deleted file mode 100644
index 0a08a0f..0000000
Binary files a/awesome/wallpaper.jpg and /dev/null differ
diff --git a/awesome/widgets/battery.lua b/awesome/widgets/battery.lua
deleted file mode 100644
index 421ea28..0000000
--- a/awesome/widgets/battery.lua
+++ /dev/null
@@ -1,91 +0,0 @@
--- Standard awesome library
--- Widget and layout library
-local wibox = require("wibox")
--- Theme handling library
-local beautiful = require("beautiful")
--- Notification library
-local naughty = require("naughty")
--- widget library
-local lain = require("lain")
-local markup      = lain.util.markup
-
-
-function hover_popup(widget, text)
-  local cur_notification = nil
-
-  local function remove_old()
-    if cur_notification ~= nil then
-      naughty.destroy(cur_notification)
-      cur_notification = nil
-    end
-  end
-  local function add_new()
-      t = text()
-      if t == nil then return end
-      remove_old()
-      cur_notification = naughty.notify({
-          text    = t,
-          timeout = 0,
-          screen  = mouse.screen,
-          opacity = 0.8,
-          --ontop = true,
-      })
-  end
-  widget:connect_signal("mouse::enter", add_new)
-  widget:connect_signal("mouse::leave", remove_old)
-end
-
--- battery
--- battery_widget = wibox.widget.textbox()
-local battery = {
-  icon   = wibox.widget.imagebox();
-  widget = nil;
-}
-do
-  local bat_state
-  battery.widget = lain.widgets.bat({
-    settings = function()
-      bat_state = bat_now
-      local icon_full  = icon_dir .. "/bat_full_01.png"
-      local icon_low   = icon_dir .. "/bat_low_01.png"
-      local icon_empty = icon_dir .. "/bat_empty_01.png"
-      local statemap = {
-        ["Unknown"] = "⌁";
-        ["Full"] = "↯";
-        ["Charging"] = "+";
-        ["Discharging"] = "-";
-      }
-      local color = beautiful.white
-      if bat_now.perc == "N/A" then
-          perc = "AC "
-      else
-        if tonumber(bat_now.perc) < 10 then
-          battery.icon:set_image(icon_empty)
-          color = beautiful.lpink
-        elseif tonumber(bat_now.perc) < 30 then
-          battery.icon:set_image(icon_low)
-          color = beautiful.lpink
-        else
-          battery.icon:set_image(icon_full)
-          color = beautiful.dgreen
-        end
-        perc = statemap[bat_now.status] .. bat_now.perc .. "%"
-      end
-      widget:set_markup(markup(color, perc))
-    end
-  })
-
-  local function popup_text()
-    if bat_state == nil then return end
-    local text = "\n" .. bat_state.status
-    if bat_state.time ~= "N/A" and bat_state.time ~= "00:00" then
-      text = text .. "\n" .. bat_state.time .. "h/min left"
-    end
-    return markup.bold(markup(beautiful.dgrey, "battery")) .. "\n" .. text
-  end
-
-  hover_popup(battery.widget, popup_text)
-
-end
-
-return battery
diff --git a/awesome/widgets/brightness.lua b/awesome/widgets/brightness.lua
deleted file mode 100644
index cb08b4c..0000000
--- a/awesome/widgets/brightness.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-local awful = require("awful")
-
-local wibox = require("wibox")
--- widget library
-local lain = require("lain")
-
-local script = "/home/yorick/dotfiles/bin/brightne.sh"
-local bness_widget = lain.widgets.base({
-  cmd = script .. " get",
-  settings = (function()
-    widget:set_text(output)
-  end),
-  timeout = 20
-})
-local brightness = {
-  icon = wibox.widget.imagebox(),
-  widget = bness_widget,
-  down = (function()
-    os.execute(script .. " down")
-    bness_widget.update()
-    end),
-  up = (function()
-    os.execute(script .. " up")
-    bness_widget.update()
-    end),
-  fix = (function()
-    os.execute(script .. " fix")
-    bness_widget.update()
-    end),
-}
-brightness.widget:buttons(awful.util.table.join(
-  awful.button({}, 1, brightness.fix),
-  awful.button({}, 4, brightness.up),
-  awful.button({}, 5, brightness.down)
-))
-brightness.icon:set_image(icon_dir .. "/half.png")
-
-return brightness
diff --git a/awesome/widgets/volume.lua b/awesome/widgets/volume.lua
deleted file mode 100644
index b10b293..0000000
--- a/awesome/widgets/volume.lua
+++ /dev/null
@@ -1,47 +0,0 @@
-local awful = require("awful")
-
-local wibox = require("wibox")
--- widget library
-local lain = require("lain")
-local beautiful = require("beautiful")
-
-local vol_icon = wibox.widget.imagebox()
-local volumewidget = lain.widgets.alsa({
-    settings = function()
-        local level = volume_now.level .. "%"
-        if volume_now.status == "off" then
-            vol_icon:set_image(icon_dir .. "/spkr_02.png")
-            level = markup(beautiful.lpink, level)
-          else
-            vol_icon:set_image(icon_dir .. "/spkr_01.png")
-        end
-
-        widget:set_markup(level)
-    end
-})
-local volume = {
-  widget = volumewidget,
-  icon = vol_icon,
-  mute = (function()
-    os.execute(string.format("amixer set %s toggle", volumewidget.channel))
-    volumewidget.update()
-  end),
-  down = (function()             
-    os.execute(string.format("amixer set %s 1%%-", volumewidget.channel))
-    volumewidget.update()
-  end),
-  up = (function()             
-    os.execute(string.format("amixer set %s 1%%+", volumewidget.channel))
-    volumewidget.update()
-  end)
-};
-vol_icon:buttons(awful.util.table.join(awful.button({ }, 1, volume.mute)))
-volumewidget:buttons(awful.util.table.join(
-  awful.button({ }, 1, function ()
-    awful.util.spawn("pavucontrol")
-  end),
-  awful.button({}, 4, volume.up),
-  awful.button({}, 5, volume.down)
-))
-
-return volume