Andrew Swistak преди 8 години
родител
ревизия
9c17165f15

+ 9 - 0
.gitmodules

@@ -112,3 +112,12 @@
 [submodule "vim/bundle/vim-go"]
 	path = vim/bundle/vim-go
 	url = https://github.com/fatih/vim-go
+[submodule "vim/bundle/mustache"]
+	path = vim/bundle/mustache
+	url = https://github.com/mustache/vim-mustache-handlebars.git
+[submodule "vim/bundle/vim-polyglot"]
+	path = vim/bundle/vim-polyglot
+	url = https://github.com/sheerun/vim-polyglot.git
+[submodule "vim/bundle/gotests-vim"]
+	path = vim/bundle/gotests-vim
+	url = https://github.com/buoto/gotests-vim

+ 4 - 4
config/awesome/rc.lua

@@ -285,10 +285,10 @@ globalkeys = awful.util.table.join(
   awful.key({ s_mod, "Control" }, "n",      awful.client.restore),
 
   -- Prompt
-  awful.key({ s_mod },            "r",      function() promptbox[mouse.screen]:run() end),
+  awful.key({ s_mod },            "r",      function() promptbox[mouse.screen.index]:run() end),
   awful.key({ s_mod },            "x",      function()
                                               awful.prompt.run({ prompt = "Run Lua code: " },
-                                              promptbox[mouse.screen].widget,
+                                              promptbox[mouse.screen.index].widget,
                                               awful.util.eval, nil,
                                               awful.util.getdir("cache") .. "/history_eval")
                                             end),
@@ -301,8 +301,8 @@ clientkeys = awful.util.table.join(
   awful.key({ s_mod, "Shift"   }, "c",      function(c) c:kill()                         end),
   awful.key({ s_mod, "Control" }, "space",  awful.client.floating.toggle                    ),
   awful.key({ s_mod, "Control" }, "Return", function(c) c:swap(awful.client.getmaster()) end),
-  awful.key({ s_mod,           }, "i",      function(c) awful.client.movetoscreen(c, c.screen-1) end ),
-  awful.key({ s_mod,           }, "o",      function(c) awful.client.movetoscreen(c, c.screen+1) end ),
+  awful.key({ s_mod,           }, "i",      function(c) awful.client.movetoscreen(c, c.screen.index-1) end ),
+  awful.key({ s_mod,           }, "o",      function(c) awful.client.movetoscreen(c, c.screen.index+1) end ),
   awful.key({ s_mod,           }, "t",      function(c) c.ontop = not c.ontop            end),
   awful.key({ s_mod,           }, "n",      function(c)
                                               -- The client currently has the input focus, so it cannot be

+ 1 - 1
vim/bundle/YouCompleteMe

@@ -1 +1 @@
-Subproject commit 0de1c0c9bb13ce82172b472c676035cd47cf6a6a
+Subproject commit 37d63e1aeca5fe5ebec21a6b371e3b4ab5a17223

+ 1 - 1
vim/bundle/ack.vim

@@ -1 +1 @@
-Subproject commit 35f4c78c6c519dcf003531cd312e5b1564d30ef5
+Subproject commit a16a9b63eb85cc0960a7f25c54647ac1f99f3360

+ 1 - 1
vim/bundle/delimitMate

@@ -1 +1 @@
-Subproject commit 8bc47fd1c40cdad9ea1f36c0cf13592c70ea65e9
+Subproject commit 728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c

+ 1 - 0
vim/bundle/gotests-vim

@@ -0,0 +1 @@
+Subproject commit a8c2eca6df7e7dd8672326dd8835a50b710f0808

+ 1 - 0
vim/bundle/mustache

@@ -0,0 +1 @@
+Subproject commit d1c983f3dd9a159c128c5192062caf7d47fd0f14

+ 1 - 1
vim/bundle/nerdcommenter

@@ -1 +1 @@
-Subproject commit e2d47bec2662d5fcd324d17e22dc37f38c97bf2d
+Subproject commit 285902752f7ab2052ac700a6d29b263dd5788afb

+ 1 - 1
vim/bundle/nerdtree

@@ -1 +1 @@
-Subproject commit d280b15ba9388ab93f3401b26877a13fdb8ed816
+Subproject commit 54b423e0f8d6cff09b8fdd202baee596d3341dc9

+ 1 - 1
vim/bundle/syntastic

@@ -1 +1 @@
-Subproject commit d6b96c079be137c83009827b543a83aa113cc011
+Subproject commit f459416dc380dae171860832f55e039a90aad492

+ 1 - 1
vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit 7b9b68f15dc50ef3c6382bd9df3a5e70c9ddcee9
+Subproject commit 7d082c03b2f4f16b31b9b54cb26bcfc40a0c0017

+ 1 - 1
vim/bundle/vim-airline-themes

@@ -1 +1 @@
-Subproject commit 796478723c01a275269b96f63ee5cd5b44a342f4
+Subproject commit 20a926a1eb6c451ca7767f0f0f00f20e27124381

+ 1 - 1
vim/bundle/vim-bundler

@@ -1 +1 @@
-Subproject commit b42217a20cd4cac5a00096dc4e98d2497c21b3fe
+Subproject commit 4ccc0e7c1268eaccadf02542c67cfb1e9dc2fd20

+ 1 - 1
vim/bundle/vim-coffee-script

@@ -1 +1 @@
-Subproject commit 32fe889b8cafd3a4921ef8e6485156453ff58c42
+Subproject commit aace5c23d812a205c93e87ff79df72d9366928df

+ 1 - 1
vim/bundle/vim-endwise

@@ -1 +1 @@
-Subproject commit 0067ceda37725d01b7bd5bf249d63b1b5d4e2ab4
+Subproject commit d5655263af8b3611a2bcb907a9963831a88d154b

+ 1 - 1
vim/bundle/vim-fugitive

@@ -1 +1 @@
-Subproject commit 3439f999b138254e4bb56187fc91f91f545b4b12
+Subproject commit be2ff98db543990d7e59a90189733d7a779788fd

+ 1 - 1
vim/bundle/vim-go

@@ -1 +1 @@
-Subproject commit 523d5a435d490c8c5ea3d8ed0ecac453e2f33f93
+Subproject commit 3806c4e59da235e01e0abbe2eefa59053c27b12b

+ 1 - 0
vim/bundle/vim-polyglot

@@ -0,0 +1 @@
+Subproject commit 8eab5f5403afc1c33a7593459a27f7ff625fa60b

+ 1 - 1
vim/bundle/vim-rails

@@ -1 +1 @@
-Subproject commit 7ea50ede5420058d3d5142d1a5d635ce876486cf
+Subproject commit d0b6a3d06a5d00ec72385bbf202f9d533e87f7c3

+ 1 - 1
vim/bundle/vim-rspec

@@ -1 +1 @@
-Subproject commit 2cf8c5002cb89eb8e9aabe59d25b89dc5afec88a
+Subproject commit 52a72592b6128f4ef1557bc6e2e3eb014d8b2d38

+ 1 - 1
vim/bundle/vim-sensible

@@ -1 +1 @@
-Subproject commit 9e91be7e0fb42949831fe3161ef583363648aa58
+Subproject commit 49ee364222dc2a5a00dddf89fd61880e3e39d46a