diff options
| -rw-r--r-- | .stack/.gitignore | 3 | ||||
| -rw-r--r-- | .stack/config.yaml | 12 | ||||
| -rw-r--r-- | .vim/ftplugin/haskell.vim | 3 | ||||
| -rw-r--r-- | .xinitrc | 6 | ||||
| -rwxr-xr-x | i3/start_polybar.sh | 12 | ||||
| -rwxr-xr-x | install.sh | 1 | ||||
| -rw-r--r-- | xinitrc.d/00-dbus.sh | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/00-misc.sh | 0 | ||||
| -rwxr-xr-x | xinitrc.d/10-background.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/10-mqtt-lock.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/10-screensaver.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | xinitrc.d/99-wm.sh | 0 |
12 files changed, 25 insertions, 15 deletions
diff --git a/.stack/.gitignore b/.stack/.gitignore new file mode 100644 index 0000000..ba1c556 --- /dev/null +++ b/.stack/.gitignore @@ -0,0 +1,3 @@ +* +!config.yaml +!.gitignore diff --git a/.stack/config.yaml b/.stack/config.yaml new file mode 100644 index 0000000..cce643c --- /dev/null +++ b/.stack/config.yaml @@ -0,0 +1,12 @@ +# Stop downloading GHCs into isolated locations under ~/.stack. +install-ghc: false + +# Allow Stack to pick the system GHC (false by default). +system-ghc: true + +# Allow to use, say, Stackage snapshot for GHC 8.8.2 with system GHC 8.8.3. +compiler-check: newer-minor + +# Add the -dynamic flag to every invocation of GHC. +ghc-options: + "$everything": -dynamic diff --git a/.vim/ftplugin/haskell.vim b/.vim/ftplugin/haskell.vim new file mode 100644 index 0000000..676d2f6 --- /dev/null +++ b/.vim/ftplugin/haskell.vim @@ -0,0 +1,3 @@ +setlocal tabstop=4 +setlocal expandtab +setlocal shiftwidth=4 @@ -12,9 +12,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then fi if [ -f ~/.files ]; then - source ~/.files + . "$HOME/.files" for f in $DOTFILEBASE/xinitrc.d/*; do - [ -x "$f" ] && . "$f" + # Some scripts require bash, but .xinitrc is sourced from sh. + # If a script is marked executable, it is executed instead of sourced. + [ -x "$f" ] && "$f" || . "$f" done unset f fi diff --git a/i3/start_polybar.sh b/i3/start_polybar.sh deleted file mode 100755 index 38b46f6..0000000 --- a/i3/start_polybar.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Terminate already running bar instances -killall -q polybar - -# Wait until the processes have been shut down -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - -# Launch Polybar, using default config location ~/.config/polybar/config -polybar $1 & - -echo "Polybar launched..." @@ -23,6 +23,7 @@ CONFIGS=( ["sway"]=".config" [".Xresources"]="." [".radare2rc"]="." [".bash_profile"]="." + [".stack"]="." ["gpg-agent.conf"]=".gnupg" ) diff --git a/xinitrc.d/00-dbus.sh b/xinitrc.d/00-dbus.sh new file mode 100644 index 0000000..341e3a6 --- /dev/null +++ b/xinitrc.d/00-dbus.sh @@ -0,0 +1 @@ +dbus-update-activation-environment --systemd DISPLAY diff --git a/xinitrc.d/00-misc.sh b/xinitrc.d/00-misc.sh index 20e3390..20e3390 100755..100644 --- a/xinitrc.d/00-misc.sh +++ b/xinitrc.d/00-misc.sh diff --git a/xinitrc.d/10-background.sh b/xinitrc.d/10-background.sh index 287183b..6e4f068 100755 --- a/xinitrc.d/10-background.sh +++ b/xinitrc.d/10-background.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash #Screen background feh if [ -f ~/.files ]; then diff --git a/xinitrc.d/10-mqtt-lock.sh b/xinitrc.d/10-mqtt-lock.sh index 8719b0b..8719b0b 100755..100644 --- a/xinitrc.d/10-mqtt-lock.sh +++ b/xinitrc.d/10-mqtt-lock.sh diff --git a/xinitrc.d/10-screensaver.sh b/xinitrc.d/10-screensaver.sh index 28e6cd2..28e6cd2 100755..100644 --- a/xinitrc.d/10-screensaver.sh +++ b/xinitrc.d/10-screensaver.sh diff --git a/xinitrc.d/99-wm.sh b/xinitrc.d/99-wm.sh index 5a83852..5a83852 100755..100644 --- a/xinitrc.d/99-wm.sh +++ b/xinitrc.d/99-wm.sh |