Commit 968b5cb7 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge remote-tracking branch 'origin/master'

parents 9842ffcd 7fdc2e8d

.config/pudb/pudb.cfg

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ custom_theme = 
display = auto

line_numbers = True

prompt_on_quit = True

seen_welcome = e033

seen_welcome = e999

shell = ipython

sidebar_width = 0.5

stack_weight = 1

.oh-my-zsh @ 05b61706

Compare 576ada13 to 05b61706
Original line number Diff line number Diff line 
Subproject commit 576ada138fc5eed3f58a4aff8141e483310c90fb
 
Subproject commit 05b617066ba5a37ef0c533385efd6e232a387b8f

.shell/bin/tmux-display-helper

+5 −8
Original line number Diff line number Diff line
@@ -84,18 +84,15 @@ get_var() { 
}





if has systemd-run; then

	launch() { systemd-run --scope --user "$@"; }

else

	launch() { setsid "$@"; }

fi





start_client() {

	[ $# -eq 1 ] || bad_arg "start-client takes no arguments"

	[ -z "$TMUX" ] || die "this command must be run from outside of tmux"

	if ! tmux has-session; then

		launch tmux start-server

		if has systemctl; then

			systemctl --user start tmux.service

		else

			setsid tmux start-server

		fi

	fi

	set_var DISPLAY "$DISPLAY"

	tmux attach-session; code=$?

.shell/bin/wallpaper.py

+4 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ else: 
	cmd = ['feh', '--no-fehbg', '--no-xinerama', '--bg-fill', None]



while 1:

	cmd[-1] = random.choice(list(all_files()))

	files = list(all_files())

	if files:

		cmd[-1] = random.choice(files)

		subprocess.call(cmd)

	time.sleep(random.randint(MIN_DELAY_SECS, MAX_DELAY_SECS))

asyncrun @ 17ac25c7

Compare 0bc88439 to 17ac25c7
Original line number Diff line number Diff line 
Subproject commit 0bc884395ea9c8ef9a90ec20b507ea5e39398168
 
Subproject commit 17ac25c76079323cf94fa4157083d0f580aee8a8