diff --git a/dotfiles-old/.config/displaym/bspwm/start.sh b/dotfiles-old/.config/displaym/bspwm/start.sh old mode 100644 new mode 100755 index 446564c..621ceaf --- a/dotfiles-old/.config/displaym/bspwm/start.sh +++ b/dotfiles-old/.config/displaym/bspwm/start.sh @@ -1,2 +1,3 @@ -cat "$DISPLAYM_CONFIG/sxhkdrc" "$DISPLAYM_CONFIG/bspwm/sxhkdrc" >"$HOME/.config/sxhkd/sxhkdrc" +. "$DISPLAYM_CONFIG/merge_xinitrc.sh" +. "$DISPLAYM_CONFIG/merge_sxhkdrc.sh" startx diff --git a/dotfiles-old/.config/displaym/ctwm/start.sh b/dotfiles-old/.config/displaym/ctwm/start.sh index 5c0fbf4..9cdb9b4 100755 --- a/dotfiles-old/.config/displaym/ctwm/start.sh +++ b/dotfiles-old/.config/displaym/ctwm/start.sh @@ -1,2 +1,3 @@ -cat "$DISPLAYM_CONFIG/sxhkdrc" >"$HOME/.config/sxhkd/sxhkdrc" +. "$DISPLAYM_CONFIG/merge_xinitrc.sh" +. "$DISPLAYM_CONFIG/default_sxhkdrc.sh" startx diff --git a/dotfiles-old/.config/displaym/default_sxhkdrc.sh b/dotfiles-old/.config/displaym/default_sxhkdrc.sh new file mode 100755 index 0000000..67a4866 --- /dev/null +++ b/dotfiles-old/.config/displaym/default_sxhkdrc.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp "$DISPLAYM_CONFIG/sxhkdrc" "$HOME/.config/sxhkd/sxhkdrc" diff --git a/dotfiles-old/.config/displaym/default_xinitrc.sh b/dotfiles-old/.config/displaym/default_xinitrc.sh new file mode 100755 index 0000000..1e49eb8 --- /dev/null +++ b/dotfiles-old/.config/displaym/default_xinitrc.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cp "$DISPLAYM_CONFIG/.xinitrc" "$HOME/.xinitrc" diff --git a/dotfiles-old/.config/displaym/i3wm/start.sh b/dotfiles-old/.config/displaym/i3wm/start.sh new file mode 100644 index 0000000..51d504d --- /dev/null +++ b/dotfiles-old/.config/displaym/i3wm/start.sh @@ -0,0 +1,3 @@ +#!/bin/sh +. "$DISPLAYM_CONFIG/merge_xinitrc.sh" +. "$DISPLAYM_CONFIG/merge_sxhkdrc.sh" diff --git a/dotfiles-old/.config/displaym/merge_sxhkdrc.sh b/dotfiles-old/.config/displaym/merge_sxhkdrc.sh new file mode 100755 index 0000000..0d82330 --- /dev/null +++ b/dotfiles-old/.config/displaym/merge_sxhkdrc.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cat "$DISPLAYM_CONFIG/sxhkdrc" "$DISPLAYM_CONFIG/$WM/sxhkdrc" \ + >"$HOME/.config/sxhkd/sxhkdrc" diff --git a/dotfiles-old/.config/displaym/merge_xinitrc.sh b/dotfiles-old/.config/displaym/merge_xinitrc.sh new file mode 100755 index 0000000..6f8e4ed --- /dev/null +++ b/dotfiles-old/.config/displaym/merge_xinitrc.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cat "$DISPLAYM_CONFIG/.xinitrc" "$DISPLAYM_CONFIG/$WM/.xinitrc" >"$HOME/.xinitrc" diff --git a/dotfiles-old/bin/displaym b/dotfiles-old/bin/displaym deleted file mode 100755 index bd28248..0000000 --- a/dotfiles-old/bin/displaym +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -set -ex - -usage() { - set +x - printf "\ -Usage: - %s start [window manager]\n" "$argv0" >>/dev/stderr - exit 1 -} - -[ -n "$1" ] || usage - -# assumption: $HOME contains the path to the user's home directory - -DISPLAYM_CONFIG="$HOME/.config/displaym"; export DISPLAYM_CONFIG -[ -d "$DISPLAYM_CONFIG" ] || mkdir -p "$DISPLAYM_CONFIG" - -case "$1" in - (start) - WM="$2"; export WM - cat "$DISPLAYM_CONFIG/.xinitrc" "$DISPLAYM_CONFIG/$WM/.xinitrc" >"$HOME/.xinitrc" - sh "$DISPLAYM_CONFIG/$WM/start.sh" - ;; - (stop) - sh "$DISPLAYM_CONFIG/$WM/stop.sh" - pkill "$WM" - ;; - (*) usage ;; -esac -