From a83b1223ef01cff158c7257cfdc7f3caba288b9c Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sat, 25 Sep 2021 18:55:36 +0200 Subject: xinitrc: sh compatability --- .xinitrc | 6 ++++-- xinitrc.d/00-misc.sh | 0 xinitrc.d/10-mqtt-lock.sh | 0 xinitrc.d/10-screensaver.sh | 0 xinitrc.d/99-wm.sh | 0 5 files changed, 4 insertions(+), 2 deletions(-) mode change 100755 => 100644 xinitrc.d/00-misc.sh mode change 100755 => 100644 xinitrc.d/10-mqtt-lock.sh mode change 100755 => 100644 xinitrc.d/10-screensaver.sh mode change 100755 => 100644 xinitrc.d/99-wm.sh diff --git a/.xinitrc b/.xinitrc index d9f49ab..935cb33 100644 --- a/.xinitrc +++ b/.xinitrc @@ -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" ] && exec "$f" || . "$f" done unset f fi diff --git a/xinitrc.d/00-misc.sh b/xinitrc.d/00-misc.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/10-mqtt-lock.sh b/xinitrc.d/10-mqtt-lock.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/10-screensaver.sh b/xinitrc.d/10-screensaver.sh old mode 100755 new mode 100644 diff --git a/xinitrc.d/99-wm.sh b/xinitrc.d/99-wm.sh old mode 100755 new mode 100644 -- cgit v1.2.3 From 89b0112d8acdf559660cbd60c5d3d98fefe5ccaf Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sat, 25 Sep 2021 19:03:40 +0200 Subject: xinitrc fix --- .xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xinitrc b/.xinitrc index 935cb33..dffc2c1 100644 --- a/.xinitrc +++ b/.xinitrc @@ -16,7 +16,7 @@ if [ -f ~/.files ]; then for f in $DOTFILEBASE/xinitrc.d/*; do # Some scripts require bash, but .xinitrc is sourced from sh. # If a script is marked executable, it is executed instead of sourced. - [ -x "$f" ] && exec "$f" || . "$f" + [ -x "$f" ] && "$f" || . "$f" done unset f fi -- cgit v1.2.3 From e264ba9bbc3ae9b2e965c50941e449503da7339d Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sat, 25 Sep 2021 19:09:24 +0200 Subject: cleanup --- i3/start_polybar.sh | 12 ------------ xinitrc.d/10-background.sh | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100755 i3/start_polybar.sh 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..." 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 -- cgit v1.2.3 From 6b31460149921527899687ce96ffa79e3e48d182 Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sun, 26 Sep 2021 15:18:49 +0200 Subject: add xinitrc/00-dbus.sh to fix gnome-keyring --- xinitrc.d/00-dbus.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 xinitrc.d/00-dbus.sh 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 -- cgit v1.2.3 From 85401d4f65ab6b190d6a303b367ce3be6266a877 Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sun, 24 Oct 2021 22:37:53 +0200 Subject: add ghc-stack --- .stack/.gitignore | 3 +++ .stack/config.yaml | 12 ++++++++++++ install.sh | 1 + 3 files changed, 16 insertions(+) create mode 100644 .stack/.gitignore create mode 100644 .stack/config.yaml 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/install.sh b/install.sh index e7b5a92..597cb3e 100755 --- a/install.sh +++ b/install.sh @@ -23,6 +23,7 @@ CONFIGS=( ["sway"]=".config" [".Xresources"]="." [".radare2rc"]="." [".bash_profile"]="." + [".stack"]="." ["gpg-agent.conf"]=".gnupg" ) -- cgit v1.2.3 From 326136564886614d72943b3a92ddac7821a6b16c Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Sun, 24 Oct 2021 22:39:17 +0200 Subject: fplugin haskell --- .vim/ftplugin/haskell.vim | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vim/ftplugin/haskell.vim 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 -- cgit v1.2.3