From e22e65c9d2f13f43968b17b48e86818bb0249c98 Mon Sep 17 00:00:00 2001 From: David Todd Date: Mon, 11 Jan 2021 14:30:12 -0600 Subject: [PATCH] move the .x files around --- Xresources => .Xresources | 10 +++--- xinitrc | 66 --------------------------------------- 2 files changed, 5 insertions(+), 71 deletions(-) rename Xresources => .Xresources (76%) delete mode 100644 xinitrc diff --git a/Xresources b/.Xresources similarity index 76% rename from Xresources rename to .Xresources index 088fda8..7cac57a 100644 --- a/Xresources +++ b/.Xresources @@ -36,10 +36,10 @@ *.color15: #d2d4de URxvt.font: xft:Source Code Pro:size=10.5 -URxvt.depth: 32 -URxvt*scrollBar: false -URxvt*mouseWheelScrollPage: true -URxvt*cursorBlink: true -URxvt*saveLines: 99999 +URxvt.depth: 32 +URxvt*scrollBar: false +URxvt*mouseWheelScrollPage: true +URxvt*cursorBlink: true +URxvt*saveLines: 99999 URxvt*internalBorder: 5 URxvt*geometry: 70x19 diff --git a/xinitrc b/xinitrc deleted file mode 100644 index 1c510bc..0000000 --- a/xinitrc +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -DEFAULT_SESSION='i3 --shmlog-size 0' - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -get_session(){ - local dbus_args=(--sh-syntax --exit-with-session) - case $1 in - awesome) dbus_args+=(awesome) ;; - bspwm) dbus_args+=(bspwm-session) ;; - budgie) dbus_args+=(budgie-desktop) ;; - cinnamon) dbus_args+=(cinnamon-session) ;; - deepin) dbus_args+=(startdde) ;; - enlightenment) dbus_args+=(enlightenment_start) ;; - fluxbox) dbus_args+=(startfluxbox) ;; - gnome) dbus_args+=(gnome-session) ;; - i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;; - jwm) dbus_args+=(jwm) ;; - kde) dbus_args+=(startkde) ;; - lxde) dbus_args+=(startlxde) ;; - lxqt) dbus_args+=(lxqt-session) ;; - mate) dbus_args+=(mate-session) ;; - xfce) dbus_args+=(xfce4-session) ;; - openbox) dbus_args+=(openbox-session) ;; - *) dbus_args+=($DEFAULT_SESSION) ;; - esac - - echo "dbus-launch ${dbus_args[*]}" -} - -exec $(get_session)