Commit 43b203dd authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge remote-tracking branch 'origin/master'

parents 1e76298f 76ba4c79

.config/awesome/user-defined.lua

+6 −8
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ local os = require('os') 
local rules = require("rules")

local awful = require("awful")

local beautiful = require("beautiful")

local debian_menu = require("debian.menu")

local util = require("util")
@@ -39,16 +38,15 @@ end 
-- {{{ Better menus



local main_menu = {

	{ "awesome", {

	{ "lock screen", "dm-tool lock" },

	{ "awesome", {

		{ "restart", awesome.restart },

		{ "quit", function() awesome.quit() end },

	}},

	{ "power", {

		{ "off", function() awful.spawn{"poweroff"} end },

		{ "reboot", function() awful.spawn{"reboot"} end }

		}}

	}, beautiful.awesome_icon },

	{ "Debian", debian_menu.Debian_menu.Debian },

	}},

}



for i, _ in ipairs(mymainmenu.items) do mymainmenu:delete(i) end

.oh-my-zsh @ f2f078a1

Compare 54055c45 to f2f078a1
Original line number Diff line number Diff line 
Subproject commit 54055c4530112439a04bf039d09c30c4b7330c84
 
Subproject commit f2f078a1bbbce1631a99150029541544e621b6be

.vim/bin/vim.remote

+2 −1
Original line number Diff line number Diff line 
#!/bin/sh

if ! type nvr >/dev/null 2>&1 || [ -z "$NVIM_LISTEN_ADDRESS" ]; then

	unset FROM_ALIAS

	exec vim "$@"

elif [ -n "$FROM_ALIAS" ]; then

	unset FROM_ALIAS

	exec nvr -s --remote "$@"

else

	exec nvr -s --remote-tab-wait -c 'setl bufhidden=wipe' "$@"

	exec nvr -s --remote-tab-wait -c 'tabmove -1 | setl bufhidden=wipe' "$@"

fi

vim-fugitive @ a358191c

Compare f91c3406 to a358191c
Original line number Diff line number Diff line 
Subproject commit f91c34069e55f93d550d8b07fea2875e5cb86bc8
 
Subproject commit a358191cfb04fa9f89d5320dcdd8b7e887e28048

vim-gnupg @ 22cbc6b6

Compare 7fcea1a0 to 22cbc6b6
Original line number Diff line number Diff line 
Subproject commit 7fcea1a08423da3012aac87f5224738c85d212a1
 
Subproject commit 22cbc6b6ab1623edd2e325d256245d21580f912a