From 84da3e2945d2336b0c0c0dc325e054f68e03cd7f Mon Sep 17 00:00:00 2001 From: DavidCromp Date: Wed, 25 Jan 2023 13:23:24 -0500 Subject: [PATCH] Fix Custom.el Conflicts --- custom.el | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/custom.el b/custom.el index 81f377e..e4e7d36 100644 --- a/custom.el +++ b/custom.el @@ -7,10 +7,14 @@ '(custom-safe-themes '("8cda1cfae8e393bfb23f1d448d4be10720835d086f7db080908a7c8d01566516" "a27f7b52fe66bacaec9059f8afd04d055a4ac3c2fba9eb9128c81e10152fc566" "1ba7196d8e7b883272ea8818a5163aec21b57023368febf55255816226f7b370" "8256e7e03444834d34915a226dc24933b0d680a0a1da568ec03f852be776f168" "4ac2f45e6b46e5bb50826d4250df71a57124169b82cc0ad75e436de6e70a9690" "29addd67feb95ca1179e60d476bb92c1f11835548e2efaec15c9ac6af2a8e6a8" "9b7a425c38c4894e161887c26381c2a6fc1de3c1407158507caaf469d76eb27b" "bce055e1681dd343659957710af77f7a6ad106677d42c61f86ebeedf637c4493" "f62c69472d3f506179d797131c014fe4095d9609dddf14542c50e0388f1e8d6d" "cf143bf23fa8160f87331893cdadc40b876556634621dfa373fcf93c4c97c444" "f459dfd377e9cb98d90e53383dcca7d73396cc0a22b31d39af24fb1cf3548fb5" "fcc14e1a22c99d77f7b1455b0c8a320f8afd0c1f4a9c5c50b45f676eb0c54ba2" "a6bae299481c3c0058e611d2c32ca169fa27203345a880806a5a8554cdd2e588" "feb9556e03558588e29e6659c8e01ea3d2a17a1e7a13e9bf9fc9e59cacba4b72" default)) '(delete-selection-mode nil) + '(dired-listing-switches "-alh") '(elpy-rpc-python-command "python3") '(lsp-java-format-on-type-enabled nil) '(lsp-java-format-settings-profile nil) + '(lsp-dart-flutter-sdk-dir "~/flutter") '(lsp-pylsp-plugins-jedi-use-pyenv-environment t) + '(org-agenda-files + '("~/Documents/research/CommitteeMeetings/First/Report/***REMOVED***_***REMOVED***_Masters_Supervisory_Committee_Meeting_Report.org" "/Users/universelaptop/Documents/research/thesis/Ideas/ModelDetails.org" "/Users/universelaptop/Documents/uoft/JPB1071/WrittenAssignment/***REMOVED***_***REMOVED***_***REMOVED***_JPB1071_Written_Assignment.org")) '(org-export-backends '(ascii beamer html icalendar latex odt)) '(org-preview-latex-process-alist '((dvipng :programs @@ -41,11 +45,96 @@ ("convert -density %D -trim -antialias %f -quality 100 %O")))) '(python-shell-completion-native-enable nil) '(warning-suppress-types '((comp) (comp) (comp) (comp) (comp)))) + '(org-latex-classes + '(("thesis" "\\documentclass{ut-thesis}" + ("\\chapter{%s}" . "\\chapter*{%s}") + ("\\section{%s}" . "\\section*{%}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}") + ("\\paragraph{%s}" . "\\paragraph*{%s}") + ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) + ("labtemplate" "\\documentclass{labtemplate}" + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}") + ("\\paragraph{%s}" . "\\paragraph*{%s}") + ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) + ("beamer" "\\documentclass[presentation]{beamer}" + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) + ("article" "\\documentclass[11pt]{article}" + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}") + ("\\paragraph{%s}" . "\\paragraph*{%s}") + ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) + ("report" "\\documentclass[11pt]{report}" + ("\\part{%s}" . "\\part*{%s}") + ("\\chapter{%s}" . "\\chapter*{%s}") + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) + ("letter" "\\documentclass{letter}" + ("" . "")) + ("book" "\\documentclass[11pt]{book}" + ("\\part{%s}" . "\\part*{%s}") + ("\\chapter{%s}" . "\\chapter*{%s}") + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))) + '(org-latex-default-packages-alist + '(("AUTO" "inputenc" t + ("pdflatex")) + ("T1" "fontenc" t + ("pdflatex")) + ("" "graphicx" t nil) + ("" "grffile" t nil) + ("" "longtable" nil nil) + ("" "wrapfig" nil nil) + ("" "rotating" nil nil) + ("normalem" "ulem" t nil) + ("" "amsmath" t nil) + ("" "textcomp" t nil) + ("" "amssymb" t nil) + ("" "capt-of" nil nil) + ("" "hyperref" nil nil))) + '(org-pandoc-menu-entry + '((61 "to ms-pdf and open." org-pandoc-export-to-ms-pdf-and-open) + (45 "to ms-pdf." org-pandoc-export-to-ms-pdf) + (106 "to json and open." org-pandoc-export-to-json-and-open) + (74 "as json." org-pandoc-export-as-json) + (80 "to pptx." org-pandoc-export-to-pptx) + (120 "to docx and open." org-pandoc-export-to-docx-and-open) + (88 "to docx." org-pandoc-export-to-docx))) + '(python-shell-completion-native-enable nil) + '(warning-suppress-log-types + '((direnv) + (lsp-mode) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp))) + '(warning-suppress-types + '((lsp-mode) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp) + (comp)))) (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. + '(default ((t (:family "JuliaMono" :height 150 :weight normal)))) '(company-preview ((t (:background "#000000" :foreground "#ffffff")))) '(company-preview-common ((t (:inherit company-preview :foreground "#ff00cf")))) '(company-preview-search ((t (:inherit company-preview :background "black")))) @@ -55,6 +144,8 @@ '(company-tooltip ((t (:background "#353535" :foreground "white")))) '(company-tooltip-common ((t (:foreground "magenta")))) '(company-tooltip-mouse ((t (:inherit company-tooltip-selection)))) + '(company-tooltip-scrollbar-thumb ((t (:background "#a22390")))) + '(company-tooltip-scrollbar-track ((t (:background "grey35")))) '(company-tooltip-search ((t (:inherit company-tooltip-selection)))) '(company-tooltip-search-selection ((t (:inherit company-tooltip-selection)))) '(company-tooltip-selection ((t (:background "#4584a2" :foreground "white"))))