diff --git a/README.org b/README.org index 4449bf63..bb608422 100644 --- a/README.org +++ b/README.org @@ -115,8 +115,8 @@ In order to have this config work on both my desktop with regular joe-schmoe mon (defun chris/set-transparency () "Set the frame to be transparent on Wayland compositors" - (if (string-search "x11" x-display-name) - '((set-frame-parameter (selected-frame) 'alpha '(80 . 80)) + (if (string-search "wayland" x-display-name) + '((set-frame-parameter (selected-frame) 'alpha '(100 . 100)) (add-to-list 'default-frame-alist '(alpha . (80 . 80))) (add-to-list 'initial-frame-alist '(alpha . (80 . 80)))))) @@ -223,6 +223,7 @@ To use straight we need to bootstrap it. This code is pulled right from Straight (straight-use-package 'use-package) (setq use-package-verbose t) +(defalias 'yes-or-no-p 'y-or-n-p) #+end_src Now let's make sure our package archives includes the newer org. @@ -412,6 +413,10 @@ This evil-collection package includes a lot of other evil based things. "wd" '(delete-window :which-key "other window") "wv" '(evil-window-vsplit :which-key "split window vertically") "ws" '(evil-window-split :which-key "split window horizontally") + "wj" '(evil-window-down :which-key "down window") + "wk" '(evil-window-up :which-key "up window") + "wh" '(evil-window-left :which-key "left window") + "wl" '(evil-window-right :which-key "right window") ";" '(execute-extended-command :which-key "execute command") ":" '(eval-expression :which-key "evaluate expression") ) @@ -634,7 +639,8 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc (use-package consult :after selectrum :config - (setq consult-narrow-key "'") + (setq consult-narrow-key "'" + consult-project-root-function 'projectile-project-root) :general (chris/leader-keys :states 'normal @@ -718,7 +724,15 @@ YASnippet is a templating system. It's powerful. ** Projectile I'm going to use projectile to keep my projects inline. #+begin_src emacs-lisp -(use-package projectile) +(use-package projectile + :general + (chris/leader-keys + :states 'normal + :keymaps 'override + "op" 'projectile-switch-open-project + "gc" 'projectile-compile-project + "gr" 'projectile-run-project + "fp" 'project-find-file)) #+end_src ** HTTPD @@ -916,16 +930,16 @@ It's probably smart to have markdown. *** QML I make some apps in Qt 5 so QML is a needed language although the support in Emacs is lacking. -#+begin_src emacs-lisp :tangle no +#+begin_src emacs-lisp :tangle yes (use-package qml-mode :mode ("\\.qml\\'" . qml-mode) :config - (use-package company-qml - :after qml-mode - :config - (add-to-list 'company-backends 'company-qml) + (setq company-idle-delay 0.1)) - (setq company-idle-delay 0.1))) +(use-package company-qml + :after qml-mode + :config + (add-to-list 'company-backends 'company-qml)) (use-package qt-pro-mode :after qml-mode) @@ -959,8 +973,8 @@ I may get into flutter development over using felgo..... but i'm not happy about :hook (dart-mode . lsp-deferred) :general (general-def 'normal dart-mode-map - "C-c r" 'lsp-dart-dap-flutter-hot-reload - "C-c R" 'lsp-dart-dap-flutter-hot-restart)) + "gr" 'flutter-run-or-hot-reload + "gR" 'lsp-dart-dap-flutter-hot-restart)) (use-package lsp-dart) (use-package flutter @@ -1279,7 +1293,6 @@ Part of this config includes some special capture templates for my work as a you "gC" 'chris/org-columns-view "ge" 'org-edit-src-code "gr" 'revert-buffer - "gs" 'org-toggle-narrow-to-subtree "S" 'org-schedule "t" 'org-todo) ('insert org-mode-map @@ -2035,7 +2048,7 @@ Let's use pdf-tools for a lot better interaction with pdfs. ** EAF (Emacs Application Framework) -#+begin_src emacs-lisp +#+begin_src emacs-lisp :tangle no (use-package eaf :straight (:host github :repo "manateelazycat/emacs-application-framework" :files ("*.el" "*.py" "core" "app")) @@ -2148,7 +2161,7 @@ interfere with the default `bongo-playlist-buffer'." :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :matcher '((local-file "file:" "http:" "ftp:" "lbry:") "mka" "wav" "wma" "ogm" "opus" - "ogg" "flac" "mp3" "mka" "wav" "webm" + "ogg" "flac" "mp3" "mka" "wav" "mpg" "mpeg" "vob" "avi" "ogm" "mp4" "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" @@ -2210,7 +2223,7 @@ I use transmission on a server to manage my torrents :commands (transmission) :config - (if (string-equal (system-name) "syls") + (if (string-equal (system-name) "archdesktop") (setq transmission-host "home.cochrun.xyz" transmission-rpc-path "/transmission/rpc" transmission-refresh-modes '(transmission-mode diff --git a/init.el b/init.el index 5922cacb..dfd71035 100644 --- a/init.el +++ b/init.el @@ -38,8 +38,8 @@ (defun chris/set-transparency () "Set the frame to be transparent on Wayland compositors" - (if (string-search "x11" x-display-name) - '((set-frame-parameter (selected-frame) 'alpha '(80 . 80)) + (if (string-search "wayland" x-display-name) + '((set-frame-parameter (selected-frame) 'alpha '(100 . 100)) (add-to-list 'default-frame-alist '(alpha . (80 . 80))) (add-to-list 'initial-frame-alist '(alpha . (80 . 80)))))) @@ -99,6 +99,7 @@ (straight-use-package 'use-package) (setq use-package-verbose t) +(defalias 'yes-or-no-p 'y-or-n-p) (use-package command-log-mode :commands command-log-mode) @@ -242,6 +243,10 @@ "wd" '(delete-window :which-key "other window") "wv" '(evil-window-vsplit :which-key "split window vertically") "ws" '(evil-window-split :which-key "split window horizontally") + "wj" '(evil-window-down :which-key "down window") + "wk" '(evil-window-up :which-key "up window") + "wh" '(evil-window-left :which-key "left window") + "wl" '(evil-window-right :which-key "right window") ";" '(execute-extended-command :which-key "execute command") ":" '(eval-expression :which-key "evaluate expression") ) @@ -338,7 +343,8 @@ vertically." (use-package consult :after selectrum :config - (setq consult-narrow-key "'") + (setq consult-narrow-key "'" + consult-project-root-function 'projectile-project-root) :general (chris/leader-keys :states 'normal @@ -399,7 +405,15 @@ vertically." (setq yas-snippet-dirs (list (expand-file-name "yasnippets/" user-emacs-directory))) (yas-global-mode 1)) -(use-package projectile) +(use-package projectile + :general + (chris/leader-keys + :states 'normal + :keymaps 'override + "op" 'projectile-switch-open-project + "gc" 'projectile-compile-project + "gr" 'projectile-run-project + "fp" 'project-find-file)) (use-package simple-httpd :ensure t) @@ -537,8 +551,8 @@ vertically." :hook (dart-mode . lsp-deferred) :general (general-def 'normal dart-mode-map - "C-c r" 'lsp-dart-dap-flutter-hot-reload - "C-c R" 'lsp-dart-dap-flutter-hot-restart)) + "gr" 'flutter-run-or-hot-reload + "gR" 'lsp-dart-dap-flutter-hot-restart)) (use-package lsp-dart) (use-package flutter @@ -824,7 +838,6 @@ vertically." "gC" 'chris/org-columns-view "ge" 'org-edit-src-code "gr" 'revert-buffer - "gs" 'org-toggle-narrow-to-subtree "S" 'org-schedule "t" 'org-todo) ('insert org-mode-map @@ -1486,13 +1499,6 @@ If on a: (add-hook 'nov-mode-hook 'chris/setup-nov-mode)) -(use-package eaf - :straight (:host github :repo "manateelazycat/emacs-application-framework" - :files ("*.el" "*.py" "core" "app")) - :defer 1 - :config - (setq eaf-browser-dark-mode t)) - (use-package elfeed :commands (elfeed) :config @@ -1590,7 +1596,7 @@ interfere with the default `bongo-playlist-buffer'." :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :matcher '((local-file "file:" "http:" "ftp:" "lbry:") "mka" "wav" "wma" "ogm" "opus" - "ogg" "flac" "mp3" "mka" "wav" "webm" + "ogg" "flac" "mp3" "mka" "wav" "mpg" "mpeg" "vob" "avi" "ogm" "mp4" "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" @@ -1648,7 +1654,7 @@ interfere with the default `bongo-playlist-buffer'." :commands (transmission) :config - (if (string-equal (system-name) "syls") + (if (string-equal (system-name) "archdesktop") (setq transmission-host "home.cochrun.xyz" transmission-rpc-path "/transmission/rpc" transmission-refresh-modes '(transmission-mode