diff options
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--devel.el | 13 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--erc.el | 1 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--files.el | 2 | ||||
| -rw-r--r-- | .config/guix/emacs-manifest.scm | 1 | ||||
| -rw-r--r-- | .config/guix/kvasir.scm | 69 |
6 files changed, 44 insertions, 44 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 05f5deb..900681f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -54,7 +54,7 @@ (require 'bd--rss) (require 'bd--eww) (require 'bd--tabs) -(require 'bd--dired) +(require 'bd--files) (require 'bd--image) (require 'bd--dictionary) (require 'bd--erc) diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el index 08c2a91..1c5c64f 100644 --- a/.config/emacs/modules/bd--devel.el +++ b/.config/emacs/modules/bd--devel.el @@ -42,11 +42,8 @@ to.") (electric-pair-mode 1) -(use-package rainbow-mode) - -(use-package rainbow-delimiters - :hook (prog-mode . rainbow-delimiters-mode)) - +(use-package rainbow-mode + :hook css-mode) (use-package magit :commands magit-status @@ -77,5 +74,11 @@ to.") ;; more memory for ml libraries (inferior-lisp-program "sbcl --dynamic-space-size 4096")) +(use-package rainbow-delimiters + :hook prog-mode) + +(use-package paredit + :hook prog-mode) + (provide 'bd--devel) diff --git a/.config/emacs/modules/bd--erc.el b/.config/emacs/modules/bd--erc.el index 9370e36..8a5165f 100644 --- a/.config/emacs/modules/bd--erc.el +++ b/.config/emacs/modules/bd--erc.el @@ -11,6 +11,7 @@ erc-autojoin-channels-alist '(("libera.chat" "#emacs" "##furry" + "#guile" "#guix" "#parabola")) erc-fill-function 'erc-fill-static diff --git a/.config/emacs/modules/bd--files.el b/.config/emacs/modules/bd--files.el index 49e819a..54191be 100644 --- a/.config/emacs/modules/bd--files.el +++ b/.config/emacs/modules/bd--files.el @@ -27,7 +27,7 @@ (require 'all-the-icons) (use-package all-the-icons-dired :hook - ((dired-mode . all-the-icons-dired-mode))) + ((dired-mode . #'all-the-icons-dired-mode))) ;;;; transmission diff --git a/.config/guix/emacs-manifest.scm b/.config/guix/emacs-manifest.scm index 334cb90..73f46cf 100644 --- a/.config/guix/emacs-manifest.scm +++ b/.config/guix/emacs-manifest.scm @@ -18,6 +18,7 @@ "emacs-notmuch" "emacs-orderless" "emacs-org-roam" + "emacs-paredit" "emacs-popper" "emacs-rainbow-delimiters" "emacs-rainbow-mode" diff --git a/.config/guix/kvasir.scm b/.config/guix/kvasir.scm index 1667f46..3260a28 100644 --- a/.config/guix/kvasir.scm +++ b/.config/guix/kvasir.scm @@ -3,7 +3,7 @@ ;; OS declaration for 'kvasir', a bootable usb. ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-module (vali) +(define-module (kvasir) #:use-module (ymir) #:use-module (gnu) #:use-module (gnu home) @@ -23,39 +23,34 @@ (define system (operating-system - (inherit ymir) - (host-name "kvasir") - - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - "8A13-7018" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/") - (device (uuid - "69a3593b-12bd-40ad-a932-007674a8cfe8")) - (type "ext4")) %base-file-systems)))) - -(define MiB (expt 2 20)) -(define GiB (expt 2 30)) - -(image - (format 'disk-image) - (operating-system system) - (partitions - (list - (partition - (size (* 40 MiB)) - (offset (* 1024 1024)) - (label "GNU-ESP") - (file-system "vfat") - (flags '(esp)) - (initializer (gexp initialize-efi-partition))) - (partition - (size (* 28 GiB)) - (label root-label) - (file-system "ext4") - (flags '(boot)) - (initializer (gexp initialize-root-partition)))))) + (inherit ymir) + (host-name "kvasir") + + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + "8A13-7018" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/") + (device (uuid + "69a3593b-12bd-40ad-a932-007674a8cfe8")) + (type "ext4")) %base-file-systems)))) + +(define home + (home-environment + (packages + `(,@desktop-packages + ,@program-packages)) + + (services + `(,@xdg-service + ,@shell-service + ,@ssh-service + ,@gpg-service + ,@base-services + ,@xmodmap-service)))) + + +(if (getenv "RUNNING_GUIX_HOME") home system) |