new setup on darrud

diff --git a/.config/i3status/config b/.config/i3status/config
index 951e24d..010b020 100644 (file)
--- a/.config/i3status/config
+++ b/.config/i3status/config
@@ -15,7 +15,7 @@ general {
 # order += "ipv6"
 order += "disk /"
 order += "disk /data"
-order += "wireless _first_"
+# order += "wireless _first_"
 order += "ethernet _first_"
 order += "battery 0"
 order += "volume master"

diff --git a/.config/sway/config b/.config/sway/config
index 5f279c7..bea5259 100644 (file)
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -14,7 +14,6 @@ set $pass rofi-pass
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in __DATADIR__/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
@@ -22,19 +21,12 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 
-# output DP-1 res 2560x1440 pos 1366,0
-# # 672 = 1440 - 768
-# output LVDS-1 pos 0,760
-
-output DP-1 res 2560x1440 pos 0,0
-# 672 = 1440 - 768
-output LVDS-1 pos 2560,760
-
 ### Input configuration
 
 input "65261:24672:technomancy_Atreus" {
     repeat_delay 200
     repeat_rate 45
+    # xkb_options altwin:swap_alt_win
 }
 
 ### Idle configuration
@@ -319,11 +311,8 @@ client.focused $blue $blue #ffffff $blue $blue
 client.unfocused $gray $gray #ffffff $gray $gray
 client.focused_inactive $gray $gray #ffffff $gray $gray
 
-# font pango: benis uushi 9
-# font pango: Ubuntu Mono 11
-# font pango: Inconsolata 11
-font pango: DejaVu Sans Mono 9
-# font pango: Liberation Mono 9
+# font pango: DejaVu Sans Mono 9
+font pango: Source Code Pro 9.5
 
 # get rid of title bars
 default_border pixel 4
@@ -333,7 +322,7 @@ exec xrdb .Xresources
 #      systemd-inhibit --what=handle-power-key --who=aminb \
 #      --why="Handle power button in sway" sleep infinity
 exec mako 2>&1 >/tmp/mako.log
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+#exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
 include /etc/sway/config.d/*
 include ~/.config/sway/`hostname`

diff --git a/.config/sway/darrud b/.config/sway/darrud
new file mode 100644 (file)
index 0000000..90185c7
--- /dev/null
+++ b/.config/sway/darrud
@@ -0,0 +1,19 @@
+output HDMI-A-1 res 2560x1440 pos 1920,0
+output eDP-1 pos 0,550
+
+focus output HDMI-A-1
+
+input "1739:31251:DLL07BE:01_06CB:7A13_Touchpad" {
+    dwt enabled
+    tap enabled
+    natural_scroll enabled
+    middle_emulation enabled
+    click_method clickfinger
+}
+
+input "1:1:AT_Translated_Set_2_keyboard" {
+    repeat_delay 200
+    repeat_rate 45
+    xkb_layout us,ir
+    xkb_options ctrl:nocaps,altwin:swap_alt_win,ctrl:rctrl_ralt,grp:shifts_toggle
+}

diff --git a/.config/sway/shemshak b/.config/sway/shemshak
deleted file mode 100644 (file)
index 8fa60b3..0000000
--- a/.config/sway/shemshak
+++ /dev/null
@@ -1,14 +0,0 @@
-input "1739:31251:DLL07BE:01_06CB:7A13_Touchpad" {
-    dwt enabled
-    tap enabled
-    natural_scroll enabled
-    middle_emulation enabled
-    click_method clickfinger
-}
-
-input "1:1:AT_Translated_Set_2_keyboard" {
-    repeat_delay 200
-    repeat_rate 45
-    xkb_layout us,ir
-    xkb_options ctrl:nocaps,altwin:swap_alt_win,ctrl:rctrl_ralt,grp:shifts_toggle
-}

diff --git a/.profile b/.profile
index 0f17b9b..65221c4 100644 (file)
--- a/.profile
+++ b/.profile
@@ -64,19 +64,6 @@ if [ -z "$IS_GUIX_SYSTEM" ]; then
     fi
 fi
 
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:nocaps \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
-
-xsetroot -cursor_name left_ptr
-xset r rate 200 45
-xset b off
-
-xrdb -merge "$HOME/.Xresources"
-
 # footenote: when on a foreign distro and using Xfce, don't forget to
 # disable its auto-start of gpg- and ssh-agent, by issuing
 #     xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled -n -t bool -s false

diff --git a/.xinitrc b/.xinitrc
new file mode 100644 (file)
index 0000000..c2feb42
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1 @@
+[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources

diff --git a/.xsession b/.xsession
deleted file mode 100755 (executable)
index edce4c6..0000000
--- a/.xsession
+++ /dev/null
@@ -1,6 +0,0 @@
-[ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
-[ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
-[ -x "$(command -v pasystray)" ] && pasystray -a &
-[ -x "$(command -v nm-applet)" ] && nm-applet &
-[ -x "$(command -v compton)" ] && compton &
-[ -x "$(command -v emacs)" ] && exec emacs -ib 0