about summary refs log tree commit diff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/desktop/.Xresources.device1
-rw-r--r--configs/desktop/.xsessionrc.device5
-rwxr-xr-xconfigs/install7
-rw-r--r--configs/shared/.Xresources2
-rw-r--r--configs/shared/.Xresources.shared1
-rw-r--r--configs/shared/.xsessionrc22
-rw-r--r--configs/shared/.xsessionrc.shared22
-rwxr-xr-xconfigs/uninstall7
-rw-r--r--configs/work_laptop/.Xresources.device1
-rw-r--r--configs/work_laptop/.xsessionrc.device11
10 files changed, 20 insertions, 59 deletions
diff --git a/configs/desktop/.Xresources.device b/configs/desktop/.Xresources.device
deleted file mode 100644
index 5c1bb0c41f86..000000000000
--- a/configs/desktop/.Xresources.device
+++ /dev/null
@@ -1 +0,0 @@
-Xcursor.size: 24
diff --git a/configs/desktop/.xsessionrc.device b/configs/desktop/.xsessionrc.device
deleted file mode 100644
index 352dd4fb7d02..000000000000
--- a/configs/desktop/.xsessionrc.device
+++ /dev/null
@@ -1,5 +0,0 @@
-# setup OSX style scrolling for desktop
-xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Natural Scrolling Enabled' 1
-
-# increase mouse speed
-xinput --set-prop 'PixArt Lenovo USB Optical Mouse' 'libinput Accel Speed' 1
diff --git a/configs/install b/configs/install
index d4d760e73f8d..d6eb7752180e 100755
--- a/configs/install
+++ b/configs/install
@@ -2,11 +2,4 @@
 
 configs="$BRIEFCASE/configs"
 
-case $(hostname) in
-  $DESKTOP)
-    (cd "$configs/desktop" && stow --target="$HOME" .);;
-  $LAPTOP)
-    (cd "$configs/work_laptop" && stow --target="$HOME" .);;
-esac
-
 (cd "$configs/shared" && stow --target="$HOME" .)
diff --git a/configs/shared/.Xresources b/configs/shared/.Xresources
deleted file mode 100644
index 4e738e3d3026..000000000000
--- a/configs/shared/.Xresources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include ".Xresources.shared"
-#include ".Xresources.device"
diff --git a/configs/shared/.Xresources.shared b/configs/shared/.Xresources.shared
deleted file mode 100644
index df8848bb786d..000000000000
--- a/configs/shared/.Xresources.shared
+++ /dev/null
@@ -1 +0,0 @@
-! Put shared configuration here
diff --git a/configs/shared/.xsessionrc b/configs/shared/.xsessionrc
index 0bb00ffb8e84..2c266af491fc 100644
--- a/configs/shared/.xsessionrc
+++ b/configs/shared/.xsessionrc
@@ -1,4 +1,22 @@
 #!/bin/sh
 
-. ~/.xsessionrc.shared
-. ~/.xsessionrc.device
+# Might be unnecessary...
+. ~/.profile
+
+export DESKTOP_SESSION=cinnamon  # gnome for trusty.
+
+# Desktop background color.
+xsetroot -solid "#333333"
+
+# Set fallback cursor.
+xsetroot -cursor_name left_ptr
+
+# `unclutter` hide the cursor in when it is inactive
+unclutter &
+
+# Control X's pointer with the keyboard. Activate by pressing <C-;>
+keynav daemonize
+
+# Startup Emacs (and EXWM). This is built by calling `make install` from within
+# ~/dotfiles/emacs.
+dbus-launch --exit-with-session wpcarros-emacs
diff --git a/configs/shared/.xsessionrc.shared b/configs/shared/.xsessionrc.shared
deleted file mode 100644
index 2c266af491fc..000000000000
--- a/configs/shared/.xsessionrc.shared
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Might be unnecessary...
-. ~/.profile
-
-export DESKTOP_SESSION=cinnamon  # gnome for trusty.
-
-# Desktop background color.
-xsetroot -solid "#333333"
-
-# Set fallback cursor.
-xsetroot -cursor_name left_ptr
-
-# `unclutter` hide the cursor in when it is inactive
-unclutter &
-
-# Control X's pointer with the keyboard. Activate by pressing <C-;>
-keynav daemonize
-
-# Startup Emacs (and EXWM). This is built by calling `make install` from within
-# ~/dotfiles/emacs.
-dbus-launch --exit-with-session wpcarros-emacs
diff --git a/configs/uninstall b/configs/uninstall
index 8a97dd06d827..30ccc76d2351 100755
--- a/configs/uninstall
+++ b/configs/uninstall
@@ -2,11 +2,4 @@
 
 configs="$BRIEFCASE/configs"
 
-case $(hostname) in
-  $DESKTOP)
-    (cd "$configs/desktop" && stow --delete --target="$HOME" .);;
-  $LAPTOP)
-    (cd "$configs/laptop" && stow --delete --target="$HOME" .);;
-esac
-
 (cd "$configs/shared" && stow --delete --target="$HOME" .)
diff --git a/configs/work_laptop/.Xresources.device b/configs/work_laptop/.Xresources.device
deleted file mode 100644
index 93a8d7e025dd..000000000000
--- a/configs/work_laptop/.Xresources.device
+++ /dev/null
@@ -1 +0,0 @@
-XTerm.vt100.faceName: GohuFont
diff --git a/configs/work_laptop/.xsessionrc.device b/configs/work_laptop/.xsessionrc.device
deleted file mode 100644
index aa4015e4cf72..000000000000
--- a/configs/work_laptop/.xsessionrc.device
+++ /dev/null
@@ -1,11 +0,0 @@
-# natural scrolling - trackpad
-xinput --set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Natural Scrolling Enabled' 1
-
-# increase cursor speed - trackpad
-xinput --set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Accel Speed' 1
-
-# natural scrolling - mouse
-xinput --set-prop 'Logitech USB Receiver Mouse' 'libinput Natural Scrolling Enabled' 1
-
-# increase cursor speed - mouse
-xinput --set-prop 'Logitech USB Receiver Mouse' 'libinput Accel Speed' 1