From 4e7cdaec80b00baac4636f2b2d6c84ac0c3c2777 Mon Sep 17 00:00:00 2001
From: mprodges <mprodrigues@csphy.pw>
Date: Mon, 28 Feb 2022 21:23:09 +0000
Subject: [PATCH] Manage majority of packages with guix, leaving straight only
 for missing ones.

---
 elisp/extras.el | 52 +++++++++++++++++++++++++------------------------
 init.el         |  6 ++++--
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/elisp/extras.el b/elisp/extras.el
index 4989f16..ba57792 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -37,7 +37,6 @@
   (after-init . doom-modeline-mode))
 
 (use-package dashboard
-  :straight t
   :config
   (dashboard-setup-startup-hook))
 
@@ -58,11 +57,12 @@
    (setq pdf-view-midnight-colors '("#DCDCCC" . "#3F3F3F"))))
 
 (use-package saveplace-pdf-view
+  :straight t
   :config
   (save-place-mode 1))
 
 ;; Disk usage analyzer
-(use-package disk-usage)
+;(use-package disk-usage)
 
 ;; Mail reader
 ;; This package was installed with debian, I hope this works
@@ -82,7 +82,7 @@
 ;  (mu4e-dashboard :type git :host github :repo "rougier/mu4e-dashboard"))
 
 ;; Orthodox file browser
-(use-package sunrise-commander)
+;;(use-package sunrise-commander)
 ;; open files in external applications
 ;;(use-package openwith
 ;;  :config
@@ -94,16 +94,17 @@
 ;; Read feeds
 (use-package elfeed)
 ;; elfeed dashboard
-(use-package elfeed-dashboard
-  :straight
-  (elfeed-dashboard :type git :host github :repo "Manoj321/elfeed-dashboard")
-  :config
-  (setq elfeed-dashboard-file "~/.emacs.d/elfeed-dashboard.org")
+;;(use-package elfeed-dashboard
+;;  :straight
+;;  (elfeed-dashboard :type git :host github :repo "Manoj321/elfeed-dashboard")
+;;  :config
+;;  (setq elfeed-dashboard-file "~/.emacs.d/elfeed-dashboard.org")
   ;; update feed counts on elfeed-quit
-  (advice-add 'elfeed-search-quit-window :after #'elfeed-dashboard-update-links))
+;;  (advice-add 'elfeed-search-quit-window :after #'elfeed-dashboard-update-links))
 
 ;; Write gemtext
-(use-package gemini-mode)
+(use-package gemini-mode
+  :straight t)
 
 ;; Interface with guix package manager
 (use-package guix)
@@ -124,7 +125,7 @@
 (use-package lsp-mode)
 
 ;;R
-(use-package auto-complete)
+;;(use-package auto-complete)
 (use-package ess
   :config
   (load "~/.emacs.d/elisp/ess-setup.el"))
@@ -146,16 +147,16 @@
   (load "~/.emacs.d/elisp/typescript.el"))
 
 ;;Purescript
-(use-package psc-ide
-  :config
-  (load "~/.emacs.d/elisp/purescript.el"))
+;(use-package psc-ide
+;  :config
+;  (load "~/.emacs.d/elisp/purescript.el"))
 
-(use-package org-brain
-  :disabled
-  :init
-  (setq org-brain-path "~/repos/csphy/drafts")
-  :config
-  (load "~/.emacs.d/elisp/org-brain-setup.el"))
+;(use-package org-brain
+;  :disabled
+;  :init
+;  (setq org-brain-path "~/repos/csphy/drafts")
+;  :config
+;  (load "~/.emacs.d/elisp/org-brain-setup.el"))
 
 ;;Geiser
 (use-package geiser)
@@ -166,7 +167,7 @@
   :config
   (setq inferior-lisp-program "clisp"))
 
-;;Rust
+;; Rust
 (use-package rust-mode
   :config
   (load "~/.emacs.d/elisp/rust-setup.el"))
@@ -179,12 +180,12 @@
 
 ;; Python
 (use-package elpy
-  :ensure t
   :init
-  (elpy-enable))
+  (elpy-enable)
+  :config
+  (add-to-list 'process-coding-system-alist '("python" . (utf-8 . utf-8))))
 
 ;(use-package lsp-pyright
-;  :ensure t
 ;  :hook (python-mode . (lambda ()
 ;			 (require 'lsp-pyright)
 ;                         (lsp))))  ; or lsp-deferred
@@ -192,7 +193,8 @@
 
 ;;Ivy related stuff
 (use-package ivy)
-(use-package ivy-bibtex)
+(use-package ivy-bibtex
+  :straight t)
 (use-package counsel)
 (use-package swiper)
 (load "~/.emacs.d/elisp/ivy-setup.el")
diff --git a/init.el b/init.el
index ddcdd1e..99037f4 100644
--- a/init.el
+++ b/init.el
@@ -15,8 +15,10 @@
   (load bootstrap-file nil 'nomessage))
 
 ;; Always use straight.el to install packages with use-package
-(straight-use-package 'use-package)
-(setq straight-use-package-by-default t)
+;;(straight-use-package 'use-package)
+(eval-when-compile
+  (require 'use-package))
+;(setq straight-use-package-by-default t)
 
 ;; Minimal package.el use so we can explore melpa packages
 (require 'package)