From 13479ad907a3725aa69bcdccc66698ccfb303542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederik=20Hangh=C3=B8j=20Iversen?= <fhi.1990@gmail.com>
Date: Tue, 26 Mar 2019 17:06:20 +0100
Subject: [PATCH] Various changes...

---
 X11/urxvt                      |  4 +--
 emacs.el                       | 51 ++++++++++++++++++++--------------
 environment.d/environment.conf |  3 +-
 git/config                     |  2 ++
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/X11/urxvt b/X11/urxvt
index 70667a2..607b920 100644
--- a/X11/urxvt
+++ b/X11/urxvt
@@ -29,7 +29,7 @@ URxvt*scrollTtyKeypress:    true
 URxvt.iso14755: false
 URxvt.iso14755_52: false
 
-! URxvt.clipboard.copycmd:  xclip -i -selection clipboard
-! URxvt.clipboard.pastecmd: xclip -o -selection clipboard
+URxvt.clipboard.copycmd:  xclip -i -selection clipboard
+URxvt.clipboard.pastecmd: xclip -o -selection clipboard
 ! URxvt.clipboard.copycmd:  xsel -ib
 ! URxvt.clipboard.pastecmd: xsel -ob
diff --git a/emacs.el b/emacs.el
index 7af00b3..31e72f4 100644
--- a/emacs.el
+++ b/emacs.el
@@ -29,14 +29,21 @@
    (quote
     ((".*Man.*" display-buffer-same-window)
      ("Buffer List" display-buffer-same-window
-     ("magit-revision:" display-buffer-same-window))))
+     ("magit-revision:" display-buffer-same-window)))))
  '(echo-keystrokes 1e-10)
+ '(erc-autojoin-channels-alist (quote (("irc.freenode.net" "#haskell" "#data.coop"))))
+ '(erc-autojoin-mode t)
  '(erc-nick "fredefox")
- '(erc-port 667)
+ '(erc-port 6667)
+ '(erc-prompt-for-password nil)
  '(erc-server "irc.freenode.net")
  '(flycheck-emacs-lisp-load-path (quote inherit))
- '(flycheck-ghc-language-extensions (quote ("UnicodeSyntax" "TypeApplications")))
- '(flycheck-hlint-language-extensions (quote ("UnicodeSyntax" "TypeApplications")))
+ '(flycheck-ghc-language-extensions
+   (quote
+    ("UnicodeSyntax" "TypeApplications" "OverloadedStrings")))
+ '(flycheck-hlint-language-extensions
+   (quote
+    ("UnicodeSyntax" "TypeApplications" "OverloadedStrings")))
  '(haskell-indentation-where-post-offset 0)
  '(haskell-indentation-where-pre-offset 0)
  '(haskell-language-extensions (quote ("UnicodeSyntax" "TypeApplications")))
@@ -61,12 +68,13 @@
  '(recentf-mode t)
  '(scroll-bar-mode nil)
  '(scroll-conservatively 101)
- '(scroll-margin 3)
+ '(scroll-margin 0)
  '(select-enable-clipboard t)
  '(send-mail-function (quote smtpmail-send-it))
  '(sgml-basic-offset 1)
  '(show-paren-mode t)
  '(set-mark-command-repeat-pop t)
+ '(show-trailing-whitespace t)
  '(shr-width 80)
  '(split-window-keep-point nil)
  '(temp-buffer-resize-mode nil)
@@ -83,6 +91,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(agda2-highlight-unsolved-constraint-face ((t (:background "dark orange"))))
+ '(agda2-highlight-unsolved-meta-face ((t (:background "dark orange"))))
  '(font-lock-comment-face ((t (:foreground "chocolate1"))))
  '(font-lock-keyword-face ((t (:foreground "Cyan1"))))
  '(variable-pitch ((t nil))))
@@ -105,18 +115,6 @@
 (add-to-list 'load-path                   "~/.config/emacs/libs/psc-ide-emacs/")
 (add-to-list 'Info-default-directory-list "~/.config/emacs/libs/psc-ide-emacs/")
 
-(require 'mu4e)
-
-(require 'purescript-mode-autoloads)
-
-(require 'psc-ide)
-
-(add-hook 'purescript-mode-hook
-  (lambda ()
-    (psc-ide-mode)
-    (company-mode)
-    (turn-on-purescript-indentation)))
-
 (require 'agda2-mode)
 
 ;; (require 'lsp)
@@ -131,6 +129,7 @@
 ;;;; Captain Hook
 
 (global-set-key (kbd "C-x C-r") 'recentf-open-files)
+(global-set-key (kbd "C-x r v") 'revert-buffer)
 
 (add-hook 'text-mode-hook
   (lambda ()
@@ -215,18 +214,28 @@
 
 ;;; ERC
 (require 'erc)
-;; (erc :server "irc.freenode.net" :port 6667 :nick "fredefox")
-;; (setq erc-autojoin-channels-alist
-;;       '(("#data.coop" "#haskell" "#Agda")))
+(erc-autojoin-mode)
 
+;;; Yaml
+(require 'yaml-mode)
+(define-key yaml-mode-map "|" nil)
+(define-key yaml-mode-map ">" nil)
+(define-key yaml-mode-map "-" nil)
+(define-key yaml-mode-map "." nil)
+
+;;; Enable disabled stuff
+(put 'set-goal-column 'disabled nil)
+(put 'narrow-to-region 'disabled nil)
+
+;;; Ruby
 (setq ruby-deep-indent-paren nil)
 (setq ruby-use-smie nil)
 
+;;; Jira
 ;; org-jira [https://github.com/ahungry/org-jira]
 (require 'org-jira)
 (setq jiralib-url "https://zendesk.atlassian.net")
 
-;;; Jira
 (add-to-list 'load-path "~/.config/emacs/lisp")
 (require 'jira)
 (define-key jira-mode-map (kbd "C-c j") 'jira-command-map)
diff --git a/environment.d/environment.conf b/environment.d/environment.conf
index ae381dc..d6ff56c 100644
--- a/environment.d/environment.conf
+++ b/environment.d/environment.conf
@@ -16,4 +16,5 @@ SAVEHIST=100000
 XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
 XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
 HOMEBREW_NO_AUTO_UPDATE=1
-LANG=en_GB.UTF-8
+LANG=en_US.UTF-8
+PATH="$PATH:~/.local/bin"
diff --git a/git/config b/git/config
index 046ee71..0574804 100644
--- a/git/config
+++ b/git/config
@@ -7,3 +7,5 @@
 	user = fredefox
 [gitlab]
 	user = fredefox
+[diff]
+        algorithm = patience
\ No newline at end of file