commit 5d5a785cbeccf3edc0b57fb4f66876c47014bb30
parent 6b8b73247136b54607a8ec42f1b254ccfc56e9cc
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Sun, 14 Aug 2022 15:03:27 -0700
Inconsolata, helm stuff
Diffstat:
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
@@ -25,15 +25,15 @@
(add-to-list 'load-path (concat user-emacs-directory "lisp/"))
-(setq x-gtk-use-system-tooltips nil)
+(setq x-gtk-use-system-tooltips nil)
;; font
(when (not (eq system-type 'windows-nt))
(if (string= system-name "Southpark")
(add-to-list 'default-frame-alist
- '(font . "Meslo LG M DZ:size=16"))
+ '(font . "Inconsolata Nerd Font Mono:size=16"))
(add-to-list 'default-frame-alist
- '(font . "Meslo LG M DZ:size=16"))))
+ '(font . "Inconsolata Nerd Font Mono:size=16"))))
(use-package prettify-symbols-mode
:init
@@ -154,6 +154,7 @@ mouse-3: Toggle minor modes"
;; Column 80 fill line.
(setq display-fill-column-indicator-column 80)
(add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
+(add-hook 'org-mode-hook #'display-fill-column-indicator-mode)
(setenv "MANWIDTH" "100") ; For man mode
@@ -367,6 +368,7 @@ mouse-3: Toggle minor modes"
(use-package tex-mode
:ensure auctex
:init
+ ;(require 'tex-buf)
(use-package company-auctex
:ensure t)
@@ -374,7 +376,6 @@ mouse-3: Toggle minor modes"
:ensure t)
:config
- (require 'tex-buf)
(setq TeX-auto-save t)
(setq TeX-parse-self t)
(setq Tex-command-default "LatexMk")
@@ -412,7 +413,6 @@ mouse-3: Toggle minor modes"
** helm
#+begin_src emacs-lisp
-(define-key global-map (kbd "M-i") #'find-file)
(use-package helm
:ensure t
:init
@@ -428,6 +428,7 @@ mouse-3: Toggle minor modes"
(define-key global-map [remap find-file] #'helm-find-files)
(define-key global-map [remap execute-extended-command] #'helm-M-x)
(define-key global-map [remap switch-to-buffer] #'helm-mini)
+ (define-key global-map (kbd "M-i") #'switch-to-buffer)
(define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
;(evil-define-key 'normal 'global (kbd "<leader>f") #'swiper)
@@ -495,6 +496,8 @@ mouse-3: Toggle minor modes"
;; optionally if you want to use debugger
(use-package dap-mode
:ensure t)
+ (require 'dap-gdb-lldb)
+ (dap-gdb-lldb-setup)
(use-package lsp-treemacs
:ensure t)
@@ -626,7 +629,13 @@ mouse-3: Toggle minor modes"
(add-hook 'prog-mode-hook #'flyspell-prog-mode) ; Flyspell on comments and strings.
(use-package cmake-mode
- :ensure t)
+ :ensure t
+ :hook (cmake-mode . lsp-deferred))
+
+(use-package cmake-font-lock
+ :ensure t
+ :after cmake-mode
+ :config (cmake-font-lock-activate))
(use-package etc-sudoers-mode
:ensure t)
@@ -691,7 +700,7 @@ mouse-3: Toggle minor modes"
(use-package cc-mode
:config
- (setq c-default-style "linux"
+ (setq c-default-style "java"
c-basic-offset 4)
(c-set-offset 'inline-open '0))
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
@@ -6,7 +6,7 @@
#: individual font faces and even specify special fonts for particular
#: characters.
-font_family Ubuntu-Mono
+font_family Inconsolata
bold_font auto
italic_font auto
bold_italic_font auto