chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

Browse source
This commit is contained in:
Chris Cochrun 2021-06-24 07:03:41 -05:00
parent ef1b41fd66 eaee5317f0
commit aa1f2c7c28
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.org
View file

@ -85,7 +85,7 @@ Let's start by making some basic ui changes like turning off the scrollbar, tool
In order to have this config work on both my desktop with regular joe-schmoe monitors and my laptop with new-hotness HiDPI monitor, I will set the font size if my system is the laptop to much higher.
#+begin_src emacs-lisp
(if (string-equal (system-name) "syl")
(defvar chris/default-font-size 240)
(defvar chris/default-font-size 120)
(defvar chris/default-font-size 120))
(defun chris/set-font-faces ()
@ -362,6 +362,7 @@ This evil-collection package includes a lot of other evil based things.
"hb" '(general-describe-keybindings :which-key "describe-bindings")
"hi" '(info :which-key "info manual")
"ss" '(consult-line :which-key "consult search")
"sr" '(consult-ripgrep :which-key "consult ripgrep")
"ww" '(other-window :which-key "other window")
"wd" '(delete-window :which-key "other window")
"wv" '(evil-window-vsplit :which-key "split window vertically")
@ -680,7 +681,7 @@ Ace link provides an avy like search for links. Upon using the keybindings prese
'(("\\*e?shell\\*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.3))
(window-width . 0.4))
("*helpful*"
(display-buffer-in-side-window)
(side . right)
@ -805,11 +806,10 @@ I make some apps in Qt 5 so QML is a needed language although the support in Ema
:config
(add-to-list 'company-backends 'company-qml)
(setq company-qml-extra-qmltypes-files '("/home/chris/.Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/qml"))
(setq company-qml-extra-qmltypes-files '("/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes"))
(setq company-idle-delay 0.1)))

14
init.el
View file

@ -22,7 +22,7 @@
(setq comp-deferred-compilation-deny-list nil)
(if (string-equal (system-name) "syl")
(defvar chris/default-font-size 240)
(defvar chris/default-font-size 120)
(defvar chris/default-font-size 120))
(defun chris/set-font-faces ()
@ -227,6 +227,7 @@
"hb" '(general-describe-keybindings :which-key "describe-bindings")
"hi" '(info :which-key "info manual")
"ss" '(consult-line :which-key "consult search")
"sr" '(consult-ripgrep :which-key "consult ripgrep")
"ww" '(other-window :which-key "other window")
"wd" '(delete-window :which-key "other window")
"wv" '(evil-window-vsplit :which-key "split window vertically")
@ -388,7 +389,7 @@ vertically."
'(("\\*e?shell\\*"
(display-buffer-in-side-window)
(side . right)
(window-width . 0.3))
(window-width . 0.4))
("*helpful*"
(display-buffer-in-side-window)
(side . right)
@ -464,11 +465,10 @@ vertically."
:config
(add-to-list 'company-backends 'company-qml)
(setq company-qml-extra-qmltypes-files '("/home/chris/.Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes"
"/home/chris/.Felgo/Felgo/gcc_64/qml"))
(setq company-qml-extra-qmltypes-files '("/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayPlugins/vplayplugins.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlayApps/vplayapps.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/VPlay/vplay.qmltypes"
"/home/chris/dev/Felgo/Felgo/gcc_64/import/Felgo/felgo.qmltypes"))
(setq company-idle-delay 0.1)))