Various changes

emacs.el

@@ -23,6 +23,7 @@
  '(haskell-indentation-where-post-offset 0)
  '(haskell-indentation-where-pre-offset 0)
  '(haskell-tags-on-save t)
+ '(initial-scratch-message nil)
  '(js-indent-level 2)
  '(line-move-visual nil)
  '(markdown-command "pandoc -t html")
@@ -33,6 +34,7 @@
  '(projectile-project-search-path (quote ("~/git/")))
  '(purescript-mode-hook (quote (turn-on-purescript-indentation)) t)
  '(sgml-basic-offset 1)
+ '(shr-width 80)
  '(temp-buffer-resize-mode nil)
  '(vc-follow-symlinks nil)
  '(window-combination-resize t))
@@ -70,11 +72,19 @@
 ;; Temp disabled.
 (require 'agda2-mode)
 
+;; (require 'lsp)
+;; Shame! `lsp-ui` is emitting:
+;; Eager macro-expansion failure: (wrong-type-argument listp kind)
+;; (require 'lsp-ui)
+;; (require 'lsp-haskell)
+;; (add-hook 'lsp-mode-hook 'lsp-ui-mode)
+;; (add-hook 'haskell-mode-hook #'lsp)
+
 
 ;;;; Captain Hook
 
 (add-hook 'text-mode-hook 'recentf-mode)
-(add-hook 'text-mode-hook 'column-number-mode)
+(column-number-mode 1)
 (add-hook 'text-mode-hook 'flyspell-mode)
 (add-hook 'prog-mode-hook 'form-feed-mode)
 ;; I think this breaks e.g. the color-picker

i3/config

@@ -205,6 +205,7 @@ client.urgent $base02 $base08 $base07 $base08
 # Bar
 bar {
   # status_command i3status
+  position top
   status_command i3blocks
   tray_output primary
 

xinit/xinitrc

@@ -7,6 +7,7 @@ emacs --daemon
 
 setxkbmap -option grp:win_space_toggle -layout us,dk
 xrdb -merge ~/.Xresources
+acpid
 
 # Nice for urxvt, not so nice for emacs:
 # autocutsel -f

zsh/config

@@ -1,48 +1,27 @@
 # 
-# User configuration
 
-# export MANPATH="/usr/local/man:$MANPATH"
+export XDG_CONFIG_HOME="$HOME/.cache"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
 
-# You may need to manually set your language environment
+# Begin compinstall
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/rsa_id"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-
-# The following lines were added by compinstall
 zstyle :compinstall filename '/home/fredefox/.zshrc'
-
 autoload -Uz compinit
-compinit
+compinit -d $XDG_DATA_HOME/zsh/zcompdump-$HOST-$ZSH_VERSION
-# End of lines added by compinstall
+# End compinstall
-# Lines configured by zsh-newuser-install
+
-HISTFILE=~/.histfile
+export LESSKEY="$XDG_CONFIG_HOME/less/lesskey"
-HISTSIZE=100000
+export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
-SAVEHIST=100000
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export DUC_DATABASE="$XDG_DATA_HOME/duc/db"
+export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
+export NODE_REPL_HISTORY="$XDG_DATA_HOME/node/repl-history"
+export HISTFILE="$XDG_DATA_HOME/zsh/history"
+export HISTSIZE=100000
+export SAVEHIST=100000
 setopt appendhistory extendedglob
 unsetopt autocd beep
 bindkey -e
-# End of lines configured by zsh-newuser-install
 
 # export PATH="$HOME/.local/bin:$PATH"
 alias sb="stack build"
@@ -50,5 +29,5 @@ alias gp="git add -p"
 # source $HOME/.config/gf/config
 alias ide='ghcid -c "stack ghci --test --ghci-options=-fno-break-on-exception --ghci-options=-fno-break-on-error --ghci-options=-v1 --ghci-options=-ferror-spans --ghci-options=-j"'
 export PAGER="less -FX"
-# perhaps just use .selected_editor for this?
+export MANWIDTH=80
-export EDITOR='emacsclient -c'
+export EDITOR='emacsclient -c -a ""'

zsh/init

@@ -1,3 +1,3 @@
-HERE="$HOME/.config/zsh"
+ZDOTDIR="$HOME/.config/zsh"
-source "$HERE/oh-my-zsh"
+source "$ZDOTDIR/oh-my-zsh"
-source "$HERE/config"
+source "$ZDOTDIR/config"