xprofile: load xmodmap on Xorg startup

Show patches and stats in appropriate places

.config/X11/xprofile

@@ -15,10 +15,4 @@ xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
 
 setxkbmap -option caps:none
 xset r rate 200 18
-
-
-# Merge system clipboards
-if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then
-    autocutsel -fork
-    autocutsel -selection PRIMARY -fork
-fi
+xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap

.config/dunst/dunstrc

@@ -1,18 +1,18 @@
 [global]
     font = sans 9.5
-    
+
     # Allow a small subset of html markup:
     #   <b>bold</b>
     #   <i>italic</i>
     #   <s>strikethrough</s>
     #   <u>underline</u>
-    # 
+    #
     # For a complete reference see
     # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
     # If markup is not allowed, those tags will be stripped out of the
     # message.
-    markup = yes
-    
+    markup = full
+
     # The format of the message.  Possible variables are:
     #   %a  appname
     #   %s  summary
@@ -22,35 +22,35 @@
     #   %p  progress value if set ([  0%] to [100%]) or nothing
     # Markup is allowed
     format = "<b>%s %p</b>\n%b"
-    
+
     # Sort messages by urgency.
     sort = yes
-    
+
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
-    
+
     # Alignment of message text.
     # Possible values are "left", "center" and "right".
     alignment = left
-    
+
     # The frequency with wich text that is longer than the notification
     # window allows bounces back and forth.
     # This option conflicts with "word_wrap".
     # Set to 0 to disable.
     bounce_freq = 0
-    
+
     # Show age of message if message is older than show_age_threshold
     # seconds.
     # Set to -1 to disable.
     show_age_threshold = 60
-    
+
     # Split notifications into multiple lines if they don't fit into
     # geometry.
     word_wrap = yes
-    
+
     # Ignore newlines '\n' in notifications.
     ignore_newline = no
-    
+
     # The geometry of the window:
     #   [{width}]x{height}[+/-{x}+/-{y}]
     # The geometry of the message window.
@@ -66,63 +66,63 @@
 
     # 53 = 30 + 23 (bar-height)
     geometry = "360x5-30+30"
-    
+
     # Shrink window if it's smaller than the width.  Will be ignored if
     # width is 0.
     shrink = yes
-    
+
     # The transparency of the window.  Range: [0; 100].
     # This option will only work if a compositing windowmanager is
     # present (e.g. xcompmgr, compiz, etc.).
     transparency = 15
-    
+
     # Don't remove messages, if the user is idle (no mouse or keyboard input)
     # for longer than idle_threshold seconds.
     # Set to 0 to disable.
     idle_threshold = 120
-    
+
     # Which monitor should the notifications be displayed on.
     monitor = 0
-    
+
     # Display notification on focused monitor.  Possible modes are:
     #   mouse: follow mouse pointer
     #   keyboard: follow window with keyboard focus
     #   none: don't follow anything
-    # 
+    #
     # "keyboard" needs a windowmanager that exports the
     # _NET_ACTIVE_WINDOW property.
     # This should be the case for almost all modern windowmanagers.
-    # 
+    #
     # If this option is set to mouse or keyboard, the monitor option
     # will be ignored.
     follow = none
-    
+
     # Should a notification popped up from history be sticky or timeout
     # as if it would normally do.
     sticky_history = yes
-    
+
     # Maximum amount of notifications kept in history
     history_length = 100
-    
+
     # Display indicators for URLs (U) and actions (A).
     show_indicators = no
-    
+
     # The height of a single line.  If the height is smaller than the
     # font height, it will get raised to the font height.
     # This adds empty space above and under the text.
     line_height = 0
-    
+
     # Draw a line of "separatpr_height" pixel height between two
     # notifications.
     # Set to 0 to disable.
     separator_height = 2
-    
+
     # Padding between text and separator.
     padding = 15
-    
+
     # Horizontal padding.
     horizontal_padding = 16
-    
+
     # Define a color for the separator.
     # possible values are:
     #  * auto: dunst tries to find a color fitting to the background;
@@ -130,15 +130,15 @@
     #  * frame: use the same color as the frame;
     #  * anything else will be interpreted as a X color.
     separator_color = frame
-    
+
     # Print a notification on startup.
     # This is mainly for error detection, since dbus (re-)starts dunst
     # automatically after a crash.
     startup_notification = false
-    
+
     # dmenu path.
     dmenu = /usr/bin/rofi -dmenu -i -p '' -config ~/.config/dunst/dunst-xresources
-    
+
     # Browser for opening urls in context menu.
     browser = /usr/bin/chromium
 
@@ -159,18 +159,18 @@
     # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
     # "mod3" and "mod4" (windows-key).
     # Xev might be helpful to find names for keys.
-    
+
     # Close notification.
     close = mod4+Escape
-    
+
     # Close all notifications.
     close_all = ctrl+mod4+Escape
-    
+
     # Redisplay last message(s).
     # On the US keyboard layout "grave" is normally above TAB and left
     # of "1".
     history = mod4+grave
-    
+
     # Context menu.
     context = mod4+shift+period
 
@@ -205,7 +205,7 @@
 # The script will be called as follows:
 #   script appname summary body icon urgency
 # where urgency can be "LOW", "NORMAL" or "CRITICAL".
-# 
+#
 # NOTE: if you don't want a notification to be displayed, set the format
 # to "".
 # NOTE: It might be helpful to run dunst -print in a terminal in order

.config/i3/alt-tab.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# ================================================================================== #
-# Focus the next window on the current workspace in i3, e.g. for binding to Alt+Tab  #
-# Depends: jq, awk, i3wm (obviously)                                                 #
-# Author: Nervengift <dev@nerven.gift>                                               #
-# License: Don't think this deserves a license, Public Domain                        #
-# Known bugs: doesn't work with non-window container focused                         #
-# ================================================================================== #
-
-ws=$(i3-msg -t get_workspaces|jq "map(select(.focused))[]|.name")
-echo $ws
-windows=$(i3-msg -t get_tree|jq ".nodes|map(.nodes[])|map(.nodes[])|map(select(.type==\"workspace\" and .name==$ws))[0].nodes|map(recurse(.nodes[]))|map(.window)|.[]|values")
-echo $windows
-current=$(i3-msg -t get_tree|jq "recurse(.nodes[])|select(.focused)|.window")
-echo $current
-if [ "x$current" != "xnull" ]; then
-	next=$(echo $windows | awk "BEGIN {RS=\" \";FS=\"   \"};NR == 1 {w=\$1};{if (f == 1){w=\$1;f=0}else if (\$1 == \"$current\") f=1};END {print w}")
-	i3-msg [id=$next] focus > /dev/null
-fi

.config/i3/config

@@ -107,7 +107,6 @@ client.unfocused        $inactive-bg-color  $inactive-bg-color $inactive-text-co
 client.focused_inactive $inactive-bg-color  $inactive-bg-color $inactive-text-color $bg-color
 client.urgent           $urgent-bg-color    $urgent-bg-color   $text-color          $bg-color
 
-exec_always --no-startup-id killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar
 exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
 
 # Window rules
@@ -130,10 +129,10 @@ focus_follows_mouse yes
 
 # keybindings
 bindsym $mod+Shift+j            reload
-bindsym $mod+c                  exec chromium
+bindsym $mod+c                  exec systemd-run --user --scope --slice=chromium.slice --no-block -- chromium
+bindsym $mod+b                  exec systemd-run --user --scope --slice=firefox.slice --no-block -- firefox
 bindsym $mod+v                  exec "i3-sensible-terminal -e \\"$SHELL -c vim;$SHELL\\"
 bindsym $mod+Ctrl+v             exec "i3-sensible-terminal -r floating-term -e \\"$SHELL -c vim;$SHELL\\"
-bindsym Mod1+Tab                exec ~/.config/i3/alt-tab.sh
 bindsym $mod+Return             exec i3-sensible-terminal
 bindsym $mod+Ctrl+Return        exec i3-sensible-terminal -r floating-term
 bindsym $mod+Shift+Return       exec i3-sensible-terminal -d "`xcwd`"
@@ -148,7 +147,7 @@ bindsym --release $mod+Print    exec imgur-screenshot
 bindsym $mod+$alt+space         exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
 bindsym $mod+numbersign         exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
 bindsym $mod+r                  exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
-bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\""
+bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"$LINK\\""
 bindsym --release $mod+i        exec sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
 
 # Media player controls
@@ -163,25 +162,4 @@ bindsym XF86AudioMute           exec --no-startup-id pactl set-sink-mute   @DEFA
 bindsym XF86MonBrightnessUp     exec xbacklight -inc 5 && pkill -RTMIN+12 i3blocks
 bindsym XF86MonBrightnessDown   exec xbacklight -dec 5 && pkill -RTMIN+12 i3blocks
 
-# app launch shortcuts
-exec --no-startup-id ~/.config/i3/disable-standby-fs.py
-exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
-exec --no-startup-id xautolock -time 5 -locker 'dm-tool switch-to-greeter' -nocloseout -nocloseerr
-exec --no-startup-id xss-lock dm-tool switch-to-greeter
-
-# startup programs
-exec --no-startup-id nextcloud
-exec --no-startup-id blueman-applet
-exec --no-startup-id redshift
-exec --no-startup-id xbindkeys
-exec --no-startup-id solaar
-exec --no-startup-id pullover
-exec --no-startup-id mailnag
-exec --no-startup-id picom -b --experimental-backends
-exec --no-startup-id chromium --no-startup-window
-exec --no-startup-id thunderbird
-
-exec i3-msg 'workspace 1; exec sleep 2 && chromium'
-exec i3-msg 'workspace 2; exec i3-sensible-terminal'
-
 # vim:ft=i3

.config/systemd/user/autocutsel-primary.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel -selection primary
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel -selection PRIMARY
+
+[Install]
+WantedBy=graphical-session.target
+

.config/systemd/user/autocutsel.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel
+
+[Install]
+WantedBy=graphical-session.target
+

.config/systemd/user/basic.target.wants/profile.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/profile.service

.config/systemd/user/blueman-applet.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Bluetooth Applet
+After=graphical-session.target bluetooth.service
+Requires=graphical-session.target bluetooth.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/blueman-applet
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/default.target

@@ -0,0 +1 @@
+/usr/lib/systemd/user/basic.target

.config/systemd/user/default.target.wants/dunst.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/dunst.service

.config/systemd/user/default.target.wants/redshift.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/redshift.service

.config/systemd/user/desktop.target.wants/blueman-applet.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/blueman-applet.service

.config/systemd/user/desktop.target.wants/dunst.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/dunst.service

.config/systemd/user/desktop.target.wants/nextcloud.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/nextcloud.service

.config/systemd/user/desktop.target.wants/picom.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/picom.service

.config/systemd/user/desktop.target.wants/polybar@i3bar.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/polybar@.service

.config/systemd/user/desktop.target.wants/solaar.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/solaar.service

.config/systemd/user/desktop.target.wants/xdg-user-dirs-update.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/xdg-user-dirs-update.service

.config/systemd/user/graphical-session.target.wants/autocutsel-primary.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel-primary.service

.config/systemd/user/graphical-session.target.wants/autocutsel.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel.service

.config/systemd/user/graphical-session.target.wants/i3.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/i3.service

.config/systemd/user/i3.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=i3 - an improved dynamic, tiling window manager
+Requires=xorg.target
+Before=graphical-session.target
+After=profile.service xprofile.service xorg.target
+
+[Service]
+ExecStart=/usr/bin/i3
+ExecReload=/bin/sh -c 'i3-msg restart; systemctl is-active --user -q picom && systemctl --user restart picom'
+ExecStop=/bin/systemctl --user stop desktop.target
+Restart=always
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/nextcloud.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Nextcloud Client
+Requires=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/nextcloud --background
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/picom.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=A lightweight compositor for X11
+Requires=graphical-session.target
+After=graphical-session.target xorg.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/picom --experimental-backends --dbus
+Restart=always
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/polybar@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Polybar
+Requires=graphical-session.target
+After=graphical-session.target pulseaudio.socket
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/polybar --reload --log=warning %i
+Restart=always
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/profile.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Load profile environment into session
+Before=graphical-session-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bash -c '. $HOME/.config/dotfiles/.profile && systemctl --user import-environment'
+
+[Install]
+WantedBy=basic.target

.config/systemd/user/sleep-lock-lightdm.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=Lock X LightDM session before sleeping
+Requires=graphical-session.target
 Before=sleep.target
 
 [Service]

.config/systemd/user/sleep.target.wants/sleep-lock-lightdm.service

@@ -1 +1 @@
-../sleep-lock-lightdm.service
+/home/frebib/.config/systemd/user/sleep-lock-lightdm.service

.config/systemd/user/solaar.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Solaar Logitech status applet
+Requires=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/solaar --restart-on-wake-up -d
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/xautolock.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=XBindKeys
+
+[Service]
+ExecStart=/usr/bin/xautolock -time 1 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/xbindkeys.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=XBindKeys
+Requires=profile.service
+After=profile.service
+
+[Service]
+ExecStart=/usr/bin/xbindkeys -n -f $XDG_CONFIG_HOME/X11/xbindkeysrc
+KillMode=process
+
+[Install]
+WantedBy=graphical-session.target

.config/systemd/user/xorg.target

@@ -0,0 +1,3 @@
+[Unit]
+Description=Graphical desktop environment
+Requires=basic.target

.config/systemd/user/xorg.target.wants/xprofile.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/xprofile.service

.config/systemd/user/xprofile.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Load Xorg configuration
+PartOf=xorg.target
+Requires=profile.service
+After=xorg.target profile.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash -cx '. $XDG_CONFIG_HOME/X11/xprofile && systemctl --user import-environment'
+
+[Install]
+WantedBy=xorg.target

.profile

@@ -43,18 +43,14 @@ export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$GOPATH/bin"
 
 exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
 
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
+    eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
+
+# Execute this after updating dbus/systemd environment
 # Source secret keys and values into environment
 if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
     set -o allexport
     source $XDG_CONFIG_HOME/secrets
     set +o allexport
 fi
-
-# Start a dbus session daemon for programs that require it
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
-    eval $(dbus-launch --sh-syntax --exit-with-session)
-    dbus-update-activation-environment --systemd \
-        DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY \
-        XDG_SEAT_PATH
-fi
-

aliases

@@ -105,7 +105,9 @@ mcd(){ mkdir -p -- $@ && cd -- $@; }
 randstr() { tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w $1 | head -n 1; }
 
 # System aliases
-alias s="sudo systemctl"
+alias sc="systemctl"
+alias ssc="sudo systemctl"
+alias scu="systemctl --user"
 alias j=journalctl
 alias ps='ps aux'
 alias catn='tail -n +1 --'
@@ -154,16 +156,19 @@ alias gpall="git remote | xargs -L1 git push"
 alias gl="git pull --rebase"
 alias glp="gl && gp"
 alias gd="git diff --patch-with-stat"
+alias gdni="gd --no-index"
 alias gds="gd --staged"
-alias gsh="git show --format=full --patch-with-stat"
-alias glg="git log --format=full --stat --color"
-alias glog="git log --oneline --decorate --color --graph"
+alias gsh="git show --format=fuller --patch-with-stat"
+alias glg="git log --color --format=fuller --stat"
+alias glgp="git log --color --format=fuller --patch-with-stat"
+alias glog="git log --color --oneline --decorate --graph"
 
 alias grst="git reset"
-alias gundo="git reset @~1"
+alias gundo="git reset --keep @~1"
 alias gclean="git clean"
 alias gbr="git branch"
 alias gtg="git tag"
+alias gbl="git blame"
 alias gr="git remote"
 alias grv="git remote -v"
 alias gra="gr add"
@@ -287,8 +292,8 @@ alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
 alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
 alias sshc="$EDITOR ~/.ssh/config"
 alias dotfiles="cd $DOTFILES"
-alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config ; i3-msg restart"
-alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; killall -q polybar; while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done; exec polybar -r i3bar"
+alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
+alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; systemctl --user restart polybar@i3bar"
 
 alias sf=screenfetch
 alias nf=neofetch