Merge remote-tracking branch 'gum/master'

1 files changed, 11 insertions, 17 deletions

diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 83dd79b4d..2abfe503d 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -243,7 +243,7 @@ awful.screen.connect_for_each_screen(function(s)
     set_wallpaper(s)
 
     -- Each screen has its own tag table.
-    awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, awful.layout.layouts[1])
+    awful.tag({ "tmp", "ssh", "www", "im", "mail","work","net","misc","remote" }, s, awful.layout.layouts[1])
 
     -- Create a promptbox for each screen
     s.mypromptbox = awful.widget.prompt()
@@ -486,14 +486,12 @@ awful.rules.rules = {
                      focus = awful.client.focus.filter,
                      keys = clientkeys,
                      buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
+    --{ rule = { class = "MPlayer" },
+    --  properties = { floating = true } },
     { rule = { class = "pinentry" },
       properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "Anamnesis" },
-      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] } },
@@ -571,16 +569,12 @@ local os = {
 
 -- {{{ autostart
 do
-  local cmds =
-  {
-    -- "@networkmanagerapplet@/bin/nm-applet",
-    -- "@blueman@/bin/blueman-applet",
-    -- "@clipit@/bin/clipit"
-  }
-
-  for _,i in pairs(cmds) do
-    awful.util.spawn(i)
-  end
+  awful.spawn("urxvt", { tag = tags[1] }) # dev shell
+  awful.spawn("urxvt -e mosh makefu@gum.i", { tag = tags[2] })
+  awful.spawn("firefox", { tag = tags[3] })
+  awful.spawn("telegram-desktop", { tag = tags[4] })
+  awful.spawn("signal-desktop", { tag = tags[4] })
+  awful.spawn("urxvt -e mutt", { tag = tags[5] })
 end
 
 -- }}}