[nix] Extract path changes from bin/

bin/executable_autostart

@@ -1,19 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY > /dev/null
-swaymsg exec -- /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets
-dbus-update-activation-environment --systemd --all
+gnome-keyring-daemon -r -d
+systemctl --user import-environment
 
-swaymsg exec nextcloud
-swaymsg exec mako
+ln -sf /run/user/1000/sway-ipc.1000.$(pidof sway).sock $SWAYSOCK
+
+swaymsg exec -- systemctl restart --user nextcloud.service
+swaymsg exec -- systemctl restart --user mako.service
 swaymsg exec -- systemctl restart --user mopidy.service
 swaymsg exec -- systemctl restart --user emacs.service
-swaymsg exec -- wl-paste -t text --watch clipman store --histpath="~/.local/share/clipman-primary.json"
-
-swaymsg exec -- gammastep -m wayland -l 48.15:11.64 -t 6500K:3000K
+swaymsg exec -- systemctl restart --user clipboard-manager.service
 
 swaymsg workspace "4 "
-swaymsg exec "emacs ~/"
+swaymsg exec "em ~/"
 sleep 0.5
 swaymsg workspace "2 "
 swaymsg exec "firefox"

bin/executable_blur-lock

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SHOTTER="grim"
 LOCKER="swaylock"

bin/executable_blur-lock-and-suspend

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 blur-lock & sleep 5
 systemctl suspend

bin/executable_dropshot

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 SHOT=$(screenshot -s)
 pngquant 64 --skip-if-larger --strip --ext=.png --force $SHOT

bin/executable_em

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-exec emacsclient -s daemacs "${@}"
+exec emacs -nw "$@"

bin/executable_my-rofi

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 SHOW=${1:-combi}
-exec rofi -m -4 -combi-modi run,bookmarks,org -sorting-method fzf -show ${SHOW} -modi combi,run,calc,bookmarks:~/Code/rofi-marks/rofi-marks,org:~/bin/rofi-org,ssh -matching fuzzy -width 40% -format s -tokenize -location 0
+exec rofi -m -4 -combi-modi run,bookmarks -sorting-method fzf -show ${SHOW} -modi combi,run,bookmarks:~/Code/rofi-marks/rofi-marks,ssh -matching fuzzy -width 40% -format s -tokenize -location 0

bin/executable_org-update-clock-file

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ORGDIR="/run/user/1000/org"
 
@@ -6,4 +6,4 @@ ORGDIR="/run/user/1000/org"
 mkdir -p "${ORGDIR}"
 
 # Trim the resulting quotes from emacs eval response
-em -e "(sway-org-clock-indicator)" | tr -d '"' > "${ORGDIR}/current-task"
+em -e "(bascht/sway-org-clock-indicator)" | tr -d '"' > "${ORGDIR}/current-task"

bin/executable_screenshot

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 FOLDER="/home/bascht/Pictures/Screenshots/$(date +'%Y-%m')"
 mkdir -p ${FOLDER}
 

bin/executable_sway-run

@@ -1,23 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-source ~/.zprofile
-source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
+# first import environment variables from the login manager
+systemctl --user import-environment
+# then start the service
+#exec systemctl --user start sway.service
+export SWAYSOCK
 
-export XKB_DEFAULT_LAYOUT=de
-export XKB_DEFAULT_OPTIONS=caps:escape
-export QT_SCALE_FACTOR=1
-export QT_AUTO_SCREEN_SCALE_FACTOR=1
-export QT_QPA_PLATFORM=wayland
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-export TERM=alacritty
-export _JAVA_AWT_WM_NONREPARENTING=1
-export GNOME_KEYRING_CONTROL=/run/user/1000/keyring
-export WLR_DRM_NO_MODIFIERS=1
-
-. /etc/X11/xinit/xinitrc-common &> /dev/null
-dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY &> /dev/null
-eval $(ssh-agent -s) &> /dev/null
-export SSH_AUTH_SOCK
-
-# exec sway --debug --verbose 2> ~/sway-$(date +%Y-%m-%d-%H%M%S).log
-exec sway 1>&1 > /dev/null
+exec sway --debug --verbose 2> ~/sway-$(date +%Y-%m-%d-%H%M%S).log
+#exec sway 1>&1 > /dev/null

bin/executable_worklogger

@@ -7,7 +7,6 @@
 # journal files and using KDialog for querying.
 
 require 'pathname'
-require 'pry'
 
 unless File.open(__FILE__).flock(File::LOCK_EX|File::LOCK_NB)
   abort("An instance of Worklogger is already running. Aborting.")