From 8599d1cafb7ca273609f07f42d8d3617bf7b7398 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Wed, 3 Jul 2019 20:10:16 -0400
Subject: [PATCH] use i3

---
 distro-begin                   |  8 +---
 input-setup                    |  7 +---
 pkgs                           |  5 +--
 subdir_files/.config/i3/config | 73 +++++++++++++++++-----------------
 4 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/distro-begin b/distro-begin
index c0c1f24..1da0579 100755
--- a/distro-begin
+++ b/distro-begin
@@ -585,17 +585,13 @@ if tp || x2 || x3; then
 fi
 
 
-##### install xmonad
+##### install x stuff
 if has_x; then
     pi ${p2[@]}
-    # note: on older ubuntu I used cabal xmonad + xfce, using cabal versin
-    # see /w/archive/programming/xmonad-cabal.sh
     if isarch; then
         # xorg-xmessage for displaying error messages.
         # optional dependency in arch, standard elsewhere.
-        pi xorg-server xorg-xmessage xmonad-contrib xorg-xsetroot xorg-xinit
-    else
-        pi suckless-tools
+        pi xorg-server xorg-xmessage xorg-xsetroot xorg-xinit
     fi
 fi
 
diff --git a/input-setup b/input-setup
index 2b7a6ba..d3388c6 100755
--- a/input-setup
+++ b/input-setup
@@ -22,12 +22,7 @@ else
     k2inorder=true
 fi
 
-case $HOSTNAME in
-    some_x200_laptop) type=laptop ;;
-    hosts_with_keyboards_attached) type=kinesis ;;
-esac
-
-
+type=model01
 
 case $1 in
     l) type=laptop ;;
diff --git a/pkgs b/pkgs
index bbed4ca..0f11b2d 100644
--- a/pkgs
+++ b/pkgs
@@ -12,11 +12,10 @@ p1=(
 )
 p2=(
   # 2nd
-  ghc
   konsole
-  xmonad
-  cabal-install
   suckless-tools
+  # prefer xmonad, but it doesnt exist for wayland
+  i3
 )
 p3=(
   at
diff --git a/subdir_files/.config/i3/config b/subdir_files/.config/i3/config
index ba4dc68..d88dd34 100644
--- a/subdir_files/.config/i3/config
+++ b/subdir_files/.config/i3/config
@@ -12,43 +12,46 @@
 set $mod Mod4
 
 
-# exit i3 (logs you out of your X session)
-bindsym $mod+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
 bindsym $mod+2 exec "pavucontrol"
-bindsym $mod+3 exec "firefox"
-bindsym $mod+4 exec "input-setup"
-bindsym $mod+w exec "/a/bin/redshift.sh 2"
-bindsym $mod+e exec "/a/bin/redshift.sh 1"
-bindsym $mod+r exec "/a/bin/redshift.sh 0"
-# todo, add mod+t for cycle layout
+bindsym $mod+3 exec "abrowser"
+bindsym $mod+4 exec "input-setup m"
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+bindsym $mod+w focus parent
+bindsym $mod+e fullscreen toggle
+bindsym $mod+r exec "/a/bin/redshift.sh"
+# todo, in newer i3, make this toggle split tabbed
 bindsym $mod+t layout toggle split
-# move focused window
-bindsym $mod+Delete move left
-bindsym $mod+parenright move right
-# todo, some other binds in here and beyond.
-# reload the configuration file. change to restart if needed.
-bindsym $mod+p restart
-# start a terminal
-bindsym $mod+k exec i3-sensible-terminal
-# start dmenu (a program launcher)
-bindsym $mod+l exec dmenu_run
-# kill focused window
-bindsym $mod+c kill
+bindsym $mod+g layout tabbed
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-bindsym F8 focus down
+bindsym $mod+u focus up
+bindsym $mod+i focus down
+bindsym $mod+o focus left
+bindsym $mod+p focus right
 
-bindsym $mod+b layout stacking
+bindsym $mod+Left move left
+bindsym $mod+Right move right
+bindsym $mod+Up move up
+bindsym $mod+Down move down
 
-# todo, other workspaces
 # switch to workspace
-bindsym $mod+f workspace 1
-bindsym $mod+d workspace 2
-bindsym $mod+s workspace 3
 bindsym $mod+a workspace 4
+bindsym $mod+s workspace 3
+bindsym $mod+d workspace 2
+bindsym $mod+f workspace 1
+
+# todo, in newer i3, make this split toggle
+bindsym $mod+v split vertical
+bindsym $mod+b split horizontal
+
+bindsym $mod+c kill
+
+
 bindsym $mod+7 workspace 5
 bindsym $mod+0 workspace 6
 
@@ -61,17 +64,15 @@ bindsym $mod+Shift+7 move container to workspace 5
 bindsym $mod+Shift+0 move container to workspace 6
 
 
+bindsym $mod+k exec i3-sensible-terminal
+bindsym $mod+l exec dmenu_run
+
+bindsym $mod+Shift+p restart
+
+
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 font pango:monospace 8
 
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
+# todo: only available in newer i3n
+#hide_edge_borders smart
\ No newline at end of file
-- 
2.30.2