Merge branch 'master' of gitlab.com:chriscochrun/dotemacs
This commit is contained in:
		
						commit
						de83e622af
					
				
					 2 changed files with 54 additions and 3 deletions
				
			
		
							
								
								
									
										44
									
								
								README.org
									
										
									
									
									
								
							
							
						
						
									
										44
									
								
								README.org
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -302,6 +302,8 @@ This evil-collection package includes a lot of other evil based things.
 | 
			
		|||
    "ss" '(consult-line :which-key "consult search")
 | 
			
		||||
    "ww" '(other-window :which-key "other window")
 | 
			
		||||
    "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")
 | 
			
		||||
    ";" '(execute-extended-command :which-key "execute command")
 | 
			
		||||
    ":" '(eval-expression :which-key "evaluate expression")
 | 
			
		||||
    )
 | 
			
		||||
| 
						 | 
				
			
			@ -620,6 +622,29 @@ Fish is my preferred shell and made some scripts in it so I keep this to be able
 | 
			
		|||
  :mode ("\\.fish\\'" . fish-mode))
 | 
			
		||||
#+end_src
 | 
			
		||||
 | 
			
		||||
*** 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
 | 
			
		||||
(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-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-idle-delay 0.1)))
 | 
			
		||||
 | 
			
		||||
(use-package qt-pro-mode
 | 
			
		||||
  :after qml-mode)
 | 
			
		||||
#+end_src
 | 
			
		||||
 | 
			
		||||
** File Management
 | 
			
		||||
*** Dired
 | 
			
		||||
I'm making a small function in here to open files in the appropriate program using XDG defaults. This is like opening odt files in Libreoffice or mp4 files in MPV.
 | 
			
		||||
| 
						 | 
				
			
			@ -632,7 +657,7 @@ I'm making a small function in here to open files in the appropriate program usi
 | 
			
		|||
    "Open the file-at-point in the appropriate program"
 | 
			
		||||
    (interactive)
 | 
			
		||||
    (let ((file (ignore-errors (dired-get-file-for-visit))))
 | 
			
		||||
      (browse-url (file-truename file))))
 | 
			
		||||
      (browse-url-xdg-open (file-truename file))))
 | 
			
		||||
  :general
 | 
			
		||||
  (chris/leader-keys
 | 
			
		||||
    :states 'normal
 | 
			
		||||
| 
						 | 
				
			
			@ -786,7 +811,18 @@ Part of this config includes some special capture templates for my work as a you
 | 
			
		|||
	  "/home/chris/org/tfc_plans.org"
 | 
			
		||||
	  "/home/chris/org/ministry_team.org"
 | 
			
		||||
	  "/home/chris/org/todo.org"
 | 
			
		||||
	  "/home/chris/org/newsletter.org"))
 | 
			
		||||
	  "/home/chris/org/newsletter.org"
 | 
			
		||||
	  ))
 | 
			
		||||
  (add-to-list '("/home/chris/org/inbox.org"
 | 
			
		||||
	  "/home/chris/org/notes.org"
 | 
			
		||||
	  "/home/chris/org/repetition.org"
 | 
			
		||||
	  "/home/chris/org/tasks.org"
 | 
			
		||||
	  "/home/chris/org/tfc_plans.org"
 | 
			
		||||
	  "/home/chris/org/ministry_team.org"
 | 
			
		||||
	  "/home/chris/org/todo.org"
 | 
			
		||||
	  "/home/chris/org/newsletter.org"
 | 
			
		||||
	  "/home/chris/org/lesson_*.org")
 | 
			
		||||
	       (expand-file-name ))
 | 
			
		||||
 | 
			
		||||
  (setq org-id-method 'ts)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -828,7 +864,9 @@ Part of this config includes some special capture templates for my work as a you
 | 
			
		|||
    "c" 'org-capture)
 | 
			
		||||
  ('normal org-agenda-mode-map
 | 
			
		||||
	   "q" 'org-agenda-quit
 | 
			
		||||
	   "r" 'org-agenda-redo)
 | 
			
		||||
	   "r" 'org-agenda-redo
 | 
			
		||||
	   "d" 'org-agenda-deadline
 | 
			
		||||
	   "s" 'org-agenda-schedule)
 | 
			
		||||
  ('normal org-columns-map
 | 
			
		||||
	   "j" 'outline-next-heading
 | 
			
		||||
	   "h" 'outline-previous-heading
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										13
									
								
								init.el
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								init.el
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1242,3 +1242,16 @@ interfere with the default `bongo-playlist-buffer'."
 | 
			
		|||
 | 
			
		||||
(setq gc-cons-threshold 2000000)
 | 
			
		||||
(setq garbage-collection-messages nil)
 | 
			
		||||
(custom-set-variables
 | 
			
		||||
 ;; custom-set-variables was added by Custom.
 | 
			
		||||
 ;; If you edit it by hand, you could mess it up, so be careful.
 | 
			
		||||
 ;; Your init file should contain only one such instance.
 | 
			
		||||
 ;; If there is more than one, they won't work right.
 | 
			
		||||
 '(org-agenda-files
 | 
			
		||||
   '("~/org/lesson_17_gospel_of_paul_s_3rd_mission.org" "/home/chris/org/inbox.org" "/home/chris/org/notes.org" "/home/chris/org/repetition.org" "/home/chris/org/tasks.org" "/home/chris/org/tfc_plans.org" "/home/chris/org/ministry_team.org" "/home/chris/org/todo.org" "/home/chris/org/newsletter.org")))
 | 
			
		||||
(custom-set-faces
 | 
			
		||||
 ;; custom-set-faces was added by Custom.
 | 
			
		||||
 ;; If you edit it by hand, you could mess it up, so be careful.
 | 
			
		||||
 ;; Your init file should contain only one such instance.
 | 
			
		||||
 ;; If there is more than one, they won't work right.
 | 
			
		||||
 )
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue