Commit fcf7bf1b authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge remote-tracking branch 'origin/master'

parents 1d3841dc 22403faa
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ local util = require("util")
-- {{{ Link titlebars with floating property

function set_titlebar(c)
	if c.floating then
	if c.floating and not c.skip_taskbar then
		awful.titlebar.show(c)
	else
		awful.titlebar.hide(c)
@@ -96,9 +96,12 @@ rules.add_rule{
	},
	except_any = {
		type = { "menu" },
		name = { "Steam" },
		name = { "^Steam$" },
	},
	properties = {
		floating = true,
		skip_taskbar = true,
	},
	properties = { floating = true },
}

-- }}}
+14 −0
Original line number Diff line number Diff line
# ignore non-dotfiles
/*
!/.*
*.ba[ck]

# local install base
/.local

# local binary data
/.backgrounds
/.fonts

# shell local files
.bash_local
.zsh_local
@@ -15,12 +20,14 @@

# caches, history
/.cache
/.dmrc
/.viminf*
/.lesshst
/.*_history
/.vim/.netrwhist
/.dvdcss
/.wget-hsts
/.thumbnails

# flags, timestamps
/.sudo_as_admin_successful
@@ -39,6 +46,7 @@
/.bundler

# logs, databases
/.cddb
*.log
*.sqlite
/.zcompdump*
@@ -53,6 +61,9 @@
# systemd links directories
.config/systemd/user/*.wants

# too volatile
/.config/htop

# software which will not be version controlled
/.adobe
/.asoundrc
@@ -69,6 +80,7 @@
/.config/gtk-2.0
/.config/gtk-3.0
/.config/gnome-sudoku
/.config/ibus
/.config/icedtea-web
/.config/libaccounts-glib
/.config/libreoffice
@@ -80,6 +92,7 @@
/.config/pulse
/.config/Skype
/.config/software-center
/.config/spotify
/.config/Synergy
/.config/Ticket\ to\ Ride
/.config/Trolltech*
@@ -114,6 +127,7 @@
/.minecraft
/.mlterm
/.mozilla
/.opera
/.pulse*
/.PyCharm*
/.pylint*
+5 −1
Original line number Diff line number Diff line
import os
import sys
from contextlib import suppress
from importlib import reload, util as _import_util
@@ -50,7 +51,10 @@ class MagicSpec:

	def create_module(self, _):
		from pip._internal import main
		if 0 != main(['install', self.package]):
		cmd = ['install', self.package]
		if not os.access(sys.prefix, os.W_OK):
			cmd.insert(1, '--user')
		if 0 != main(cmd):
			raise ImportError("Unable to install {}".format(self.package))
		self.spec = _import_util.find_spec(self.name)
		if hasattr(self.spec.loader, 'create_module'):
Compare abca62ad to 0853b74f
Original line number Diff line number Diff line
Subproject commit abca62add1a6d0ac34e697beac8682076d5c1dd7
Subproject commit 0853b74fef0fa3a05af7487ff9b15a7f714bb037
Loading