Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@vitek
vitek committed May 23, 2023
1 parent 280d816 commit b499a07
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 64 deletions.
82 changes: 41 additions & 41 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include Makefile.common
GCONFTOOL = gconftool-2
EMACS = emacs

I3_DESTDIR = $(DESTDIR)/.config/i3
I3_DESTDIR = $(CONFIGDIR)/i3

AWESOME_FILES = \
awesome/rc.lua \
Expand Down Expand Up @@ -100,8 +100,8 @@ install-vim:

install-misc: install-screen install-tmux
$(INSTALL) -m 0644 pylintrc $(DESTDIR)/.pylintrc
$(INSTALL) -d $(DESTDIR)/.config
$(INSTALL) -m 0644 flake8 $(DESTDIR)/.config/flake8
$(INSTALL) -d $(CONFIGDIR)
$(INSTALL) -m 0644 flake8 $(CONFIGDIR)/flake8

install-screen:
$(INSTALL) -m 0644 screenrc $(DESTDIR)/.screenrc
Expand All @@ -115,19 +115,19 @@ install-gconf:
$(GCONFTOOL) --set /apps/gnome-terminal/profiles/Default/scrollbar_position --type string hidden

install-awesome: install-x11-utils
$(INSTALL) -d $(DESTDIR)/.config/awesome
$(INSTALL) -m 0644 $(AWESOME_FILES) $(DESTDIR)/.config/awesome/
$(INSTALL) -d $(CONFIGDIR)/awesome
$(INSTALL) -m 0644 $(AWESOME_FILES) $(CONFIGDIR)/awesome/
$(INSTALL) -m 0644 awesome/gnomerc $(DESTDIR)/.gnomerc
$(INSTALL) -d $(DESTDIR)/.config/awesome/apw
$(INSTALL) -d $(CONFIGDIR)/awesome/apw
$(INSTALL) -m 0644 awesome/apw/widget.lua awesome/apw/pulseaudio.lua \
$(DESTDIR)/.config/awesome/apw
$(INSTALL) -d $(DESTDIR)/.config/awesome/scripts
@if [ -e $(DESTDIR)/.config/awesome/scripts/start.sh ]; then \
$(CONFIGDIR)/awesome/apw
$(INSTALL) -d $(CONFIGDIR)/awesome/scripts
@if [ -e $(CONFIGDIR)/awesome/scripts/start.sh ]; then \
echo "Awesome startup script already exists"; \
else \
echo "Installing awesom startup script template"; \
$(INSTALL) -m 0755 awesome/scripts/start.sh \
$(DESTDIR)/.config/awesome/scripts/start.sh; \
$(CONFIGDIR)/awesome/scripts/start.sh; \
fi

i3-reload: install-i3
Expand All @@ -140,28 +140,28 @@ install-i3: install-xob install-i3status install-polybar install-x11-utils insta
$(INSTALL) -m 0644 i3/config $(I3_DESTDIR)
$(INSTALL) -m 0644 i3/hostname.d/*.conf $(I3_DESTDIR)/hostname.d/
$(INSTALL) -m 0644 i3/config.d/*.conf $(I3_DESTDIR)/config.d/
$(INSTALL) -m 0755 i3/xkb-layout.py $(DESTDIR)/bin/i3-xkb-layout
$(INSTALL) -m 0755 i3/i3-switch-layout $(DESTDIR)/bin/
$(INSTALL) -m 0755 i3/i3-lock $(DESTDIR)/bin/
$(INSTALL) -m 0755 i3/xkb-layout.py $(BINDIR)/i3-xkb-layout
$(INSTALL) -m 0755 i3/i3-switch-layout $(BINDIR)/
$(INSTALL) -m 0755 i3/i3-lock $(BINDIR)/

install-i3status:
$(INSTALL) -d $(DESTDIR)/.config/i3status
$(INSTALL) -m 0644 i3/status/config $(DESTDIR)/.config/i3status/
$(INSTALL) -d $(CONFIGDIR)/i3status
$(INSTALL) -m 0644 i3/status/config $(CONFIGDIR)/i3status/

install-picom:
$(INSTALL) -d $(DESTDIR)/.config/
$(INSTALL) -m 0644 picom.conf $(DESTDIR)/.config/picom.conf
$(INSTALL) -d $(CONFIGDIR)/
$(INSTALL) -m 0644 picom.conf $(CONFIGDIR)/picom.conf

install-polybar:
$(INSTALL) -d $(DESTDIR)/.config/polybar
$(INSTALL) -m 0644 polybar.ini $(DESTDIR)/.config/polybar/config.ini
$(INSTALL) -d $(CONFIGDIR)/polybar
$(INSTALL) -m 0644 polybar.ini $(CONFIGDIR)/polybar/config.ini

install-sway: install-desktop-init
$(MAKE) -C wayland install-sway

install-desktop-init:
$(INSTALL) -d $(DESTDIR)/bin/
$(INSTALL) -m 0755 bin/desktop-init.sh $(DESTDIR)/bin/
$(INSTALL) -d $(BINDIR)/
$(INSTALL) -m 0755 bin/desktop-init.sh $(BINDIR)/

install-xob:
$(INSTALL) -d $(SYSTEMD_USER_PATH)
Expand All @@ -173,8 +173,8 @@ reinstall-wob: install-wob
systemctl --user restart wob.service

install-qt:
$(INSTALL) -d $(DESTDIR)/.config/qt5ct
$(INSTALL) -m 0644 qt/qt5ct.conf $(DESTDIR)/.config/qt5ct/
$(INSTALL) -d $(CONFIGDIR)/qt5ct
$(INSTALL) -m 0644 qt/qt5ct.conf $(CONFIGDIR)/qt5ct/
$(INSTALL) -d $(DESTDIR)/.icons/default/
$(INSTALL) -m 0644 icons/index.theme $(DESTDIR)/.icons/default/

Expand All @@ -183,15 +183,15 @@ restart-awesome: install-awesome
awesome --replace

install-compton:
$(INSTALL) -d $(DESTDIR)/.config
$(INSTALL) -m 0644 awesome/compton.conf $(DESTDIR)/.config/
$(INSTALL) -d $(CONFIGDIR)
$(INSTALL) -m 0644 awesome/compton.conf $(CONFIGDIR)/

install-x11-utils:
$(INSTALL) -d $(DESTDIR)/bin
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0644 xbindkeysrc $(DESTDIR)/.xbindkeysrc
$(INSTALL) -m 0755 bin/scrot-area $(DESTDIR)/bin
$(INSTALL) -m 0755 bin/zoom-mute $(DESTDIR)/bin
$(INSTALL) -m 0755 bin/x11-display-ctl $(DESTDIR)/bin
$(INSTALL) -m 0755 bin/scrot-area $(BINDIR)
$(INSTALL) -m 0755 bin/zoom-mute $(BINDIR)
$(INSTALL) -m 0755 bin/x11-display-ctl $(BINDIR)

install-bashrc:
$(INSTALL) -m 0644 inputrc $(DESTDIR)/.inputrc
Expand All @@ -202,8 +202,8 @@ install-bashrc:
$(INSTALL) -m 0644 bash.d/*.bash $(DESTDIR)/.bash.d

install-bin:
$(INSTALL) -d $(DESTDIR)/bin
$(INSTALL) -m 0755 $(BIN_FILES) $(DESTDIR)/bin/
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 $(BIN_FILES) $(BINDIR)/

install-ubuntu-extra:
python installpkgs.py ubuntu-packages
Expand Down Expand Up @@ -242,10 +242,10 @@ install-systemd: install-bin install-systemd-units
install-ya: install-arc

install-arc: ya/arc ya/arc-bash-completion
$(INSTALL) -d $(DESTDIR)/bin
$(INSTALL) -m 0755 ya/arc $(DESTDIR)/bin
$(INSTALL) -d $(DESTDIR)/.config/systemd/user/
$(INSTALL) -m 0644 ya/arc.service $(DESTDIR)/.config/systemd/user/
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 ya/arc $(BINDIR)
$(INSTALL) -d $(SYSTEMD_USER_PATH)
$(INSTALL) -m 0644 ya/arc.service $(SYSTEMD_USER_PATH)
$(INSTALL) -d $(DESTDIR)/.local/share/bash-completion/completions/
$(INSTALL) -m 0644 ya/arc-bash-completion $(DESTDIR)/.local/share/bash-completion/completions/arc
$(INSTALL) -d $(DESTDIR)/.bash.d
Expand All @@ -264,12 +264,12 @@ clean-arc:
rm -f ya/arc ya/arc-bash-completion

install-schroot:
$(INSTALL) -d $(DESTDIR)/bin
$(INSTALL) -m 0755 ya/schroot-session-helper $(DESTDIR)/bin/
$(INSTALL) -m 0755 ya/schroot-session-end $(DESTDIR)/bin/
ln -sf schroot-session-helper $(DESTDIR)/bin/bionic
ln -sf schroot-session-helper $(DESTDIR)/bin/xenial
ln -sf schroot-session-helper $(DESTDIR)/bin/focal
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 ya/schroot-session-helper $(BINDIR)/
$(INSTALL) -m 0755 ya/schroot-session-end $(BINDIR)/
ln -sf schroot-session-helper $(BINDIR)/bionic
ln -sf schroot-session-helper $(BINDIR)/xenial
ln -sf schroot-session-helper $(BINDIR)/focal
sudo $(INSTALL) -m 0755 ya/schroot-mount.sh /etc/schroot/setup.d/99mount-home

.PHONY: diff
Expand Down
4 changes: 3 additions & 1 deletion Makefile.common
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
INSTALL = install
DESTDIR = $(HOME)
SYSTEMD_USER_PATH = $(DESTDIR)/.config/systemd/user/
BINDIR = $(HOME)/bin
CONFIGDIR = $(HOME)/.config
SYSTEMD_USER_PATH = $(CONFIGDIR)/systemd/user/
PYTHON3 = $(firstword $(shell which python3.9 python3.8 python3.7 python3 2> /dev/null))

ROOTDIR = $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
Expand Down
41 changes: 23 additions & 18 deletions wayland/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ SWAY_BIN_FILES = \
grimshot \
sway-session.sh \
wait-sni-ready \
sway-dpms \
sway-switch-layout \
sway-lock.sh \
sway-idle.sh \
sway-quake \
sway-notify-ready \
sway-user-service \
launcher-menu \
wf-recorder.sh

SWAY_SYSTEMD_FILES = \
Expand All @@ -26,39 +26,44 @@ SWAY_SYSTEMD_FILES = \
systemd/wayland-session-pre.target \
systemd/wayland-session.target

install-sway: install-waybar install-wob install-desktopctl install-dunst install-sway-session
$(INSTALL) -d $(DESTDIR)/.config/sway
$(INSTALL) -d $(DESTDIR)/.config/sway/config.d
$(INSTALL) -d $(DESTDIR)/.config/sway/hostname.d
$(INSTALL) -m 0644 sway/config $(DESTDIR)/.config/sway/
$(INSTALL) -m 0644 sway/hostname.d/*.conf $(DESTDIR)/.config/sway/hostname.d/
$(INSTALL) -m 0644 sway/config.d/*.conf $(DESTDIR)/.config/sway/config.d/
$(INSTALL) -m 0755 $(SWAY_BIN_FILES) $(DESTDIR)/bin/
install-sway: install-waybar install-wob install-desktopctl install-dunst install-sway-session install-sway-dpms
$(INSTALL) -d $(CONFIGDIR)/sway
$(INSTALL) -d $(CONFIGDIR)/sway/config.d
$(INSTALL) -d $(CONFIGDIR)/sway/hostname.d
$(INSTALL) -m 0644 sway/config $(CONFIGDIR)/sway/
$(INSTALL) -m 0644 sway/hostname.d/*.conf $(CONFIGDIR)/sway/hostname.d/
$(INSTALL) -m 0644 sway/config.d/*.conf $(CONFIGDIR)/sway/config.d/
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 $(SWAY_BIN_FILES) $(BINDIR)

install-sway-dpms:
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 sway-dpms.sh $(BINDIR)/sway-dpms

install-sway-session: $(SWAY_SYSTEMD_FILES)
$(INSTALL) -d $(SYSTEMD_USER_PATH)
$(INSTALL) -m 0644 $(SWAY_SYSTEMD_FILES) $(SYSTEMD_USER_PATH)
systemctl --user daemon-reload

install-waybar:
$(INSTALL) -d $(DESTDIR)/.config/waybar
$(INSTALL) -m 0644 waybar/config $(DESTDIR)/.config/waybar/
$(INSTALL) -m 0644 waybar/style.css $(DESTDIR)/.config/waybar/
$(INSTALL) -d $(CONFIGDIR)/waybar
$(INSTALL) -m 0644 waybar/config $(CONFIGDIR)/waybar/
$(INSTALL) -m 0644 waybar/style.css $(CONFIGDIR)/waybar/

install-wob:
$(INSTALL) -d $(SYSTEMD_USER_PATH)
$(INSTALL) -m 0644 wob/wob.socket wob/wob.service \
$(SYSTEMD_USER_PATH)
$(INSTALL) -d $(DESTDIR)/.config/wob
$(INSTALL) -m 0644 wob/wob.ini $(DESTDIR)/.config/wob
$(INSTALL) -d $(CONFIGDIR)/wob
$(INSTALL) -m 0644 wob/wob.ini $(CONFIGDIR)/wob

install-desktopctl:
$(INSTALL) -d $(DESTDIR)/bin
$(INSTALL) -m 0755 desktopctl $(DESTDIR)/bin
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 0755 desktopctl $(BINDIR)

install-dunst:
$(INSTALL) -d $(DESTDIR)/.config/dunst/
$(INSTALL) -m 0644 dunstrc $(DESTDIR)/.config/dunst/dunstrc
$(INSTALL) -d $(CONFIGDIR)/dunst/
$(INSTALL) -m 0644 dunstrc $(CONFIGDIR)/dunst/dunstrc

clean:
rm -f systemd/sway-lock.service
11 changes: 11 additions & 0 deletions wayland/launcher-menu
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

run_menu() {
dmenu_path | dmenu -fn 'Noto Sans-12'
}

cmd=$(run_menu)

if [ -n "$cmd" ]; then
exec $cmd
fi
7 changes: 7 additions & 0 deletions wayland/sway-dpms.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

if [ "$1" = "off" ]; then
exec swaymsg 'output * dpms off'
else
exec swaymsg 'output * dpms on'
fi
14 changes: 11 additions & 3 deletions wayland/sway-user-service
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,16 @@ dbus-update-activation-environment --systemd --all
# import environment variables from the login manager
systemctl --user import-environment PATH XDG_CURRENT_DESKTOP


session_cleanup() {
# cleanup environment
systemctl --user unset-environment $new_env
}

trap session_cleanup INT TERM

# then start the service
systemctl --wait --user start sway.service
##systemctl --wait --user start sway.service

# cleanup environment
systemctl --user unset-environment $new_env
systemd-cat -t sway -- sway
session_cleanup
2 changes: 1 addition & 1 deletion wayland/sway/config.d/00-keys.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bindsym --to-code {
$mod+Shift+c kill

# Start your launcher
$mod+r exec $menu
$mod+r exec launcher-menu

# Reload the configuration file
$mod+Shift+r reload
Expand Down

0 comments on commit b499a07

Please sign in to comment.