From c7c57ac143ae58531a9695d260a27051722f18f2 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Mon, 13 Aug 2018 11:06:32 -0700
Subject: [PATCH] Clean up xfce4 configs, fix issue with i3 xinit login

---
 home/.config/keypack                          |  34 ----
 home/.config/openbox/autostart                |   2 -
 home/.config/xfce4/al-xfce-configs/.gtkrc-2.0 |  29 ----
 home/.config/xfce4/al-xfce-configs/helpers.rc |   3 -
 .../xfconf/xfce-perchannel-xml/thunar.xml     |  13 --
 .../xfce4-keyboard-shortcuts.xml              | 150 ------------------
 .../xfce-perchannel-xml/xfce4-notifyd.xml     |  22 ---
 .../xfce-perchannel-xml/xfce4-panel.xml       |  66 --------
 .../xfce4-power-manager.xml                   |  22 ---
 .../xfce-perchannel-xml/xfce4-session.xml     |  28 ----
 .../xfconf/xfce-perchannel-xml/xsettings.xml  |  41 -----
 .../panel/whiskermenu-1.rc                    |   0
 .../xfconf/xfce-perchannel-xml/keyboards.xml  |   0
 .../xfce-perchannel-xml/xfce4-desktop.xml     |   0
 .../xfconf/xfce-perchannel-xml/xfwm4.xml      |   0
 home/.xinitrc                                 |   2 +-
 16 files changed, 1 insertion(+), 411 deletions(-)
 delete mode 100755 home/.config/keypack
 delete mode 100644 home/.config/xfce4/al-xfce-configs/.gtkrc-2.0
 delete mode 100644 home/.config/xfce4/al-xfce-configs/helpers.rc
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/thunar.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-session.xml
 delete mode 100644 home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xsettings.xml
 rename home/.config/xfce4/{al-xfce-configs => }/panel/whiskermenu-1.rc (100%)
 rename home/.config/xfce4/{al-xfce-configs => }/xfconf/xfce-perchannel-xml/keyboards.xml (100%)
 rename home/.config/xfce4/{al-xfce-configs => }/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%)
 rename home/.config/xfce4/{al-xfce-configs => }/xfconf/xfce-perchannel-xml/xfwm4.xml (100%)

diff --git a/home/.config/keypack b/home/.config/keypack
deleted file mode 100755
index 16f0a64e..00000000
--- a/home/.config/keypack
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# this script will setup the keyring
-# for any user being created from /etc/skel
-# only after a valid internet connection is made
-
-keys=(
-"AEFB411B072836CD48FF0381AE252C284B5DBA5D"
-"9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0"
-"35F52A02854DCCAEC9DD5CC410443C7F54B00041"
-)
-
-setup_keyring() {
-    sudo dirmngr </dev/null
-    sudo pacman-key --init
-    sudo pacman-key --populate archlinux
-    for k in "${keys[@]}"; do
-        if ! grep -q "$k" <<< "$(sudo pacman-key --list-keys)"; then
-            gpg --receive-keys "$k"
-            sudo pacman-key -r "$k"
-            sudo pacman-key --lsign "$k"
-        fi
-    done
-    sudo pacman-key --populate archlabs
-}
-
-while ! (ping -c 1 archlabslinux.com || ping -c 1 bitbucket.org || ping -c 1 github.com || ping -c 1 google.com) &>/dev/null; do
-    sleep 1
-done
-
-setup_keyring &
-
-sed -i '/keypack/d' "$HOME/.config/openbox/autostart"
-rm -f "$HOME/.config/keypack"
diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index 260bce29..e720d8cd 100644
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -31,5 +31,3 @@ xdg-user-dirs-gtk-update &
 
 # start conky
 sleep 1; al-conky-session --autostart &
-
-$HOME/.config/keypack &
diff --git a/home/.config/xfce4/al-xfce-configs/.gtkrc-2.0 b/home/.config/xfce4/al-xfce-configs/.gtkrc-2.0
deleted file mode 100644
index bb581cac..00000000
--- a/home/.config/xfce4/al-xfce-configs/.gtkrc-2.0
+++ /dev/null
@@ -1,29 +0,0 @@
-# DO NOT EDIT! This file will be overwritten by LXAppearance.
-# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-
-gtk-theme-name="ArchLabs-dARK"
-gtk-icon-theme-name="ArchLabs-Light"
-gtk-font-name="Ubuntu Light 10"
-gtk-cursor-theme-name="ArchLabs-Light"
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=0
-gtk-enable-input-feedback-sounds=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle="hintslight"
-gtk-xft-rgba="rgb"
-
-style "xfdesktop-icon-view" {
-    XfdesktopIconView::label-alpha = 10
-    base[NORMAL] = "#000000"
-    base[SELECTED] = "#71B9FF"
-    base[ACTIVE] = "#71B9FF"
-    fg[NORMAL] = "#fcfcfc"
-    fg[SELECTED] = "#ffffff"
-    fg[ACTIVE] = "#ffffff"
-}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
diff --git a/home/.config/xfce4/al-xfce-configs/helpers.rc b/home/.config/xfce4/al-xfce-configs/helpers.rc
deleted file mode 100644
index ed607c19..00000000
--- a/home/.config/xfce4/al-xfce-configs/helpers.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-FileManager=Thunar
-TerminalEmulator=custom-TerminalEmulator
-WebBrowser=firefox
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/thunar.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/thunar.xml
deleted file mode 100644
index 4bb6cb4c..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/thunar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="thunar" version="1.0">
-  <property name="last-view" type="string" value="ThunarIconView"/>
-  <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
-  <property name="last-separator-position" type="int" value="170"/>
-  <property name="last-show-hidden" type="bool" value="true"/>
-  <property name="last-window-width" type="int" value="800"/>
-  <property name="last-window-height" type="int" value="700"/>
-  <property name="last-window-maximized" type="bool" value="false"/>
-  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALLER"/>
-  <property name="last-details-view-column-widths" type="string" value="50,124,50,50,695,50,50,57,63"/>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index ff35ebbd..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;F1" type="empty"/>
-      <property name="&lt;Alt&gt;F2" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Alt&gt;F3" type="empty">
-        <property name="startup-notify" type="empty"/>
-      </property>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
-      <property name="XF86Display" type="empty"/>
-      <property name="&lt;Super&gt;p" type="empty"/>
-      <property name="&lt;Primary&gt;Escape" type="empty"/>
-      <property name="XF86WWW" type="empty"/>
-      <property name="XF86Mail" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;F1" type="string" value="rofi-apps"/>
-      <property name="&lt;Alt&gt;F2" type="string" value="rofi-apps">
-        <property name="startup-notify" type="bool" value="false"/>
-      </property>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="i3lock-fancy"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="i3lock-fancy"/>
-      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="xfwm4" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;Insert" type="empty"/>
-      <property name="Escape" type="empty"/>
-      <property name="Left" type="empty"/>
-      <property name="Right" type="empty"/>
-      <property name="Up" type="empty"/>
-      <property name="Down" type="empty"/>
-      <property name="&lt;Alt&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
-      <property name="&lt;Alt&gt;F4" type="empty"/>
-      <property name="&lt;Alt&gt;F6" type="empty"/>
-      <property name="&lt;Alt&gt;F7" type="empty"/>
-      <property name="&lt;Alt&gt;F8" type="empty"/>
-      <property name="&lt;Alt&gt;F9" type="empty"/>
-      <property name="&lt;Alt&gt;F10" type="empty"/>
-      <property name="&lt;Alt&gt;F11" type="empty"/>
-      <property name="&lt;Alt&gt;F12" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
-      <property name="&lt;Alt&gt;space" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Super&gt;Tab" type="empty"/>
-      <property name="&lt;Primary&gt;F1" type="empty"/>
-      <property name="&lt;Primary&gt;F2" type="empty"/>
-      <property name="&lt;Primary&gt;F3" type="empty"/>
-      <property name="&lt;Primary&gt;F4" type="empty"/>
-      <property name="&lt;Primary&gt;F5" type="empty"/>
-      <property name="&lt;Primary&gt;F6" type="empty"/>
-      <property name="&lt;Primary&gt;F7" type="empty"/>
-      <property name="&lt;Primary&gt;F8" type="empty"/>
-      <property name="&lt;Primary&gt;F9" type="empty"/>
-      <property name="&lt;Primary&gt;F10" type="empty"/>
-      <property name="&lt;Primary&gt;F11" type="empty"/>
-      <property name="&lt;Primary&gt;F12" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="&lt;Primary&gt;F7" type="string" value="workspace_7_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Primary&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Primary&gt;F1" type="string" value="workspace_1_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Primary&gt;F2" type="string" value="workspace_2_key"/>
-      <property name="&lt;Primary&gt;F4" type="string" value="workspace_4_key"/>
-      <property name="&lt;Primary&gt;F5" type="string" value="workspace_5_key"/>
-      <property name="&lt;Primary&gt;F6" type="string" value="workspace_6_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Primary&gt;F8" type="string" value="workspace_8_key"/>
-      <property name="&lt;Primary&gt;F9" type="string" value="workspace_9_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Primary&gt;F3" type="string" value="workspace_3_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="commands"/>
-    <value type="string" value="xfwm4"/>
-  </property>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
deleted file mode 100644
index 109e4c7f..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
-  <property name="applications" type="empty">
-    <property name="known_applications" type="array">
-      <value type="string" value="Package Manager"/>
-      <value type="string" value="nm-applet"/>
-      <value type="string" value="Volume Icon"/>
-      <value type="string" value="Xfce4-notifyd settings"/>
-    </property>
-    <property name="muted_applications" type="array">
-    </property>
-  </property>
-  <property name="notify-location" type="uint" value="2"/>
-  <property name="log-level" type="uint" value="0"/>
-  <property name="log-level-apps" type="uint" value="0"/>
-  <property name="expire-timeout" type="int" value="3"/>
-  <property name="initial-opacity" type="double" value="1.000000"/>
-  <property name="primary-monitor" type="uint" value="0"/>
-  <property name="theme" type="string" value="Default"/>
-  <property name="do-fadeout" type="bool" value="false"/>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-panel.xml
deleted file mode 100644
index 6f905a5f..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-panel" version="1.0">
-  <property name="configver" type="int" value="2"/>
-  <property name="panels" type="array">
-    <value type="int" value="1"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=6;x=0;y=0"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="30"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="1"/>
-        <value type="int" value="3"/>
-        <value type="int" value="15"/>
-        <value type="int" value="4"/>
-        <value type="int" value="5"/>
-        <value type="int" value="6"/>
-        <value type="int" value="2"/>
-      </property>
-      <property name="background-alpha" type="uint" value="90"/>
-      <property name="background-style" type="uint" value="0"/>
-      <property name="background-color" type="array">
-        <value type="uint" value="4883"/>
-        <value type="uint" value="4883"/>
-        <value type="uint" value="4883"/>
-        <value type="uint" value="65535"/>
-      </property>
-    </property>
-  </property>
-  <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="actions">
-      <property name="items" type="array">
-        <value type="string" value="-lock-screen"/>
-        <value type="string" value="-switch-user"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="-hibernate"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="+suspend"/>
-        <value type="string" value="+logout"/>
-        <value type="string" value="+restart"/>
-        <value type="string" value="+shutdown"/>
-        <value type="string" value="-separator"/>
-        <value type="string" value="-logout-dialog"/>
-      </property>
-      <property name="appearance" type="uint" value="1"/>
-    </property>
-    <property name="plugin-3" type="string" value="tasklist"/>
-    <property name="plugin-15" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-4" type="string" value="pager"/>
-    <property name="plugin-5" type="string" value="clock">
-      <property name="digital-format" type="string" value="%I:%M %p"/>
-    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="names-visible" type="array">
-        <value type="string" value="xfce4-power-manager"/>
-        <value type="string" value="pamac-tray"/>
-        <value type="string" value="thunar"/>
-      </property>
-    </property>
-    <property name="plugin-1" type="string" value="whiskermenu"/>
-  </property>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
deleted file mode 100644
index ce7df67b..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-power-manager" version="1.0">
-  <property name="xfce4-power-manager" type="empty">
-    <property name="power-button-action" type="uint" value="4"/>
-    <property name="sleep-button-action" type="uint" value="1"/>
-    <property name="hibernate-button-action" type="uint" value="2"/>
-    <property name="brightness-switch-restore-on-exit" type="int" value="1"/>
-    <property name="brightness-switch" type="int" value="1"/>
-    <property name="lid-action-on-battery" type="uint" value="1"/>
-    <property name="lid-action-on-ac" type="uint" value="1"/>
-    <property name="logind-handle-lid-switch" type="bool" value="true"/>
-    <property name="dpms-on-ac-off" type="uint" value="0"/>
-    <property name="dpms-on-ac-sleep" type="uint" value="0"/>
-    <property name="blank-on-ac" type="int" value="0"/>
-    <property name="show-tray-icon" type="bool" value="false"/>
-    <property name="general-notification" type="bool" value="false"/>
-    <property name="inactivity-on-ac" type="uint" value="14"/>
-    <property name="lock-screen-suspend-hibernate" type="bool" value="false"/>
-    <property name="dpms-enabled" type="bool" value="true"/>
-  </property>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-session.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index 88dc4d0c..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
-  <property name="general" type="empty">
-    <property name="FailsafeSessionName" type="empty"/>
-    <property name="SessionName" type="string" value="Default"/>
-    <property name="SaveOnExit" type="bool" value="false"/>
-  </property>
-  <property name="sessions" type="empty">
-    <property name="Failsafe" type="empty">
-      <property name="IsFailsafe" type="empty"/>
-      <property name="Count" type="empty"/>
-      <property name="Client0_Command" type="empty"/>
-      <property name="Client0_PerScreen" type="empty"/>
-      <property name="Client1_Command" type="empty"/>
-      <property name="Client1_PerScreen" type="empty"/>
-      <property name="Client2_Command" type="empty"/>
-      <property name="Client2_PerScreen" type="empty"/>
-      <property name="Client3_Command" type="empty"/>
-      <property name="Client3_PerScreen" type="bool" value="false"/>
-      <property name="Client4_Command" type="empty"/>
-      <property name="Client4_PerScreen" type="empty"/>
-    </property>
-  </property>
-  <property name="splash" type="empty">
-    <property name="Engine" type="empty"/>
-  </property>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xsettings.xml b/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index b730f0b7..00000000
--- a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="ArchLabs-dARK"/>
-    <property name="IconThemeName" type="string" value="ArchLabs-Light"/>
-    <property name="DoubleClickTime" type="empty"/>
-    <property name="DoubleClickDistance" type="empty"/>
-    <property name="DndDragThreshold" type="empty"/>
-    <property name="CursorBlink" type="empty"/>
-    <property name="CursorBlinkTime" type="empty"/>
-    <property name="SoundThemeName" type="empty"/>
-    <property name="EnableEventSounds" type="empty"/>
-    <property name="EnableInputFeedbackSounds" type="empty"/>
-  </property>
-  <property name="Xft" type="empty">
-    <property name="DPI" type="int" value="-1"/>
-    <property name="Antialias" type="int" value="1"/>
-    <property name="Hinting" type="int" value="1"/>
-    <property name="HintStyle" type="string" value="hintslight"/>
-    <property name="RGBA" type="string" value="rgb"/>
-  </property>
-  <property name="Gtk" type="empty">
-    <property name="CanChangeAccels" type="bool" value="false"/>
-    <property name="ColorPalette" type="empty"/>
-    <property name="FontName" type="string" value="Ubuntu Light 10"/>
-    <property name="IconSizes" type="empty"/>
-    <property name="KeyThemeName" type="empty"/>
-    <property name="ToolbarStyle" type="string" value="icons"/>
-    <property name="ToolbarIconSize" type="empty"/>
-    <property name="MenuImages" type="bool" value="true"/>
-    <property name="ButtonImages" type="bool" value="true"/>
-    <property name="MenuBarAccel" type="empty"/>
-    <property name="CursorThemeName" type="string" value="ArchLabs-Light"/>
-    <property name="CursorThemeSize" type="empty"/>
-    <property name="DecorationLayout" type="empty"/>
-  </property>
-  <property name="Xfce" type="empty">
-    <property name="LastCustomDPI" type="int" value="92"/>
-  </property>
-</channel>
diff --git a/home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc b/home/.config/xfce4/panel/whiskermenu-1.rc
similarity index 100%
rename from home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc
rename to home/.config/xfce4/panel/whiskermenu-1.rc
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/keyboards.xml b/home/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/keyboards.xml
rename to home/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to home/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfwm4.xml b/home/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from home/.config/xfce4/al-xfce-configs/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to home/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/home/.xinitrc b/home/.xinitrc
index df7b2498..61e33799 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -56,7 +56,7 @@ kbdrate -d 400 -r 50
 
 # do NOT put commands below the exec lines
 case $session in
-    i3|i3wm)    exec i3 ;;
+    i3|i3wm|i3-gaps) exec i3 ;;
     bsp|bspwm)  exec bspwm ;;
     xfce|xfce4) exec startxfce4 ;;
     openbox)    exec openbox-session ;;