]> gitweb.fluxo.info Git - rhatto/dotfiles.git/commitdiff
Removing awesome to convert it to a submodule
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 27 Dec 2013 17:12:25 +0000 (15:12 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 27 Dec 2013 17:12:25 +0000 (15:12 -0200)
README.mdwn
modules/awesome/config.dot/awesome.link/awesompd [deleted submodule]
modules/awesome/config.dot/awesome.link/awesompd.lua [deleted file]
modules/awesome/config.dot/awesome.link/functions.lua [deleted file]
modules/awesome/config.dot/awesome.link/keys.lua [deleted file]
modules/awesome/config.dot/awesome.link/leds.lua [deleted file]
modules/awesome/config.dot/awesome.link/programs.lua [deleted file]
modules/awesome/config.dot/awesome.link/rc.lua [deleted file]
modules/awesome/config.dot/awesome.link/rc.lua.simple [deleted file]
modules/awesome/config.dot/awesome.link/theme.lua [deleted file]
modules/awesome/config.dot/awesome.link/volume.lua [deleted file]

index 9d4cb0a3fe25bae1ce82782fa5876e5c88452d5a..279d08fdfb5b55638e4b4c3c492c32f846d1e1ac 100644 (file)
@@ -3,3 +3,10 @@ Rhatto's dotfiles bundle
 
 This is the bundle repository for rhatto's dotfiles.
 More information at https://git.sarava.org/?p=metadot.git
+
+TODO
+----
+
+- Split modules into distinct repositories.
+- Profile: automatic $PATH inclusion for installed script repositories.
+- Integration with scripts project.
diff --git a/modules/awesome/config.dot/awesome.link/awesompd b/modules/awesome/config.dot/awesome.link/awesompd
deleted file mode 160000 (submodule)
index 4142a7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4142a7aa82e938afc7e948c3744ba2b0e520e495
diff --git a/modules/awesome/config.dot/awesome.link/awesompd.lua b/modules/awesome/config.dot/awesome.link/awesompd.lua
deleted file mode 100644 (file)
index 4af25a3..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-require("awesompd/awesompd")
-
-musicwidget = awesompd:create() -- Create awesompd widget
---musicwidget.font = "Liberation Mono" -- Set widget font 
-musicwidget.scrolling = true -- If true, the text in the widget will be scrolled
-musicwidget.output_size = 30 -- Set the size of widget in symbols
-musicwidget.update_interval = 10 -- Set the update interval in seconds
--- Set the folder where icons are located (change username to your login name)
-musicwidget.path_to_icons = configdir .. "/awesompd/icons" 
--- Set the default music format for Jamendo streams. You can change
--- this option on the fly in awesompd itself.
--- possible formats: awesompd.FORMAT_MP3, awesompd.FORMAT_OGG
-musicwidget.jamendo_format = awesompd.FORMAT_MP3
--- If true, song notifications for Jamendo tracks and local tracks will also contain
--- album cover image.
-musicwidget.show_album_cover = false
--- Specify how big in pixels should an album cover be. Maximum value
--- is 100.
-musicwidget.album_cover_size = 50
--- This option is necessary if you want the album covers to be shown
--- for your local tracks.
---musicwidget.mpd_config = homedir .. "/.mpdconf"
--- Specify the browser you use so awesompd can open links from
--- Jamendo in it.
-musicwidget.browser = "firefox"
--- Specify decorators on the left and the right side of the
--- widget. Or just leave empty strings if you decorate the widget
--- from outside.
-musicwidget.ldecorator = " "
-musicwidget.rdecorator = " "
--- Set all the servers to work with (here can be any servers you use)
--- Set the buttons of the widget
-musicwidget:register_buttons({
-             --{ "", awesompd.MOUSE_LEFT, musicwidget:command_toggle() },
-             --{ "Control", awesompd.MOUSE_SCROLL_UP, musicwidget:command_prev_track() },
-             --{ "Control", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_next_track() },
-             { "", "XF86AudioPrev", musicwidget:command_prev_track() },
-             { "", "XF86AudioNext", musicwidget:command_next_track() },
-             { modkey, "XF86AudioPrev", musicwidget:command_previous_server() },
-             { modkey, "XF86AudioNext", musicwidget:command_next_server() },
-                        --{ "", awesompd.MOUSE_SCROLL_UP, musicwidget:command_volume_up() },
-                        --{ "", awesompd.MOUSE_SCROLL_DOWN, musicwidget:command_volume_down() },
-                        { "", awesompd.MOUSE_RIGHT, musicwidget:command_show_menu() },
-             --{ "", "XF86AudioLowerVolume", musicwidget:command_volume_down() },
-             --{ "", "XF86AudioRaiseVolume", musicwidget:command_volume_up() },
-             --{ modkey, "Pause", musicwidget:command_playpause() } })
-             { "", "XF86AudioPlay", musicwidget:command_playpause() } })
-
--- Put your server definitions in this file, like this:
---musicwidget.servers = {
---   { server = "localhost",
---        port = 6600 },
---   { server = "192.168.0.72",
---        port = 6600 } }
-dofile(homedir .. "/.custom/awesome/awesompd.lua")
-
-musicwidget:run() -- After all configuration is done, run the widget
diff --git a/modules/awesome/config.dot/awesome.link/functions.lua b/modules/awesome/config.dot/awesome.link/functions.lua
deleted file mode 100644 (file)
index aa98502..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-function file_exists(name)
-   local f=io.open(name,"r")
-   if f~=nil then io.close(f) return true else return false end
-end
diff --git a/modules/awesome/config.dot/awesome.link/keys.lua b/modules/awesome/config.dot/awesome.link/keys.lua
deleted file mode 100644 (file)
index f056aca..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
--- Key bindings
-globalkeys = awful.util.table.join(root.keys(),
-    awful.key({ modkey, "Control" }, "f", function () awful.util.spawn("firefox") end),
-    awful.key({ modkey, "Control" }, "v", function () awful.util.spawn("gvim") end),
-    awful.key({ modkey, "Control" }, "m", function () awful.util.spawn("terminal mutt") end),
-    awful.key({ modkey, "Control" }, "g", function () awful.util.spawn("gimp") end),
-    awful.key({ modkey, "Control" }, "i", function () awful.util.spawn("gqview") end),
-    awful.key({ modkey, "Control" }, "a", function () awful.util.spawn("audacious") end),
-    awful.key({ modkey, "Control" }, "l", function () awful.util.spawn("xlock") end),
-    awful.key({ modkey, "Control" }, "s", function () awful.util.spawn("xsuspend") end),
-    awful.key({ modkey, "Control" }, "h", function () awful.util.spawn("xhibernate") end),
-    awful.key({ modkey, "Control" }, "k", function () awful.util.spawn("kedpm") end),
-    awful.key({ modkey, "Control" }, "c", function () awful.util.spawn("chromium-browser") end),
-    awful.key({ modkey, "Control" }, "t", function () awful.util.spawn("thunar") end),
-    awful.key({ modkey, "Control" }, "w", function () awful.util.spawn("terminal 'sleep 0.2 && wyrd'") end),
-    --awful.key({ modkey, "Control" }, "b", function () awful.util.spawn("terminal irssi") end),
-
-    -- Xlock
-    awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("xlock") end),
-
-    -- Volume keys
-    awful.key({ }, "XF86AudioRaiseVolume", function () awful.util.spawn("amixer set Master 9%+", false) end),
-    awful.key({ }, "XF86AudioLowerVolume", function () awful.util.spawn("amixer set Master 9%-", false) end),
-    awful.key({ }, "XF86AudioMute", function () awful.util.spawn("amixer sset Master toggle", false) end)
-)
-
--- Append keys from music widget
-if awesompd then
-  musicwidget:append_global_keys()
-end
-
--- Set keys
-root.keys(globalkeys)
diff --git a/modules/awesome/config.dot/awesome.link/leds.lua b/modules/awesome/config.dot/awesome.link/leds.lua
deleted file mode 100644 (file)
index 382abdd..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
--- See https://bbs.archlinux.org/viewtopic.php?id=68511
-myledbox = widget({ type = "textbox" })
-
-function run_leds()
-        local filedescripter = io.popen('leds')
-        local value = filedescripter:read()
-        filedescripter:close()
-        return value
-end
-
-mytimer = timer({ timeout = 1 })
-mytimer:add_signal("timeout", function() myledbox.text = run_leds() end)
-mytimer:start()
diff --git a/modules/awesome/config.dot/awesome.link/programs.lua b/modules/awesome/config.dot/awesome.link/programs.lua
deleted file mode 100644 (file)
index b14083c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
--- Put here all startup command declarations
---awful.util.spawn_with_shell("xwicd")
diff --git a/modules/awesome/config.dot/awesome.link/rc.lua b/modules/awesome/config.dot/awesome.link/rc.lua
deleted file mode 100644 (file)
index e5fe3bb..0000000
+++ /dev/null
@@ -1,391 +0,0 @@
--- Standard awesome library
-require("awful")
-require("awful.autofocus")
-require("awful.rules")
-
--- Theme handling library
-require("beautiful")
-
--- Notification library
-require("naughty")
-
--- Widget libraries
-require("vicious")
-
--- Load Debian menu entries
-require("debian.menu")
-
--- {{{ Variable definitions
--- Folders
-homedir   = os.getenv("HOME")
-configdir = homedir .. "/.config/awesome"
--- Themes define colours, icons, and wallpapers
-beautiful.init(configdir .. "/theme.lua")
-
--- This is used later as the default terminal and editor to run.
-terminal = "terminal"
-editor = os.getenv("EDITOR") or "editor"
-editor_cmd = terminal .. " " .. editor
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-layouts =
-{
-    awful.layout.suit.max,
-    awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    --awful.layout.suit.fair,
-    --awful.layout.suit.fair.horizontal,
-    --awful.layout.suit.spiral,
-    --awful.layout.suit.spiral.dwindle,
-    --awful.layout.suit.max.fullscreen,
-    --awful.layout.suit.magnifier
-}
--- }}}
-
--- {{{ Misc functions
-dofile(configdir .. "/functions.lua")
--- }}}
-
--- {{{ Widgets
--- Leds
-dofile(configdir .. "/leds.lua")
-dofile(configdir .. "/volume.lua")
-
-if file_exists(homedir .. "/.custom/awesome/awesompd.lua") then
-  awesompd = true
-  dofile(configdir .. "/awesompd.lua")
-end
--- }}}
-
--- {{{ Tags
--- Define a tag table which hold all screen tags.
-tags = {}
-for s = 1, screen.count() do
-    -- Each screen has its own tag table.
-    tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
-end
--- }}}
-
--- {{{ Menu
--- Create a laucher widget and a main menu
-myawesomemenu = {
-   { "quit", awesome.quit },
-   { "restart", awesome.restart },
-   { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" }
-}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "debian", debian.menu.Debian_menu.Debian },
-                                    { "terminal", terminal }
-                                  }
-                        })
-
-mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
-                                     menu = mymainmenu })
--- }}}
-
--- {{{ Wibox
--- Create a textclock widget
-mytextclock = awful.widget.textclock({ align = "right" })
-
--- Create a systray
-mysystray = widget({ type = "systray" })
-
--- Create a wibox for each screen and add it
-mywibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, awful.client.toggletag),
-                    awful.button({ }, 4, awful.tag.viewnext),
-                    awful.button({ }, 5, awful.tag.viewprev)
-                    )
-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if not c:isvisible() then
-                                                  awful.tag.viewonly(c:tags()[1])
-                                              end
-                                              client.focus = c
-                                              c:raise()
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              end
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                              if client.focus then client.focus:raise() end
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                              if client.focus then client.focus:raise() end
-                                          end))
-
-for s = 1, screen.count() do
-    -- Create a promptbox for each screen
-    mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
-    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    mylayoutbox[s] = awful.widget.layoutbox(s)
-    mylayoutbox[s]:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
-    -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
-
-    -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(function(c)
-                                              return awful.widget.tasklist.label.currenttags(c, s)
-                                          end, mytasklist.buttons)
-
-    -- Create the wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s })
-    -- Add widgets to the wibox - order matters
-    mywibox[s].widgets = {
-        {
-            mylauncher,
-            mytaglist[s],
-            mypromptbox[s],
-            layout = awful.widget.layout.horizontal.leftright
-        },
-        mylayoutbox[s],
-        mytextclock,
-        s == 1 and mysystray or nil,
-        volume_widget,
-        myledbox,
-        awesompd and musicwidget.widget or nil,
-        mytasklist[s],
-        layout = awful.widget.layout.horizontal.rightleft
-    }
-end
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(awful.util.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-))
--- }}}
-
--- {{{ Key bindings
-globalkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
-    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
-
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,           }, "w", function () mymainmenu:show({keygrabber=true}) end),
-
-    -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
-
-    --- Default tab behavior
-    awful.key({ modkey,           }, "Tab",
-        function ()
-            awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
-        end),
-
-    --- Cyclic tab behavior
-    --- See http://stackoverflow.com/questions/11697102/awesome-alttab-just-switches-between-two-apps
-    awful.key({ "Mod1", "Shift"   }, "Tab",
-        function ()
-            -- awful.client.focus.history.previous()
-            awful.client.focus.byidx(-1)
-            if client.focus then
-                client.focus:raise()
-            end
-        end),
-    awful.key({ "Mod1",           }, "Tab",
-        function ()
-            -- awful.client.focus.history.previous()
-            awful.client.focus.byidx(1)
-            if client.focus then
-                client.focus:raise()
-            end
-        end),
-
-    -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control" }, "r", awesome.restart),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit),
-
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
-    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
-
-    -- Prompt
-    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
-
-    awful.key({ modkey }, "x",
-              function ()
-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[mouse.screen].widget,
-                  awful.util.eval, nil,
-                  awful.util.getdir("cache") .. "/history_eval")
-              end)
-)
-
-clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
-    awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
-    awful.key({ modkey,           }, "n",      function (c) c.minimized = not c.minimized    end),
-    awful.key({ modkey,           }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end)
-)
-
--- Compute the maximum number of digit we need, limited to 9
-keynumber = 0
-for s = 1, screen.count() do
-   keynumber = math.min(9, math.max(#tags[s], keynumber));
-end
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it works on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, keynumber do
-    globalkeys = awful.util.table.join(globalkeys,
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = mouse.screen
-                        if tags[screen][i] then
-                            awful.tag.viewonly(tags[screen][i])
-                        end
-                  end),
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = mouse.screen
-                      if tags[screen][i] then
-                          awful.tag.viewtoggle(tags[screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.movetotag(tags[client.focus.screen][i])
-                      end
-                  end),
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus and tags[client.focus.screen][i] then
-                          awful.client.toggletag(tags[client.focus.screen][i])
-                      end
-                  end))
-end
-
-clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
-awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { tag = tags[1][2] } },
-}
--- }}}
-
--- {{{ Signals
--- Signal function to execute when a new client appears.
-client.add_signal("manage", function (c, startup)
-    -- Add a titlebar
-    -- awful.titlebar.add(c, { modkey = modkey })
-
-    -- Enable sloppy focus (focus on mouse over)
-    --c:add_signal("mouse::enter", function(c)
-    --    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-    --        and awful.client.focus.filter(c) then
-    --        client.focus = c
-    --    end
-    --end)
-
-    if not startup then
-        -- Set the windows at the slave,
-        -- i.e. put it at the end of others instead of setting it master.
-        -- awful.client.setslave(c)
-
-        -- Put windows in a smart way, only if they does not set an initial position.
-        if not c.size_hints.user_position and not c.size_hints.program_position then
-            awful.placement.no_overlap(c)
-            awful.placement.no_offscreen(c)
-        end
-    end
-end)
-
-client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
-client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
--- }}}
-
--- Key mappings
-dofile(configdir .. "/keys.lua")
-
--- Startup commands
-dofile(configdir .. "/programs.lua")
diff --git a/modules/awesome/config.dot/awesome.link/rc.lua.simple b/modules/awesome/config.dot/awesome.link/rc.lua.simple
deleted file mode 100644 (file)
index 0910bca..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
--- Environment variables
-homedir   = os.getenv("HOME")
-configdir = homedir .. "/.config/awesome"
-
--- Include default distro configuration
-dofile("/etc/xdg/awesome/rc.lua")
-dofile(configdir .. "/keys.lua")
-
--- Custom changes
-terminal = "terminal"
-
--- Background
-awful.util.spawn_with_shell("sleep 1 && awsetbg " .. homedir .. "/themes/backgrounds/background.jpg")
diff --git a/modules/awesome/config.dot/awesome.link/theme.lua b/modules/awesome/config.dot/awesome.link/theme.lua
deleted file mode 100644 (file)
index 913022c..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-theme = {}
-
-theme.font          = "sans 8"
---theme.font          = "mono 8"
-
----theme.bg_normal     = "#222222"
-theme.bg_normal     = "#000000"
----theme.bg_focus      = "#535d6c"
-theme.bg_focus      = "#222222"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#ffffff"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize   = "#ffffff"
-
-theme.border_width  = "1"
-theme.border_normal = "#000000"
----theme.border_focus  = "#535d6c"
-theme.border_focus  = "#222222"
-theme.border_marked = "#91231c"
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-
--- Display the taglist squares
-theme.taglist_squares_sel   = "/usr/share/awesome/themes/default/taglist/squarefw.png"
-theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png"
-
-theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png"
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png"
-theme.menu_height = "15"
-theme.menu_width  = "100"
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Define the image to load
-theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = "/usr/share/awesome/themes/default/titlebar/close_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"
-
--- You can use your own command to set your wallpaper
---theme.wallpaper_cmd = { "awsetbg " .. homedir .. "/themes/backgrounds/background.jpg" }
-theme.wallpaper_cmd = { "xsetroot -solid black" }
-
--- You can use your own layout icons like this:
-theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"
-theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png"
-theme.layout_floating  = "/usr/share/awesome/themes/default/layouts/floatingw.png"
-theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png"
-theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png"
-theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png"
-theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png"
-theme.layout_tileleft   = "/usr/share/awesome/themes/default/layouts/tileleftw.png"
-theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png"
-theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png"
-theme.layout_spiral  = "/usr/share/awesome/themes/default/layouts/spiralw.png"
-theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png"
-
-theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
-
-return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/modules/awesome/config.dot/awesome.link/volume.lua b/modules/awesome/config.dot/awesome.link/volume.lua
deleted file mode 100644 (file)
index 0a5bb45..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
--- See http://awesome.naquadah.org/wiki/Volume_control_and_display
-volume_widget = widget({ type = "textbox", name = "tb_volume",
-                         align = "right" })
-
-function update_volume(widget)
-    local fd = io.popen("amixer sget Master")
-    local status = fd:read("*all")
-    fd:close()
-    
-    local volume = tonumber(string.match(status, "(%d?%d?%d)%%")) / 100
-    -- volume = string.format("% 3d", volume)
-
-    status = string.match(status, "%[(o[^%]]*)%]")
-
-    -- starting colour
-    local sr, sg, sb = 0x3F, 0x3F, 0x3F
-    -- ending colour
-    local er, eg, eb = 0xDC, 0xDC, 0xCC
-
-    local ir = volume * (er - sr) + sr
-    local ig = volume * (eg - sg) + sg
-    local ib = volume * (eb - sb) + sb
-    interpol_colour = string.format("%.2x%.2x%.2x", ir, ig, ib)
-    if string.find(status, "on", 1, true) then
-        volume = " <span background='#" .. interpol_colour .. "'>   </span>"
-    else
-        volume = " <span color='red' background='#" .. interpol_colour .. "'> M </span>"
-    end
-    widget.text = volume
- end
-
-mytimer = timer({ timeout = 1 })
-mytimer:add_signal("timeout", function () update_volume(volume_widget) end)
-mytimer:start()