Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3'

diff --cc .config/awesome/lain/.gitmodules
Simple merge

diff --cc .config/awesome/lain/ISSUE_TEMPLATE.md
Simple merge

diff --cc .config/awesome/lain/README.rst
Simple merge

diff --cc .config/awesome/lain/helpers.lua
Simple merge

diff --cc .config/awesome/lain/icons/cal/black/1.png
index 0000000000000000000000000000000000000000,d2fb62efed0b3d3217156b2d6e6dc100d3de505b..d2fb62efed0b3d3217156b2d6e6dc100d3de505b
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/10.png
index 0000000000000000000000000000000000000000,507b0795a285c1bfd69f28227ae6016da6f468cb..507b0795a285c1bfd69f28227ae6016da6f468cb
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/11.png
index 0000000000000000000000000000000000000000,336141b1d75423b3a575a6585eefaa92abebcc45..336141b1d75423b3a575a6585eefaa92abebcc45
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/12.png
index 0000000000000000000000000000000000000000,c58972948eb35130f67b04edcc3dc96ab0f16e45..c58972948eb35130f67b04edcc3dc96ab0f16e45
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/13.png
index 0000000000000000000000000000000000000000,377518bb4a72f73e51397a056d784c24c43218cc..377518bb4a72f73e51397a056d784c24c43218cc
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/14.png
index 0000000000000000000000000000000000000000,6f4a9fe89a15285f7529ccc8c2561b58198b6295..6f4a9fe89a15285f7529ccc8c2561b58198b6295
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/15.png
index 0000000000000000000000000000000000000000,1a271c1798c6b5763f237308554a307868e7a01c..1a271c1798c6b5763f237308554a307868e7a01c
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/16.png
index 0000000000000000000000000000000000000000,5e65835dc6f2492241b874cd512f3bb6230e475c..5e65835dc6f2492241b874cd512f3bb6230e475c
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/17.png
index 0000000000000000000000000000000000000000,f3fa0a997e607ce485c4d5a9cfce4a799f965f32..f3fa0a997e607ce485c4d5a9cfce4a799f965f32
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/18.png
index 0000000000000000000000000000000000000000,7acb37a874d2d992acbce5058c25e7241df3dfbb..7acb37a874d2d992acbce5058c25e7241df3dfbb
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/19.png
index 0000000000000000000000000000000000000000,a55795731b54a9cbd599a7d1261ba100311f494b..a55795731b54a9cbd599a7d1261ba100311f494b
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/2.png
index 0000000000000000000000000000000000000000,17b33e01699cff6f09928e6d15fa9364d5e4b19d..17b33e01699cff6f09928e6d15fa9364d5e4b19d
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/20.png
index 0000000000000000000000000000000000000000,558d111017d89d6e0094b381a4a790a581ff9ac0..558d111017d89d6e0094b381a4a790a581ff9ac0
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/21.png
index 0000000000000000000000000000000000000000,0bbedc85ece0eda14690ec6aaa6df156577aa7ac..0bbedc85ece0eda14690ec6aaa6df156577aa7ac
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/22.png
index 0000000000000000000000000000000000000000,762d2628c170c70e98e4f54c5c95ec3fddcb0f11..762d2628c170c70e98e4f54c5c95ec3fddcb0f11
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/23.png
index 0000000000000000000000000000000000000000,a39dceef2ce63719cd018ac3d143cc51ca4e2aa3..a39dceef2ce63719cd018ac3d143cc51ca4e2aa3
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/24.png
index 0000000000000000000000000000000000000000,c00dbca8ace5a63284fbc7a9ef1eb5af4741d5c5..c00dbca8ace5a63284fbc7a9ef1eb5af4741d5c5
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/25.png
index 0000000000000000000000000000000000000000,dc9243cf44efff936d27e22f33b68f31223eab67..dc9243cf44efff936d27e22f33b68f31223eab67
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/26.png
index 0000000000000000000000000000000000000000,50bb182a54e87ccae7a7205983fe59e71764b5cc..50bb182a54e87ccae7a7205983fe59e71764b5cc
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/27.png
index 0000000000000000000000000000000000000000,0fbf9fcf424b0e018ef5108c035754751ecee0b2..0fbf9fcf424b0e018ef5108c035754751ecee0b2
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/28.png
index 0000000000000000000000000000000000000000,def6ab29ffde309e908afdd34e3d5fee238c1464..def6ab29ffde309e908afdd34e3d5fee238c1464
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/29.png
index 0000000000000000000000000000000000000000,531923cb1e114b38aa58cb4a8a25e1a401adaea0..531923cb1e114b38aa58cb4a8a25e1a401adaea0
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/3.png
index 0000000000000000000000000000000000000000,98b552d39053d7edc7857ef2505ff28d049482b3..98b552d39053d7edc7857ef2505ff28d049482b3
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/30.png
index 0000000000000000000000000000000000000000,ca58151deb777a3117989b290d85bdf843bb0aee..ca58151deb777a3117989b290d85bdf843bb0aee
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/31.png
index 0000000000000000000000000000000000000000,6e8da212b6e3e1d5105841f89350435acc26faf0..6e8da212b6e3e1d5105841f89350435acc26faf0
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/4.png
index 0000000000000000000000000000000000000000,43359797a5eb03268e0b0bd92782de42f21a2ee1..43359797a5eb03268e0b0bd92782de42f21a2ee1
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/5.png
index 0000000000000000000000000000000000000000,576ec119f8c730a82d4aefe35d53a76da9e368fc..576ec119f8c730a82d4aefe35d53a76da9e368fc
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/6.png
index 0000000000000000000000000000000000000000,56fa8abea64f43b5d209c15f3851623765407498..56fa8abea64f43b5d209c15f3851623765407498
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/7.png
index 0000000000000000000000000000000000000000,7c90b3a8bd982ff6122d09619b6485e1c3b28c91..7c90b3a8bd982ff6122d09619b6485e1c3b28c91
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/8.png
index 0000000000000000000000000000000000000000,9d1f28e6f2d0c1b0a94e1fac58f520ad84146797..9d1f28e6f2d0c1b0a94e1fac58f520ad84146797
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/black/9.png
index 0000000000000000000000000000000000000000,00d0933c34f51f6ed6934c46ab958cbf89b2c333..00d0933c34f51f6ed6934c46ab958cbf89b2c333
mode 000000,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/1.png
index 90b696ca0820164118bea3af0df0f41b0b2ba4bb,a0faa20c7992d5894fff6667a78af0bc53891c11..a0faa20c7992d5894fff6667a78af0bc53891c11
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/10.png
index b462ffbf0d60bc57c236bc3aef3f388dcce152f9,7d9343bd4030e8bea49f994ad003730a0512cff5..7d9343bd4030e8bea49f994ad003730a0512cff5
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/11.png
index cf43296120793006ccdeb2b08da06fba5bc629a2,7af5e993e620ffc6402001b0f43e779cd81b7105..7af5e993e620ffc6402001b0f43e779cd81b7105
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/12.png
index 42cf092c707630612ecda89455794e1cecd2579f,b164f858f81b057490c770f5ed84c52cf21f73b1..b164f858f81b057490c770f5ed84c52cf21f73b1
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/13.png
index 37db670cb71fecb2f2932981b09dae765adee205,fef74f36e7c2a65ddff7ce9876e1c8c78fbc61de..fef74f36e7c2a65ddff7ce9876e1c8c78fbc61de
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/14.png
index 01885040cb3d6920da2bf0c591ed3006e3e42709,d747a6bd1714fff027ea81b23d7e0f27dec67b38..d747a6bd1714fff027ea81b23d7e0f27dec67b38
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/18.png
index 817c4267d2d8d6fe36ae370c388aeae0f79c86d2,0cf1c2430217fb553f0a3994d5bf34e52afcbeaf..0cf1c2430217fb553f0a3994d5bf34e52afcbeaf
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/19.png
index 0e6dafcc9ff661f86836c6746265b9d2bb34f20e,bfd3530c249c7a3956a2ba1d693292696b9bebec..bfd3530c249c7a3956a2ba1d693292696b9bebec
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/2.png
index b93789a59ad776ad87b50024d765abfe4b9258ee,e7f3fa49510883b734e09eb895a3960aff0f94e5..e7f3fa49510883b734e09eb895a3960aff0f94e5
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/20.png
index 3d8d7c618fcf7b0bd4446be1fd26a9dd9e5647f1,9a5a1fb3c99ee20cc5d6f509955ea46d45611270..9a5a1fb3c99ee20cc5d6f509955ea46d45611270
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/21.png
index 79a74f3d2ba82322a3ae7fb7be95ac6805f77747,266ab9f389a943587ea3a9b151d8d1e7b5fc6b78..266ab9f389a943587ea3a9b151d8d1e7b5fc6b78
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/22.png
index e8845ce2e8950e7a773d7fd9dad893f3f490882c,f4862892d4ac2f84484005e3af8377fdc7bca606..f4862892d4ac2f84484005e3af8377fdc7bca606
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/23.png
index a8d4dfb6dc75657f4b5b9cd07704bafc0b779340,244dceb8af83e9c769659a6f06b7b63f60a9f666..244dceb8af83e9c769659a6f06b7b63f60a9f666
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/24.png
index 1a3b38ad29f89a08702f67ddb9cc2d37126673f4,0ce1c75530ec0afe555333ad26a6149084f53317..0ce1c75530ec0afe555333ad26a6149084f53317
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/25.png
index c3621b7b6ea8705107ef54198389dde2c9325224,48d279c4a2ef0e55259633daf7b6c77b55959109..48d279c4a2ef0e55259633daf7b6c77b55959109
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/26.png
index f26731bbf41bb4fcebae8d075310abc25128c299,7535855dacaf32dd47f3caf28b5ce61208830c92..7535855dacaf32dd47f3caf28b5ce61208830c92
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/27.png
index e4dde7700dd2c86fed2c94ec070f3fb751ced45b,2aa9074280bf67089da3ee7c8048ae982d888a94..2aa9074280bf67089da3ee7c8048ae982d888a94
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/28.png
index b924c22a861495d22203257b4de5f3e71ee8b208,0201976903380d771849f3c8c109d53e35568fe2..0201976903380d771849f3c8c109d53e35568fe2
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/29.png
index e9a74f8be9e55a8e7db753e3689354dea3f9028f,9305b9bd0411669c859a66c3c34789cc4f32232a..9305b9bd0411669c859a66c3c34789cc4f32232a
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/3.png
index 11242710cb04449563e2e6c56440d9f19c8afbe1,f1eb5de62db5f243352fd5aa91c0b82a86428177..f1eb5de62db5f243352fd5aa91c0b82a86428177
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/30.png
index 8147d78f042bc2918a7cb6b8ff0f482c91a8f363,1ba61aacfa9adbf89acb2d084b42ab65411ae5c0..1ba61aacfa9adbf89acb2d084b42ab65411ae5c0
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/31.png
index a1be3e840049e04738875cebdb5f6f7d75ddcb40,e9a873bc290f1b488ae1bb8238de4e45fccf05c6..e9a873bc290f1b488ae1bb8238de4e45fccf05c6
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/4.png
index 16713bcd6729a74a11856b7199365bffe6fd3689,ee1ed6a8829e464e0c591377cc0871ffc34bc996..ee1ed6a8829e464e0c591377cc0871ffc34bc996
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/6.png
index a1c9798bd0c4cf8f03ebdb6524f723c6f8e415ec,0a7bf4d704b2d10c3895cbda295627fd2ace3bab..0a7bf4d704b2d10c3895cbda295627fd2ace3bab
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/8.png
index 909b72606b000c6c2642db09f2a3ae7ce71104d0,cb03d0b40d4204f869f9d90cdffb2335c51249dd..cb03d0b40d4204f869f9d90cdffb2335c51249dd
Binary files differ

diff --cc .config/awesome/lain/icons/cal/white/9.png
index dc636c48820ade07a45c24431101a4cff6f296e7,fca554a5bb00ceef5006b5ece6a208282abeb169..fca554a5bb00ceef5006b5ece6a208282abeb169
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/cascadetile.png
index 2f12ada6300e54c16b5b2337824c7651c5909f29,ba30f43e0bc7adbd02e91e11c9033d591ebca574..ba30f43e0bc7adbd02e91e11c9033d591ebca574
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/cascadetilew.png
index c46b48be2b4132ca68f77250765f4dc7bc6bb4be,d15eb70be374033aa153aa119bfd2821f7bad580..d15eb70be374033aa153aa119bfd2821f7bad580
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/centerwork.png
index 826b331b48679d671048f232a9c2c254ba5e7af4,51e06bc7e806dfe62b860b62fc1b94c78a93ce5c..51e06bc7e806dfe62b860b62fc1b94c78a93ce5c
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/centerworkh.png
index 4fb4fdd38e9e30d30537434d963a192b30ba154d,c59092f01d9dc94c48162ef26e1b343554a1a8f9..c59092f01d9dc94c48162ef26e1b343554a1a8f9
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/centerworkhw.png
index fd27766ca2b2b7ded2f59c82901f4ce9defecde5,7820f8cb4a27f74ef55dbb3a5160ddc291de8291..7820f8cb4a27f74ef55dbb3a5160ddc291de8291
Binary files differ

diff --cc .config/awesome/lain/icons/layout/default/centerworkw.png
index fcfa7e317d0c3a093c18568bf16418fc9010260c,85e699646d84d1832b9266bb663fd1c563da8257..85e699646d84d1832b9266bb663fd1c563da8257
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/cascade.png
index 532842ddcf2ebdf34f50f8450df45a288713510d,fbe4fac509426ab8c4cb17cbc24eea2514175e11..fbe4fac509426ab8c4cb17cbc24eea2514175e11
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/cascadetile.png
index 87be6581f6e9137f15b74c8f12db2c41eabe68f8,2e03a8072eba9f7b1337c575476424c57fbd626b..2e03a8072eba9f7b1337c575476424c57fbd626b
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/centerfair.png
index 01cda8e89c14980825199778ed2c5defea611305,75dc993bed99b27d88637902db444ea5b292a57f..75dc993bed99b27d88637902db444ea5b292a57f
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/centerwork.png
index 6a2ceccee81eee4fea2cd2fb05fc5890e6c66b85,af7a863d1f2d017866c8917d4eb5dd7f1b90ba31..af7a863d1f2d017866c8917d4eb5dd7f1b90ba31
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/centerworkh.png
index 00beeb50c49d50ade2e964925de8e14afe6db535,88019b309eada2ba102b9c09a6333e1d5e86bfbd..88019b309eada2ba102b9c09a6333e1d5e86bfbd
Binary files differ

diff --cc .config/awesome/lain/icons/layout/zenburn/termfair.png
index b7d5880c64fb32af4906b58bae4a347e8f8db4f5,f7640b555f7b291ff8d69724fe6174bffae3313f..f7640b555f7b291ff8d69724fe6174bffae3313f
Binary files differ

diff --cc .config/awesome/lain/icons/mail.png
index 60ba6e03c83096ece4c7b3e819fbf465a57c33db,9c0c7a39096084c198c0fc73334cdc90628a72ea..9c0c7a39096084c198c0fc73334cdc90628a72ea
Binary files differ

diff --cc .config/awesome/lain/icons/no_net.png
index 1a3e8a8ab82472adbce12200207d3af55956e9c7,3613372f8615ffa50877d02646b01379a643a46a..3613372f8615ffa50877d02646b01379a643a46a
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/01d.png
index d9e2745cee4f88db9a855ed58d9bc3f2c34ddb12,569965e62fc1e20eff0c287cda8ee743f838d836..569965e62fc1e20eff0c287cda8ee743f838d836
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/01n.png
index 84ea1408ba782bc48e03bbbd79f862412d3cb48d,ce5b135466d886ab7f9befb5ec3085eeb79701db..ce5b135466d886ab7f9befb5ec3085eeb79701db
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/02d.png
index 8fd0a5b04d686db4e7dea16981db46d5d1f94de2,2ba979984f2bcd4fc97125d8f5515b73dc526e37..2ba979984f2bcd4fc97125d8f5515b73dc526e37
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/02n.png
index 9e4404d7511aa84a563fbc2e4933ee032a1ce88e,12e4283df110569a13f354d6a110d21f8194281c..12e4283df110569a13f354d6a110d21f8194281c
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/03d.png
index 22b929c612e7d04a2408bc71625114908f255769,1cf0e9d2cd8f89eea3dbad0734a0b778404d4c03..1cf0e9d2cd8f89eea3dbad0734a0b778404d4c03
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/03n.png
index d8b3673492f457ab354bf4276b2a2e49cc4c6dee,89a42b8b91d596e07fb3c33842e5f6d13aa4fdb7..89a42b8b91d596e07fb3c33842e5f6d13aa4fdb7
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/04d.png
index bac1e7ebb84426f6bf1704f4c8a3c70486713cd1,e7fb67ff6a4a7e1a27d9ee04c964c3791d8948aa..e7fb67ff6a4a7e1a27d9ee04c964c3791d8948aa
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/09d.png
index d00552a5fd8d96d08d0e5915d51a7963d40cc7ae,cfa066a27ca1a99425a8a0b7b87d012a31c30388..cfa066a27ca1a99425a8a0b7b87d012a31c30388
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/10d.png
index 3cc6665dc0e98c2be584079add634d9744b459a5,712d0c88dd71f9d44cfa856f2520ab9ab1e59ff9..712d0c88dd71f9d44cfa856f2520ab9ab1e59ff9
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/11d.png
index d30e120582fe1084bbfc6f33f67dfa4ef4e66539,3b62f7c7756f59cc369c2c4b52e190f1447bfcec..3b62f7c7756f59cc369c2c4b52e190f1447bfcec
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/13d.png
index ddcb8f38c76c583648000c9bc8846a04676815d2,e265b012c7445a69f75fdba1edf75eb62f08674a..e265b012c7445a69f75fdba1edf75eb62f08674a
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/50d.png
index 009039f8dd2433627a9499003f6c86bfad4b0c80,905ace335f506df75a88ffc5fe1beaf60cf850f5..905ace335f506df75a88ffc5fe1beaf60cf850f5
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/openweathermap/na.png
index 62a5350d878dccc626e9e7be17e728aab0737b87,1cc513211171edcb389a8a80c91f42ddcd6c28d6..1cc513211171edcb389a8a80c91f42ddcd6c28d6
mode 100755,100644..100644
Binary files differ

diff --cc .config/awesome/lain/icons/taskwarrior.png
index 859ca29120f197ef2f46a76baefd7b5cd81c58c1,c64fe8623044f41f204857ccbb3394b2c5450e79..c64fe8623044f41f204857ccbb3394b2c5450e79
Binary files differ

diff --cc .config/awesome/lain/init.lua
Simple merge

diff --cc .config/awesome/lain/lain-scm-1.rockspec
index 0000000000000000000000000000000000000000,fb1eaaf1255db7240d0c2ddb32a6b6c629d444e0..fb1eaaf1255db7240d0c2ddb32a6b6c629d444e0
mode 000000,100644..100644
--- /dev/null
--- 2/lain-scm-1.rockspec
+++ b/.config/awesome/lain/lain-scm-1.rockspec

diff --cc .config/awesome/lain/layout/cascade.lua
Simple merge

diff --cc .config/awesome/lain/layout/centerwork.lua
Simple merge

diff --cc .config/awesome/lain/layout/init.lua
Simple merge

diff --cc .config/awesome/lain/layout/termfair.lua
Simple merge

diff --cc .config/awesome/lain/util/init.lua
Simple merge

diff --cc .config/awesome/lain/util/markup.lua
Simple merge

diff --cc .config/awesome/lain/util/menu_iterator.lua
index 0000000000000000000000000000000000000000,9959b2589d4b40f3fedfa2453d6b87a8ece6dda9..9959b2589d4b40f3fedfa2453d6b87a8ece6dda9
mode 000000,100644..100644
--- /dev/null
--- 2/util/menu_iterator.lua
+++ b/.config/awesome/lain/util/menu_iterator.lua

diff --cc .config/awesome/lain/util/quake.lua
Simple merge

diff --cc .config/awesome/lain/util/separators.lua
Simple merge

diff --cc .config/awesome/lain/widget/alsa.lua
Simple merge

diff --cc .config/awesome/lain/widget/alsabar.lua
Simple merge

diff --cc .config/awesome/lain/widget/bat.lua
Simple merge

diff --cc .config/awesome/lain/widget/cal.lua
index 0000000000000000000000000000000000000000,928a7bd91f15119e582584b8ac6412a41e6a0930..928a7bd91f15119e582584b8ac6412a41e6a0930
mode 000000,100644..100644
--- /dev/null
--- 2/widget/cal.lua
+++ b/.config/awesome/lain/widget/cal.lua

diff --cc .config/awesome/lain/widget/contrib/init.lua
Simple merge

diff --cc .config/awesome/lain/widget/contrib/moc.lua
Simple merge

diff --cc .config/awesome/lain/widget/contrib/redshift.lua
Simple merge

diff --cc .config/awesome/lain/widget/contrib/task.lua
Simple merge

diff --cc .config/awesome/lain/widget/contrib/tp_smapi.lua
index 0000000000000000000000000000000000000000,b8acbe2cdedf0bc033ccbc122da943eba38be619..b8acbe2cdedf0bc033ccbc122da943eba38be619
mode 000000,100644..100644
--- /dev/null
--- 2/widget/contrib/tp_smapi.lua
+++ b/.config/awesome/lain/widget/contrib/tp_smapi.lua

diff --cc .config/awesome/lain/widget/cpu.lua
Simple merge

diff --cc .config/awesome/lain/widget/fs.lua
Simple merge

diff --cc .config/awesome/lain/widget/imap.lua
Simple merge

diff --cc .config/awesome/lain/widget/init.lua
Simple merge

diff --cc .config/awesome/lain/widget/mem.lua
Simple merge

diff --cc .config/awesome/lain/widget/mpd.lua
Simple merge

diff --cc .config/awesome/lain/widget/net.lua
Simple merge

diff --cc .config/awesome/lain/widget/pulse.lua
index 0000000000000000000000000000000000000000,f63fe55c3b146b548a348176b9d05d44112a1796..f63fe55c3b146b548a348176b9d05d44112a1796
mode 000000,100644..100644
--- /dev/null
--- 2/widget/pulse.lua
+++ b/.config/awesome/lain/widget/pulse.lua

diff --cc .config/awesome/lain/widget/pulsebar.lua
Simple merge

diff --cc .config/awesome/lain/widget/sysload.lua
Simple merge

diff --cc .config/awesome/lain/widget/temp.lua
Simple merge

diff --cc .config/awesome/lain/widget/weather.lua
Simple merge

diff --cc .config/awesome/lain/wiki
Simple merge