Guix and emacs config cleanup

emacs/.emacs.d/init.el

@@ -14,7 +14,7 @@
 
 (advice-add 'risky-local-variable-p :override #'ignore)
 
-;; Increase buffers and whatnot for lsp-mode
+;; Increase various buffers for lsp-mode
 (setq read-process-output-max (* 1024 1024)) ;; 1mb
 (setq gc-cons-threshold 100000000)
 
@@ -44,7 +44,6 @@
   (setq which-key-idle-delay 0.3))
 
 (use-package markdown-mode
-  :ensure t
   :mode ("README\\.md\\'" . gfm-mode)
   :init
   (setq markdown-asymmetric-header nil)

emacs/.emacs.d/modules/jg-core.el

@@ -28,8 +28,8 @@
 (setq initial-scratch-message nil)
 
 ;; Disable menu, tool and scroll bars
-(menu-bar-mode -1)  
-(tool-bar-mode -1) 
+(menu-bar-mode -1)
+(tool-bar-mode -1)
 (scroll-bar-mode -1)
 
 ;; line numbers

emacs/.emacs.d/modules/jg-dev.el

@@ -30,7 +30,7 @@
 
 (use-package company
   :after lsp-mode
-  :hook (lsp-mode . company-mode)
+  :hook (lsp-mode company)
   :bind (:map company-active-map
          ("<tab>" . company-complete-selection))
         (:map lsp-mode-map
@@ -40,7 +40,7 @@
   (company-idle-delay 0.0))
 
 (use-package lsp-ui
-  :hook (lsp-mode . lsp-ui-mode)
+  :hook (lsp-mode lsp-ui)
   :custom
   (lsp-ui-doc-position 'bottom)
   :commands lsp-ui-mode)
@@ -77,7 +77,7 @@
   :ensure nil
   :hook (python-mode . lsp-deferred)
   :custom
-  ;; NOTE: Set these if Python 3 is called "python3" on your system!
+  ;; Look for python3 rather than python
   (python-shell-interpreter "python3")
   (dap-python-executable "python3")
   (dap-python-debugger 'debugpy)

emacs/.emacs.d/modules/jg-package.el

@@ -2,9 +2,11 @@
 
 (require 'package)
 
+;;;; Code:
+
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
                          ("org" . "https://orgmode.org/elpa/")
-                         ("elpa" . "https://elpa.gnu.org/packages/")    ))
+                         ("elpa" . "https://elpa.gnu.org/packages/")))
 
 (package-initialize)
 (unless package-archive-contents
@@ -16,3 +18,4 @@
 (setq use-package-always-ensure t)
 
 (provide 'jg-package)
+;;; jg-package.el ends here

guix/config.scm

@@ -1,6 +1,5 @@
 ;; This is an operating system configuration template
-;; for a "desktop" setup with GNOME and Xfce where the
-;; root partition is encrypted with LUKS, and a swap file.
+;; for a "desktop" setup with Sway and Wayland.
 
 (use-modules (gnu) (gnu packages) 
 	(gnu system nss)
@@ -50,7 +49,7 @@
 
   ;; Specify a swap file for the system, which resides on the
   ;; root file system.
-  (swap-devices '("/dev/nvme0n1p2"))
+ ;; (swap-devices '("/dev/nvme0n1p2"))
 
   ;; Create user `bob' with `alice' as its initial password.
   (users (append

guix/guix-home-config.scm

@@ -6,14 +6,20 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services shells)
   #:use-module (gnu services)
-  #:use-module (gnu system shadow))
+  #:use-module (gnu system shadow)
+  #:use-module (gnu packages))
 
 (define home-config
   (home-environment
+   (packages (specifications->packages
+              (list "git"
+                    "emacs-no-x-toolkit"
+                    "foot")))
+   
     (services
       (list
         ;; Uncomment the shell you wish to use for your user:
-        ;(service home-bash-service-type)
+        (service home-bash-service-type)
         ;(service home-fish-service-type)
         ;(service home-zsh-service-type)
 
@@ -25,4 +31,4 @@
          `(("gdb/gdbinit" ,%default-gdbinit)
            ("nano/nanorc" ,%default-nanorc)))))))
 
-home-config
+home-config