Cleaned up scripts folder and moved some stuff

home/.config/sway/conf.d/01-vars.conf

@@ -4,3 +4,4 @@ set $mod Mod4
 set $term alacritty
 set $gnome-schema org.gnome.desktop.interface
 set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1)
+set $scripts ~/.config/sway/scripts

home/.config/sway/conf.d/06-keybinds.conf

@@ -6,8 +6,34 @@ bindsym $mod+Return exec $term
 # kill focused window
 bindsym $mod+w kill
 
-# start your launcher
-bindsym $mod+Shift+p exec rofi-pass --bmarks
+# Modes for controlling gaps
+set $mode_gaps Gaps: (o) outer, (i) inner
+set $mode_gaps_outer Outer Gaps: j|k|0|r|i 
+set $mode_gaps_inner Inner Gaps: j|k|0|r|o
+bindsym $mod+g mode "$mode_gaps"
+
+mode "$mode_gaps" {
+        bindsym o      mode "$mode_gaps_outer"
+        bindsym i      mode "$mode_gaps_inner"
+        bindsym Escape mode "default"
+}
+
+mode "$mode_gaps_inner" {
+        bindsym j gaps inner all minus 1
+        bindsym k gaps inner all plus 1
+        bindsym 0 gaps inner all set 0
+		bindsym r gaps inner all set 10
+        bindsym i      mode "$mode_gaps_outer"
+        bindsym Escape mode "default"
+}
+mode "$mode_gaps_outer" {
+        bindsym j gaps outer all minus 1
+        bindsym k gaps outer all plus 1
+        bindsym 0 gaps outer all set 0
+		bindsym r gaps outer all set 10
+        bindsym o      mode "$mode_gaps_inner"
+        bindsym Escape mode "default"
+}
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
@@ -27,7 +53,7 @@ bindsym --locked XF86Search output eDP-1 toggle
 
 # FZF
 # exit menu
-bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh
+bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh
 # launch a program
 bindsym $mod+d exec wofi
 bindsym $mod+Shift+d exec wofi --show run

home/.config/sway/conf.d/08-exec.conf

@@ -1,7 +1,7 @@
 # vim:ft=i3config
 
 exec {
-	$HOME/Scripts/swayidle.sh
+	$scripts/idle.sh
 	autotiling
 	redshift-gtk -m wayland
 	telegram-desktop

home/.config/sway/scripts/exit.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+RESP=$(cat <<EOF | fzf +s --tac
+Shutdown
+Reboot
+Suspend
+Lock
+Exit
+EOF
+);
+
+case "$RESP" in
+	Shutdown)
+		systemctl poweroff
+		;;
+	Reboot)
+		systemctl reboot
+		;;
+	Suspend)
+		systemctl suspend
+		;;
+	Lock)
+		loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2)
+		;;
+	Exit)
+		swaymsg exit
+		;;
+	*)
+		exit 1
+esac

home/.config/sway/scripts/idle.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+swaylock="$HOME/.config/sway/scripts/lock.sh"
+screenon="swaymsg 'output * dpms on'"
+screenoff="swaymsg 'output * dpms off'"
+swayidle \
+	lock "$swaylock" \
+	unlock "pkill -9 swaylock" \
+	timeout 300 "lqsd -d" \
+    resume "lqsd -r" \
+	timeout 600 "loginctl lock-session" \
+	timeout 610 "$screenoff" \
+    resume "$screenon; lqsd -r" \
+	before-sleep "playerctl pause; loginctl lock-session" \

home/.config/sway/scripts/lock.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+swaylock \
+	--screenshots \
+	--indicator \
+	--clock \
+	--datestr %Y-%m-%d \
+	--effect-blur 6x10 \
+	--inside-color "#2E3440" \
+	--ring-color "#88C0D0" \
+	--text-color "#FFFFFF" \
+	--key-hl-color "#EBCB8B" \
+	--inside-ver-color "#88C0D0" \
+	--ring-ver-color "#88C0D0" \
+	--ring-wrong-color "#BF616A" \
+	--inside-wrong-color "#BF616A" \

home/.config/sway/scripts/run.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Set environment variables for Sway
+
+# Firefox
+export MOZ_ENABLE_WAYLAND=1
+export MOZ_USE_XINPUT2=1
+export MOZ_WEBRENDER=1
+
+# Fix java on wayland
+export _JAVA_AWT_WM_NONREPARENTING=1
+export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+
+# Enable qt5 theming and wayland support
+export QT_QPA_PLATFORMTHEME=qt5ct
+export QT_QPA_PLATFORM=wayland-egl
+export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
+# Fix redshift on wlroots
+export WLR_DRM_NO_ATOMIC=1
+
+# Run sway
+sway
+
+# Unset the variables after quitting Sway
+unset MOZ_ENABLE_WAYLAND=1
+unset MOZ_USE_XINPUT2=1
+unset MOZ_WEBRENDER=1
+unset _JAVA_AWT_WM_NONREPARENTING=1
+unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+unset QT_QPA_PLATFORMTHEME=qt5ct
+unset QT_QPA_PLATFORM=wayland-egl
+unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+unset WLR_DRM_NO_ATOMIC=1

home/.config/user-dirs.dirs

@@ -1,10 +1,3 @@
-# This file is written by xdg-user-dirs-update
-# If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run.
-# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
-# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
-# absolute path. No other format is supported.
-# 
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_TEMPLATES_DIR="$HOME/Templates"

home/.config/waybar/config

@@ -107,7 +107,7 @@
     "tooltip": false,
     "format": "{}",
     "return-type": "json",
-    "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null",
+    "exec": "$HOME/.config/waybar/scripts/mediaplayer.py 2>/dev/null",
     "max-length": 50,
     "on-click": "playerctl play-pause",
     "on-click-right": "playerctl next",

home/.config/waybar/scripts/mediaplayer.py

@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+import argparse
+import logging
+import sys
+import signal
+import gi
+import json
+gi.require_version('Playerctl', '2.0')
+from gi.repository import Playerctl, GLib
+
+logger = logging.getLogger(__name__)
+
+
+def write_output(text, player):
+    logger.info('Writing output')
+
+    output = {'text': text,
+              'class': 'custom-' + player.props.player_name,
+              'alt': player.props.player_name}
+
+    sys.stdout.write(json.dumps(output) + '\n')
+    sys.stdout.flush()
+
+
+def on_play(player, status, manager):
+    logger.info('Received new playback status')
+    on_metadata(player, player.props.metadata, manager)
+
+
+def on_metadata(player, metadata, manager):
+    logger.info('Received new metadata')
+    track_info = ''
+
+    if player.get_artist() != '' and player.get_title() != '':
+        track_info = '{artist} - {title}'.format(artist=player.get_artist(),
+                                                 title=player.get_title())
+    else:
+        track_info = player.get_title()
+
+    if player.props.status == 'Playing' and track_info:
+        track_info = '   ' + track_info
+    else:
+        track_info = '   ' + track_info
+
+    write_output(track_info, player)
+
+
+def on_player_appeared(manager, player, selected_player=None):
+    if player is not None and (selected_player is None or player.name == selected_player):
+        init_player(manager, player)
+    else:
+        logger.debug("New player appeared, but it's not the selected player, skipping")
+
+
+def on_player_vanished(manager, player):
+    logger.info('Player has vanished')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+
+
+def init_player(manager, name):
+    logger.debug('Initialize player: {player}'.format(player=name.name))
+    player = Playerctl.Player.new_from_name(name)
+    player.connect('playback-status', on_play, manager)
+    player.connect('metadata', on_metadata, manager)
+    manager.manage_player(player)
+    on_metadata(player, player.props.metadata, manager)
+
+
+def signal_handler(sig, frame):
+    logger.debug('Received signal to stop, exiting')
+    sys.stdout.write('\n')
+    sys.stdout.flush()
+    # loop.quit()
+    sys.exit(0)
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser()
+
+    # Increase verbosity with every occurence of -v
+    parser.add_argument('-v', '--verbose', action='count', default=0)
+
+    # Define for which player we're listening
+    parser.add_argument('--player')
+
+    return parser.parse_args()
+
+
+def main():
+    arguments = parse_arguments()
+
+    # Initialize logging
+    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
+                        format='%(name)s %(levelname)s %(message)s')
+
+    # Logging is set by default to WARN and higher.
+    # With every occurrence of -v it's lowered by one
+    logger.setLevel(max((3 - arguments.verbose) * 10, 0))
+
+    # Log the sent command line arguments
+    logger.debug('Arguments received {}'.format(vars(arguments)))
+
+    manager = Playerctl.PlayerManager()
+    loop = GLib.MainLoop()
+
+    manager.connect('name-appeared', lambda *args: on_player_appeared(*args, arguments.player))
+    manager.connect('player-vanished', on_player_vanished)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    for player in manager.props.player_names:
+        if arguments.player is not None and arguments.player != player.name:
+            logger.debug('{player} is not the filtered player, skipping it'
+                         .format(player=player.name)
+                         )
+            continue
+
+        init_player(manager, player)
+
+    loop.run()
+
+
+if __name__ == '__main__':
+    main()

home/.config/zsh/01-env.zsh

@@ -18,6 +18,7 @@ export GOPATH=~/.bin/go
 
 # fzf settings
 export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null'
+export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all'
 export FZF_COMPLETION_TRIGGER='**'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "'

home/.config/zsh/03-aliases.zsh

@@ -140,7 +140,6 @@ update() {
 		zinit update -p
 		$HOME/.tmux/plugins/tpm/bin/update_plugins all
 	}
-	{%@@ if profile == "Moria" @@%}
 
 	docker-update() {
 		for dir in $HOME/Git/dotfiles/docker/*; do
@@ -151,7 +150,6 @@ update() {
 		done
 	}
 
-	{%@@ endif @@%}
 	if [ $# -eq 0 ]; then
 		1=base
 	fi
@@ -166,11 +164,9 @@ update() {
 		plugins)
 			plugins
 			;;
-	{%@@ if profile == "Moria" @@%}
 		docker)
 			docker-update
 			;;
-	{%@@ endif @@%}
 		*)
 			printf "$1: not a valid action"
 			;;
@@ -187,7 +183,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu
 alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist'
 
 # better ls
-alias ls='ls_extended -I'
+alias ls='ls_extended -Ih'
 
 # default icon for notify-send
 alias notify-send='notify-send --icon=alarm'