Move executables into local/bin

and fix known bustedness
main
Dan Buch 4 years ago
parent caea8cab11
commit a2cc7a788a
Signed by: meatballhat
GPG Key ID: 9685130D8B763EA7

@ -1,21 +1,27 @@
TOP_SOURCES := $(shell git ls-files | grep -vE 'README|Makefile|^config|^\.git|^\.travis' | grep -v /) TOP_SOURCES := $(shell git ls-files | grep -vE 'README|Makefile|^config|^\.git|^\.travis' | grep -v /)
CONFIG_SOURCES := $(shell git ls-files config) CONFIG_SOURCES := $(shell git ls-files config)
LOCAL_BIN_SOURCES := $(shell git ls-files local/bin)
TARGETS := \ TARGETS := \
$(patsubst %,$(HOME)/.%,$(TOP_SOURCES)) \ $(patsubst %,$(HOME)/.%,$(TOP_SOURCES)) \
$(patsubst %,$(HOME)/.%,$(CONFIG_SOURCES)) \ $(patsubst %,$(HOME)/.%,$(CONFIG_SOURCES)) \
$(patsubst %,$(HOME)/.%,$(LOCAL_BIN_SOURCES)) \
$(HOME)/.config/i3/config $(HOME)/.config/i3/config
$(HOME)/.%: % $(HOME)/.%: %
$(RM) '$@' && mkdir -p $(dir $@) && ln -svf '$(PWD)/$^' '$@' $(RM) '$@' && mkdir -p $(dir $@) && ln -svf '$(PWD)/$^' '$@'
.PHONY: all .PHONY: all
all: $(HOME)/.config $(TARGETS) all: $(HOME)/.config $(HOME)/.local/bin $(TARGETS)
$(HOME)/.config: $(HOME)/.config:
mkdir -p $@ mkdir -p $@
$(HOME)/.local/bin:
mkdir -p $@
.PHONY: echo .PHONY: echo
echo: echo:
@echo TOP_SOURCES=$(TOP_SOURCES) @echo TOP_SOURCES=$(TOP_SOURCES)
@echo CONFIG_SOURCES=$(CONFIG_SOURCES) @echo CONFIG_SOURCES=$(CONFIG_SOURCES)
@echo LOCAL_BIN_SOURCES=$(LOCAL_BIN_SOURCES)
@echo TARGETS=$(TARGETS) @echo TARGETS=$(TARGETS)

@ -102,12 +102,12 @@ bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -1000
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +1000 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +1000
bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle
bindsym XF86MonBrightnessDown exec ~/.i3status-update-do xbacklight -5 bindsym XF86MonBrightnessDown exec ~/.local/bin/i3status-update-do xbacklight -5
bindsym XF86MonBrightnessUp exec ~/.i3status-update-do xbacklight +5 bindsym XF86MonBrightnessUp exec ~/.local/bin/i3status-update-do xbacklight +5
bindsym XF86Tools exec i3lock -c ed1c24 bindsym XF86Tools exec i3lock -c ed1c24
bindsym XF86Calculator exec xcalc bindsym XF86Calculator exec xcalc
bindsym XF86Display exec ~/.i3-screenlayout-toggle bindsym XF86Display exec ~/.local/bin/i3-screenlayout-toggle
bindsym Print exec xfce4-screenshooter bindsym Print exec xfce4-screenshooter
# resize window (you can also use the mouse for that) # resize window (you can also use the mouse for that)
@ -139,5 +139,5 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command "i3status | python ~/.i3wrapper.py" status_command "i3status | python ~/.local/bin/i3wrapper.py"
} }

@ -1,5 +1,5 @@
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/home/me/.redshift-gtk-wrapper ExecStart=/home/me/.local/bin/redshift-gtk-wrapper
SyslogIdentifier= SyslogIdentifier=
SyslogIdentifier=redshift-gtk SyslogIdentifier=redshift-gtk

@ -1,5 +1,5 @@
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/home/me/.redshift-wrapper ExecStart=/home/me/.local/bin/redshift-wrapper
SyslogIdentifier= SyslogIdentifier=
SyslogIdentifier=redshift SyslogIdentifier=redshift

@ -3,7 +3,7 @@ set -o errexit
main() { main() {
export REDSHIFT_EXE=redshift-gtk export REDSHIFT_EXE=redshift-gtk
exec ~/.redshift-wrapper "${@}" exec ~/.local/bin/redshift-wrapper "${@}"
} }
main "${@}" main "${@}"

@ -5,7 +5,7 @@ set -o pipefail
main() { main() {
: "${FALLBACK_COORDS:=40.4325:-79.863}" : "${FALLBACK_COORDS:=40.4325:-79.863}"
local coords local coords
coords="$(~/.get-coords 2>/dev/null || echo "${FALLBACK_COORDS}")" coords="$(~/.local/bin/latlon 2>/dev/null || echo "${FALLBACK_COORDS}")"
exec "${REDSHIFT_EXE:-redshift}" -l "${coords}" -v exec "${REDSHIFT_EXE:-redshift}" -l "${coords}" -v
} }
Loading…
Cancel
Save