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

This commit is contained in:
Chris Cochrun 2021-08-24 10:52:43 -05:00
commit 5cb5bb1792
2 changed files with 27 additions and 18 deletions

View file

@ -102,9 +102,11 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
(defun chris/set-transparency () (defun chris/set-transparency ()
"Set the frame to be transparent on Wayland compositors" "Set the frame to be transparent on Wayland compositors"
(if (string= x-display-name "wayland-0") (if (string-search "wayland" x-display-name)
((set-frame-parameter (selected-frame) 'alpha '(90 . 90)) (set-frame-parameter (selected-frame) 'alpha '(100 . 100))
(add-to-list 'default-frame-alist '(alpha . (90 . 90)))))) (set-frame-parameter (selected-frame) 'undecorated t)
(add-to-list 'default-frame-alist '(undecorated . t))
(add-to-list 'default-frame-alist '(alpha . (100 . 100)))))
(if (daemonp) (if (daemonp)
(add-hook 'after-make-frame-functions (add-hook 'after-make-frame-functions
@ -112,8 +114,7 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
(with-selected-frame frame (with-selected-frame frame
(chris/set-font-faces) (chris/set-font-faces)
(chris/set-transparency))) (chris/set-transparency)))
(chris/set-font-faces)) (chris/set-font-faces)))
(chris/set-transparency))
#+end_src #+end_src
Then let's make sure line-numbers are relative and on. And let's turn on visual-line-mode globally. Then let's make sure line-numbers are relative and on. And let's turn on visual-line-mode globally.
@ -642,7 +643,7 @@ Marginalia makes for some great decoration to our minibuffer completion items. W
:custom :custom
(company-dabbrev-other-buffers t) (company-dabbrev-other-buffers t)
(company-minimum-prefix-length 1) (company-minimum-prefix-length 1)
(company-idle-delay 0.2) (company-idle-delay 0.1)
:general :general
(general-def '(normal insert) company-active-map (general-def '(normal insert) company-active-map
"TAB" 'company-complete-selection "TAB" 'company-complete-selection
@ -801,7 +802,7 @@ LSP is useful...
(use-package lsp-ui (use-package lsp-ui
:hook (lsp-mode . lsp-ui-mode) :hook (lsp-mode . lsp-ui-mode)
:custom :custom
(lsp-ui-doc-position 'bottom)) (lsp-ui-doc-position 'top))
(use-package lsp-treemacs (use-package lsp-treemacs
:after lsp) :after lsp)
@ -919,7 +920,10 @@ I may get into flutter development over using felgo..... but i'm not happy about
(use-package lsp-dart) (use-package lsp-dart)
(use-package flutter (use-package flutter
:after dart) :after dart
:general
(chris/leader-keys dart-mode-map
"rf" 'flutter-run-or-hot-reload))
(use-package hover (use-package hover
:after dart) :after dart)
#+end_src #+end_src

25
init.el
View file

@ -38,9 +38,11 @@
(defun chris/set-transparency () (defun chris/set-transparency ()
"Set the frame to be transparent on Wayland compositors" "Set the frame to be transparent on Wayland compositors"
(if (string= x-display-name "wayland-0") (if (string-search "wayland" x-display-name)
((set-frame-parameter (selected-frame) 'alpha '(90 . 90)) (set-frame-parameter (selected-frame) 'alpha '(100 . 100))
(add-to-list 'default-frame-alist '(alpha . (90 . 90)))))) (set-frame-parameter (selected-frame) 'undecorated t)
(add-to-list 'default-frame-alist '(undecorated . t))
(add-to-list 'default-frame-alist '(alpha . (100 . 100)))))
(if (daemonp) (if (daemonp)
(add-hook 'after-make-frame-functions (add-hook 'after-make-frame-functions
@ -346,10 +348,10 @@ vertically."
(use-package marginalia (use-package marginalia
:bind (:map minibuffer-local-map :bind (:map minibuffer-local-map
("C-M-a" . marginalia-cycle) ("C-M-a" . marginalia-cycle)
;; :map embark-general-map ;; :map embark-general-map
;; ("A" . marginalia-cycle) ;; ("A" . marginalia-cycle)
) )
;; The :init configuration is always executed (Not lazy!) ;; The :init configuration is always executed (Not lazy!)
:init :init
@ -374,7 +376,7 @@ vertically."
:custom :custom
(company-dabbrev-other-buffers t) (company-dabbrev-other-buffers t)
(company-minimum-prefix-length 1) (company-minimum-prefix-length 1)
(company-idle-delay 0.2) (company-idle-delay 0.1)
:general :general
(general-def '(normal insert) company-active-map (general-def '(normal insert) company-active-map
"TAB" 'company-complete-selection "TAB" 'company-complete-selection
@ -486,7 +488,7 @@ vertically."
(use-package lsp-ui (use-package lsp-ui
:hook (lsp-mode . lsp-ui-mode) :hook (lsp-mode . lsp-ui-mode)
:custom :custom
(lsp-ui-doc-position 'bottom)) (lsp-ui-doc-position 'top))
(use-package lsp-treemacs (use-package lsp-treemacs
:after lsp) :after lsp)
@ -555,7 +557,10 @@ vertically."
(use-package lsp-dart) (use-package lsp-dart)
(use-package flutter (use-package flutter
:after dart) :after dart
:general
(chris/leader-keys dart-mode-map
"rf" 'flutter-run-or-hot-reload))
(use-package hover (use-package hover
:after dart) :after dart)