From de063e2ed0f2def9b7cb882cc42e0b29b56e52df Mon Sep 17 00:00:00 2001
From: Sir Garbagetruck <truck@OneOfThoseDays.amigadns.net>
Date: Wed, 1 Jan 2020 21:05:11 +0200
Subject: [PATCH 1/5] Some changes for powerline10k, tmux plugin, emacs
 cleanup.

---
 emacs-init.el | 181 ++++++--------------------------------------------
 tmux.conf     |   3 +
 zshrc         |   4 +-
 3 files changed, 26 insertions(+), 162 deletions(-)

diff --git a/emacs-init.el b/emacs-init.el
index d0ecfac..8b4b8fd 100644
--- a/emacs-init.el
+++ b/emacs-init.el
@@ -66,13 +66,6 @@
   :defer t
   :init (add-hook 'global-company-mode-hook #'company-quickhelp-mode))
 
-(use-package company-go
-  :ensure t
-  :defer t
-  :init
-  (with-eval-after-load 'company
-    (add-to-list 'company-backends 'company-go)))
-
 (use-package flycheck
   :ensure t
   :defer t
@@ -84,21 +77,6 @@
   :init (yas-global-mode 1)
   )
 
-(use-package go-mode
-  :ensure t
-  :init
-  (progn
-    (setq gofmt-command "goimports")
-    (add-hook 'before-save-hook 'gofmt-before-save)
-    (bind-key [remap find-tag] #'godef-jump))
-  :config
-  (add-hook 'go-mode-hook 'electric-pair-mode)
-  (setq company-tooltip-limit 20)
-  (setq company-idle-delay .3)
-  (setq company-echo-delay 0)
-  (setq company-begin-commands '(self-insert-command))
-  )
-
 (use-package markdown-mode
   :ensure t)
 
@@ -108,6 +86,22 @@
 	 )
   )
 
+(use-package projectile
+  :ensure t
+  :init (projectile-mode +1)
+  )
+
+(use-package helm-projectile
+  :ensure t
+  :init (helm-projectile-on)
+  )
+
+(use-package helm-ag
+  :ensure t
+  :defer t
+  )
+
+
 (use-package paradox
   :ensure t
   :defer t)
@@ -116,15 +110,16 @@
   :ensure t
   :defer t)
 
-(use-package color-theme-solarized
-  :ensure t
-  :defer t)
-
 (use-package subatomic256-theme
   :ensure t
   :defer t
   )
 
+(use-package anti-zenburn-theme
+  :ensure t
+  :defer t
+  )
+
 ;; kill the damned gnu screen
 (setq inhibit-startup-screen t)
 
@@ -187,140 +182,6 @@
  '(default ((t (:inherit nil :stipple nil :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 142 :width normal :foundry "unci" :family "MonofurForPowerline Nerd Font"))))
  '(fixed-pitch ((t (:family "Iosevka")))))
 
-;;; Fira code
-;; This works when using emacs --daemon + emacsclient
-(add-hook 'after-make-frame-functions (lambda (frame) (set-fontset-font t '(#Xe100 . #Xe16f) "Fira Code Symbol")))
-;; This works when using emacs without server/client
-(set-fontset-font t '(#Xe100 . #Xe16f) "Fira Code Symbol")
-;; I haven't found one statement that makes both of the above situations work, so I use both for now
-
-(defconst fira-code-font-lock-keywords-alist
-  (mapcar (lambda (regex-char-pair)
-            `(,(car regex-char-pair)
-              (0 (prog1 ()
-                   (compose-region (match-beginning 1)
-                                   (match-end 1)
-                                   ;; The first argument to concat is a string containing a literal tab
-                                   ,(concat "	" (list (decode-char 'ucs (cadr regex-char-pair)))))))))
-          '(("\\(www\\)"                   #Xe100)
-            ("[^/]\\(\\*\\*\\)[^/]"        #Xe101)
-            ("\\(\\*\\*\\*\\)"             #Xe102)
-            ("\\(\\*\\*/\\)"               #Xe103)
-            ("\\(\\*>\\)"                  #Xe104)
-            ("[^*]\\(\\*/\\)"              #Xe105)
-            ("\\(\\\\\\\\\\)"              #Xe106)
-            ("\\(\\\\\\\\\\\\\\)"          #Xe107)
-            ("\\({-\\)"                    #Xe108)
-            ("\\(\\[\\]\\)"                #Xe109)
-            ("\\(::\\)"                    #Xe10a)
-            ("\\(:::\\)"                   #Xe10b)
-            ("[^=]\\(:=\\)"                #Xe10c)
-            ("\\(!!\\)"                    #Xe10d)
-            ("\\(!=\\)"                    #Xe10e)
-            ("\\(!==\\)"                   #Xe10f)
-            ("\\(-}\\)"                    #Xe110)
-            ("\\(--\\)"                    #Xe111)
-            ("\\(---\\)"                   #Xe112)
-            ("\\(-->\\)"                   #Xe113)
-            ("[^-]\\(->\\)"                #Xe114)
-            ("\\(->>\\)"                   #Xe115)
-            ("\\(-<\\)"                    #Xe116)
-            ("\\(-<<\\)"                   #Xe117)
-            ("\\(-~\\)"                    #Xe118)
-            ("\\(#{\\)"                    #Xe119)
-            ("\\(#\\[\\)"                  #Xe11a)
-            ("\\(##\\)"                    #Xe11b)
-            ("\\(###\\)"                   #Xe11c)
-            ("\\(####\\)"                  #Xe11d)
-            ("\\(#(\\)"                    #Xe11e)
-            ("\\(#\\?\\)"                  #Xe11f)
-            ("\\(#_\\)"                    #Xe120)
-            ("\\(#_(\\)"                   #Xe121)
-            ("\\(\\.-\\)"                  #Xe122)
-            ("\\(\\.=\\)"                  #Xe123)
-            ("\\(\\.\\.\\)"                #Xe124)
-            ("\\(\\.\\.<\\)"               #Xe125)
-            ("\\(\\.\\.\\.\\)"             #Xe126)
-            ("\\(\\?=\\)"                  #Xe127)
-            ("\\(\\?\\?\\)"                #Xe128)
-            ("\\(;;\\)"                    #Xe129)
-            ("\\(/\\*\\)"                  #Xe12a)
-            ("\\(/\\*\\*\\)"               #Xe12b)
-            ("\\(/=\\)"                    #Xe12c)
-            ("\\(/==\\)"                   #Xe12d)
-            ("\\(/>\\)"                    #Xe12e)
-            ("\\(//\\)"                    #Xe12f)
-            ("\\(///\\)"                   #Xe130)
-            ("\\(&&\\)"                    #Xe131)
-            ("\\(||\\)"                    #Xe132)
-            ("\\(||=\\)"                   #Xe133)
-            ("[^|]\\(|=\\)"                #Xe134)
-            ("\\(|>\\)"                    #Xe135)
-            ("\\(\\^=\\)"                  #Xe136)
-            ("\\(\\$>\\)"                  #Xe137)
-            ("\\(\\+\\+\\)"                #Xe138)
-            ("\\(\\+\\+\\+\\)"             #Xe139)
-            ("\\(\\+>\\)"                  #Xe13a)
-            ("\\(=:=\\)"                   #Xe13b)
-            ("[^!/]\\(==\\)[^>]"           #Xe13c)
-            ("\\(===\\)"                   #Xe13d)
-            ("\\(==>\\)"                   #Xe13e)
-            ("[^=]\\(=>\\)"                #Xe13f)
-            ("\\(=>>\\)"                   #Xe140)
-            ("\\(<=\\)"                    #Xe141)
-            ("\\(=<<\\)"                   #Xe142)
-            ("\\(=/=\\)"                   #Xe143)
-            ("\\(>-\\)"                    #Xe144)
-            ("\\(>=\\)"                    #Xe145)
-            ("\\(>=>\\)"                   #Xe146)
-            ("[^-=]\\(>>\\)"               #Xe147)
-            ("\\(>>-\\)"                   #Xe148)
-            ("\\(>>=\\)"                   #Xe149)
-            ("\\(>>>\\)"                   #Xe14a)
-            ("\\(<\\*\\)"                  #Xe14b)
-            ("\\(<\\*>\\)"                 #Xe14c)
-            ("\\(<|\\)"                    #Xe14d)
-            ("\\(<|>\\)"                   #Xe14e)
-            ("\\(<\\$\\)"                  #Xe14f)
-            ("\\(<\\$>\\)"                 #Xe150)
-            ("\\(<!--\\)"                  #Xe151)
-            ("\\(<-\\)"                    #Xe152)
-            ("\\(<--\\)"                   #Xe153)
-            ("\\(<->\\)"                   #Xe154)
-            ("\\(<\\+\\)"                  #Xe155)
-            ("\\(<\\+>\\)"                 #Xe156)
-            ("\\(<=\\)"                    #Xe157)
-            ("\\(<==\\)"                   #Xe158)
-            ("\\(<=>\\)"                   #Xe159)
-            ("\\(<=<\\)"                   #Xe15a)
-            ("\\(<>\\)"                    #Xe15b)
-            ("[^-=]\\(<<\\)"               #Xe15c)
-            ("\\(<<-\\)"                   #Xe15d)
-            ("\\(<<=\\)"                   #Xe15e)
-            ("\\(<<<\\)"                   #Xe15f)
-            ("\\(<~\\)"                    #Xe160)
-            ("\\(<~~\\)"                   #Xe161)
-            ("\\(</\\)"                    #Xe162)
-            ("\\(</>\\)"                   #Xe163)
-            ("\\(~@\\)"                    #Xe164)
-            ("\\(~-\\)"                    #Xe165)
-            ("\\(~=\\)"                    #Xe166)
-            ("\\(~>\\)"                    #Xe167)
-            ("[^<]\\(~~\\)"                #Xe168)
-            ("\\(~~>\\)"                   #Xe169)
-            ("\\(%%\\)"                    #Xe16a)
-           ;; ("\\(x\\)"                   #Xe16b) This ended up being hard to do properly so i'm leaving it out.
-            ("[^:=]\\(:\\)[^:=]"           #Xe16c)
-            ("[^\\+<>]\\(\\+\\)[^\\+<>]"   #Xe16d)
-            ("[^\\*/<>]\\(\\*\\)[^\\*/<>]" #Xe16f))))
-
-(defun add-fira-code-symbol-keywords ()
-  (font-lock-add-keywords nil fira-code-font-lock-keywords-alist))
-
-(if window-system
-    (add-hook 'prog-mode-hook
-              #'add-fira-code-symbol-keywords)
-  )
 
 (if window-system
     (load-theme 'anti-zenburn t)
diff --git a/tmux.conf b/tmux.conf
index 4038b79..9d6dd1c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -29,4 +29,7 @@ set -g @plugin 'tmux-plugins/tmux-urlview'
 # set -g @plugin 'git@bitbucket.com/user/plugin'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+# you have to do this, though:
+# git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+# and then source ~/.tmux.conf and then do ctrl-a I
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/zshrc b/zshrc
index fd4901a..f8da825 100644
--- a/zshrc
+++ b/zshrc
@@ -64,8 +64,8 @@ fi
 if [[ ${TERM} == linux ]]; then
 	prompt pure
 else
-	. ~/bin/powerlevel_vars
-	prompt powerlevel9k
+#	. ~/bin/powerlevel_vars
+	prompt powerlevel10k
 fi
 
 #alias t=todo.sh

From 9852289933bca0c6f74da34f0098cd9a70bd7b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sir=20Garbagetruck=20=F0=9F=9A=9A?=
 <yep.still.truck@still.truck>
Date: Wed, 1 Jan 2020 21:10:24 +0200
Subject: [PATCH 2/5] Remove codeface; we don't use these fonts basically

---
 .gitmodules    | 3 ---
 fonts/codeface | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 fonts/codeface

diff --git a/.gitmodules b/.gitmodules
index cfcbd12..c11093e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "tmuxcompose"]
 	path = tmuxcompose
 	url = https://github.com/truck/tmuxcompose
-[submodule "fonts/codeface"]
-	path = fonts/codeface
-	url = https://github.com/chrissimpkins/codeface
diff --git a/fonts/codeface b/fonts/codeface
deleted file mode 160000
index 67e1247..0000000
--- a/fonts/codeface
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67e12479572485cff55daa063207bc2be1f4a69a

From 76816d73386761ea358c4493cf87174bfd668868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sir=20Garbagetruck=20=F0=9F=9A=9A?=
 <yep.still.truck@still.truck>
Date: Wed, 1 Jan 2020 21:10:48 +0200
Subject: [PATCH 3/5] update zgen to latest

---
 zgen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zgen b/zgen
index 09f5425..0b669d2 160000
--- a/zgen
+++ b/zgen
@@ -1 +1 @@
-Subproject commit 09f542515e20ac655a4aa429cf9604fe698ccf42
+Subproject commit 0b669d2d0dcf788b4c81a7a30b4fa41dfbf7d1a7

From 9e61be69aa36799bd79f7d590271c873793bbecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sir=20Garbagetruck=20=F0=9F=9A=9A?=
 <yep.still.truck@still.truck>
Date: Wed, 1 Jan 2020 21:10:56 +0200
Subject: [PATCH 4/5] A small change (fix backtick to modern $( ) )

---
 NF_pick.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NF_pick.sh b/NF_pick.sh
index 67ff725..37a4e11 100755
--- a/NF_pick.sh
+++ b/NF_pick.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-F=`dmenu -i -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist`
-C=`ls ~/bin/st* |dmenu -l 8 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true'`
+F=$(dmenu -i -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist)
+C=$(ls ~/bin/st* |dmenu -l 8 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true')
 ${C} -f "${F}"

From 997bd6440f40afcf07605093182e0919ff42029d Mon Sep 17 00:00:00 2001
From: Howland Owl <still@notonfire.co.uk>
Date: Wed, 6 May 2020 03:33:10 +0300
Subject: [PATCH 5/5] Update tmux.conf

---
 tmux.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 303c5e9..a5ffbfb 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -32,9 +32,6 @@ set -g @themepack 'powerline/block/yellow'
 # set -g @plugin 'git@bitbucket.com/user/plugin'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-# you have to do this, though:
-# git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-# and then source ~/.tmux.conf and then do ctrl-a I
 run '~/.tmux/plugins/tpm/tpm'
 
 set-option -ga terminal-overrides ",xterm-256color:Tc"