changing stuff

1 files changed, 24 insertions, 31 deletions

diff --git a/emacs/init.el b/emacs/init.el
index b6f82c6..f4d3348 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -18,6 +18,7 @@
 (setq jrk/font-big-size 24)
 (setq jrk/font (concat jrk/font-name (number-to-string jrk/font-size)))
 (modify-all-frames-parameters `((font . ,jrk/font)))
+(load-theme 'gruber-darker t)
 
 (set-default 'truncate-lines nil)
 
@@ -66,7 +67,7 @@
 
 (require 'package)
 (add-to-list 'package-archives
-             '("melpa-stable" . "https://stable.melpa.org/packages/") t)
+             '("melpa" . "https://melpa.org/packages/") t)
 
 (use-package compile
   :ensure t
@@ -78,16 +79,11 @@
 (use-package modus-themes
   :ensure t
   :config
-  (setq modus-themes-org-blocks 'gray-background)
-  (load-theme 'modus-operandi t))
+  (setq modus-themes-org-blocks 'gray-background))
 
 (use-package ef-themes
   :ensure t)
 
-;;; TODO: make guix package
-;; (use-package gruber-darker-theme
-;;   :ensure t)
-
 (use-package minions
   :ensure t
 
@@ -132,26 +128,13 @@
   :ensure t
   :init
   (vertico-mode 1)
-  (setq vertico-cycle t)
-  :config
-  (setq vertico-multiform-categories
-        '((consult-grep
-           buffer
-           (vertico-buffer-display-action . (display-buffer-same-window))))))
+  (setq vertico-cycle t))
 
 (use-package orderless
   :ensure t
-  :init
-  ;; Configure a custom style dispatcher (see the Consult wiki)
-  ;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch)
-  ;;       orderless-component-separator #'orderless-escapable-split-on-space)
-  (setq completion-styles '(orderless basic)
-        completion-category-defaults nil
-        completion-category-overrides '((file (styles partial-completion))))
-  :config
-  (vertico-multiform-mode)
-  (setq vertico-multiform-categories
-        '((consult-grep buffer))))
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-overrides '((file (styles basic partial-completion)))))
 
 (use-package dired
   :ensure nil
@@ -235,7 +218,7 @@
                       (display-line-numbers-mode -1))))
 
 (use-package org-tempo
-  :ensure t
+  :ensure nil
   :after (org)
   :config
   (add-to-list 'org-structure-template-alist
@@ -243,11 +226,10 @@
 
 (use-package org-bullets
   :ensure t
-  :after (org)
-  :ensure
-  :hook
-  (org-mode . (lambda ()
-                (org-bullets-mode))))
+  :after (org))
+  ;; :hook
+  ;; (org-mode . (lambda ()
+  ;;               (org-bullets-mode))))
 
 (use-package ido
   :ensure t
@@ -294,6 +276,17 @@
                         '(("internal" . font-lock-keyword-face)
                           ("global" . 'font-lock-keyword-face)))
 
+(use-package web-mode
+  :ensure t)
+  ;; :hook
+  ;; (web-mode . (lambda ()
+  ;;               (setq tab-width 2
+  ;;                     web-mode-style-padding 2
+  ;;                     web-mode-script-padding 2
+  ;;                     web-mode-markup-indent-offset 2
+  ;;                     web-mode-code-indent-offset 2
+  ;;                     setq web-mode-css-indent-offset 2))))
+
 (defun jrk/eshell ()
   "Open eshell in other window"
   (interactive)
@@ -345,7 +338,7 @@
 ;; Sets the default compile command based on OS
 (if (string= system-type "windows-nt")
     (setq compile-command "build.bat")
-  (setq compile-command "guix shell -m ./manifest.scm -- ./build.sh"))
+  (setq compile-command "./build.sh"))
 
 (defun jrk/disable-all-themes ()
   "Disables all active themes."