From: martin f. krafft Date: Thu, 6 Apr 2017 09:01:06 +0000 (+0200) Subject: Add '.config/awesome/lain/' from commit 'fc6e880da40668c6e9bd9da3786ff2fcae519c75' X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/4c392a6d980af9c72052145c6a7a812c51e6ecee?ds=sidebyside;hp=-c Add '.config/awesome/lain/' from commit 'fc6e880da40668c6e9bd9da3786ff2fcae519c75' git-subtree-dir: .config/awesome/lain git-subtree-mainline: 40798583795b58e496db607d9d23324b4a7ae09c git-subtree-split: fc6e880da40668c6e9bd9da3786ff2fcae519c75 --- 4c392a6d980af9c72052145c6a7a812c51e6ecee diff --combined .config/awesome/lain/.gitmodules index 0000000,a50818f..a50818f mode 000000,100644..100644 --- a/.config/awesome/lain/.gitmodules +++ b/.config/awesome/lain/.gitmodules @@@ -1,0 -1,3 +1,3 @@@ + [submodule "lain.wiki"] + path = wiki + url = https://github.com/copycat-killer/lain.wiki.git diff --combined .config/awesome/lain/ISSUE_TEMPLATE.md index 0000000,37c2141..37c2141 mode 000000,100644..100644 --- a/.config/awesome/lain/ISSUE_TEMPLATE.md +++ b/.config/awesome/lain/ISSUE_TEMPLATE.md @@@ -1,0 -1,21 +1,21 @@@ + # If you have a question + + Take the following steps: + + 1. [Google it](https://encrypted.google.com) + 2. Search [Awesome doc](https://awesomewm.org/doc) + 3. Ask [community](https://awesomewm.org/community) + + and, if you still don't have an answer, you can ask here. + + **Please be warned:** if your question is __unrelated__ to this repository, a reply is only an act of kindness. + + # If you have an issue + + **Please read the [wiki](https://github.com/copycat-killer/lain/wiki) and search the [Issues section](https://github.com/copycat-killer/lain/issues) first.** + + If you can't find a solution there, then go ahead and provide: + + * output of `awesome -v` and `lua -v` + * expected behavior and actual behavior + * steps to reproduce the problem diff --combined .config/awesome/lain/LICENSE index 0000000,23cb790..23cb790 mode 000000,100644..100644 --- a/.config/awesome/lain/LICENSE +++ b/.config/awesome/lain/LICENSE @@@ -1,0 -1,339 +1,339 @@@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + License is intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights that + you have. You must make sure that they, too, receive or can get the + source code. And you must show them these terms so they know their + rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, we + want its recipients to know that what they have is not the original, so + that any problems introduced by others will not reflect on the original + authors' reputations. + + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains + a notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running the Program is not restricted, and the output from the Program + is covered only if its contents constitute a work based on the + Program (independent of having been made by running the Program). + Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any warranty; + and give any other recipients of the Program a copy of this License + along with the Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion + of it, thus forming a work based on the Program, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Program, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source + code means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the executable. However, as a + special exception, the source code distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of the + operating system on which the executable runs, unless that component + itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is + void, and will automatically terminate your rights under this License. + However, parties who have received copies, or rights, from you under + this License will not have their licenses terminated so long as such + parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties to + this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions + of the General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free Software + Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the author + to ask for permission. For software which is copyrighted by the Free + Software Foundation, write to the Free Software Foundation; we sometimes + make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS + TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, + REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING + OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED + TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the appropriate + parts of the General Public License. Of course, the commands you use may + be called something other than `show w' and `show c'; they could even be + mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. diff --combined .config/awesome/lain/README.rst index 0000000,4515be7..4515be7 mode 000000,100644..100644 --- a/.config/awesome/lain/README.rst +++ b/.config/awesome/lain/README.rst @@@ -1,0 -1,54 +1,54 @@@ + Lain + ==== + + ------------------------------------------------- + Layouts, widgets and utilities for Awesome WM 4.x + ------------------------------------------------- + + :Author: Luke Bonham + :Version: git + :License: GNU-GPL2_ + :Source: https://github.com/copycat-killer/lain + + Warning + ------- + + If you still have to use branch 3.5.x, you can refer to the commit 301faf5_, but be aware that it's no longer supported. + + Description + ----------- + + Successor of awesome-vain_, this module provides alternative layouts, asynchronous widgets and utility functions for Awesome_ WM. + + Read the wiki_ for all the info. + + Contributions + ------------- + + Any contribution is welcome! Feel free to make a pull request. + + Just make sure that: + + - Your code fits with the general style of the module. In particular, you should use the same indentation pattern that the code uses, and also avoid adding space at the ends of lines. + + - Your code its easy to understand, maintainable, and modularized. You should also avoid code duplication wherever possible by adding functions or using lain.helpers_. If something is unclear, and you can't write it in such a way that it will be clear, explain it with a comment. + + - You test your changes before submitting to make sure that not only your code works, but did not break other parts of the module too! + + - You eventually update ``wiki`` submodule with a thorough section. + + Contributed widgets have to be put in ``widget/contrib``. + + Screenshots + ----------- + + .. image:: http://i.imgur.com/8D9A7lW.png + .. image:: http://i.imgur.com/9Iv3OR3.png + .. image:: http://i.imgur.com/STCPcaJ.png + + .. _GNU-GPL2: http://www.gnu.org/licenses/gpl-2.0.html + .. _301faf5: https://github.com/copycat-killer/lain/tree/301faf5370d045e94c9c344acb0fdac84a2f25a6 + .. _awesome-vain: https://github.com/vain/awesome-vain + .. _Awesome: https://github.com/awesomeWM/awesome + .. _wiki: https://github.com/copycat-killer/lain/wiki + .. _lain.helpers: https://github.com/copycat-killer/lain/blob/master/helpers.lua diff --combined .config/awesome/lain/helpers.lua index 0000000,4e5ce1f..4e5ce1f mode 000000,100644..100644 --- a/.config/awesome/lain/helpers.lua +++ b/.config/awesome/lain/helpers.lua @@@ -1,0 -1,169 +1,169 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + + local easy_async = require("awful.spawn").easy_async + local timer = require("gears.timer") + local debug = require("debug") + local io = { lines = io.lines, + open = io.open } + local rawget = rawget + local table = { sort = table.sort } + + -- Lain helper functions for internal use + -- lain.helpers + local helpers = {} + + helpers.lain_dir = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]] + helpers.icons_dir = helpers.lain_dir .. 'icons/' + helpers.scripts_dir = helpers.lain_dir .. 'scripts/' + + -- {{{ Modules loader + + function helpers.wrequire(table, key) + local module = rawget(table, key) + return module or require(table._NAME .. '.' .. key) + end + + -- }}} + + -- {{{ File operations + + -- see if the file exists and is readable + function helpers.file_exists(file) + local f = io.open(file) + if f then + local s = f:read() + f:close() + f = s + end + return f ~= nil + end + + -- get all lines from a file, returns an empty + -- list/table if the file does not exist + function helpers.lines_from(file) + if not helpers.file_exists(file) then return {} end + local lines = {} + for line in io.lines(file) do + lines[#lines + 1] = line + end + return lines + end + + -- match all lines from a file, returns an empty + -- list/table if the file or match does not exist + function helpers.lines_match(regexp, file) + local lines = {} + for index,line in pairs(helpers.lines_from(file)) do + if string.match(line, regexp) then + lines[index] = line + end + end + return lines + end + + -- get first line of a file, return nil if + -- the file does not exist + function helpers.first_line(file) + return helpers.lines_from(file)[1] + end + + -- get first non empty line from a file, + -- returns nil otherwise + function helpers.first_nonempty_line(file) + for k,v in pairs(helpers.lines_from(file)) do + if #v then return v end + end + return nil + end + + -- }}} + + -- {{{ Timer maker + + helpers.timer_table = {} + + function helpers.newtimer(name, timeout, fun, nostart, stoppable) + if not name or #name == 0 then return end + name = (stoppable and name) or timeout + if not helpers.timer_table[name] then + helpers.timer_table[name] = timer({ timeout = timeout }) + helpers.timer_table[name]:start() + end + helpers.timer_table[name]:connect_signal("timeout", fun) + if not nostart then + helpers.timer_table[name]:emit_signal("timeout") + end + return stoppable and helpers.timer_table[name] + end + + -- }}} + + -- {{{ Pipe operations + + -- run a command and execute a function on its output (asynchronous pipe) + -- @param cmd the input command + -- @param callback function to execute on cmd output + -- @return cmd PID + function helpers.async(cmd, callback) + return easy_async(cmd, + function (stdout, stderr, reason, exit_code) + callback(stdout) + end) + end + + -- }}} + + -- {{{ A map utility + + helpers.map_table = {} + + function helpers.set_map(element, value) + helpers.map_table[element] = value + end + + function helpers.get_map(element) + return helpers.map_table[element] + end + + -- }}} + + -- {{{ Misc + + -- check if an element exist on a table + function helpers.element_in_table(element, tbl) + for _, i in pairs(tbl) do + if i == element then + return true + end + end + return false + end + + -- iterate over table of records sorted by keys + function helpers.spairs(t) + -- collect the keys + local keys = {} + for k in pairs(t) do keys[#keys+1] = k end + + table.sort(keys) + + -- return the iterator function + local i = 0 + return function() + i = i + 1 + if keys[i] then + return keys[i], t[keys[i]] + end + end + end + + -- }}} + + return helpers diff --combined .config/awesome/lain/icons/cal/white/1.png index 0000000,90b696c..90b696c mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/10.png index 0000000,b462ffb..b462ffb mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/11.png index 0000000,cf43296..cf43296 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/12.png index 0000000,42cf092..42cf092 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/13.png index 0000000,37db670..37db670 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/14.png index 0000000,0188504..0188504 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/15.png index 0000000,64418a6..64418a6 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/16.png index 0000000,8b86700..8b86700 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/17.png index 0000000,033b5ff..033b5ff mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/18.png index 0000000,817c426..817c426 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/19.png index 0000000,0e6dafc..0e6dafc mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/2.png index 0000000,b93789a..b93789a mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/20.png index 0000000,3d8d7c6..3d8d7c6 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/21.png index 0000000,79a74f3..79a74f3 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/22.png index 0000000,e8845ce..e8845ce mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/23.png index 0000000,a8d4dfb..a8d4dfb mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/24.png index 0000000,1a3b38a..1a3b38a mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/25.png index 0000000,c3621b7..c3621b7 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/26.png index 0000000,f26731b..f26731b mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/27.png index 0000000,e4dde77..e4dde77 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/28.png index 0000000,b924c22..b924c22 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/29.png index 0000000,e9a74f8..e9a74f8 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/3.png index 0000000,1124271..1124271 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/30.png index 0000000,8147d78..8147d78 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/31.png index 0000000,a1be3e8..a1be3e8 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/4.png index 0000000,16713bc..16713bc mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/5.png index 0000000,466aa71..466aa71 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/6.png index 0000000,a1c9798..a1c9798 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/7.png index 0000000,e971951..e971951 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/8.png index 0000000,909b726..909b726 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/cal/white/9.png index 0000000,dc636c4..dc636c4 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/cascade.png index 0000000,292a057..292a057 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/cascadetile.png index 0000000,2f12ada..2f12ada mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/cascadetilew.png index 0000000,c46b48b..c46b48b mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/cascadew.png index 0000000,da64bd6..da64bd6 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerfair.png index 0000000,188c243..188c243 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerfairw.png index 0000000,ed4bcf5..ed4bcf5 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerwork.png index 0000000,826b331..826b331 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerworkh.png index 0000000,4fb4fdd..4fb4fdd mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerworkhw.png index 0000000,fd27766..fd27766 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/centerworkw.png index 0000000,fcfa7e3..fcfa7e3 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/termfair.png index 0000000,06226c1..06226c1 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/default/termfairw.png index 0000000,0a8b576..0a8b576 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/cascade.png index 0000000,532842d..532842d mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/cascadetile.png index 0000000,87be658..87be658 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/centerfair.png index 0000000,01cda8e..01cda8e mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/centerwork.png index 0000000,6a2cecc..6a2cecc mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/centerworkh.png index 0000000,00beeb5..00beeb5 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/layout/zenburn/termfair.png index 0000000,b7d5880..b7d5880 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/mail.png index 0000000,60ba6e0..60ba6e0 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/icons/no_net.png index 0000000,1a3e8a8..1a3e8a8 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/01d.png index 0000000,d9e2745..d9e2745 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/01n.png index 0000000,84ea140..84ea140 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/02d.png index 0000000,8fd0a5b..8fd0a5b mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/02n.png index 0000000,9e4404d..9e4404d mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/03d.png index 0000000,22b929c..22b929c mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/03n.png index 0000000,d8b3673..d8b3673 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/04d.png index 0000000,bac1e7e..bac1e7e mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/04n.png index 0000000,b9a83df..b9a83df mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/04n.png +++ b/.config/awesome/lain/icons/openweathermap/04n.png @@@ -1,0 -1,1 +1,1 @@@ + 04d.png diff --combined .config/awesome/lain/icons/openweathermap/09d.png index 0000000,d00552a..d00552a mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/09n.png index 0000000,cca1f5d..cca1f5d mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/09n.png +++ b/.config/awesome/lain/icons/openweathermap/09n.png @@@ -1,0 -1,1 +1,1 @@@ + 09d.png diff --combined .config/awesome/lain/icons/openweathermap/10d.png index 0000000,3cc6665..3cc6665 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/10n.png index 0000000,6e01227..6e01227 mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/10n.png +++ b/.config/awesome/lain/icons/openweathermap/10n.png @@@ -1,0 -1,1 +1,1 @@@ + 10d.png diff --combined .config/awesome/lain/icons/openweathermap/11d.png index 0000000,d30e120..d30e120 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/11n.png index 0000000,b227917..b227917 mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/11n.png +++ b/.config/awesome/lain/icons/openweathermap/11n.png @@@ -1,0 -1,1 +1,1 @@@ + 11d.png diff --combined .config/awesome/lain/icons/openweathermap/13d.png index 0000000,ddcb8f3..ddcb8f3 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/13n.png index 0000000,94e5a52..94e5a52 mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/13n.png +++ b/.config/awesome/lain/icons/openweathermap/13n.png @@@ -1,0 -1,1 +1,1 @@@ + 13d.png diff --combined .config/awesome/lain/icons/openweathermap/50d.png index 0000000,009039f..009039f mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/openweathermap/50n.png index 0000000,e3ba961..e3ba961 mode 000000,120000..120000 --- a/.config/awesome/lain/icons/openweathermap/50n.png +++ b/.config/awesome/lain/icons/openweathermap/50n.png @@@ -1,0 -1,1 +1,1 @@@ + 50d.png diff --combined .config/awesome/lain/icons/openweathermap/README.md index 0000000,f908fbd..f908fbd mode 000000,100644..100644 --- a/.config/awesome/lain/icons/openweathermap/README.md +++ b/.config/awesome/lain/icons/openweathermap/README.md @@@ -1,0 -1,3 +1,3 @@@ + [Plain Weather Icons](http://merlinthered.deviantart.com/art/plain-weather-icons-157162192), created by [MerlinTheRed](http://merlinthered.deviantart.com/). + + diff --combined .config/awesome/lain/icons/openweathermap/na.png index 0000000,62a5350..62a5350 mode 000000,100755..100755 Binary files differ diff --combined .config/awesome/lain/icons/taskwarrior.png index 0000000,859ca29..859ca29 mode 000000,100644..100644 Binary files differ diff --combined .config/awesome/lain/init.lua index 0000000,46ab825..46ab825 mode 000000,100644..100644 --- a/.config/awesome/lain/init.lua +++ b/.config/awesome/lain/init.lua @@@ -1,0 -1,16 +1,16 @@@ + + --[[ + + Lain + Layouts, widgets and utilities for Awesome WM + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + return { + layout = require("lain.layout"), + util = require("lain.util"), + widget = require("lain.widget") + } diff --combined .config/awesome/lain/lain-git.rockspec index 0000000,a264384..a264384 mode 000000,100644..100644 --- a/.config/awesome/lain/lain-git.rockspec +++ b/.config/awesome/lain/lain-git.rockspec @@@ -1,0 -1,26 +1,26 @@@ + package = "lain" + version = "git" + source = { + url = "https://github.com/copycat-killer/lain", + tag = "git" + } + description = { + summary = "Layout, widgets and utilities for Awesome WM", + detailed = [[ + Successor of awesome-vain, this module provides new layouts, a set of widgets and utility functions, with the aim of improving Awesome usability and configurability. + + Optional dependency: curl (for IMAP and weather widgets). + ]], + homepage = "https://github.com/copycat-killer/lain", + license = "GPL v2" + } + dependencies = { + "lua >= 5.3", + "awesome >= 4.0", + "curl" + } + supported_platforms = { "linux" } + build = { + type = "builtin", + modules = { lain = "init.lua" } + } diff --combined .config/awesome/lain/layout/cascade.lua index 0000000,204ce40..204ce40 mode 000000,100644..100644 --- a/.config/awesome/lain/layout/cascade.lua +++ b/.config/awesome/lain/layout/cascade.lua @@@ -1,0 -1,173 +1,173 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2014, projektile + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local floor = math.floor + local screen = screen + + local cascade = { + name = "cascade", + nmaster = 0, + offset_x = 32, + offset_y = 8, + tile = { + name = "cascadetile", + nmaster = 0, + ncol = 0, + mwfact = 0, + offset_x = 5, + offset_y = 32, + extra_padding = 0 + } + } + + local function do_cascade(p, tiling) + local t = p.tag or screen[p.screen].selected_tag + local wa = p.workarea + local cls = p.clients + + if #cls == 0 then return end + + if not tiling then + -- Cascade windows. + + local num_c + if cascade.nmaster > 0 then + num_c = cascade.nmaster + else + num_c = t.master_count + end + + -- Opening a new window will usually force all existing windows to + -- get resized. This wastes a lot of CPU time. So let's set a lower + -- bound to "how_many": This wastes a little screen space but you'll + -- get a much better user experience. + local how_many = (#cls >= num_c and #cls) or num_c + + local current_offset_x = cascade.offset_x * (how_many - 1) + local current_offset_y = cascade.offset_y * (how_many - 1) + + -- Iterate. + for i = 1,#cls,1 do + local c = cls[i] + local g = {} + + g.x = wa.x + (how_many - i) * cascade.offset_x + g.y = wa.y + (i - 1) * cascade.offset_y + g.width = wa.width - current_offset_x + g.height = wa.height - current_offset_y + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + end + else + -- Layout with one fixed column meant for a master window. Its + -- width is calculated according to mwfact. Other clients are + -- cascaded or "tabbed" in a slave column on the right. + + -- (1) (2) (3) (4) + -- +----------+---+ +----------+---+ +----------+---+ +----------+---+ + -- | | | | | 3 | | | 4 | | +---+| + -- | | | -> | | | -> | +---++ -> | +---+|+ + -- | 1 | 2 | | 1 +---++ | 1 | 3 || | 1 +---+|+| + -- | | | | | 2 || | +---++| | +---+|+ | + -- | | | | | || | | 2 | | | | 2 |+ | + -- +----------+---+ +---------+---++ +--------+---+-+ +------+---+---+ + + local mwfact + if cascade.tile.mwfact > 0 then + mwfact = cascade.tile.mwfact + else + mwfact = t.master_width_factor + end + + -- Make slave windows overlap main window? Do this if ncol is 1. + local overlap_main + if cascade.tile.ncol > 0 then + overlap_main = cascade.tile.ncol + else + overlap_main = t.column_count + end + + -- Minimum space for slave windows? See cascade.tile.lua. + local num_c + if cascade.tile.nmaster > 0 then + num_c = cascade.tile.nmaster + else + num_c = t.master_count + end + + local how_many = (#cls - 1 >= num_c and (#cls - 1)) or num_c + + local current_offset_x = cascade.tile.offset_x * (how_many - 1) + local current_offset_y = cascade.tile.offset_y * (how_many - 1) + + if #cls <= 0 then return end + + -- Main column, fixed width and height. + local c = cls[1] + local g = {} + -- Rounding is necessary to prevent the rendered size of slavewid + -- from being 1 pixel off when the result is not an integer. + local mainwid = floor(wa.width * mwfact) + local slavewid = wa.width - mainwid + + if overlap_main == 1 then + g.width = wa.width + + -- The size of the main window may be reduced a little bit. + -- This allows you to see if there are any windows below the + -- main window. + -- This only makes sense, though, if the main window is + -- overlapping everything else. + g.width = g.width - cascade.tile.extra_padding + else + g.width = mainwid + end + + g.height = wa.height + g.x = wa.x + g.y = wa.y + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + + -- Remaining clients stacked in slave column, new ones on top. + if #cls <= 1 then return end + for i = 2,#cls do + c = cls[i] + g = {} + + g.width = slavewid - current_offset_x + g.height = wa.height - current_offset_y + + g.x = wa.x + mainwid + (how_many - (i - 1)) * cascade.tile.offset_x + g.y = wa.y + (i - 2) * cascade.tile.offset_y + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + end + end + end + + function cascade.tile.arrange(p) + return do_cascade(p, true) + end + + function cascade.arrange(p) + return do_cascade(p, false) + end + + return cascade diff --combined .config/awesome/lain/layout/centerwork.lua index 0000000,eafab78..eafab78 mode 000000,100644..100644 --- a/.config/awesome/lain/layout/centerwork.lua +++ b/.config/awesome/lain/layout/centerwork.lua @@@ -1,0 -1,154 +1,154 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2016, Henrik Antonsson + * (c) 2015, Joerg Jaspert + * (c) 2014, projektile + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local floor = math.floor + local screen = screen + + local centerwork = { + name = "centerwork", + horizontal = { name = "centerworkh" } + } + + local function do_centerwork(p, orientation) + local t = p.tag or screen[p.screen].selected_tag + local wa = p.workarea + local cls = p.clients + + if #cls == 0 then return end + + local c = cls[1] + local g = {} + + -- Main column, fixed width and height. + local mwfact = t.master_width_factor + local mainhei = floor(wa.height * mwfact) + local mainwid = floor(wa.width * mwfact) + local slavewid = wa.width - mainwid + local slaveLwid = floor(slavewid / 2) + local slaveRwid = slavewid - slaveLwid + local slavehei = wa.height - mainhei + local slaveThei = floor(slavehei / 2) + local slaveBhei = slavehei - slaveThei + local nbrFirstSlaves = floor(#cls / 2) + local nbrSecondSlaves = floor((#cls - 1) / 2) + + local slaveFirstDim, slaveSecondDim = 0, 0 + + if orientation == "vertical" then + if nbrFirstSlaves > 0 then slaveFirstDim = floor(wa.height / nbrFirstSlaves) end + if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.height / nbrSecondSlaves) end + + g.height = wa.height + g.width = mainwid + + g.x = wa.x + slaveLwid + g.y = wa.y + else + if nbrFirstSlaves > 0 then slaveFirstDim = floor(wa.width / nbrFirstSlaves) end + if nbrSecondSlaves > 0 then slaveSecondDim = floor(wa.width / nbrSecondSlaves) end + + g.height = mainhei + g.width = wa.width + + g.x = wa.x + g.y = wa.y + slaveThei + end + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + + -- Auxiliary windows. + if #cls <= 1 then return end + for i = 2,#cls do + local c = cls[i] + local g = {} + + local rowIndex = floor(i/2) + + if orientation == "vertical" then + if i % 2 == 0 then + -- left slave + g.x = wa.x + g.y = wa.y + (rowIndex-1)*slaveFirstDim + + g.width = slaveLwid + + -- if last slave in left row use remaining space for that slave + if rowIndex == nbrFirstSlaves then + g.height = wa.y + wa.height - g.y + else + g.height = slaveFirstDim + end + else + -- right slave + g.x = wa.x + slaveLwid + mainwid + g.y = wa.y + (rowIndex-1)*slaveSecondDim + + g.width = slaveRwid + + -- if last slave in right row use remaining space for that slave + if rowIndex == nbrSecondSlaves then + g.height = wa.y + wa.height - g.y + else + g.height = slaveSecondDim + end + end + else + if i % 2 == 0 then + -- top slave + g.x = wa.x + (rowIndex-1)*slaveFirstDim + g.y = wa.y + + g.height = slaveThei + + -- if last slave in top row use remaining space for that slave + if rowIndex == nbrFirstSlaves then + g.width = wa.x + wa.width - g.x + else + g.width = slaveFirstDim + end + else + -- bottom slave + g.x = wa.x + (rowIndex-1)*slaveSecondDim + g.y = wa.y + slaveThei + mainhei + + g.height = slaveBhei + + -- if last slave in bottom row use remaining space for that slave + if rowIndex == nbrSecondSlaves then + g.width = wa.x + wa.width - g.x + else + g.width = slaveSecondDim + end + + end + end + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + end + end + + + function centerwork.horizontal.arrange(p) + return do_centerwork(p, "horizontal") + end + + function centerwork.arrange(p) + return do_centerwork(p, "vertical") + end + + return centerwork diff --combined .config/awesome/lain/layout/init.lua index 0000000,d79679a..d79679a mode 000000,100644..100644 --- a/.config/awesome/lain/layout/init.lua +++ b/.config/awesome/lain/layout/init.lua @@@ -1,0 -1,20 +1,20 @@@ + + --[[ + + Lain + Layouts, widgets and utilities for Awesome WM + + Layouts section + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local wrequire = require("lain.helpers").wrequire + local setmetatable = setmetatable + + local layout = { _NAME = "lain.layout" } + + return setmetatable(layout, { __index = wrequire }) diff --combined .config/awesome/lain/layout/termfair.lua index 0000000,33b7ffc..33b7ffc mode 000000,100644..100644 --- a/.config/awesome/lain/layout/termfair.lua +++ b/.config/awesome/lain/layout/termfair.lua @@@ -1,0 -1,240 +1,240 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2014, projektile + * (c) 2013, Luke Bonham + * (c) 2010, Nicolas Estibals + * (c) 2010-2012, Peter Hofmann + + --]] + + local math = { ceil = math.ceil, + floor = math.floor, + max = math.max } + local screen = screen + local tonumber = tonumber + + local termfair = { name = "termfair" } + termfair.center = { name = "centerfair" } + + local function do_fair(p, orientation) + local t = p.tag or screen[p.screen].selected_tag + local wa = p.workarea + local cls = p.clients + + if #cls == 0 then return end + + if orientation == "west" then + -- Layout with fixed number of vertical columns (read from nmaster). + -- New windows align from left to right. When a row is full, a now + -- one above it is created. Like this: + + -- (1) (2) (3) + -- +---+---+---+ +---+---+---+ +---+---+---+ + -- | | | | | | | | | | | | + -- | 1 | | | -> | 2 | 1 | | -> | 3 | 2 | 1 | -> + -- | | | | | | | | | | | | + -- +---+---+---+ +---+---+---+ +---+---+---+ + + -- (4) (5) (6) + -- +---+---+---+ +---+---+---+ +---+---+---+ + -- | 4 | | | | 5 | 4 | | | 6 | 5 | 4 | + -- +---+---+---+ -> +---+---+---+ -> +---+---+---+ + -- | 3 | 2 | 1 | | 3 | 2 | 1 | | 3 | 2 | 1 | + -- +---+---+---+ +---+---+---+ +---+---+---+ + + -- How many vertical columns? Read from nmaster on the tag. + local num_x = tonumber(termfair.nmaster) or t.master_count + local ncol = tonumber(termfair.ncol) or t.column_count + + if num_x <= 2 then num_x = 2 end + if ncol <= 1 then ncol = 1 end + local width = math.floor(wa.width/num_x) + + local num_y = math.max(math.ceil(#cls / num_x), ncol) + local height = math.floor(wa.height/num_y) + local cur_num_x = num_x + local at_x = 0 + local at_y = 0 + + local remaining_clients = #cls + + -- We start the first row. Left-align by limiting the number of + -- available slots. + if remaining_clients < num_x then + cur_num_x = remaining_clients + end + + -- Iterate in reversed order. + for i = #cls,1,-1 do + -- Get x and y position. + local c = cls[i] + local this_x = cur_num_x - at_x - 1 + local this_y = num_y - at_y - 1 + + -- Calculate geometry. + local g = {} + if this_x == (num_x - 1) then + g.width = wa.width - (num_x - 1)*width + else + g.width = width + end + + if this_y == (num_y - 1) then + g.height = wa.height - (num_y - 1)*height + else + g.height = height + end + + g.x = wa.x + this_x*width + g.y = wa.y + this_y*height + + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + + p.geometries[c] = g + + remaining_clients = remaining_clients - 1 + + -- Next grid position. + at_x = at_x + 1 + if at_x == num_x then + -- Row full, create a new one above it. + at_x = 0 + at_y = at_y + 1 + + -- We start a new row. Left-align. + if remaining_clients < num_x then + cur_num_x = remaining_clients + end + end + end + elseif orientation == "center" then + -- Layout with fixed number of vertical columns (read from nmaster). + -- Cols are centerded until there is nmaster columns, then windows + -- are stacked in the slave columns, with at most ncol clients per + -- column if possible. + + -- with nmaster=3 and ncol=1 you'll have + -- (1) (2) (3) + -- +---+---+---+ +-+---+---+-+ +---+---+---+ + -- | | | | | | | | | | | | | + -- | | 1 | | -> | | 1 | 2 | | -> | 1 | 2 | 3 | -> + -- | | | | | | | | | | | | | + -- +---+---+---+ +-+---+---+-+ +---+---+---+ + + -- (4) (5) + -- +---+---+---+ +---+---+---+ + -- | | | 3 | | | 2 | 4 | + -- + 1 + 2 +---+ -> + 1 +---+---+ + -- | | | 4 | | | 3 | 5 | + -- +---+---+---+ +---+---+---+ + + -- How many vertical columns? Read from nmaster on the tag. + local num_x = tonumber(termfair.center.nmaster) or t.master_count + local ncol = tonumber(termfair.center.ncol) or t.column_count + + if num_x <= 2 then num_x = 2 end + if ncol <= 1 then ncol = 1 end + + local width = math.floor(wa.width / num_x) + + if #cls < num_x then + -- Less clients than the number of columns, let's center it! + local offset_x = wa.x + (wa.width - #cls*width) / 2 + for i = 1, #cls do + local g = { y = wa.y } + g.width = width + g.height = wa.height + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + g.x = offset_x + (i - 1) * width + p.geometries[cls[i]] = g + end + else + -- More clients than the number of columns, let's arrange it! + -- Master client deserves a special treatement + local g = {} + g.width = wa.width - (num_x - 1)*width + g.height = wa.height + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + g.x = wa.x + g.y = wa.y + p.geometries[cls[1]] = g + + -- Treat the other clients + + -- Compute distribution of clients among columns + local num_y = {} + local remaining_clients = #cls-1 + local ncol_min = math.ceil(remaining_clients/(num_x-1)) + + if ncol >= ncol_min then + for i = (num_x-1), 1, -1 do + if (remaining_clients-i+1) < ncol then + num_y[i] = remaining_clients-i + 1 + else + num_y[i] = ncol + end + remaining_clients = remaining_clients - num_y[i] + end + else + local rem = remaining_clients % (num_x-1) + if rem == 0 then + for i = 1, num_x-1 do + num_y[i] = ncol_min + end + else + for i = 1, num_x-1 do + num_y[i] = ncol_min - 1 + end + for i = 0, rem-1 do + num_y[num_x-1-i] = num_y[num_x-1-i] + 1 + end + end + end + + -- Compute geometry of the other clients + local nclient = 2 -- we start with the 2nd client + local wx = g.x + g.width + for i = 1, (num_x-1) do + local height = math.floor(wa.height / num_y[i]) + local wy = wa.y + for j = 0, (num_y[i]-2) do + local g = {} + g.x = wx + g.y = wy + g.height = height + g.width = width + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + p.geometries[cls[nclient]] = g + nclient = nclient + 1 + wy = wy + height + end + local g = {} + g.x = wx + g.y = wy + g.height = wa.height - (num_y[i] - 1)*height + g.width = width + if g.width < 1 then g.width = 1 end + if g.height < 1 then g.height = 1 end + p.geometries[cls[nclient]] = g + nclient = nclient + 1 + wx = wx + width + end + end + end + end + + function termfair.center.arrange(p) + return do_fair(p, "center") + end + + function termfair.arrange(p) + return do_fair(p, "west") + end + + return termfair diff --combined .config/awesome/lain/scripts/dfs index 0000000,df87150..df87150 mode 000000,100755..100755 --- a/.config/awesome/lain/scripts/dfs +++ b/.config/awesome/lain/scripts/dfs @@@ -1,0 -1,397 +1,397 @@@ + #!/usr/bin/env sh + # + # Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux) + # JM, 10/12/2004 + # + # Integrated into Lain in september 2013 + # https://github.com/copycat-killer/lain + + # Requires gawk + + # ------------------------------------------------------------------------- + # Decoding options + # ------------------------------------------------------------------------- + USAGE="Usage: $0 [-h(elp)] | [-n(arrow mode)] | [-w(eb output) | --type= | --exclude-type=]" + + NARROW_MODE=0 + WEB_OUTPUT=0 + DF_OPTIONS="" + + while [ $# -gt 0 ]; do + case "$1" in + "-h" ) + echo $USAGE + exit + ;; + "-d" ) + DEBUG=1 + ;; + "-n" ) + NARROW_MODE=1 + ;; + "-w" ) + WEB_OUTPUT=1 + ;; + --type=*) + DF_OPTIONS+=" $1" + ;; + --exclude-type=*) + DF_OPTIONS+=" $1" + ;; + * ) + echo $USAGE + exit + ;; + esac + shift + done + + # ------------------------------------------------------------------------- + # Preparations + # ------------------------------------------------------------------------- + SYSTEM=`uname -s` + PATTERN="/" + + case "$SYSTEM" in + "Linux" ) + DF_COMMAND="/usr/bin/env df -k" + SORT_COMMAND="/usr/bin/env sort -k6" + AWK_COMMAND="/usr/bin/env awk" + ;; + * ) + DF_COMMAND="/bin/df -k" + SORT_COMMAND="/usr/bin/sort -k6" + AWK_COMMAND="/usr/bin/env gawk" + ;; + esac + + # Add additional df options + DF_COMMAND+=$DF_OPTIONS + + # ------------------------------------------------------------------------- + # Grabbing "df" result + # ------------------------------------------------------------------------- + DF_RESULT=`$DF_COMMAND` + if [ ! -z $DEBUG ]; then + echo "--> DF_RESULT:" + echo "$DF_RESULT" + echo "" + fi + + # ------------------------------------------------------------------------- + # Preprocessing "df" result, to join split logical lines + # ------------------------------------------------------------------------- + PREPROCESSING_RESULT=` \ + echo "$DF_RESULT" | $AWK_COMMAND -v PATTERN=$PATTERN \ + ' + NF == 1 { + printf ("%s", $0) + } + + NF == 5 { + printf ("%s\n", $0) + } + + NF > 6 { + } + + NF == 6 { + printf ("%s\n", $0) + }' + ` + if [ ! -z $DEBUG ]; then + echo "--> PREPROCESSING_RESULT:" + echo "$PREPROCESSING_RESULT" + echo "" + fi + + SORTED_FILE_SYSTEMS_INFO=`echo "$PREPROCESSING_RESULT" | $SORT_COMMAND` + + if [ ! -z $DEBUG ]; then + echo "--> SORTED_FILE_SYSTEMS_INFO:" + echo "$SORTED_FILE_SYSTEMS_INFO" + echo "" + fi + + # ------------------------------------------------------------------------- + # Computing mount point max length + # ------------------------------------------------------------------------- + MOUNT_POINT_MAX_LENGTH=` \ + echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v PATTERN=$PATTERN \ + ' + BEGIN { + mount_point_length_max = 15; + } + + END { + printf ("%d", mount_point_length_max); + } + + $0 ~ PATTERN { + # printf ("$6 = %s\n", $6); + + mount_point = $6; + # printf ("mount_point = %s\n", mount_point); + + mount_point_length = length (mount_point); + # printf ("mount_point_length = %d\n", mount_point_length); + + if (mount_point_length > mount_point_length_max) + mount_point_length_max = mount_point_length; + }' + ` + if [ ! -z $DEBUG ]; then + echo "MOUNT_POINT_MAX_LENGTH: $MOUNT_POINT_MAX_LENGTH" + fi + + # ------------------------------------------------------------------------- + # Computing mount point data max size + # ------------------------------------------------------------------------- + MOUNT_POINT_MAX_SIZE=` \ + echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v PATTERN=$PATTERN \ + ' + BEGIN { + mount_point_size_max = 0; + } + + END { + printf ("%d", mount_point_size_max); + } + + $0 ~ PATTERN { + # df -k shows k_bytes! + # printf ("$2 = %s\n", $2); + + mount_point_size = $2 * 1024; + # printf ("mount_point_size = %d\n", mount_point_size); + + if (mount_point_size > mount_point_size_max) + mount_point_size_max = mount_point_size; + }' + ` + if [ ! -z $DEBUG ]; then + echo "MOUNT_POINT_MAX_SIZE: $MOUNT_POINT_MAX_SIZE" + fi + + # ------------------------------------------------------------------------- + # Let's go! + # ------------------------------------------------------------------------- + echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v DEBUG=$DEBUG -v PATTERN=$PATTERN -v NARROW_MODE=$NARROW_MODE -v LEFT_COLUMN=$MOUNT_POINT_MAX_LENGTH -v MAX_SIZE=$MOUNT_POINT_MAX_SIZE -v SCALE=$SCALE -v WEB_OUTPUT=$WEB_OUTPUT \ + ' + # {printf ("$0 = %s\n", $0);} + # {printf ("$1 = %s\n", $1);} + # {printf ("PATTERN = %s\n", PATTERN);} + # {printf ("LEFT_COLUMN = %s\n", LEFT_COLUMN);} + + BEGIN { + k_bytes = 1024.0; + m_bytes = 1024.0 * k_bytes; + g_bytes = 1024.0 * m_bytes; + t_bytes = 1024.0 * g_bytes; + + if (WEB_OUTPUT) + { + all_stars = "**************************************************"; + current_date = strftime ("%d-%m-%Y @ %H:%M:%S", localtime (systime ())); + free_threshold = 10; # % + + printf ("\n"); + + printf ( \ + "\n" \ + "

%s -- STATUS OF ALCOR FILE SYSTEMS


\n", + current_date ) + + printf ("\n"); + + printf ( \ + "\n" \ + "\n" \ + "\n" \ + "\n" \ + "\n" \ + "\n" \ + "\n" ); + } + else + { + narrow_margin = " "; + # printf ("%-*s", LEFT_COLUMN + 2, "Mount point"); + if (NARROW_MODE) + printf ("\n%s", narrow_margin); + else + printf ("%-*s", LEFT_COLUMN + 2, ""); + print " Used Free Total "; + if (! NARROW_MODE) + print " "; + } + } + + END { + if (WEB_OUTPUT) + { + printf ("
Mount point%% Usato (*)" \ + " - %% Free (*)%% UsedFreeTotal
\n"); + + printf ("\n"); + } + else + { + if (NARROW_MODE) + printf ("%s", narrow_margin); + else + printf ("%-*s", LEFT_COLUMN + 2, ""); + print "|----|----|----|----|----|----|----|----|----|----|" + if (NARROW_MODE) + printf ("\n%s", narrow_margin); + else + printf ("%-*s", LEFT_COLUMN + 2, ""); + print "0 10 20 30 40 50 60 70 80 90 100"; + print ""; + } + } + + $0 ~ PATTERN { + + if (index ($0, "members") == 0 && index ($0, "Download") == 0 && index ($0, "admin") == 0) + { + # df -k shows k_bytes! + + total_size = $2 * k_bytes; + free_size = $4 * k_bytes; + percentage_occupied = substr($5, 0, 3); + mount_point = $6; + + percentage_free = int (100 - percentage_occupied); + + # reduction_factor: 2 + stars_number = int (percentage_occupied / 2); + + if (WEB_OUTPUT) + { + posGroup = index (mount_point, "scratch"); + if (posGroup == 0) + posGroup = index (mount_point, "u1"); + if (posGroup == 0) + posGroup = index (mount_point, "u2"); + if (posGroup == 0) + posGroup = index (mount_point, "u4"); + if (posGroup == 0) + posGroup = index (mount_point, "u5"); + + printf ("\n"); + + if (posGroup > 0 || percentage_free < free_threshold) + { + if (percentage_free < free_threshold) + { + class = "titlered"; + if (posGroup == 0) + posGroup = 1; # to display the whole mount_point in this color anyway + } + else if ((index (mount_point, "scratch") != 0) || (index (mount_point, "u1") != 0) || (index (mount_point, "u2") != 0)) + { + class = "titleorange"; + posGroup = 1; # to display the whole mount_point in this color + } + else if ((index (mount_point, "u4") != 0) || (index (mount_point, "u5") != 0)) + { + class = "titlebrown"; + posGroup = 1; # to display the whole mount_point in this color + } + + printf ( \ + "%s%s\n", + substr (mount_point, 1, posGroup - 1), + class, + substr (mount_point, posGroup) ); + } + else + { + printf ("%s\n", mount_point); + } + + printf ( \ + "%s%s\n", + substr (all_stars, 1, stars_number), substr (all_stars, stars_number + 1, 49) ); + + if (percentage_free < free_threshold) + { + color_beginning = ""; + color_end = "" + } + else + { + color_beginning = ""; + color_end = "" + } + + if (total_size > 1 * t_bytes) + printf ( \ + "%s%3d%%%s%5.1f Tb%5.1f Tb\n", \ + color_beginning, percentage_occupied, color_end, free_size / t_bytes, total_size / t_bytes \ + ); + else if (total_size > 1 * g_bytes) + printf ( \ + "%s%3d%%%s%5.1f Gb%5.1f Gb\n", \ + color_beginning, percentage_occupied, color_end, free_size / g_bytes, total_size / g_bytes \ + ); + else if (total_size > 1 * m_byptes) + printf ( \ + "%s%3d%%%s%5.1f Mb%5.1f Mb\n", \ + color_beginning, percentage_occupied, color_end, free_size / m_bytes, total_size / m_bytes \ + ); + else + printf ( \ + "%s%3d%%%s%5.1f Kb%5.1f Kb\n", \ + color_beginning, percentage_occupied, color_end, free_size / k_bytes, total_size / k_bytes \ + ); + + printf ("\n"); + } + + else + { + # printf ("percentage_occupied = %d\n", percentage_occupied); + # printf ("percentage_free = %d\n", percentage_free); + + printf ("%-*s", LEFT_COLUMN + 2, mount_point); + if (NARROW_MODE) + printf ("\n%s", narrow_margin); + + # printf ("stars_number = %d\n", stars_number); + + printf ("|"); + for (i = 1; i <= stars_number && i <= 49; i++) + { + printf ("%s", "*"); + } + for (i = stars_number + 1; i <= 49; i++) + { + printf ("%s", "-"); + } + + + if (total_size > 1 * t_bytes) + printf ( \ + "| %3d%% %6.1f %6.1f Tb\n", \ + percentage_occupied, free_size / t_bytes, total_size / t_bytes \ + ); + else if (total_size > 1 * g_bytes) + printf ( \ + "| %3d%% %6.1f %6.1f Gb\n", \ + percentage_occupied, free_size / g_bytes, total_size / g_bytes \ + ); + else if (total_size > 1 * m_byptes) + printf ( \ + "| %3d%% %6.1f %6.1f Mb\n", \ + percentage_occupied, free_size / m_bytes, total_size / m_bytes \ + ); + else + printf ( \ + "| %3d%% %6.1f %6.1f Kb\n", \ + percentage_occupied, free_size / k_bytes, total_size / k_bytes \ + ); + } + } # if + }' diff --combined .config/awesome/lain/util/dkjson.lua index 0000000,89aa2e1..89aa2e1 mode 000000,100644..100644 --- a/.config/awesome/lain/util/dkjson.lua +++ b/.config/awesome/lain/util/dkjson.lua @@@ -1,0 -1,713 +1,713 @@@ + -- Module options: + local always_try_using_lpeg = true + local register_global_module_table = false + local global_module_name = 'json' + + --[==[ + + David Kolf's JSON module for Lua 5.1/5.2 + + Version 2.5 + + + For the documentation see the corresponding readme.txt or visit + . + + You can contact the author by sending an e-mail to 'david' at the + domain 'dkolf.de'. + + + Copyright (C) 2010-2013 David Heiko Kolf + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + --]==] + + -- global dependencies: + local pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset = + pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset + local error, require, pcall, select = error, require, pcall, select + local floor, huge = math.floor, math.huge + local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat = + string.rep, string.gsub, string.sub, string.byte, string.char, + string.find, string.len, string.format + local strmatch = string.match + local concat = table.concat + + local json = { version = "dkjson 2.5" } + + if register_global_module_table then + _G[global_module_name] = json + end + + local _ENV = nil -- blocking globals in Lua 5.2 + + pcall (function() + -- Enable access to blocked metatables. + -- Don't worry, this module doesn't change anything in them. + local debmeta = require "debug".getmetatable + if debmeta then getmetatable = debmeta end + end) + + json.null = setmetatable ({}, { + __tojson = function () return "null" end + }) + + local function isarray (tbl) + local max, n, arraylen = 0, 0, 0 + for k,v in pairs (tbl) do + if k == 'n' and type(v) == 'number' then + arraylen = v + if v > max then + max = v + end + else + if type(k) ~= 'number' or k < 1 or floor(k) ~= k then + return false + end + if k > max then + max = k + end + n = n + 1 + end + end + if max > 10 and max > arraylen and max > n * 2 then + return false -- don't create an array with too many holes + end + return true, max + end + + local escapecodes = { + ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f", + ["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t" + } + + local function escapeutf8 (uchar) + local value = escapecodes[uchar] + if value then + return value + end + local a, b, c, d = strbyte (uchar, 1, 4) + a, b, c, d = a or 0, b or 0, c or 0, d or 0 + if a <= 0x7f then + value = a + elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then + value = (a - 0xc0) * 0x40 + b - 0x80 + elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then + value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80 + elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then + value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80 + else + return "" + end + if value <= 0xffff then + return strformat ("\\u%.4x", value) + elseif value <= 0x10ffff then + -- encode as UTF-16 surrogate pair + value = value - 0x10000 + local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400) + return strformat ("\\u%.4x\\u%.4x", highsur, lowsur) + else + return "" + end + end + + local function fsub (str, pattern, repl) + -- gsub always builds a new string in a buffer, even when no match + -- exists. First using find should be more efficient when most strings + -- don't contain the pattern. + if strfind (str, pattern) then + return gsub (str, pattern, repl) + else + return str + end + end + + local function quotestring (value) + -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js + value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8) + if strfind (value, "[\194\216\220\225\226\239]") then + value = fsub (value, "\194[\128-\159\173]", escapeutf8) + value = fsub (value, "\216[\128-\132]", escapeutf8) + value = fsub (value, "\220\143", escapeutf8) + value = fsub (value, "\225\158[\180\181]", escapeutf8) + value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8) + value = fsub (value, "\226\129[\160-\175]", escapeutf8) + value = fsub (value, "\239\187\191", escapeutf8) + value = fsub (value, "\239\191[\176-\191]", escapeutf8) + end + return "\"" .. value .. "\"" + end + json.quotestring = quotestring + + local function replace(str, o, n) + local i, j = strfind (str, o, 1, true) + if i then + return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1) + else + return str + end + end + + -- locale independent num2str and str2num functions + local decpoint, numfilter + + local function updatedecpoint () + decpoint = strmatch(tostring(0.5), "([^05+])") + -- build a filter that can be used to remove group separators + numfilter = "[^0-9%-%+eE" .. gsub(decpoint, "[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0") .. "]+" + end + + updatedecpoint() + + local function num2str (num) + return replace(fsub(tostring(num), numfilter, ""), decpoint, ".") + end + + local function str2num (str) + local num = tonumber(replace(str, ".", decpoint)) + if not num then + updatedecpoint() + num = tonumber(replace(str, ".", decpoint)) + end + return num + end + + local function addnewline2 (level, buffer, buflen) + buffer[buflen+1] = "\n" + buffer[buflen+2] = strrep (" ", level) + buflen = buflen + 2 + return buflen + end + + function json.addnewline (state) + if state.indent then + state.bufferlen = addnewline2 (state.level or 0, + state.buffer, state.bufferlen or #(state.buffer)) + end + end + + local encode2 -- forward declaration + + local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state) + local kt = type (key) + if kt ~= 'string' and kt ~= 'number' then + return nil, "type '" .. kt .. "' is not supported as a key by JSON." + end + if prev then + buflen = buflen + 1 + buffer[buflen] = "," + end + if indent then + buflen = addnewline2 (level, buffer, buflen) + end + buffer[buflen+1] = quotestring (key) + buffer[buflen+2] = ":" + return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder, state) + end + + local function appendcustom(res, buffer, state) + local buflen = state.bufferlen + if type (res) == 'string' then + buflen = buflen + 1 + buffer[buflen] = res + end + return buflen + end + + local function exception(reason, value, state, buffer, buflen, defaultmessage) + defaultmessage = defaultmessage or reason + local handler = state.exception + if not handler then + return nil, defaultmessage + else + state.bufferlen = buflen + local ret, msg = handler (reason, value, state, defaultmessage) + if not ret then return nil, msg or defaultmessage end + return appendcustom(ret, buffer, state) + end + end + + function json.encodeexception(reason, value, state, defaultmessage) + return quotestring("<" .. defaultmessage .. ">") + end + + encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, state) + local valtype = type (value) + local valmeta = getmetatable (value) + valmeta = type (valmeta) == 'table' and valmeta -- only tables + local valtojson = valmeta and valmeta.__tojson + if valtojson then + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + state.bufferlen = buflen + local ret, msg = valtojson (value, state) + if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end + tables[value] = nil + buflen = appendcustom(ret, buffer, state) + elseif value == nil then + buflen = buflen + 1 + buffer[buflen] = "null" + elseif valtype == 'number' then + local s + if value ~= value or value >= huge or -value >= huge then + -- This is the behaviour of the original JSON implementation. + s = "null" + else + s = num2str (value) + end + buflen = buflen + 1 + buffer[buflen] = s + elseif valtype == 'boolean' then + buflen = buflen + 1 + buffer[buflen] = value and "true" or "false" + elseif valtype == 'string' then + buflen = buflen + 1 + buffer[buflen] = quotestring (value) + elseif valtype == 'table' then + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + level = level + 1 + local isa, n = isarray (value) + if n == 0 and valmeta and valmeta.__jsontype == 'object' then + isa = false + end + local msg + if isa then -- JSON array + buflen = buflen + 1 + buffer[buflen] = "[" + for i = 1, n do + buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + if i < n then + buflen = buflen + 1 + buffer[buflen] = "," + end + end + buflen = buflen + 1 + buffer[buflen] = "]" + else -- JSON object + local prev = false + buflen = buflen + 1 + buffer[buflen] = "{" + local order = valmeta and valmeta.__jsonorder or globalorder + if order then + local used = {} + n = #order + for i = 1, n do + local k = order[i] + local v = value[k] + if v then + used[k] = true + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + prev = true -- add a seperator before the next element + end + end + for k,v in pairs (value) do + if not used[k] then + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + else -- unordered + for k,v in pairs (value) do + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + if indent then + buflen = addnewline2 (level - 1, buffer, buflen) + end + buflen = buflen + 1 + buffer[buflen] = "}" + end + tables[value] = nil + else + return exception ('unsupported type', value, state, buffer, buflen, + "type '" .. valtype .. "' is not supported by JSON.") + end + return buflen + end + + function json.encode (value, state) + state = state or {} + local oldbuffer = state.buffer + local buffer = oldbuffer or {} + state.buffer = buffer + updatedecpoint() + local ret, msg = encode2 (value, state.indent, state.level or 0, + buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state) + if not ret then + error (msg, 2) + elseif oldbuffer == buffer then + state.bufferlen = ret + return true + else + state.bufferlen = nil + state.buffer = nil + return concat (buffer) + end + end + + local function loc (str, where) + local line, pos, linepos = 1, 1, 0 + while true do + pos = strfind (str, "\n", pos, true) + if pos and pos < where then + line = line + 1 + linepos = pos + pos = pos + 1 + else + break + end + end + return "line " .. line .. ", column " .. (where - linepos) + end + + local function unterminated (str, what, where) + return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where) + end + + local function scanwhite (str, pos) + while true do + pos = strfind (str, "%S", pos) + if not pos then return nil end + local sub2 = strsub (str, pos, pos + 1) + if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then + -- UTF-8 Byte Order Mark + pos = pos + 3 + elseif sub2 == "//" then + pos = strfind (str, "[\n\r]", pos + 2) + if not pos then return nil end + elseif sub2 == "/*" then + pos = strfind (str, "*/", pos + 2) + if not pos then return nil end + pos = pos + 2 + else + return pos + end + end + end + + local escapechars = { + ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f", + ["n"] = "\n", ["r"] = "\r", ["t"] = "\t" + } + + local function unichar (value) + if value < 0 then + return nil + elseif value <= 0x007f then + return strchar (value) + elseif value <= 0x07ff then + return strchar (0xc0 + floor(value/0x40), + 0x80 + (floor(value) % 0x40)) + elseif value <= 0xffff then + return strchar (0xe0 + floor(value/0x1000), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) + elseif value <= 0x10ffff then + return strchar (0xf0 + floor(value/0x40000), + 0x80 + (floor(value/0x1000) % 0x40), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) + else + return nil + end + end + + local function scanstring (str, pos) + local lastpos = pos + 1 + local buffer, n = {}, 0 + while true do + local nextpos = strfind (str, "[\"\\]", lastpos) + if not nextpos then + return unterminated (str, "string", pos) + end + if nextpos > lastpos then + n = n + 1 + buffer[n] = strsub (str, lastpos, nextpos - 1) + end + if strsub (str, nextpos, nextpos) == "\"" then + lastpos = nextpos + 1 + break + else + local escchar = strsub (str, nextpos + 1, nextpos + 1) + local value + if escchar == "u" then + value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16) + if value then + local value2 + if 0xD800 <= value and value <= 0xDBff then + -- we have the high surrogate of UTF-16. Check if there is a + -- low surrogate escaped nearby to combine them. + if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then + value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16) + if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then + value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000 + else + value2 = nil -- in case it was out of range for a low surrogate + end + end + end + value = value and unichar (value) + if value then + if value2 then + lastpos = nextpos + 12 + else + lastpos = nextpos + 6 + end + end + end + end + if not value then + value = escapechars[escchar] or escchar + lastpos = nextpos + 2 + end + n = n + 1 + buffer[n] = value + end + end + if n == 1 then + return buffer[1], lastpos + elseif n > 1 then + return concat (buffer), lastpos + else + return "", lastpos + end + end + + local scanvalue -- forward declaration + + local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta) + local len = strlen (str) + local tbl, n = {}, 0 + local pos = startpos + 1 + if what == 'object' then + setmetatable (tbl, objectmeta) + else + setmetatable (tbl, arraymeta) + end + while true do + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + local char = strsub (str, pos, pos) + if char == closechar then + return tbl, pos + 1 + end + local val1, err + val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + if char == ":" then + if val1 == nil then + return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")" + end + pos = scanwhite (str, pos + 1) + if not pos then return unterminated (str, what, startpos) end + local val2 + val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + tbl[val1] = val2 + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + else + n = n + 1 + tbl[n] = val1 + end + if char == "," then + pos = pos + 1 + end + end + end + + scanvalue = function (str, pos, nullval, objectmeta, arraymeta) + pos = pos or 1 + pos = scanwhite (str, pos) + if not pos then + return nil, strlen (str) + 1, "no valid JSON value (reached the end)" + end + local char = strsub (str, pos, pos) + if char == "{" then + return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta) + elseif char == "[" then + return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta) + elseif char == "\"" then + return scanstring (str, pos) + else + local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos) + if pstart then + local number = str2num (strsub (str, pstart, pend)) + if number then + return number, pend + 1 + end + end + pstart, pend = strfind (str, "^%a%w*", pos) + if pstart then + local name = strsub (str, pstart, pend) + if name == "true" then + return true, pend + 1 + elseif name == "false" then + return false, pend + 1 + elseif name == "null" then + return nullval, pend + 1 + end + end + return nil, pos, "no valid JSON value at " .. loc (str, pos) + end + end + + local function optionalmetatables(...) + if select("#", ...) > 0 then + return ... + else + return {__jsontype = 'object'}, {__jsontype = 'array'} + end + end + + function json.decode (str, pos, nullval, ...) + local objectmeta, arraymeta = optionalmetatables(...) + return scanvalue (str, pos, nullval, objectmeta, arraymeta) + end + + function json.use_lpeg () + local g = require ("lpeg") + + if g.version() == "0.11" then + error "due to a bug in LPeg 0.11, it cannot be used for JSON matching" + end + + local pegmatch = g.match + local P, S, R = g.P, g.S, g.R + + local function ErrorCall (str, pos, msg, state) + if not state.msg then + state.msg = msg .. " at " .. loc (str, pos) + state.pos = pos + end + return false + end + + local function Err (msg) + return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall) + end + + local SingleLineComment = P"//" * (1 - S"\n\r")^0 + local MultiLineComment = P"/*" * (1 - P"*/")^0 * P"*/" + local Space = (S" \n\r\t" + P"\239\187\191" + SingleLineComment + MultiLineComment)^0 + + local PlainChar = 1 - S"\"\\\n\r" + local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars + local HexDigit = R("09", "af", "AF") + local function UTF16Surrogate (match, pos, high, low) + high, low = tonumber (high, 16), tonumber (low, 16) + if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then + return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000) + else + return false + end + end + local function UTF16BMP (hex) + return unichar (tonumber (hex, 16)) + end + local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit)) + local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP + local Char = UnicodeEscape + EscapeSequence + PlainChar + local String = P"\"" * g.Cs (Char ^ 0) * (P"\"" + Err "unterminated string") + local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0)) + local Fractal = P"." * R"09"^0 + local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1 + local Number = (Integer * Fractal^(-1) * Exponent^(-1))/str2num + local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1) + local SimpleValue = Number + String + Constant + local ArrayContent, ObjectContent + + -- The functions parsearray and parseobject parse only a single value/pair + -- at a time and store them directly to avoid hitting the LPeg limits. + local function parsearray (str, pos, nullval, state) + local obj, cont + local npos + local t, nt = {}, 0 + repeat + obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state) + if not npos then break end + pos = npos + nt = nt + 1 + t[nt] = obj + until cont == 'last' + return pos, setmetatable (t, state.arraymeta) + end + + local function parseobject (str, pos, nullval, state) + local obj, key, cont + local npos + local t = {} + repeat + key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state) + if not npos then break end + pos = npos + t[key] = obj + until cont == 'last' + return pos, setmetatable (t, state.objectmeta) + end + + local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) * Space * (P"]" + Err "']' expected") + local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) * Space * (P"}" + Err "'}' expected") + local Value = Space * (Array + Object + SimpleValue) + local ExpectedValue = Value + Space * Err "value expected" + ArrayContent = Value * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp() + local Pair = g.Cg (Space * String * Space * (P":" + Err "colon expected") * ExpectedValue) + ObjectContent = Pair * Space * (P"," * g.Cc'cont' + g.Cc'last') * g.Cp() + local DecodeValue = ExpectedValue * g.Cp () + + function json.decode (str, pos, nullval, ...) + local state = {} + state.objectmeta, state.arraymeta = optionalmetatables(...) + local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state) + if state.msg then + return nil, state.pos, state.msg + else + return obj, retpos + end + end + + -- use this function only once: + json.use_lpeg = function () return json end + + json.using_lpeg = true + + return json -- so you can get the module using json = require "dkjson".use_lpeg() + end + + if always_try_using_lpeg then + pcall (json.use_lpeg) + end + + return json diff --combined .config/awesome/lain/util/init.lua index 0000000,1fc5805..1fc5805 mode 000000,100644..100644 --- a/.config/awesome/lain/util/init.lua +++ b/.config/awesome/lain/util/init.lua @@@ -1,0 -1,168 +1,168 @@@ + + --[[ + + Lain + Layouts, widgets and utilities for Awesome WM + + Utilities section + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local awful = require("awful") + local sqrt = math.sqrt + local pairs = pairs + local client = client + local tonumber = tonumber + local wrequire = require("lain.helpers").wrequire + local setmetatable = setmetatable + + -- Lain utilities submodule + -- lain.util + local util = { _NAME = "lain.util" } + + -- Like awful.menu.clients, but only show clients of currently selected tags + function util.menu_clients_current_tags(menu, args) + -- List of currently selected tags. + local cls_tags = awful.screen.focused().selected_tags + + if cls_tags == nil then return nil end + + -- Final list of menu items. + local cls_t = {} + + -- For each selected tag get all clients of that tag and add them to + -- the menu. A click on a menu item will raise that client. + for i = 1,#cls_tags do + local t = cls_tags[i] + local cls = t:clients() + + for k, c in pairs(cls) do + cls_t[#cls_t + 1] = { awful.util.escape(c.name) or "", + function () + c.minimized = false + client.focus = c + c:raise() + end, + c.icon } + end + end + + -- No clients? Then quit. + if #cls_t <= 0 then return nil end + + -- menu may contain some predefined values, otherwise start with a + -- fresh menu. + if not menu then menu = {} end + + -- Set the list of items and show the menu. + menu.items = cls_t + local m = awful.menu(menu) + m:show(args) + + return m + end + + -- Magnify a client: set it to "float" and resize it. + function util.magnify_client(c, width_f, height_f) + if c and not c.floating then + util.magnified_client = c + util.mc(c, width_f, height_f) + else + util.magnified_client = nil + c.floating = false + end + end + + -- https://github.com/copycat-killer/lain/issues/195 + function util.mc(c, width_f, height_f) + c = c or util.magnified_client + if not c then return end + + c.floating = true + local s = awful.screen.focused() + local mg = s.workarea + local g = {} + local mwfact = width_f or s.selected_tag.master_width_factor or 0.5 + g.width = sqrt(mwfact) * mg.width + g.height = sqrt(height_f or mwfact) * mg.height + g.x = mg.x + (mg.width - g.width) / 2 + g.y = mg.y + (mg.height - g.height) / 2 + + if c then c:geometry(g) end -- if c is still a valid object + end + + -- Non-empty tag browsing + -- direction in {-1, 1} <-> {previous, next} non-empty tag + function util.tag_view_nonempty(direction, sc) + local s = sc or awful.screen.focused() + + for i = 1, #s.tags do + awful.tag.viewidx(direction, s) + if #s.clients > 0 then + return + end + end + end + + -- {{{ Dynamic tagging + + -- Add a new tag + function util.add_tag(layout) + awful.prompt.run { + prompt = "New tag name: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = function(name) + if not name or #name == 0 then return end + awful.tag.add(name, { screen = awful.screen.focused(), layout = layout or awful.layout.layouts[0] }):view_only() + end + } + end + + -- Rename current tag + function util.rename_tag() + awful.prompt.run { + prompt = "Rename tag: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = function(new_name) + if not new_name or #new_name == 0 then return end + local t = awful.screen.focused().selected_tag + if t then + t.name = new_name + end + end + } + end + + -- Move current tag + -- pos in {-1, 1} <-> {previous, next} tag position + function util.move_tag(pos) + local tag = awful.screen.focused().selected_tag + if tonumber(pos) <= -1 then + awful.tag.move(tag.index - 1, tag) + else + awful.tag.move(tag.index + 1, tag) + end + end + + -- Delete current tag + -- Any rule set on the tag shall be broken + function util.delete_tag() + local t = awful.screen.focused().selected_tag + if not t then return end + t:delete() + end + + -- }}} + + -- On the fly useless gaps change + function util.useless_gaps_resize(thatmuch) + local scr = awful.screen.focused() + scr.selected_tag.gap = scr.selected_tag.gap + tonumber(thatmuch) + awful.layout.arrange(scr) + end + + return setmetatable(util, { __index = wrequire }) diff --combined .config/awesome/lain/util/markup.lua index 0000000,0d3b17a..0d3b17a mode 000000,100644..100644 --- a/.config/awesome/lain/util/markup.lua +++ b/.config/awesome/lain/util/markup.lua @@@ -1,0 -1,67 +1,67 @@@ + + --[[ + + Licensed under MIT License + * (c) 2013, Luke Bonham + * (c) 2009, Uli Schlachter + * (c) 2009, Majic + + --]] + + local string = { format = string.format } + local setmetatable = setmetatable + + -- Lain markup util submodule + -- lain.util.markup + local markup = { fg = {}, bg = {} } + + -- Convenience tags. + function markup.bold(text) return '' .. text .. '' end + function markup.italic(text) return '' .. text .. '' end + function markup.strike(text) return '' .. text .. '' end + function markup.underline(text) return '' .. text .. '' end + function markup.monospace(text) return '' .. text .. '' end + function markup.big(text) return '' .. text .. '' end + function markup.small(text) return '' .. text .. '' end + + -- Set the font. + function markup.font(font, text) + return '' .. text ..'' + end + + -- Set the foreground. + function markup.fg.color(color, text) + return '' .. text .. '' + end + + -- Set the background. + function markup.bg.color(color, text) + return '' .. text .. '' + end + + -- Set foreground and background. + function markup.color(fg, bg, text) + return string.format('%s', fg, bg, text) + end + + -- Set font and foreground. + function markup.fontfg(font, fg, text) + return string.format('%s', font, fg, text) + end + + -- Set font and background. + function markup.fontbg(font, bg, text) + return string.format('%s', font, bg, text) + end + + -- Set font, foreground and background. + function markup.fontcolor(font, fg, bg, text) + return string.format('%s', font, fg, bg, text) + end + + -- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...) + setmetatable(markup.fg, { __call = function(_, ...) return markup.fg.color(...) end }) + setmetatable(markup.bg, { __call = function(_, ...) return markup.bg.color(...) end }) + + -- link markup(...) calls to markup.fg.color(...) + return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end }) diff --combined .config/awesome/lain/util/quake.lua index 0000000,4c42803..4c42803 mode 000000,100644..100644 --- a/.config/awesome/lain/util/quake.lua +++ b/.config/awesome/lain/util/quake.lua @@@ -1,0 -1,169 +1,169 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2016, Luke Bonham + * (c) 2015, unknown + + --]] + + local awful = require("awful") + local capi = { client = client } + + local math = { floor = math.floor } + local string = { format = string.format } + + local pairs = pairs + local screen = screen + + local setmetatable = setmetatable + + -- Quake-like Dropdown application spawn + local quake = {} + + -- If you have a rule like "awful.client.setslave" for your terminals, + -- ensure you use an exception for QuakeDD. Otherwise, you may + -- run into problems with focus. + + function quake:display() + if self.followtag then self.screen = awful.screen.focused() end + + -- First, we locate the client + local client = nil + local i = 0 + for c in awful.client.iterate(function (c) + -- c.name may be changed! + return c.instance == self.name + end, nil, self.screen) + do + i = i + 1 + if i == 1 then + client = c + else + -- Additional matching clients, let's remove the sticky bit + -- which may persist between awesome restarts. We don't close + -- them as they may be valuable. They will just turn into + -- normal clients. + c.sticky = false + c.ontop = false + c.above = false + end + end + + if not client and not self.visible then return end + + if not client then + -- The client does not exist, we spawn it + cmd = string.format("%s %s %s", self.app, + string.format(self.argname, self.name), self.extra) + awful.spawn(cmd, { tag = self.screen.selected_tag }) + return + end + + -- Set geometry + client.floating = true + client.border_width = self.border + client.size_hints_honor = false + client:geometry(self:compute_size()) + + -- Set not sticky and on top + client.sticky = false + client.ontop = true + client.above = true + client.skip_taskbar = true + + -- Additional user settings + if self.settings then self.settings(client) end + + -- Toggle display + if self.visible then + client.hidden = false + client:raise() + self.last_tag = self.screen.selected_tag + client:tags({self.screen.selected_tag}) + capi.client.focus = client + else + client.hidden = true + local ctags = client:tags() + for i, t in pairs(ctags) do + ctags[i] = nil + end + client:tags(ctags) + end + + return client + end + + function quake:compute_size() + -- skip if we already have a geometry for this screen + if not self.geometry[self.screen] then + local geom + if not self.overlap then + geom = screen[self.screen].workarea + else + geom = screen[self.screen].geometry + end + local width, height = self.width, self.height + if width <= 1 then width = math.floor(geom.width * width) - 2 * self.border end + if height <= 1 then height = math.floor(geom.height * height) end + local x, y + if self.horiz == "left" then x = geom.x + elseif self.horiz == "right" then x = geom.width + geom.x - width + else x = geom.x + (geom.width - width)/2 end + if self.vert == "top" then y = geom.y + elseif self.vert == "bottom" then y = geom.height + geom.y - height + else y = geom.y + (geom.height - height)/2 end + self.geometry[self.screen] = { x = x, y = y, width = width, height = height } + end + return self.geometry[self.screen] + end + + function quake:new(config) + local conf = config or {} + + conf.app = conf.app or "xterm" -- application to spawn + conf.name = conf.name or "QuakeDD" -- window name + conf.argname = conf.argname or "-name %s" -- how to specify window name + conf.extra = conf.extra or "" -- extra arguments + conf.border = conf.border or 1 -- client border width + conf.visible = conf.visible or false -- initially not visible + conf.followtag = conf.followtag or false -- spawn on currently focused screen + conf.overlap = conf.overlap or false -- overlap wibox + conf.screen = conf.screen or awful.screen.focused() + conf.settings = conf.settings + + -- If width or height <= 1 this is a proportion of the workspace + conf.height = conf.height or 0.25 -- height + conf.width = conf.width or 1 -- width + conf.vert = conf.vert or "top" -- top, bottom or center + conf.horiz = conf.horiz or "left" -- left, right or center + conf.geometry = {} -- internal use + + local dropdown = setmetatable(conf, { __index = quake }) + + capi.client.connect_signal("manage", function(c) + if c.instance == dropdown.name and c.screen == dropdown.screen then + dropdown:display() + end + end) + capi.client.connect_signal("unmanage", function(c) + if c.instance == dropdown.name and c.screen == dropdown.screen then + dropdown.visible = false + end + end) + + return dropdown + end + + function quake:toggle() + if self.followtag then self.screen = awful.screen.focused() end + local current_tag = self.screen.selected_tag + if current_tag and self.last_tag ~= current_tag and self.visible then + self:display():move_to_tag(current_tag) + else + self.visible = not self.visible + self:display() + end + end + + return setmetatable(quake, { __call = function(_, ...) return quake:new(...) end }) diff --combined .config/awesome/lain/util/separators.lua index 0000000,abf57c4..abf57c4 mode 000000,100644..100644 --- a/.config/awesome/lain/util/separators.lua +++ b/.config/awesome/lain/util/separators.lua @@@ -1,0 -1,102 +1,102 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2015, Luke Bonham + * (c) 2015, plotnikovanton + + --]] + + local wibox = require("wibox") + local gears = require("gears") + + -- Lain Cairo separators util submodule + -- lain.util.separators + local separators = { height = 0, width = 9 } + + -- [[ Arrow + + -- Right + function separators.arrow_right(col1, col2) + local widget = wibox.widget.base.make_widget() + + widget.fit = function(m, w, h) + return separators.width, separators.height + end + + widget.draw = function(mycross, wibox, cr, width, height) + if col2 ~= "alpha" then + cr:set_source_rgb(gears.color.parse_color(col2)) + cr:new_path() + cr:move_to(0, 0) + cr:line_to(width, height/2) + cr:line_to(width, 0) + cr:close_path() + cr:fill() + + cr:new_path() + cr:move_to(0, height) + cr:line_to(width, height/2) + cr:line_to(width, height) + cr:close_path() + cr:fill() + end + + if col1 ~= "alpha" then + cr:set_source_rgb(gears.color.parse_color(col1)) + cr:new_path() + cr:move_to(0, 0) + cr:line_to(width, height/2) + cr:line_to(0, height) + cr:close_path() + cr:fill() + end + end + + return widget + end + + -- Left + function separators.arrow_left(col1, col2) + local widget = wibox.widget.base.make_widget() + + widget.fit = function(m, w, h) + return separators.width, separators.height + end + + widget.draw = function(mycross, wibox, cr, width, height) + if col1 ~= "alpha" then + cr:set_source_rgb(gears.color.parse_color(col1)) + cr:new_path() + cr:move_to(width, 0) + cr:line_to(0, height/2) + cr:line_to(0, 0) + cr:close_path() + cr:fill() + + cr:new_path() + cr:move_to(width, height) + cr:line_to(0, height/2) + cr:line_to(0, height) + cr:close_path() + cr:fill() + end + + if col2 ~= "alpha" then + cr:new_path() + cr:move_to(width, 0) + cr:line_to(0, height/2) + cr:line_to(width, height) + cr:close_path() + + cr:set_source_rgb(gears.color.parse_color(col2)) + cr:fill() + end + end + + return widget + end + + -- ]] + + return separators diff --combined .config/awesome/lain/widget/alsa.lua index 0000000,36ccc71..36ccc71 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/alsa.lua +++ b/.config/awesome/lain/widget/alsa.lua @@@ -1,0 -1,55 +1,55 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010, Adrian C. + + --]] + + local helpers = require("lain.helpers") + local shell = require("awful.util").shell + local wibox = require("wibox") + local string = { match = string.match, + format = string.format } + + -- ALSA volume + -- lain.widget.alsa + + local function factory(args) + local alsa = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + + alsa.cmd = args.cmd or "amixer" + alsa.channel = args.channel or "Master" + alsa.togglechannel = args.togglechannel + + local format_cmd = string.format("%s get %s", alsa.cmd, alsa.channel) + + if alsa.togglechannel then + format_cmd = { shell, "-c", string.format("%s get %s; %s get %s", + alsa.cmd, alsa.channel, alsa.cmd, alsa.togglechannel) } + end + + alsa.last = {} + + function alsa.update() + helpers.async(format_cmd, function(mixer) + local l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + if alsa.last.level ~= l or alsa.last.status ~= s then + volume_now = { level = l, status = s } + widget = alsa.widget + settings() + alsa.last = volume_now + end + end) + end + + helpers.newtimer(string.format("alsa-%s-%s", alsa.cmd, alsa.channel), timeout, alsa.update) + + return alsa + end + + return factory diff --combined .config/awesome/lain/widget/alsabar.lua index 0000000,2ad0210..2ad0210 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/alsabar.lua +++ b/.config/awesome/lain/widget/alsabar.lua @@@ -1,0 -1,135 +1,135 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2013, Rman + + --]] + + local helpers = require("lain.helpers") + local awful = require("awful") + local naughty = require("naughty") + local wibox = require("wibox") + local math = { modf = math.modf } + local string = { format = string.format, + match = string.match, + rep = string.rep } + local type, tonumber = type, tonumber + + -- ALSA volume bar + -- lain.widget.alsabar + + local function factory(args) + local alsabar = { + colors = { + background = "#000000", + mute = "#EB8F8F", + unmute = "#A4CE8A" + }, + + _current_level = 0, + _muted = false + } + + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local width = args.width or 63 + local height = args.height or 1 + local ticks = args.ticks or false + local ticks_size = args.ticks_size or 7 + + alsabar.cmd = args.cmd or "amixer" + alsabar.channel = args.channel or "Master" + alsabar.togglechannel = args.togglechannel + alsabar.colors = args.colors or alsabar.colors + alsabar.followtag = args.followtag or false + alsabar.notification_preset = args.notification_preset + + if not alsabar.notification_preset then + alsabar.notification_preset = {} + alsabar.notification_preset.font = "Monospace 10" + end + + local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel) + + if alsabar.togglechannel then + format_cmd = { awful.util.shell, "-c", string.format("%s get %s; %s get %s", + alsabar.cmd, alsabar.channel, alsabar.cmd, alsabar.togglechannel) } + end + + alsabar.bar = wibox.widget { + forced_height = height, + forced_width = width, + color = alsabar.colors.unmute, + background_color = alsabar.colors.background, + margins = 1, + paddings = 1, + ticks = ticks, + ticks_size = ticks_size, + widget = wibox.widget.progressbar + } + + alsabar.tooltip = awful.tooltip({ objects = { alsabar.bar } }) + + function alsabar.update(callback) + helpers.async(format_cmd, function(mixer) + local volu,mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") + if (volu and tonumber(volu) ~= alsabar._current_level) or (mute and string.match(mute, "on") ~= alsabar._muted) then + alsabar._current_level = tonumber(volu) or alsabar._current_level + alsabar.bar:set_value(alsabar._current_level / 100) + if (not mute and tonumber(volu) == 0) or mute == "off" then + alsabar._muted = true + alsabar.tooltip:set_text ("[Muted]") + alsabar.bar.color = alsabar.colors.mute + else + alsabar._muted = false + alsabar.tooltip:set_text(string.format("%s: %s", alsabar.channel, volu)) + alsabar.bar.color = alsabar.colors.unmute + end + + volume_now = {} + volume_now.level = tonumber(volu) + volume_now.status = mute + + settings() + + if type(callback) == "function" then callback() end + end + end) + end + + function alsabar.notify() + alsabar.update(function() + local preset = alsabar.notification_preset + + if alsabar._muted then + preset.title = string.format("%s - Muted", alsabar.channel) + else + preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level) + end + + int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height) + preset.text = string.format("[%s%s]", string.rep("|", int), + string.rep(" ", awful.screen.focused().mywibox.height - int)) + + if alsabar.followtag then preset.screen = awful.screen.focused() end + + if not alsabar.notification then + alsabar.notification = naughty.notify { + preset = preset, + destroy = function() alsabar.notification = nil end + } + else + naughty.replace_text(alsabar.notification, preset.title, preset.text) + end + end) + end + + helpers.newtimer(string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel), timeout, alsabar.update) + + return alsabar + end + + return factory diff --combined .config/awesome/lain/widget/bat.lua index 0000000,e901842..e901842 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/bat.lua +++ b/.config/awesome/lain/widget/bat.lua @@@ -1,0 -1,181 +1,181 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local first_line = require("lain.helpers").first_line + local newtimer = require("lain.helpers").newtimer + local naughty = require("naughty") + local wibox = require("wibox") + local math = { abs = math.abs, + floor = math.floor, + log10 = math.log10, + min = math.min } + local string = { format = string.format } + local ipairs = ipairs + local tonumber = tonumber + + -- Battery infos + -- lain.widget.bat + + local function factory(args) + local bat = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 30 + local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"} + local ac = args.ac or "AC0" + local notify = args.notify or "on" + local n_perc = args.n_perc or { 5, 15 } + local settings = args.settings or function() end + + bat_notification_critical_preset = { + title = "Battery exhausted", + text = "Shutdown imminent", + timeout = 15, + fg = "#000000", + bg = "#FFFFFF" + } + + bat_notification_low_preset = { + title = "Battery low", + text = "Plug the cable!", + timeout = 15, + fg = "#202020", + bg = "#CDCDCD" + } + + bat_now = { + status = "N/A", + ac_status = "N/A", + perc = "N/A", + time = "N/A", + watt = "N/A" + } + + bat_now.n_status = {} + bat_now.n_perc = {} + for i = 1, #batteries do + bat_now.n_status[i] = "N/A" + bat_now.n_perc[i] = 0 + end + + function bat.update() + local sum_rate_current = 0 + local sum_rate_voltage = 0 + local sum_rate_power = 0 + local sum_rate_energy = 0 + local sum_energy_now = 0 + local sum_energy_full = 0 + local pspath = "/sys/class/power_supply/" + + for i, battery in ipairs(batteries) do + local bstr = pspath .. battery + local present = first_line(bstr .. "/present") + + if tonumber(present) == 1 then + -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW] + local rate_current = tonumber(first_line(bstr .. "/current_now")) + local rate_voltage = tonumber(first_line(bstr .. "/voltage_now")) + local rate_power = tonumber(first_line(bstr .. "/power_now")) + + -- energy_now(P)[uWh], charge_now(I)[uAh] + local energy_now = tonumber(first_line(bstr .. "/energy_now") or + first_line(bstr .. "/charge_now")) + + -- energy_full(P)[uWh], charge_full(I)[uAh] + local energy_full = tonumber(first_line(bstr .. "/energy_full") or + first_line(bstr .. "/charge_full")) + + local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or + math.floor((energy_now / energy_full) * 100) + + bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A" + bat_now.n_perc[i] = energy_percentage or bat_now.n_perc[i] + + sum_rate_current = sum_rate_current + (rate_current or 0) + sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0) + sum_rate_power = sum_rate_power + (rate_power or 0) + sum_rate_energy = sum_rate_energy + (rate_power or (((rate_voltage or 0) * (rate_current or 0)) / 1e6)) + sum_energy_now = sum_energy_now + (energy_now or 0) + sum_energy_full = sum_energy_full + (energy_full or 0) + end + end + + -- When one of the battery is charging, others' status are either + -- "Full", "Unknown" or "Charging". When the laptop is not plugged in, + -- one or more of the batteries may be full, but only one battery + -- discharging suffices to set global status to "Discharging". + bat_now.status = bat_now.n_status[1] + for _,status in ipairs(bat_now.n_status) do + if status == "Discharging" or status == "Charging" then + bat_now.status = status + end + end + bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A" + + if bat_now.status ~= "N/A" then + if bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then + bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) + bat_now.time = "00:00" + bat_now.watt = 0 + + -- update {perc,time,watt} iff battery not full and rate > 0 + elseif bat_now.status ~= "Full" then + local rate_time = 0 + -- Calculate time and watt if rates are greater then 0 + if (sum_rate_power > 0 or sum_rate_current > 0) then + local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current + + if bat_now.status == "Charging" then + rate_time = (sum_energy_full - sum_energy_now) / div + else -- Discharging + rate_time = sum_energy_now / div + end + + if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199) + rate_time_magnitude = math.abs(math.floor(math.log10(rate_time))) + rate_time = rate_time * 10^(rate_time_magnitude - 2) + end + end + + local hours = math.floor(rate_time) + local minutes = math.floor((rate_time - hours) * 60) + bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6)) + elseif bat_now.status == "Full" then + bat_now.perc = 100 + bat_now.time = "00:00" + bat_now.watt = 0 + end + end + + widget = bat.widget + settings() + + -- notifications for critical and low levels + if notify == "on" and bat_now.status == "Discharging" then + if tonumber(bat_now.perc) <= n_perc[1] then + bat.id = naughty.notify({ + preset = bat_notification_critical_preset, + replaces_id = bat.id + }).id + elseif tonumber(bat_now.perc) <= n_perc[2] then + bat.id = naughty.notify({ + preset = bat_notification_low_preset, + replaces_id = bat.id + }).id + end + end + end + + newtimer("batteries", timeout, bat.update) + + return bat + end + + return factory diff --combined .config/awesome/lain/widget/calendar.lua index 0000000,99e8817..99e8817 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/calendar.lua +++ b/.config/awesome/lain/widget/calendar.lua @@@ -1,0 -1,128 +1,128 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local markup = require("lain.util.markup") + local awful = require("awful") + local naughty = require("naughty") + local mouse = mouse + local os = { date = os.date } + local string = { format = string.format, + gsub = string.gsub } + local ipairs = ipairs + local tonumber = tonumber + local setmetatable = setmetatable + + -- Calendar notification + -- lain.widget.calendar + local calendar = { offset = 0 } + + function calendar.hide() + if not calendar.notification then return end + naughty.destroy(calendar.notification) + calendar.notification = nil + end + + function calendar.show(t_out, inc_offset, scr) + local f, offs = nil, inc_offset or 0 + + calendar.notification_preset.screen = scr or (calendar.followtag and awful.screen.focused()) or 1 + calendar.offset = calendar.offset + offs + + local current_month = (offs == 0 or calendar.offset == 0) + + if current_month then -- today highlighted + calendar.offset = 0 + calendar.icon = string.format("%s%s.png", calendar.icons, tonumber(os.date("%d"))) + f = calendar.cal + else -- no current month showing, no day to highlight + local month = tonumber(os.date("%m")) + local year = tonumber(os.date("%Y")) + + month = month + calendar.offset + + while month > 12 do + month = month - 12 + year = year + 1 + end + + while month < 1 do + month = month + 12 + year = year - 1 + end + + calendar.icon = nil + f = string.format("%s %s %s", calendar.cal, month, year) + end + + helpers.async(f, function(ws) + local fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg + calendar.notification_preset.text = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?", + markup.bold(markup.color(bg, fg, os.date("%e")))):gsub("\n*$", "") + + local widget_focused = true + + if t_out == 0 and mouse.current_widgets then + widget_focused = false + for i, widget in ipairs(calendar.attach_to) do + for _,v in ipairs(mouse.current_widgets) do + if widget == v then + widget_focused = true + break + end + end + end + end + + if widget_focused then + calendar.hide() + calendar.notification = naughty.notify({ + preset = calendar.notification_preset, + icon = calendar.icon, + timeout = t_out or calendar.notification_preset.timeout or 5 + }) + end + end) + end + + function calendar.hover_on() calendar.show(0) end + function calendar.hover_off() calendar.hide() end + function calendar.prev() calendar.show(0, -1) end + function calendar.next() calendar.show(0, 1) end + + function calendar.attach(widget) + widget:connect_signal("mouse::enter", calendar.hover_on) + widget:connect_signal("mouse::leave", calendar.hover_off) + widget:buttons(awful.util.table.join( + awful.button({}, 1, calendar.prev), + awful.button({}, 3, calendar.next), + awful.button({}, 2, calendar.hover_on), + awful.button({}, 4, calendar.prev), + awful.button({}, 5, calendar.next))) + end + + local function factory(args) + local args = args or {} + calendar.cal = args.cal or "/usr/bin/cal" + calendar.attach_to = args.attach_to or {} + calendar.followtag = args.followtag or false + calendar.icons = args.icons or helpers.icons_dir .. "cal/white/" + calendar.notification_preset = args.notification_preset + + if not calendar.notification_preset then + calendar.notification_preset = { + font = "Monospace 10", + fg = "#FFFFFF", + bg = "#000000" + } + end + + for i, widget in ipairs(calendar.attach_to) do calendar.attach(widget) end + end + + return setmetatable(calendar, { __call = function(_, ...) return factory(...) end }) diff --combined .config/awesome/lain/widget/contrib/gpmdp.lua index 0000000,e980209..e980209 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/gpmdp.lua +++ b/.config/awesome/lain/widget/contrib/gpmdp.lua @@@ -1,0 -1,88 +1,88 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2016, Alexandre Terrien + + --]] + + local helpers = require("lain.helpers") + local json = require("lain.util.dkjson") + local focused = require("awful.screen").focused + local pread = require("awful.util").pread + local naughty = require("naughty") + local wibox = require("wibox") + local next, getenv, table = next, os.getenv, table + + -- Google Play Music Desktop infos + -- lain.widget.contrib.gpmdp + -- requires: curl + + local function factory(args) + local gpmdp = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local notify = args.notify or "off" + local followtag = args.followtag or false + local file_location = args.file_location or + getenv("HOME") .. "/.config/Google Play Music Desktop Player/json_store/playback.json" + local settings = args.settings or function() end + + gpmdp_notification_preset = { + title = "Now playing", + timeout = 6 + } + + helpers.set_map("gpmdp_current", nil) + + function gpmdp.update() + local filelines = helpers.lines_from(file_location) + + if not next(filelines) then + local gpm_now = { running = false, playing = false } + else + dict, pos, err = json.decode(table.concat(filelines), 1, nil) + local gpm_now = {} + gpm_now.artist = dict.song.artist + gpm_now.album = dict.song.album + gpm_now.title = dict.song.title + gpm_now.cover_url = dict.song.albumArt + gpm_now.playing = dict.playing + end + + if pread("pidof 'Google Play Music Desktop Player'") ~= '' then + gpm_now.running = true + else + gpm_now.running = false + end + + gpmdp_notification_preset.text = string.format("%s (%s) - %s", gpm_now.artist, gpm_now.album, gpm_now.title) + widget = gpmdp.widget + settings() + + if gpm_now.playing then + if notify == "on" and gpm_now.title ~= helpers.get_map("gpmdp_current") then + helpers.set_map("gpmdp_current", gpm_now.title) + + if followtag then gpmdp_notification_preset.screen = focused() end + + helpers.async(string.format("curl %d -o /tmp/gpmcover.png", gpm_now.cover_url), + function(f) + gpmdp.id = naughty.notify({ + preset = gpmdp_notification_preset, + icon = "/tmp/gpmcover.png", + replaces_id = gpmdp.id + }).id + end) + end + elseif not gpm_now.running then + helpers.set_map("gpmdp_current", nil) + end + end + + gpmdp.timer = helpers.newtimer("gpmdp", timeout, gpmdp.update, true, true) + + return gpmdp + end + + return factory diff --combined .config/awesome/lain/widget/contrib/init.lua index 0000000,d7f130e..d7f130e mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/init.lua +++ b/.config/awesome/lain/widget/contrib/init.lua @@@ -1,0 -1,19 +1,19 @@@ + + --[[ + + Lain + Layouts, widgets and utilities for Awesome WM + + Users contributed widgets section + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + local wrequire = require("lain.helpers").wrequire + local setmetatable = setmetatable + + local widget = { _NAME = "lain.widget.contrib" } + + return setmetatable(widget, { __index = wrequire }) diff --combined .config/awesome/lain/widget/contrib/kbdlayout.lua index 0000000,5964bd7..5964bd7 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/kbdlayout.lua +++ b/.config/awesome/lain/widget/contrib/kbdlayout.lua @@@ -1,0 -1,78 +1,78 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2015, Dario Gjorgjevski + + --]] + + local helpers = require("lain.helpers") + local awful = require("awful") + local wibox = require("wibox") + local string = { format = string.format, + match = string.match } + local execute = os.execute + local setmetatable = setmetatable + + -- Keyboard layout switcher + -- lain.widget.contrib.kblayout + + local function factory(args) + local kbdlayout = { widget = wibox.widget.textbox() } + local args = args or {} + local layouts = args.layouts or {} + local settings = args.settings or function () end + local add_us_secondary = true + local timeout = args.timeout or 5 + local idx = 1 + + if args.add_us_secondary == false then add_us_secondary = false end + + local function kbd_run_settings(layout, variant) + kbdlayout_now = { + layout = string.match(layout, "[^,]+"), -- Make sure to match the primary layout only. + variant = variant + } + widget = kbdlayout.widget + settings() + end + + function kbdlayout.update() + helpers.async("setxkbmap -query", function(status) + kbd_run_settings(string.match(status, "layout:%s*([^\n]*)"), + string.match(status, "variant:%s*([^\n]*)")) + end) + end + + function kbdlayout.set(i) + if #layouts == 0 then return end + idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed. + local to_execute = "setxkbmap " .. layouts[idx].layout + + if add_us_secondary and not string.match(layouts[idx].layout, ",?us,?") then + to_execute = to_execute .. ",us" + end + + if layouts[idx].variant then + to_execute = to_execute .. " " .. layouts[idx].variant + end + + if execute(to_execute) then + kbd_run_settings(layouts[idx].layout, layouts[idx].variant) + end + end + + function kbdlayout.next() kbdlayout.set(idx + 1) end + function kbdlayout.prev() kbdlayout.set(idx - 1) end + + -- Mouse bindings + kbdlayout.widget:buttons(awful.util.table.join( + awful.button({ }, 1, function () kbdlayout.next() end), + awful.button({ }, 3, function () kbdlayout.prev() end))) + + helpers.newtimer("kbdlayout", timeout, kbdlayout.update) + + return kbdlayout + end + + return factory diff --combined .config/awesome/lain/widget/contrib/moc.lua index 0000000,83d8aaf..83d8aaf mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/moc.lua +++ b/.config/awesome/lain/widget/contrib/moc.lua @@@ -1,0 -1,98 +1,98 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2014, anticlockwise + + --]] + + local helpers = require("lain.helpers") + local shell = require("awful.util").shell + local focused = require("awful.screen").focused + local escape_f = require("awful.util").escape + local naughty = require("naughty") + local wibox = require("wibox") + local os = { getenv = os.getenv } + local string = { format = string.format, + gmatch = string.gmatch } + + -- MOC audio player + -- lain.widget.contrib.moc + + local function factory(args) + local moc = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local music_dir = args.music_dir or os.getenv("HOME") .. "/Music" + local cover_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$" + local cover_size = args.cover_size or 100 + local default_art = args.default_art or "" + local followtag = args.followtag or false + local settings = args.settings or function() end + + moc_notification_preset = { title = "Now playing", timeout = 6 } + + helpers.set_map("current moc track", nil) + + function moc.update() + helpers.async("mocp -i", function(f) + moc_now = { + state = "N/A", + file = "N/A", + artist = "N/A", + title = "N/A", + album = "N/A", + elapsed = "N/A", + total = "N/A" + } + + for line in string.gmatch(f, "[^\n]+") do + for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do + if k == "State" then moc_now.state = v + elseif k == "File" then moc_now.file = v + elseif k == "Artist" then moc_now.artist = escape_f(v) + elseif k == "SongTitle" then moc_now.title = escape_f(v) + elseif k == "Album" then moc_now.album = escape_f(v) + elseif k == "CurrentTime" then moc_now.elapsed = escape_f(v) + elseif k == "TotalTime" then moc_now.total = escape_f(v) + end + end + end + + moc_notification_preset.text = string.format("%s (%s) - %s\n%s", moc_now.artist, + moc_now.album, moc_now.total, moc_now.title) + widget = moc.widget + settings() + + if moc_now.state == "PLAY" then + if moc_now.title ~= helpers.get_map("current moc track") then + helpers.set_map("current moc track", moc_now.title) + + if followtag then moc_notification_preset.screen = focused() end + + local common = { + preset = moc_notification_preset, + icon = default_art, + icon_size = cover_size, + replaces_id = moc.id, + } + + local path = string.format("%s/%s", music_dir, string.match(moc_now.file, ".*/")) + local cover = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern) + helpers.async({ shell, "-c", cover }, function(current_icon) + common.icon = current_icon:gsub("\n", "") + moc.id = naughty.notify(common).id + end) + end + elseif moc_now.state ~= "PAUSE" then + helpers.set_map("current moc track", nil) + end + end) + end + + moc.timer = helpers.newtimer("moc", timeout, moc.update, true, true) + + return moc + end + + return factory diff --combined .config/awesome/lain/widget/contrib/redshift.lua index 0000000,0babb3a..0babb3a mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/redshift.lua +++ b/.config/awesome/lain/widget/contrib/redshift.lua @@@ -1,0 -1,54 +1,54 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2014, blueluke + + --]] + + local async = require("lain.helpers").async + local awful = require("awful") + local execute = os.execute + local type = type + + -- Redshift + -- lain.widget.contrib.redshift + local redshift = { active = false, pid = nil } + + function redshift:start() + execute("pkill redshift") + awful.spawn.with_shell("redshift -x") -- clear adjustments + redshift.pid = awful.spawn.with_shell("redshift") + redshift.active = true + if type(redshift.update_fun) == "function" then + redshift.update_fun(redshift.active) + end + end + + function redshift:toggle() + async({ awful.util.shell, "-c", string.format("ps -p %d -o pid=", redshift.pid) }, function(f) + if f and #f > 0 then -- redshift is running + -- Sending -USR1 toggles redshift (See project website) + execute("pkill -USR1 redshift") + redshift.active = not redshift.active + else -- not started or killed, (re)start it + redshift:start() + end + redshift.update_fun(redshift.active) + end) + end + + -- Attach to a widget + -- Provides a button which toggles redshift on/off on click + -- @param widget: Widget to attach to. + -- @param fun: Function to be run each time redshift is toggled (optional). + -- Use it to update widget text or icons on status change. + function redshift:attach(widget, fun) + redshift.update_fun = fun or function() end + if not redshift.pid then redshift:start() end + if widget then + widget:buttons(awful.util.table.join(awful.button({}, 1, function () redshift:toggle() end))) + end + end + + return redshift diff --combined .config/awesome/lain/widget/contrib/task.lua index 0000000,ba79553..ba79553 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/task.lua +++ b/.config/awesome/lain/widget/contrib/task.lua @@@ -1,0 -1,82 +1,82 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Jan Xie + + --]] + + local helpers = require("lain.helpers") + local markup = require("lain.util").markup + local awful = require("awful") + local naughty = require("naughty") + local string = { format = string.format, gsub = string.gsub } + + -- Taskwarrior notification + -- lain.widget.contrib.task + local task = {} + + function task.hide() + if not task.notification then return end + naughty.destroy(task.notification) + task.notification = nil + end + + function task.show(scr) + task.hide() + + if task.followtag then + task.notification_preset.screen = awful.screen.focused() + elseif scr then + task.notification_preset.screen = scr + end + + helpers.async(task.show_cmd, function(f) + task.notification = naughty.notify({ + preset = task.notification_preset, + title = task.show_cmd, + text = markup.font(task.notification_preset.font, + awful.util.escape(f:gsub("\n*$", ""))) + }) + end) + end + + function task.prompt() + awful.prompt.run { + prompt = task.prompt_text, + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = function(t) + helpers.async(t, function(f) + naughty.notify { + preset = task.notification_preset, + title = t, + text = markup.font(task.notification_preset.font, + awful.util.escape(f:gsub("\n*$", ""))) + } + end) + end, + history_path = awful.util.getdir("cache") .. "/history_task" + } + end + + function task.attach(widget, args) + local args = args or {} + task.show_cmd = args.show_cmd or "task next" + task.prompt_text = args.prompt_text or "Enter task command: " + task.followtag = args.followtag or false + task.notification_preset = args.notification_preset + + if not task.notification_preset then + task.notification_preset = { + font = "Monospace 10", + icon = helpers.icons_dir .. "/taskwarrior.png" + } + end + + if widget then + widget:connect_signal("mouse::enter", function () task.show() end) + widget:connect_signal("mouse::leave", function () task.hide() end) + end + end + + return task diff --combined .config/awesome/lain/widget/contrib/tpbat/init.lua index 0000000,49cc01a..49cc01a mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/tpbat/init.lua +++ b/.config/awesome/lain/widget/contrib/tpbat/init.lua @@@ -1,0 -1,162 +1,162 @@@ + + --[[ + + tpbat.lua + Battery status widget for ThinkPad laptops that use SMAPI + lain.widget.contrib.tpbat + + More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi + + Licensed under GNU General Public License v2 + * (c) 2013, Conor Heine + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local debug = { getinfo = debug.getinfo } + local newtimer = require("lain.helpers").newtimer + local first_line = require("lain.helpers").first_line + local naughty = require("naughty") + local wibox = require("wibox") + local string = { format = string.format } + local math = { floor = math.floor } + local tostring = tostring + local setmetatable = setmetatable + package.path = debug.getinfo(1,"S").source:match[[^@?(.*[\/])[^\/]-$]] .. "?.lua;" .. package.path + local smapi = require("smapi") + + -- ThinkPad SMAPI-enabled battery info widget + -- lain.widget.contrib.tpbat + local tpbat = {} + + function tpbat.hide() + if not tpbat.notification then return end + naughty.destroy(tpbat.notification) + tpbat.notification = nil + end + + function tpbat.show(t_out) + tpbat.hide() + + local bat = tpbat.bat + + if bat == nil or not bat:installed() then return end + + local t_out = t_out or 0 + local mfgr = bat:get('manufacturer') or "no_mfgr" + local model = bat:get('model') or "no_model" + local chem = bat:get('chemistry') or "no_chem" + local status = bat:get('state') or "nil" + local time = bat:remaining_time() + local msg = "\t" + + if status ~= "idle" and status ~= "nil" then + if time == "N/A" then + msg = "...Calculating time remaining..." + else + msg = time .. (status == "charging" and " until charged" or " remaining") + end + else + msg = "On AC Power" + end + + local str = string.format("%s : %s %s (%s)\n", bat.name, mfgr, model, chem) + .. string.format("\n%s \t\t\t %s", status:upper(), msg) + + tpbat.notification = naughty.notify({ + text = str, + timeout = t_out, + screen = client.focus and client.focus.screen or 1 + }) + end + + function tpbat.register(args) + local args = args or {} + local timeout = args.timeout or 30 + local battery = args.battery or "BAT0" + local settings = args.settings or function() end + + tpbat.bat = smapi:battery(battery) -- Create a new battery + local bat = tpbat.bat + + tpbat.widget = wibox.widget.textbox() + + bat_notification_low_preset = { + title = "Battery low", + text = "Plug the cable!", + timeout = 15, + fg = "#202020", + bg = "#CDCDCD" + } + + bat_notification_critical_preset = { + title = "Battery exhausted", + text = "Shutdown imminent", + timeout = 15, + fg = "#000000", + bg = "#FFFFFF" + } + + if bat:get('state') == nil + then + local n = naughty.notify({ + preset = bat_notification_low_preset, + title = "SMAPI Battery Warning: Unable to read battery state!", + text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.", + screen = client.focus and client.focus.screen or 1 + }) + end + + function tpbat.update() + bat_now = { + status = "Not present", + perc = "N/A", + time = "N/A", + watt = "N/A" + } + + if bat:installed() + then + bat_now.status = bat:status() or "N/A" + bat_now.perc = bat:percent() + bat_now.time = bat:remaining_time() + -- bat_now.watt = string.format("%.2fW", (VOLTS * AMPS) / 1e12) + + -- notifications for low and critical states (when discharging) + if bat_now.status == "discharging" + then + if bat_now.perc <= 5 + then + tpbat.id = naughty.notify({ + preset = bat_notification_critical_preset, + replaces_id = tpbat.id, + screen = client.focus and client.focus.screen or 1 + }).id + elseif bat_now.perc <= 15 + then + tpbat.id = naughty.notify({ + preset = bat_notification_low_preset, + replaces_id = tpbat.id, + screen = client.focus and client.focus.screen or 1 + }).id + end + end + + bat_now.perc = tostring(bat_now.perc) + end + + widget = tpbat.widget + + settings() + end + + newtimer("tpbat-" .. bat.name, timeout, tpbat.update) + + widget:connect_signal('mouse::enter', function () tpbat.show() end) + widget:connect_signal('mouse::leave', function () tpbat.hide() end) + + return tpbat + end + + return setmetatable(tpbat, { __call = function(_, ...) return tpbat.register(...) end }) diff --combined .config/awesome/lain/widget/contrib/tpbat/smapi.lua index 0000000,9002585..9002585 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/contrib/tpbat/smapi.lua +++ b/.config/awesome/lain/widget/contrib/tpbat/smapi.lua @@@ -1,0 -1,99 +1,99 @@@ + + --[[ + + smapi.lua + Interface with thinkpad battery information + + Licensed under GNU General Public License v2 + * (c) 2013, Conor Heine + + --]] + + local first_line = require("lain.helpers").first_line + + local string = { format = string.format } + local tonumber = tonumber + local setmetatable = setmetatable + + local smapi = {} + local apipath = "/sys/devices/platform/smapi" + + -- Most are readable values, but some can be written to (not implemented, yet?) + local readable = { + barcoding = true, + charging_max_current = true, + charging_max_voltage = true, + chemistry = true, + current_avg = true, + current_now = true, + cycle_count = true, + design_capacity = true, + design_voltage = true, + dump = true, + first_use_date = true, + force_discharge = false, + group0_voltage = true, + group1_voltage = true, + group2_voltage = true, + group3_voltage = true, + inhibit_charge_minutes = false, + installed = true, + last_full_capacity = true, + manufacture_date = true, + manufacturer = true, + model = true, + power_avg = true, + power_now = true, + remaining_capacity = true, + remaining_charging_time = true, + remaining_percent = true, + remaining_percent_error = true, + remaining_running_time = true, + remaining_running_time_now = true, + serial = true, + start_charge_thresh = false, + state = true, + stop_charge_thresh = false, + temperature = true, + voltage = true, + } + + function smapi:battery(name) + local bat = {} + + bat.name = name + bat.path = apipath .. "/" .. name + + function bat:get(item) + return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil + end + + function bat:installed() + return self:get("installed") == "1" + end + + function bat:status() + return self:get('state') + end + + -- Remaining time can either be time until battery dies or time until charging completes + function bat:remaining_time() + local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time' + local mins_left = self:get(time_val) + + if not mins_left:find("^%d+") then return "N/A" end + + local hrs = math.floor(mins_left / 60) + local min = mins_left % 60 + + return string.format("%02d:%02d", hrs, min) + end + + function bat:percent() + return tonumber(self:get("remaining_percent")) + end + + return setmetatable(bat, {__metatable = false, __newindex = false}) + end + + return smapi diff --combined .config/awesome/lain/widget/cpu.lua index 0000000,9a5a964..9a5a964 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/cpu.lua +++ b/.config/awesome/lain/widget/cpu.lua @@@ -1,0 -1,79 +1,79 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local helpers = require("lain.helpers") + local wibox = require("wibox") + local math = { ceil = math.ceil } + local string = { format = string.format, + gmatch = string.gmatch } + local tostring = tostring + + -- CPU usage + -- lain.widget.cpu + + local function factory(args) + local cpu = { core = {}, widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local settings = args.settings or function() end + + function cpu.update() + -- Read the amount of time the CPUs have spent performing + -- different kinds of work. Read the first line of /proc/stat + -- which is the sum of all CPUs. + local times = helpers.lines_match("cpu","/proc/stat") + + for index,time in pairs(times) do + local coreid = index - 1 + local core = cpu.core[coreid] or + { last_active = 0 , last_total = 0, usage = 0 } + local at = 1 + local idle = 0 + local total = 0 + + for field in string.gmatch(time, "[%s]+([^%s]+)") do + -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done + -- nothing during these times. + if at == 4 or at == 5 then + idle = idle + field + end + total = total + field + at = at + 1 + end + + local active = total - idle + + if core.last_active ~= active or core.last_total ~= total then + -- Read current data and calculate relative values. + local dactive = active - core.last_active + local dtotal = total - core.last_total + local usage = math.ceil((dactive / dtotal) * 100) + + core.last_active = active + core.last_total = total + core.usage = usage + + -- Save current data for the next run. + cpu.core[coreid] = core + end + end + + cpu_now = cpu.core + cpu_now.usage = cpu_now[0].usage + widget = cpu.widget + + settings() + end + + helpers.newtimer("cpu", timeout, cpu.update) + + return cpu + end + + return factory diff --combined .config/awesome/lain/widget/fs.lua index 0000000,473bd33..473bd33 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/fs.lua +++ b/.config/awesome/lain/widget/fs.lua @@@ -1,0 -1,124 +1,124 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local shell = require("awful.util").shell + local focused = require("awful.screen").focused + local wibox = require("wibox") + local naughty = require("naughty") + local string = string + local tonumber = tonumber + + -- File system disk space usage + -- lain.widget.fs + + local function factory(args) + local fs = { unit = { ["mb"] = 1024, ["gb"] = 1024^2 }, widget = wibox.widget.textbox() } + + function fs.hide() + if not fs.notification then return end + naughty.destroy(fs.notification) + fs.notification = nil + end + + function fs.show(seconds, scr) + fs.update() + fs.hide() + + if fs.followtag then + fs.notification_preset.screen = focused() + else + fs.notification_preset.screen = scr or 1 + end + + fs.notification = naughty.notify({ + preset = fs.notification_preset, + timeout = seconds or 5 + }) + end + + local args = args or {} + local timeout = args.timeout or 600 + local partition = args.partition or "/" + local showpopup = args.showpopup or "on" + local notify = args.notify or "on" + local settings = args.settings or function() end + + fs.options = args.options + fs.followtag = args.followtag or false + fs.notification_preset = args.notification_preset + + if not fs.notification_preset then + fs.notification_preset = { + font = "Monospace 10", + fg = "#FFFFFF", + bg = "#000000" + } + end + + helpers.set_map(partition, false) + + function fs.update() + fs_info, fs_now = {}, {} + helpers.async({ shell, "-c", "/usr/bin/env LC_ALL=C df -k --output=target,size,used,avail,pcent" }, function(f) + for line in string.gmatch(f, "\n[^\n]+") do + local m,s,u,a,p = string.match(line, "(/.-%s).-(%d+).-(%d+).-(%d+).-([%d]+)%%") + m = m:gsub(" ", "") -- clean target from any whitespace + + fs_info[m .. " size_mb"] = string.format("%.1f", tonumber(s) / fs.unit["mb"]) + fs_info[m .. " size_gb"] = string.format("%.1f", tonumber(s) / fs.unit["gb"]) + fs_info[m .. " used_mb"] = string.format("%.1f", tonumber(u) / fs.unit["mb"]) + fs_info[m .. " used_gb"] = string.format("%.1f", tonumber(u) / fs.unit["gb"]) + fs_info[m .. " used_p"] = p + fs_info[m .. " avail_mb"] = string.format("%.1f", tonumber(a) / fs.unit["mb"]) + fs_info[m .. " avail_gb"] = string.format("%.1f", tonumber(a) / fs.unit["gb"]) + fs_info[m .. " avail_p"] = string.format("%d", 100 - tonumber(p)) + end + + fs_now.size_mb = fs_info[partition .. " size_mb"] or "N/A" + fs_now.size_gb = fs_info[partition .. " size_gb"] or "N/A" + fs_now.used = fs_info[partition .. " used_p"] or "N/A" + fs_now.used_mb = fs_info[partition .. " used_mb"] or "N/A" + fs_now.used_gb = fs_info[partition .. " used_gb"] or "N/A" + fs_now.available = fs_info[partition .. " avail_p"] or "N/A" + fs_now.available_mb = fs_info[partition .. " avail_mb"] or "N/A" + fs_now.available_gb = fs_info[partition .. " avail_gb"] or "N/A" + + notification_preset = fs.notification_preset + widget = fs.widget + settings() + + if notify == "on" and #fs_now.used > 0 and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then + naughty.notify({ + preset = naughty.config.presets.critical, + title = "Warning", + text = partition .. " is full", + }) + helpers.set_map(partition, true) + else + helpers.set_map(partition, false) + end + end) + + local notifycmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs" + helpers.async(helpers.scripts_dir .. notifycmd, function(ws) + fs.notification_preset.text = ws:gsub("\n*$", "") + end) + end + + if showpopup == "on" then + fs.widget:connect_signal('mouse::enter', function () fs.show(0) end) + fs.widget:connect_signal('mouse::leave', function () fs.hide() end) + end + + helpers.newtimer(partition, timeout, fs.update) + + return fs + end + + return factory diff --combined .config/awesome/lain/widget/imap.lua index 0000000,0f7fde5..0f7fde5 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/imap.lua +++ b/.config/awesome/lain/widget/imap.lua @@@ -1,0 -1,86 +1,86 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local naughty = require("naughty") + local wibox = require("wibox") + local string = { format = string.format, + gsub = string.gsub } + local type = type + local tonumber = tonumber + + -- Mail IMAP check + -- lain.widget.imap + + local function factory(args) + local imap = { widget = wibox.widget.textbox() } + local args = args or {} + local server = args.server + local mail = args.mail + local password = args.password + local port = args.port or 993 + local timeout = args.timeout or 60 + local is_plain = args.is_plain or false + local followtag = args.followtag or false + local settings = args.settings or function() end + + local head_command = "curl --connect-timeout 3 -fsm 3" + local request = "-X 'SEARCH (UNSEEN)'" + + if not server or not mail or not password then return end + + helpers.set_map(mail, 0) + + if not is_plain then + if type(password) == "string" or type(password) == "table" then + helpers.async(password, function(f) password = f:gsub("\n", "") end) + elseif type(password) == "function" then + local p = password() + end + end + + function update() + mail_notification_preset = { + icon = helpers.icons_dir .. "mail.png", + position = "top_left" + } + + if followtag then + mail_notification_preset.screen = awful.screen.focused() + end + + curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k", + head_command, server, port, mail, password, request) + + helpers.async(curl, function(f) + _, mailcount = string.gsub(f, "%d+", "") + _ = nil + + widget = imap.widget + settings() + + if mailcount >= 1 and mailcount > helpers.get_map(mail) then + if mailcount == 1 then + nt = mail .. " has one new message" + else + nt = mail .. " has " .. mailcount .. " new messages" + end + naughty.notify({ preset = mail_notification_preset, text = nt }) + end + + helpers.set_map(mail, mailcount) + end) + + end + + imap.timer = helpers.newtimer(mail, timeout, update, true, true) + + return imap + end + + return factory diff --combined .config/awesome/lain/widget/init.lua index 0000000,f77f872..f77f872 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/init.lua +++ b/.config/awesome/lain/widget/init.lua @@@ -1,0 -1,20 +1,20 @@@ + + --[[ + + Lain + Layouts, widgets and utilities for Awesome WM + + Widgets section + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local wrequire = require("lain.helpers").wrequire + local setmetatable = setmetatable + + local widget = { _NAME = "lain.widget" } + + return setmetatable(widget, { __index = wrequire }) diff --combined .config/awesome/lain/widget/mem.lua index 0000000,50fff3b..50fff3b mode 000000,100644..100644 --- a/.config/awesome/lain/widget/mem.lua +++ b/.config/awesome/lain/widget/mem.lua @@@ -1,0 -1,51 +1,51 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local helpers = require("lain.helpers") + local wibox = require("wibox") + local gmatch, lines, floor = string.gmatch, io.lines, math.floor + + -- Memory usage (ignoring caches) + -- lain.widget.mem + + local function factory(args) + local mem = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local settings = args.settings or function() end + + function mem.update() + mem_now = {} + for line in lines("/proc/meminfo") do + for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do + if k == "MemTotal" then mem_now.total = floor(v / 1024 + 0.5) + elseif k == "MemFree" then mem_now.free = floor(v / 1024 + 0.5) + elseif k == "Buffers" then mem_now.buf = floor(v / 1024 + 0.5) + elseif k == "Cached" then mem_now.cache = floor(v / 1024 + 0.5) + elseif k == "SwapTotal" then mem_now.swap = floor(v / 1024 + 0.5) + elseif k == "SwapFree" then mem_now.swapf = floor(v / 1024 + 0.5) + elseif k == "SReclaimable" then mem_now.srec = floor(v / 1024 + 0.5) + end + end + end + + mem_now.used = mem_now.total - mem_now.free - mem_now.buf - mem_now.cache - mem_now.srec + mem_now.swapused = mem_now.swap - mem_now.swapf + mem_now.perc = math.floor(mem_now.used / mem_now.total * 100) + + widget = mem.widget + settings() + end + + helpers.newtimer("mem", timeout, mem.update) + + return mem + end + + return factory diff --combined .config/awesome/lain/widget/mpd.lua index 0000000,d0b37d7..d0b37d7 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/mpd.lua +++ b/.config/awesome/lain/widget/mpd.lua @@@ -1,0 -1,135 +1,135 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010, Adrian C. + + --]] + + local helpers = require("lain.helpers") + local shell = require("awful.util").shell + local escape_f = require("awful.util").escape + local focused = require("awful.screen").focused + local naughty = require("naughty") + local wibox = require("wibox") + local os = { getenv = os.getenv } + local string = { format = string.format, + gmatch = string.gmatch, + match = string.match } + + -- MPD infos + -- lain.widget.mpd + + local function factory(args) + local mpd = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local password = (args.password and #args.password > 0 and string.format("password %s\\n", args.password)) or "" + local host = args.host or "127.0.0.1" + local port = args.port or "6600" + local music_dir = args.music_dir or os.getenv("HOME") .. "/Music" + local cover_pattern = args.cover_pattern or "*\\.(jpg|jpeg|png|gif)$" + local cover_size = args.cover_size or 100 + local default_art = args.default_art + local notify = args.notify or "on" + local followtag = args.followtag or false + local settings = args.settings or function() end + + local mpdh = string.format("telnet://%s:%s", host, port) + local echo = string.format("printf \"%sstatus\\ncurrentsong\\nclose\\n\"", password) + local cmd = string.format("%s | curl --connect-timeout 1 -fsm 3 %s", echo, mpdh) + + mpd_notification_preset = { title = "Now playing", timeout = 6 } + + helpers.set_map("current mpd track", nil) + + function mpd.update() + helpers.async({ shell, "-c", cmd }, function(f) + mpd_now = { + random_mode = false, + single_mode = false, + repeat_mode = false, + consume_mode = false, + pls_pos = "N/A", + pls_len = "N/A", + state = "N/A", + file = "N/A", + name = "N/A", + artist = "N/A", + title = "N/A", + album = "N/A", + genre = "N/A", + track = "N/A", + date = "N/A", + time = "N/A", + elapsed = "N/A" + } + + for line in string.gmatch(f, "[^\n]+") do + for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do + if k == "state" then mpd_now.state = v + elseif k == "file" then mpd_now.file = v + elseif k == "Name" then mpd_now.name = escape_f(v) + elseif k == "Artist" then mpd_now.artist = escape_f(v) + elseif k == "Title" then mpd_now.title = escape_f(v) + elseif k == "Album" then mpd_now.album = escape_f(v) + elseif k == "Genre" then mpd_now.genre = escape_f(v) + elseif k == "Track" then mpd_now.track = escape_f(v) + elseif k == "Date" then mpd_now.date = escape_f(v) + elseif k == "Time" then mpd_now.time = v + elseif k == "elapsed" then mpd_now.elapsed = string.match(v, "%d+") + elseif k == "song" then mpd_now.pls_pos = v + elseif k == "playlistlength" then mpd_now.pls_len = v + elseif k == "repeat" then mpd_now.repeat_mode = v ~= "0" + elseif k == "single" then mpd_now.single_mode = v ~= "0" + elseif k == "random" then mpd_now.random_mode = v ~= "0" + elseif k == "consume" then mpd_now.consume_mode = v ~= "0" + end + end + end + + mpd_notification_preset.text = string.format("%s (%s) - %s\n%s", mpd_now.artist, + mpd_now.album, mpd_now.date, mpd_now.title) + widget = mpd.widget + settings() + + if mpd_now.state == "play" then + if notify == "on" and mpd_now.title ~= helpers.get_map("current mpd track") then + helpers.set_map("current mpd track", mpd_now.title) + + if followtag then mpd_notification_preset.screen = focused() end + + local common = { + preset = mpd_notification_preset, + icon = default_art, + icon_size = cover_size, + replaces_id = mpd.id + } + + if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream + local path = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/")) + local cover = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", + path:gsub("'", "'\\''"), cover_pattern) + helpers.async({ shell, "-c", cover }, function(current_icon) + common.icon = current_icon:gsub("\n", "") + if #common.icon == 0 then common.icon = nil end + mpd.id = naughty.notify(common).id + end) + else + mpd.id = naughty.notify(common).id + end + + end + elseif mpd_now.state ~= "pause" then + helpers.set_map("current mpd track", nil) + end + end) + end + + mpd.timer = helpers.newtimer("mpd", timeout, mpd.update, true, true) + + return mpd + end + + return factory diff --combined .config/awesome/lain/widget/net.lua index 0000000,f42ec25..f42ec25 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/net.lua +++ b/.config/awesome/lain/widget/net.lua @@@ -1,0 -1,104 +1,104 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local helpers = require("lain.helpers") + local naughty = require("naughty") + local wibox = require("wibox") + local string = { format = string.format, match = string.match } + + -- Network infos + -- lain.widget.net + + local function factory(args) + local net = { widget = wibox.widget.textbox(), devices = {} } + local args = args or {} + local timeout = args.timeout or 2 + local units = args.units or 1024 -- KB + local notify = args.notify or "on" + local screen = args.screen or 1 + local settings = args.settings or function() end + + -- Compatibility with old API where iface was a string corresponding to 1 interface + net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or + (type(args.iface) == "table" and args.iface)) or {} + + function net.get_device() + helpers.async(string.format("ip link show", device_cmd), function(ws) + ws = ws:match("(%w+): ") + net.iface = ws and { ws } or {} + end) + end + + if #net.iface == 0 then net.get_device() end + + function net.update() + -- These are the totals over all specified interfaces + net_now = { + devices = {}, + -- Bytes since last iteration + sent = 0, + received = 0 + } + + for i, dev in ipairs(net.iface) do + local dev_now = {} + local dev_before = net.devices[dev] or { last_t = 0, last_r = 0 } + local now_t = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/tx_bytes", dev)) or 0) + local now_r = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/rx_bytes", dev)) or 0) + + dev_now.carrier = helpers.first_line(string.format("/sys/class/net/%s/carrier", dev)) or "0" + dev_now.state = helpers.first_line(string.format("/sys/class/net/%s/operstate", dev)) or "down" + + dev_now.sent = (now_t - dev_before.last_t) / timeout / units + dev_now.received = (now_r - dev_before.last_r) / timeout / units + + net_now.sent = net_now.sent + dev_now.sent + net_now.received = net_now.received + dev_now.received + + dev_now.sent = string.format("%.1f", dev_now.sent) + dev_now.received = string.format("%.1f", dev_now.received) + + dev_now.last_t = now_t + dev_now.last_r = now_r + + net.devices[dev] = dev_now + + -- Notify only once when connection is loss + if string.match(dev_now.carrier, "0") and notify == "on" and helpers.get_map(dev) then + naughty.notify { + title = dev, + text = "No carrier", + icon = helpers.icons_dir .. "no_net.png", + screen = screen + } + helpers.set_map(dev, false) + elseif string.match(dev_now.carrier, "1") then + helpers.set_map(dev, true) + end + + net_now.carrier = dev_now.carrier + net_now.state = dev_now.state + net_now.devices[dev] = dev_now + -- new_now.sent and net_now.received will be + -- the totals across all specified devices + end + + net_now.sent = string.format("%.1f", net_now.sent) + net_now.received = string.format("%.1f", net_now.received) + + widget = net.widget + settings() + end + + helpers.newtimer("network", timeout, net.update) + + return net + end + + return factory diff --combined .config/awesome/lain/widget/pulseaudio.lua index 0000000,ed37cb5..ed37cb5 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/pulseaudio.lua +++ b/.config/awesome/lain/widget/pulseaudio.lua @@@ -1,0 -1,64 +1,64 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2016, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local shell = require("awful.util").shell + local wibox = require("wibox") + local string = { gmatch = string.gmatch, + match = string.match, + format = string.format } + + -- PulseAudio volume + -- lain.widget.pulseaudio + + local function factory(args) + local pulseaudio = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local scallback = args.scallback + + pulseaudio.device = "N/A" + pulseaudio.devicetype = args.devicetype or "sink" + pulseaudio.cmd = args.cmd or "pacmd list-" .. pulseaudio.devicetype .. "s | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" + + function pulseaudio.update() + if scallback then pulseaudio.cmd = scallback() end + + helpers.async({ shell, "-c", pulseaudio.cmd }, function(s) + volume_now = { + index = string.match(s, "index: (%S+)") or "N/A", + device = string.match(s, "device.string = \"(%S+)\"") or "N/A", + sink = device, -- legacy API + muted = string.match(s, "muted: (%S+)") or "N/A" + } + + pulseaudio.device = volume_now.index + + local ch = 1 + volume_now.channel = {} + for v in string.gmatch(s, ":.-(%d+)%%") do + volume_now.channel[ch] = v + ch = ch + 1 + end + + volume_now.left = volume_now.channel[1] or "N/A" + volume_now.right = volume_now.channel[2] or "N/A" + + widget = pulseaudio.widget + + settings() + end) + end + + helpers.newtimer("pulseaudio", timeout, pulseaudio.update) + + return pulseaudio + end + + return factory diff --combined .config/awesome/lain/widget/pulsebar.lua index 0000000,41a8ce3..41a8ce3 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/pulsebar.lua +++ b/.config/awesome/lain/widget/pulsebar.lua @@@ -1,0 -1,148 +1,148 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2013, Rman + + --]] + + local helpers = require("lain.helpers") + local awful = require("awful") + local naughty = require("naughty") + local wibox = require("wibox") + local math = { modf = math.modf } + local string = { format = string.format, + match = string.match, + gmatch = string.gmatch, + rep = string.rep } + local type, tonumber = type, tonumber + + -- Pulseaudio volume bar + -- lain.widget.pulsebar + + local function factory(args) + local pulsebar = { + colors = { + background = "#000000", + mute = "#EB8F8F", + unmute = "#A4CE8A" + }, + + _current_level = 0, + _muted = false + } + + local args = args or {} + local timeout = args.timeout or 5 + local settings = args.settings or function() end + local width = args.width or 63 + local height = args.heigth or 1 + local ticks = args.ticks or false + local ticks_size = args.ticks_size or 7 + local scallback = args.scallback + + pulsebar.cmd = args.cmd or "pacmd list-sinks | sed -n -e '0,/*/d' -e '/base volume/d' -e '/volume:/p' -e '/muted:/p' -e '/device\\.string/p'" + pulsebar.sink = args.sink or 0 + pulsebar.colors = args.colors or pulsebar.colors + pulsebar.followtag = args.followtag or false + pulsebar.notifications = args.notification_preset + pulsebar.device = "N/A" + + if not pulsebar.notification_preset then + pulsebar.notification_preset = {} + pulsebar.notification_preset.font = "Monospace 10" + end + + pulsebar.bar = wibox.widget { + forced_height = height, + forced_width = width, + color = pulsebar.colors.unmute, + background_color = pulsebar.colors.background, + margins = 1, + paddings = 1, + ticks = ticks, + ticks_size = ticks_size, + widget = wibox.widget.progressbar, + } + + pulsebar.tooltip = awful.tooltip({ objects = { pulsebar.bar } }) + + function pulsebar.update(callback) + if scallback then pulsebar.cmd = scallback() end + + helpers.async({ awful.util.shell, "-c", pulsebar.cmd }, function(s) + volume_now = { + index = string.match(s, "index: (%S+)") or "N/A", + sink = string.match(s, "device.string = \"(%S+)\"") or "N/A", + muted = string.match(s, "muted: (%S+)") or "N/A" + } + + pulsebar.device = volume_now.index + + local ch = 1 + volume_now.channel = {} + for v in string.gmatch(s, ":.-(%d+)%%") do + volume_now.channel[ch] = v + ch = ch + 1 + end + + volume_now.left = volume_now.channel[1] or "N/A" + volume_now.right = volume_now.channel[2] or "N/A" + + local volu = volume_now.left + local mute = volume_now.muted + + if (volu and volu ~= pulsebar._current_level) or (mute and mute ~= pulsebar._muted) then + pulsebar._current_level = volu + pulsebar.bar:set_value(pulsebar._current_level / 100) + if (not mute and volu == 0) or mute == "yes" then + pulsebar._muted = true + pulsebar.tooltip:set_text ("[Muted]") + pulsebar.bar.color = pulsebar.colors.mute + else + pulsebar._muted = false + pulsebar.tooltip:set_text(string.format("%s: %s", pulsebar.sink, volu)) + pulsebar.bar.color = pulsebar.colors.unmute + end + + settings() + + if type(callback) == "function" then callback() end + end + end) + end + + function pulsebar.notify() + pulsebar.update(function() + local preset = pulsebar.notification_preset + + if pulsebar._muted then + preset.title = string.format("Sink %s - Muted", pulsebar.sink) + else + preset.title = string.format("%s - %s%%", pulsebar.sink, pulsebar._current_level) + end + + int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height) + preset.text = string.format("[%s%s]", string.rep("|", int), + string.rep(" ", awful.screen.focused().mywibox.height - int)) + + if pulsebar.followtag then preset.screen = awful.screen.focused() end + + if not pulsebar.notification then + pulsebar.notification = naughty.notify { + preset = preset, + destroy = function() pulsebar.notification = nil end + } + else + naughty.replace_text(pulsebar.notification, preset.title, preset.text) + end + end) + end + + helpers.newtimer(string.format("pulsebar-%s", pulsebar.sink), timeout, pulsebar.update) + + return pulsebar + end + + return factory diff --combined .config/awesome/lain/widget/sysload.lua index 0000000,d358687..d358687 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/sysload.lua +++ b/.config/awesome/lain/widget/sysload.lua @@@ -1,0 -1,39 +1,39 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + + --]] + + local helpers = require("lain.helpers") + local wibox = require("wibox") + local open, match = io.open, string.match + + -- System load + -- lain.widget.sysload + + local function factory(args) + local sysload = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local settings = args.settings or function() end + + function sysload.update() + local f = open("/proc/loadavg") + local ret = f:read("*all") + f:close() + + load_1, load_5, load_15 = match(ret, "([^%s]+) ([^%s]+) ([^%s]+)") + + widget = sysload.widget + settings() + end + + helpers.newtimer("sysload", timeout, sysload.update) + + return sysload + end + + return factory diff --combined .config/awesome/lain/widget/temp.lua index 0000000,efe2ab9..efe2ab9 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/temp.lua +++ b/.config/awesome/lain/widget/temp.lua @@@ -1,0 -1,42 +1,42 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local wibox = require("wibox") + local open = io.open + local tonumber = tonumber + + -- coretemp + -- lain.widget.temp + + local function factory(args) + local temp = { widget = wibox.widget.textbox() } + local args = args or {} + local timeout = args.timeout or 2 + local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp" + local settings = args.settings or function() end + + function temp.update() + local f = open(tempfile) + if f then + coretemp_now = tonumber(f:read("*all")) / 1000 + f:close() + else + coretemp_now = "N/A" + end + + widget = temp.widget + settings() + end + + helpers.newtimer("coretemp", timeout, temp.update) + + return temp + end + + return factory diff --combined .config/awesome/lain/widget/watch.lua index 0000000,36118b8..36118b8 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/watch.lua +++ b/.config/awesome/lain/widget/watch.lua @@@ -1,0 -1,40 +1,40 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2014, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local textbox = require("wibox.widget.textbox") + + -- Template for asynchronous watcher widgets + -- lain.widget.watch + + local function factory(args) + local watch = { widget = args.widget or textbox() } + local args = args or {} + local timeout = args.timeout or 5 + local nostart = args.nostart or false + local stoppable = args.stoppable or false + local cmd = args.cmd + local settings = args.settings or function() widget:set_text(output) end + + function watch.update() + helpers.async(cmd, function(f) + output = f + if output ~= watch.prev then + widget = watch.widget + settings() + watch.prev = output + end + end) + end + + watch.timer = helpers.newtimer(cmd, timeout, watch.update, nostart, stoppable) + + return watch + end + + return factory diff --combined .config/awesome/lain/widget/weather.lua index 0000000,1098146..1098146 mode 000000,100644..100644 --- a/.config/awesome/lain/widget/weather.lua +++ b/.config/awesome/lain/widget/weather.lua @@@ -1,0 -1,173 +1,173 @@@ + + --[[ + + Licensed under GNU General Public License v2 + * (c) 2015, Luke Bonham + + --]] + + local helpers = require("lain.helpers") + local json = require("lain.util").dkjson + local focused = require("awful.screen").focused + local naughty = require("naughty") + local wibox = require("wibox") + local math = { floor = math.floor } + local os = { time = os.time, + date = os.date, + difftime = os.difftime } + local string = { format = string.format, + gsub = string.gsub } + local tonumber = tonumber + + -- OpenWeatherMap + -- current weather and X-days forecast + -- lain.widget.weather + + local function factory(args) + local weather = { widget = wibox.widget.textbox() } + local args = args or {} + local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default + local timeout = args.timeout or 900 -- 15 min + local timeout_forecast = args.timeout or 86400 -- 24 hrs + local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" + local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" + local city_id = args.city_id or 0 -- placeholder + local utc_offset = args.utc_offset or + function () + local now = os.time() + return os.difftime(now, os.time(os.date("!*t", now))) + ((os.date("*t").isdst and 1 or 0) * 3600) + end + local units = args.units or "metric" + local lang = args.lang or "en" + local cnt = args.cnt or 5 + local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" + local icons_path = args.icons_path or helpers.icons_dir .. "openweathermap/" + local notification_preset = args.notification_preset or {} + local notification_text_fun = args.notification_text_fun or + function (wn) + local day = os.date("%a %d", wn["dt"]) + local tmin = math.floor(wn["temp"]["min"]) + local tmax = math.floor(wn["temp"]["max"]) + local desc = wn["weather"][1]["description"] + return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + end + local weather_na_markup = args.weather_na_markup or " N/A " + local followtag = args.followtag or false + local settings = args.settings or function() end + + weather.widget:set_markup(weather_na_markup) + weather.icon_path = icons_path .. "na.png" + weather.icon = wibox.widget.imagebox(weather.icon_path) + + function weather.show(t_out) + weather.hide() + + if followtag then + notification_preset.screen = focused() + end + + if not weather.notification_text then + weather.update() + weather.forecast_update() + end + + weather.notification = naughty.notify({ + text = weather.notification_text, + icon = weather.icon_path, + timeout = t_out, + preset = notification_preset + }) + end + + function weather.hide() + if weather.notification then + naughty.destroy(weather.notification) + weather.notification = nil + end + end + + function weather.attach(obj) + obj:connect_signal("mouse::enter", function() + weather.show(0) + end) + obj:connect_signal("mouse::leave", function() + weather.hide() + end) + end + + function weather.forecast_update() + local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID) + helpers.async(cmd, function(f) + local pos, err + weather_now, pos, err = json.decode(f, 1, nil) + + if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then + weather.notification_text = '' + for i = 1, weather_now["cnt"] do + weather.notification_text = weather.notification_text .. + notification_text_fun(weather_now["list"][i]) + + if i < weather_now["cnt"] then + weather.notification_text = weather.notification_text .. "\n" + end + end + end + end) + end + + function weather.update() + local cmd = string.format(current_call, city_id, units, lang, APPID) + helpers.async(cmd, function(f) + local pos, err, icon + weather_now, pos, err = json.decode(f, 1, nil) + + if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then + -- weather icon based on localtime + local now = os.time() + local sunrise = tonumber(weather_now["sys"]["sunrise"]) + local sunset = tonumber(weather_now["sys"]["sunset"]) + local icon = weather_now["weather"][1]["icon"] + local loc_m = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 } + local offset = utc_offset() + local utc_m = loc_m - offset + + if offset > 0 and (now - utc_m)>=86400 then + utc_m = utc_m + 86400 + elseif offset < 0 and (utc_m - now)>=86400 then + utc_m = utc_m - 86400 + end + + -- if we are 1 day after the GMT, return 1 day back, and viceversa + if offset > 0 and loc_m >= utc_m then + now = now - 86400 + elseif offset < 0 and loc_m <= utc_m then + now = now + 86400 + end + + if sunrise <= now and now <= sunset then + icon = string.gsub(icon, "n", "d") + else + icon = string.gsub(icon, "d", "n") + end + + weather.icon_path = icons_path .. icon .. ".png" + widget = weather.widget + settings() + else + weather.icon_path = icons_path .. "na.png" + weather.widget:set_markup(weather_na_markup) + end + + weather.icon:set_image(weather.icon_path) + end) + end + + weather.attach(weather.widget) + + weather.timer = helpers.newtimer("weather-" .. city_id, timeout, weather.update, false, true) + weather.timer_forecast = helpers.newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, true) + + return weather + end + + return factory diff --combined .config/awesome/lain/wiki index 0000000,d6cf027..d6cf027 mode 000000,160000..160000 --- a/.config/awesome/lain/wiki +++ b/.config/awesome/lain/wiki @@@ -1,0 -1,1 +1,1 @@@ + Subproject commit d6cf027a4c2535c179a8112137d065a5bc740fea