From 3858306acd6ebf93ee826a1c161d3096f6b0bf35 Mon Sep 17 00:00:00 2001
From: Mateja <mail@matejamaric.com>
Date: Sat, 1 May 2021 17:31:51 +0200
Subject: Use `.xprofile` instead of `autostart.sh`.

---
 .config/awesome/rc.lua  |  2 --
 .config/qtile/config.py |  6 ------
 .local/bin/autostart.sh | 17 -----------------
 .xinitrc                |  5 +++++
 .xprofile               | 15 +++++++++++++++
 5 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100755 .local/bin/autostart.sh
 create mode 100644 .xinitrc

diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 6400075..05e9714 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -66,8 +66,6 @@ awful.layout.layouts = {
 -- Keyboard map indicator and switcher
 mykeyboardlayout = awful.widget.keyboardlayout()
 
-awful.spawn.with_shell("~/.local/bin/autostart.sh")
-
 -- Wibar --------------------------------------------------------------------
 
 -- Create a textclock widget
diff --git a/.config/qtile/config.py b/.config/qtile/config.py
index 878ddd6..dedfe6c 100644
--- a/.config/qtile/config.py
+++ b/.config/qtile/config.py
@@ -12,12 +12,6 @@ mod = "mod4"
 terminal = "st -e tmux"
 
 
-@hook.subscribe.startup_once
-def autostart():
-    home = os.path.expanduser('~/.local/bin/autostart.sh')
-    subprocess.call([home])
-
-
 keys = [
     # Audio
     Key([mod], "h", lazy.spawn("amixer -q sset Master 1%+"),
diff --git a/.local/bin/autostart.sh b/.local/bin/autostart.sh
deleted file mode 100755
index f1cfe16..0000000
--- a/.local/bin/autostart.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-xset -b
-
-#setxkbmap -option caps:swapescape
-#setxkbmap -layout us,rs,rs -variant ,alternatequotes,latin -option grp:alt_shift_toggle,caps:swapescape
-setxkbmap -layout us,rs,rs -variant ,alternatequotes,latin -option caps:swapescape
-
-numlockx &
-dunst &
-udiskie &
-
-#picom &
-compton --backend glx -b &
-
-feh --bg-fill ~/stuff/pictures/nantes.jpg
-
-#mpd &
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..9c0f21d
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -f ~/.xprofile ] && . ~/.xprofile
+
+exec awesome
diff --git a/.xprofile b/.xprofile
index d13cb65..d4f0efc 100755
--- a/.xprofile
+++ b/.xprofile
@@ -1,2 +1,17 @@
 #!/bin/sh
+
 eval $(keychain --clear --eval --agents gpg,ssh --quiet)
+
+xset -b
+setxkbmap -layout us,rs,rs -variant ,alternatequotes,latin -option grp:alt_shift_toggle,caps:swapescape
+numlockx &
+
+dunst &
+udiskie &
+
+#picom &
+compton --backend glx -b &
+
+feh --bg-fill ~/stuff/pictures/nantes.jpg
+
+mpd &
-- 
cgit v1.2.3