Browse Source

Updated emacs UTF8 for terminal and fixed i3 bindings

pull/2/head
Josh Wolfe 5 years ago
parent
commit
1afef3ef33
  1. 21
      emacs/.emacs.d/README.org
  2. 22
      i3/.config/i3/config
  3. 3
      zsh/.zshrc

21
emacs/.emacs.d/README.org

@ -295,10 +295,11 @@ otherwise fall back to regular =Inconsolata=. @@ -295,10 +295,11 @@ otherwise fall back to regular =Inconsolata=.
Force =Fira Code= for all =UTF-8= symbols.
#+BEGIN_SRC emacs-lisp :tangle yes
(let ((utf8-font "Fira Code"))
(set-fontset-font "fontset-startup" '(#x000000 . #x3FFFFF) utf8-font)
(set-fontset-font "fontset-default" '(#x000000 . #x3FFFFF) utf8-font)
(set-fontset-font "fontset-standard" '(#x000000 . #x3FFFFF) utf8-font))
(when (display-graphic-p)
(let ((utf8-font "Fira Code"))
(set-fontset-font "fontset-startup" '(#x000000 . #x3FFFFF) utf8-font)
(set-fontset-font "fontset-default" '(#x000000 . #x3FFFFF) utf8-font)
(set-fontset-font "fontset-standard" '(#x000000 . #x3FFFFF) utf8-font)))
#+END_SRC
Make sure that UTF-8 is used everywhere.
@ -959,12 +960,10 @@ repeatedly creates a transient map replacing the controls regardless of my evil @@ -959,12 +960,10 @@ repeatedly creates a transient map replacing the controls regardless of my evil
(lambda ()
(if org-tree-slide-mode
;; When mode is enabled
(progn (setq org-hide-emphasis-markers t
wolfe--enable-transient-map t)
(progn (setq wolfe--enable-transient-map t)
(wolfe/org-tree-set-transient-map))
;; When mode is disabled
(setq org-hide-emphasis-markers nil
wolfe--enable-transient-map nil)))))
(setq wolfe--enable-transient-map nil)))))
#+END_SRC
* Keymaps
@ -1371,7 +1370,9 @@ Project management @@ -1371,7 +1370,9 @@ Project management
(use-package omnisharp
:after company
:config
(setq omnisharp-server-executable-path "C:/emacs/omnisharp/Omnisharp.exe")
(when wolfe/windows?
(setq omnisharp-server-executable-path "C:/emacs/omnisharp/Omnisharp.exe"))
(add-hook 'csharp-mode-hook 'omnisharp-mode)
(add-to-list 'company-backends 'company-omnisharp))
#+END_SRC
@ -1409,6 +1410,8 @@ Project management @@ -1409,6 +1410,8 @@ Project management
(use-package company-go
:after company
:config
(when wolfe/linux?
(add-to-list 'exec-path "~/Projects/go/bin"))
(add-to-list 'company-backends 'company-go))
#+END_SRC

22
i3/.config/i3/config

@ -81,7 +81,7 @@ bindsym $mod+Shift+q kill @@ -81,7 +81,7 @@ bindsym $mod+Shift+q kill
# start dmenu (a program launcher)
bindsym $mod+space exec rofi -show run
bindsym $mod+c exec vivaldi-snapshot
bindsym $mod+c exec firefox-developer
bindsym $mod+n exec "~/bin/lock.sh"
# change focus
@ -117,15 +117,15 @@ bindsym $mod+Shift+space floating toggle @@ -117,15 +117,15 @@ bindsym $mod+Shift+space floating toggle
bindsym Mod1+space focus mode_toggle
# switch to workspace
bindsym $mod+percent workspace 1
bindsym $mod+bracketleft workspace 2
bindsym $mod+braceleft workspace 3
bindsym $mod+braceright workspace 4
bindsym $mod+parenleft workspace 5
bindsym $mod+equal workspace 6
bindsym $mod+astericks workspace 7
bindsym $mod+parenright workspace 8
bindsym $mod+plus workspace 9
bindsym $mod+percent workspace 1
bindsym $mod+bracketleft workspace 2
bindsym $mod+braceleft workspace 3
bindsym $mod+braceright workspace 4
bindsym $mod+parenleft workspace 5
bindsym $mod+equal workspace 6
bindsym $mod+asterisk workspace 7
bindsym $mod+parenright workspace 8
bindsym $mod+plus workspace 9
bindsym $mod+bracketright workspace 10
bindsym $mod+Shift+percent move container to workspace 1
@ -134,7 +134,7 @@ bindsym $mod+Shift+braceleft move container to workspace 3 @@ -134,7 +134,7 @@ bindsym $mod+Shift+braceleft move container to workspace 3
bindsym $mod+Shift+braceright move container to workspace 4
bindsym $mod+Shift+parenleft move container to workspace 5
bindsym $mod+Shift+equal move container to workspace 6
bindsym $mod+Shift+astericks move container to workspace 7
bindsym $mod+Shift+asterisk move container to workspace 7
bindsym $mod+Shift+parenright move container to workspace 8
bindsym $mod+Shift+plus move container to workspace 9
bindsym $mod+Shift+bracketright move container to workspace 10

3
zsh/.zshrc

@ -186,3 +186,6 @@ fi @@ -186,3 +186,6 @@ fi
# added by travis gem
[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh
export GOROOT=/usr/lib/go
export GOPATH=$HOME/Projects/go

Loading…
Cancel
Save