From 04c904839e83527828af5034645fa587a386e626 Mon Sep 17 00:00:00 2001
From: Marco Thomas <mail@marco-thomas.net>
Date: Sun, 1 Aug 2021 14:00:18 +0200
Subject: [PATCH] Cleanup i3 config

---
 files/.config/i3/config                  | 30 +++++++++++++++++-------
 files/linkdots.sh                        |  2 +-
 files/scripts/fix_time.sh                |  5 ----
 files/{.xinitrc => scripts/wallpaper.sh} | 21 +----------------
 4 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100755 files/scripts/fix_time.sh
 rename files/{.xinitrc => scripts/wallpaper.sh} (53%)

diff --git a/files/.config/i3/config b/files/.config/i3/config
index 6944d74..045a484 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -11,12 +11,12 @@ floating_modifier $mod
 workspace_layout stacking
 
 ### keybinds for starting
-bindsym $mod+Return exec alacritty
-bindsym Ctrl+Return exec xterm
+bindsym $mod+Return exec --no-startup-id alacritty
+bindsym Ctrl+Return exec --no-startup-id xterm
 bindsym $mod+d exec --no-startup-id dmenu_run
-bindsym $mod+e exec "emacsclient -c"
-bindsym $mod+Ctrl+e exec "emacsclient --eval '(emacs-everywhere)'"
-bindsym $mod+Shift+s exec "flameshot gui"
+bindsym $mod+e exec --no-startup-id "emacsclient -c"
+bindsym $mod+Ctrl+e exec --no-startup-id "emacsclient --eval '(emacs-everywhere)'"
+bindsym $mod+Shift+s exec --no-startup-id "flameshot gui"
 
 ### keybinds for moving windows
 bindsym $mod+Shift+q kill
@@ -83,11 +83,11 @@ bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 
 # audio and display control
-bindsym XF86AudioMute exec amixer -q set Master toggle
+bindsym XF86AudioMute exec --no-startup-id amixer -q set Master toggle
 bindsym XF86AudioLowerVolume exec --no-startup-id "pactl set-sink-volume @DEFAULT_SINK@ -2%"
 bindsym XF86AudioRaiseVolume exec --no-startup-id "pactl set-sink-volume @DEFAULT_SINK@ +2%"
-bindsym XF86MonBrightnessUp exec light -A 5 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 5 # decrease screen brightness
+bindsym XF86MonBrightnessUp exec --no-startup-id light -A 5 # increase screen brightness
+bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5 # decrease screen brightness
 
 # styling
 new_window none
@@ -128,4 +128,16 @@ client.unfocused        #f2e5bc #f2e5bc #282828 #fbf1c7 #f2e5bc
 client.urgent           #cc241d #fb4934 #282828 #cc241d #fb4934
 
 # startup
-exec $HOME/.xinitrc
+exec --no-startup-id "fcitx5 -d &"
+exec --no-startup-id "nextcloud &"
+exec --no-startup-id "nm-applet &"
+exec --no-startup-id "dunst &"
+
+# set screens
+exec --no-startup-id $HOME/.screenlayout/layout.sh
+
+# set wallpaper
+exec --no-startup-id $HOME/scripts/wallpaper.sh
+
+# set X things
+exec --no-startup-id "xrdb -merge $HOME/.Xresources"
\ No newline at end of file
diff --git a/files/linkdots.sh b/files/linkdots.sh
index c09aaab..f3cd074 100755
--- a/files/linkdots.sh
+++ b/files/linkdots.sh
@@ -4,7 +4,7 @@
 path=$(pwd)
 
 # --- home --- #
-home_files="scripts .bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources .xinitrc .profile"
+home_files="scripts .bashrc .zshrc .gitconfig .tmux.conf .vimrc .Xresources .profile"
 
 for file in $home_files
 do
diff --git a/files/scripts/fix_time.sh b/files/scripts/fix_time.sh
deleted file mode 100755
index 13e09d6..0000000
--- a/files/scripts/fix_time.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-timedatectl set-timezone Europe/Berlin
-timedatectl set-ntp 1
-sudo hwclock --systohc
diff --git a/files/.xinitrc b/files/scripts/wallpaper.sh
similarity index 53%
rename from files/.xinitrc
rename to files/scripts/wallpaper.sh
index 7117e88..f3fc36b 100755
--- a/files/.xinitrc
+++ b/files/scripts/wallpaper.sh
@@ -1,23 +1,4 @@
-#!/bin/bash
-# Executed by startx
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-
-# merge in defaults and keymaps
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start programs
-fcitx5 -d &
-nextcloud &
-nm-applet &
-dunst &
+#!/bin/sh
 
 # desktop or laptop?
 if [ `hostname` == "nazarick" ];then