emacs and neovim colorscheme stuff

emacs/.config/emacs/Emacs.org

@@ -113,33 +113,33 @@
 ** Theme
 *** Modus Themes
 #+begin_src emacs-lisp
-  (use-package emacs
+  ;; (use-package emacs
-    :ensure nil
+  ;;   :ensure nil
-    :config
+  ;;   :config
-    (require-theme 'modus-themes)
+  ;;   (require-theme 'modus-themes)
-    (setq modus-themes-italic-constructs t
+  ;;   (setq modus-themes-italic-constructs t
-          modus-themes-bold-constructs t
+  ;;         modus-themes-bold-constructs t
-  	modus-themes-links '(no-underline background faint)
+  ;; 	modus-themes-links '(no-underline background faint)
-          modus-themes-prompts '(bold intense)
+  ;;         modus-themes-prompts '(bold intense)
-          modus-themes-mode-line '(borderless accented moody)
+  ;;         modus-themes-mode-line '(borderless accented moody)
-          modus-themes-org-blocks 'gray-background
+  ;;         modus-themes-org-blocks 'gray-background
-          modus-themes-region '(bg-only no-extend))
+  ;;         modus-themes-region '(bg-only no-extend))
-    (load-theme 'modus-operandi :no-confirm))
+  ;;   (load-theme 'modus-operandi :no-confirm))
 #+end_src
 *** Autodark
 #+begin_src emacs-lisp
-  (use-package auto-dark
+  ;; (use-package auto-dark
-    :ensure t
+  ;;   :ensure t
-    :custom
+  ;;   :custom
-    (auto-dark-themes '((modus-vivendi) (modus-operandi)))
+  ;;   (auto-dark-themes '((modus-vivendi) (modus-operandi)))
-    :init (auto-dark-mode))
+  ;;   :init (auto-dark-mode))
 #+end_src
 *** Catpuccin
 #+begin_src emacs-lisp
-  ;; (use-package catppuccin-theme
+   (use-package catppuccin-theme
-  ;;   :init (setq catppuccin-flavor 'mocha)
+     :init (setq catppuccin-flavor 'mocha)
-  ;;   :config
+     :config
-  ;;   (load-theme 'catppuccin :no-confirm))
+     (load-theme 'catppuccin :no-confirm))
 #+end_src
 ** Ultra Scroll
 #+begin_src emacs-lisp
@@ -433,6 +433,9 @@ I don't really use markdown ([[Org Mode]] is a strict improvement imo), but it's
 #+end_src
 * Org Mode
 ** Org itself
+#+begin_src elisp
+  (package-vc-install '(org-mode :url "https://code.tecosaur.net/tec/org-mode" :branch "dev"))
+#+end_src
 I use [[https://abode.karthinks.com/org-latex-preview/][this]] fork of org-mode in order to have amazing latex previews. /Make sure to follow the installation instructions!/ It's supposed to eventually be merged into org proper, which is very exciting. I'm already pretty dependent on this feature (the previews are just that good), so I'll have to use this until it gets merged, but that's fine with me.
 #+begin_src emacs-lisp
   (use-package org-mode

nvim/.config/nvim/lua/plugins/colors.lua

@@ -3,28 +3,28 @@ return {
         'norcalli/nvim-colorizer.lua',
         config = true
     },
-    -- {
-    --     'catppuccin/nvim',
-    --     name = 'catppuccin',
-    --     priority = 1000,
-    --     config = function()
-    --         require('catppuccin').setup({
-    --             transparent_background = true,
-    --         })
-    --         vim.cmd.colorscheme([[catppuccin-mocha]])
-    --     end
-    -- },
     {
-        "Mofiqul/adwaita.nvim",
+        'catppuccin/nvim',
-        lazy = false,
+        name = 'catppuccin',
         priority = 1000,
-
-        -- configure and set on startup
         config = function()
-            vim.g.adwaita_darker = true             -- for darker version
+            require('catppuccin').setup({
-            -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline
+                transparent_background = true,
-            vim.g.adwaita_transparent = true        -- makes the background transparent
+            })
-            vim.cmd('colorscheme adwaita')
+            vim.cmd.colorscheme([[catppuccin-mocha]])
         end
-    }
+    },
+    -- {
+    --     "Mofiqul/adwaita.nvim",
+    --     lazy = false,
+    --     priority = 1000,
+    --
+    --     -- configure and set on startup
+    --     config = function()
+    --         vim.g.adwaita_darker = true             -- for darker version
+    --         -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline
+    --         vim.g.adwaita_transparent = true        -- makes the background transparent
+    --         vim.cmd('colorscheme adwaita')
+    --     end
+    -- }
 }