Merge branch 'master' of github.com:dustinswan/dotfiles

README.org

@@ -1,12 +1,10 @@
 * Dotfiles
 
-I primarily use OS X and [[http://nixos.org][NixOS]] GNU/Linux. I'm
+I run OS X on my laptop and [[http://nixos.org][NixOS]] GNU/Linux on my desktop.
-trying [[https://nixos.org/nix/][nix]] on OS X for package management,
-and [[http://brew.sh/][Homebrew]] for anything that's missing or broken.
 
 After ~15 years with Vim &
 [[https://tmux.github.io/][Tmux]]/[[https://www.gnu.org/software/screen/][GNU
-Screen]], I've switched to
+Screen]], I've mostly switched to
 [[https://www.gnu.org/software/emacs/][Emacs]] &
 [[https://github.com/syl20bnr/spacemacs][Spacemacs]].
 
@@ -17,8 +15,8 @@ If you
 - like Lisp better than Vimscript (yes, I know about neovim)
 - want a huge, ancient hacker community & ecosystem
 
-then I really suggest checking out Emacs & Spacemacs. Emacs really is a
+then I suggest checking out Emacs & Spacemacs. Emacs really is a
-great operating system, and now it has a great editor.
+great operating system, and now it has a great editor!
 
 ** Other Software
 
@@ -28,21 +26,20 @@ great operating system, and now it has a great editor.
    [[https://www.fastmail.com/][Fastmail]]
 -  Terminal: [[http://www.emacswiki.org/emacs/MultiTerm][multiterm]] &
    [[http://www.iterm2.com][iTerm 2]] (OS X) &
-   [[http://software.schmorp.de/pkg/rxvt-unicode.html][urxvt]] (Linux)
+   [[https://github.com/jwilm/alacritty][alacritty]] (Linux)
 -  Shell:
    [[http://www.gnu.org/software/emacs/manual/html_mono/eshell.html][EShell]]
    & [[http://www.fishshell.com][Fish]]
 -  Browser: [[http://www.emacswiki.org/emacs/eww][eww]] &
    [[https://www.mozilla.org/en-US/firefox][Firefox]] &
    [[http://www.qutebrowser.org/][qutebrowser]]
--  IRC: [[http://www.emacswiki.org/emacs/ERC][ERC]]
+-  IRC & IM & chat: [[https://weechat.org/][WeeChat]] & [[https://bitlbee.org/][Bitlbee]] & [[https://github.com/the-kenny/weechat.el][weechat.el]]
--  Notes & TODO & bookmarks & spreadsheets & blog & etc.:
+-  Notes & to-do lists & bookmarks & spreadsheets & journal & everything, really:
    [[http://orgmode.org][Org mode]]
--  Window Manager & Launcher: [[http://www.alfredapp.com][Alfred]] (OS
+-  Window Manager: [[http://www.alfredapp.com][Alfred]] (OS
-   X) & [[http://xmonad.org][xmonad]] (Linux)
+   X) & [[https://i3wm.org/][i3]] (or [[http://xmonad.org][xmonad]], depending on the month..) (Linux)
 -  Sync: [[https://syncthing.net][Syncthing]]
--  RSS Reader: [[https://github.com/skeeto/elfeed][Elfeed]] &
+-  RSS Reader: [[https://feedly.com/][Feedly]] & [[https://github.com/skeeto/elfeed][Elfeed]]
-   Feedly
 
 ** Todo List
 

i3

@@ -0,0 +1,184 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+for_window [class="^.*"] border pixel 1
+new_window pixel 1
+
+gaps inner 10
+gaps outer 0
+# smart_gaps on
+smart_borders on
+
+set $mod Mod4
+
+# 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
+font pango:Iosevka Nerd Font Regular 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.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+# bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec alacritty
+
+# kill focused window
+bindsym $mod+Shift+apostrophe kill
+
+# start dmenu (a program launcher)
+bindsym $mod+e exec dmenu_run
+# bindsym Mod1+Space exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
+
+bindsym $mod+Tab focus right
+bindsym $mod+Shift+Tab focus left
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+apostrophe split h
+
+# split in vertical orientation
+bindsym $mod+minus split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+comma layout tabbed
+bindsym $mod+period layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+bindsym $mod+c focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
+
+# reload the configuration file
+bindsym $mod+Shift+r reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+c restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+period 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'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym t resize grow height 10 px or 10 ppt
+        bindsym n resize shrink height 10 px or 10 ppt
+        bindsym s resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+p mode "default"
+}
+
+bindsym $mod+p mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+# bar {
+#         status_command i3status
+# }

xmonad.hs

@@ -12,7 +12,7 @@ lightBlue = "#66aaff"
 main = xmonad $ docks $ ewmh $ defaultConfig
     { terminal = "alacritty"
     , modMask = mod4Mask
-    , workspaces = [ "α", "β", "γ" ]
+    , workspaces = [ "α", "β", "γ", "δ", "ε"]
     , borderWidth = 2
     , normalBorderColor = "#000000"
     , focusedBorderColor = lightBlue