config/i3/lock

@@ -3,7 +3,6 @@
 # Remove SSH and GPG keys from keystores
 ssh-add -D
 echo RELOADAGENT | gpg-connect-agent
-rm -rf "/tmp/cached_pass_$UID"
 
 
 dm-tool lock

config/polybar/bars.ini

@@ -1,11 +0,0 @@
-[bar/base]
-monitor = ${env:display}
-bottom = true
-
-[bar/primary]
-inherit = bar/base
-modules-right = date
-
-[bar/secondary]
-inherit = bar/base
-modules-right = date

config/polybar/config.ini

@@ -1,2 +0,0 @@
-include-file = modules.ini
-include-file = bars.ini

config/polybar/launch.sh

@@ -21,7 +21,7 @@ do
     else
         bar="secondary"
     fi
-    polybar -q $bar -c ~/.config/polybar/config.ini &
+    polybar $bar &
 done
 
 echo "Bars launched..."

config/polybar/modules.ini

@@ -1,3 +0,0 @@
-[module/date]
-type = internal/date
-date = %m-%d %H:%M:%S

config/scripts/cached_pass

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# TODO Password changed?
-
-
-set -euo pipefail
-
-if [[ $# -ne 1 ]]
-then
-    echo "Usage: $0 pass-name"
-    exit 2
-fi
-name="$1"
-
-BASEDIR="/tmp/cached_pass_${UID}"
-mkdir -p "$BASEDIR"
-chmod 700 "$BASEDIR"
-
-name_base64="$(echo "$name" | base64)"
-file="${BASEDIR}/${name_base64}"
-
-if [ ! -f "${file}" ]
-then
-    pass="$(pass ${name} | head -1)"
-    echo -n $pass > "${file}"
-    notify-send -u low "cached_pass" "Cached: ${name}"
-fi
-
-cat "${file}"

config/scripts/crepuscule

@@ -5,4 +5,4 @@
 cd ~/.dotfiles/config/automatrop
 echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
 xrandr --output HDMI-0 --brightness 1
-ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local --limit $HOSTNAME
+ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local

config/scripts/jour

@@ -5,4 +5,4 @@
 cd ~/.dotfiles/config/automatrop
 echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
 xrandr --output HDMI-0 --brightness 1
-ansible-playbook playbooks/default.yml -e base16_scheme=solarized-light --tags color --connection local --limit $HOSTNAME
+ansible-playbook playbooks/default.yml -e base16_scheme=solarized-light --tags color --connection local

config/scripts/lestrte

@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import random
-
-# maj = True
-
-for line in sys.stdin:
-    nl = ""
-    word = ""
-    grace = True
-    for c in line:
-        if c.isalpha():
-            if grace:
-                nl += word
-                nl += c
-                word = ""
-                grace = False
-            else:
-                word += c
-        else:
-            wrd = list(word)
-            random.shuffle(wrd)
-            nl += ''.join(wrd)
-            nl += c
-            word = ""
-            grace = True
-    print(nl, end="")

config/scripts/nuit

@@ -5,4 +5,4 @@
 cd ~/.dotfiles/config/automatrop
 echo 1 | sudo tee /sys/class/backlight/intel_backlight/brightness
 xrandr --output HDMI-0 --brightness 0.5
-ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local --limit $HOSTNAME
+ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local

config/scripts/requirements.txt

@@ -1,3 +1,2 @@
-coloredlogs>=10.0<11
-progressbar2>=3.47.0<4
-youtube-dl>=2021.6.6
+coloredlogs==10.0
+progressbar2==3.47.0

config/scripts/smtpdummy

@@ -47,7 +47,6 @@ if __name__ == "__main__":
         env_var="SUBJECT",
         default=f"Test message {now.strftime('%H:%M:%S')}",
     )
-    parser.add_argument("-c", "--callout", env_var="CALLOUT", action="store_true")
 
     parser.add_argument("-b", "--body", env_var="BODY", default="")
     parser.add_argument("-g", "--gtube", env_var="GTUBE", action="store_true")
@@ -177,7 +176,6 @@ Input arguments:
         send(f"AUTH PLAIN {encoded}")
     send(f"MAIL FROM: <{args.sender}>")
     send(f"RCPT TO: <{args.receiver}>")
-    if not args.callout:
     send("DATA")
     send(text)
     send("QUIT")

config/scripts/softwareList

@@ -291,7 +291,6 @@ if $INSTALL_VIDEO
 then
     i vlc # Video player
     i mpv # Audio/Video player
-    i mpv-thumbnail-script # Show thumbnails for mpv
     i ffmpeg # Video/Audio file handler
     i youtube-dl # Downloader for videos
     i megatools # Downloader for mega.nz

config/xinitrc

@@ -4,6 +4,8 @@
 #
 # Executed by xinit (startx)
 
+echo ~/.xinitrc
+
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
   for f in /etc/X11/xinit/xinitrc.d/*; do
     [ -x "$f" ] && . "$f"

xsession

@@ -3,91 +3,58 @@
 #
 # ~/.xsession
 #
-# Sourced by display managers
+# Might be sourced by DM when on custom
+# TODO Test that on a DM I guess?
 #
 
-# Load Xresources
 [ -f ~/.config/Xresources/main ] && xrdb -I"$HOME" ~/.config/Xresources/main
-
-# Disable the bell
 xset b off
 
-# Folders to search for desktop environments (DE) in
-sessions_dirs="/usr/share/xsessions"
-
-# If we have locally installed DE try them before system ones
-sessions_dir_local="$HOME/.local/share/xsessions"
-if [ -d "$sessions_dir_local" ]
+found=0
+tryDM() {
+    if [ $found -eq 0 ]; then
+        parameters=''
+        case $1 in
+            awesome           ) executable=awesome;;
+            bspwm             ) executable=bspwm;;
+            catwm             ) executable=catwm;;
+            cinnamon          ) executable=cinnamon-session;;
+            dwm               ) executable=dwm;;
+            enlightenment     ) executable=enlightenment_start;;
+            ede               ) executable=startede;;
+            fluxbox           ) executable=startfluxbox;;
+            gnome             ) executable=gnome-session;;
+            gnome-classic     ) executable=gnome-session; parameters="--session=gnome-classic";;
+            i3|i3wm           ) executable=i3;;
+            icewm             ) executable=icewm-session;;
+            jwm               ) executable=jwm;;
+            kde               ) executable=startkde;;
+            mate              ) executable=mate-session;;
+            monster|monsterwm ) executable=monsterwm;;
+            notion            ) executable=notion;;
+            openbox           ) executable=openbox-session;;
+            plasma            ) executable=startplasma-x11;;
+            unity             ) executable=unity;;
+            xfce|xfce4        ) executable=startxfce4;;
+            xmonad            ) executable=xmonad;;
+            *) executable=$1;;
+        esac
+        if command -v "$executable"
         then
-    sessions_dirs="$sessions_dir_local $sessions_dirs"
-fi
-
-# If we have junest installed DE try them before all others
-sessions_dir_junest="$HOME/.local/share/xsessions"
-if [ -d "$sessions_dir_junest" ]
-then
-    sessions_dirs="$sessions_dir_junest $sessions_dirs"
-fi
-
-startSession() {
-    session_dir="$1"
-    session_name="$2"
-
-    session_file="${session_dir}/${session_name}.desktop"
-    executable="$(grep ^Exec= "$session_file" | cut -d'=' -f2)"
-    # TODO Does this work with parameters?
-    # gnome-classic might need some
-
-    # If this is a Junest DE, we need to wrap it
-    if [ "$sessions_dir" = "$sessions_dir_junest" ]
-    then
-        # Some DMs enforce that to you,
-        # which shows warning on Junest
-        unset LD_PRELOAD
-
-        # The intended way:
-        # exec ~/.local/bin/junest "$executable" $parameters
-        # Too restricted to the outside (e.g. Yubikey isn't accessible)
-
-        # The custom way
-        exec ~/.local/bin/junest --backend-args "--dev-bind /run /run" "$executable" $parameters
-
-        # The fallback wrappers way
-        # export PATH="$PATH:~/.junest/usr/bin_wrappers"
-        # exec "$executable" $parameters
-        # Should work but doesn't, I forgot why
-
-        # The "I do what I want" way
-        #exec bwrap --bind $HOME/.junest / --bind $HOME $HOME --bind /tmp /tmp --proc /proc --dev-bind /dev /dev --dev-bind /run /run "$executable" $parameters
-        # Even Alacritty doesn't work here
-
-    fi
-
+            found=1
             exec "$executable" $parameters
-}
-
-trySession() { # session_name
-    session_name="$1"
-    for sessions_dir in $sessions_dirs
-    do
-        session_file="$sessions_dir/${session_name}.desktop"
-        if [ -f "$session_file" ]
-        then
-            startSession "$sessions_dir" "$session_name"
         fi
-    done
+    fi
 }
 
 if [ -n "$1" ]
 then
-    trySession "$1"
+    tryDM "$1"
 fi
-trySession i3
-trySession xfce4
-trySession mate
-trySession plasma
-trySession gnome
-trySession kde
+tryDM i3
+tryDM xfce4
+tryDM mate
+tryDM plasma
+tryDM gnome
+tryDM kde
 
-# If we found nothing by then,
-# I guess it's up to the DM to default to something