diff options
Diffstat (limited to '.config/guix/modules')
| -rw-r--r-- | .config/guix/modules/base.scm | 16 | ||||
| -rw-r--r-- | .config/guix/modules/emacs.scm | 1 | ||||
| -rw-r--r-- | .config/guix/modules/wayland.scm | 47 | ||||
| -rw-r--r-- | .config/guix/modules/xorg.scm | 13 |
4 files changed, 61 insertions, 16 deletions
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index c84a8de..290e32b 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -32,13 +32,12 @@ cryptsetup ;; cryptsetup curl ;; curl databases ;; recutils - emacs ;; emacs fonts ;; font-google-noto-emoji, font-terminus fontutils ;; fontconfig - gimp ;; gimp - gnupg ;; gnupg, pinentry, + gimp ;; gimp-next + gnupg ;; gnupg, pinentry, pinentry-emacs gnuzilla ;; icecat - gtk ;; gtk+ + image ;; flameshot imagemagick ;; imagemagick librewolf ;; librewolf mail ;; notmuch, offlineimap @@ -62,14 +61,13 @@ offlineimap3 pass-otp password-store - pinentry + pinentry-emacs transmission xpdf ; pdftotext yt-dlp cryptsetup curl - emacs git jq netcat @@ -84,11 +82,11 @@ (define desk (list ffmpeg + flameshot fontconfig font-google-noto-emoji font-terminus - gimp - gtk+ + gimp-next icecat imagemagick librewolf @@ -158,7 +156,7 @@ (service home-gpg-agent-service-type (home-gpg-agent-configuration (pinentry-program - (file-append pinentry "/bin/pinentry")) + (file-append pinentry-emacs "/bin/pinentry-emacs")) (ssh-support? #t))) (service home-bash-service-type diff --git a/.config/guix/modules/emacs.scm b/.config/guix/modules/emacs.scm index b78c2d5..de75e9d 100644 --- a/.config/guix/modules/emacs.scm +++ b/.config/guix/modules/emacs.scm @@ -41,6 +41,7 @@ emacs-orderless emacs-org-roam emacs-paredit + emacs-pinentry emacs-popper emacs-rainbow-delimiters emacs-rainbow-mode diff --git a/.config/guix/modules/wayland.scm b/.config/guix/modules/wayland.scm new file mode 100644 index 0000000..eac31b9 --- /dev/null +++ b/.config/guix/modules/wayland.scm @@ -0,0 +1,47 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Provides a set of my preferred program ;; +;; and services for wayland desktops ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-module (modules wayland) + #:use-module (dwl-guile packages) + #:use-module (gnu) + #:use-module (gnu home services) + #:use-module (gnu home services desktop) + #:use-module (gnu home services sound) + #:use-module (guix gexp) + #:use-module (guix packages) + #:export (bd-desktop-system-packages + bd-desktop-home-services)) + +(use-service-modules audio desktop networking + sound) + +(use-package-modules + emacs ;; emacs-pgtk + image-viewers ;; imv + qt ;; qt-wayland, qt-base + wm ;; sway-bg, mako + xdisorg ;; bemenu + ) + +(define bd-desktop-system-packages + (list + bemenu + dwl-guile + emacs-pgtk + imv + mako + qtbase + qtwayland + swaybg + )) + +;; (define bd-desktop-system-services +;; (list +;; )) + +(define bd-desktop-home-services + (list + (service home-pipewire-service-type) + (service home-dbus-service-type))) diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm index 9a94f8b..eb057bc 100644 --- a/.config/guix/modules/xorg.scm +++ b/.config/guix/modules/xorg.scm @@ -8,7 +8,6 @@ #:use-module (gnu) #:use-module (gnu home services) #:use-module (gnu home services desktop) - #:use-module (gnu home services shells) #:use-module (guix gexp) #:use-module (guix packages) #:export (bd-desktop-system-packages @@ -19,14 +18,14 @@ sound xorg) (use-package-modules - image ;; flameshot, - suckless ;; dmenu, - gnome ;; libnotify, - pulseaudio ;; pavucontrol, pulseaudio, compton ;; picom + emacs ;; emacs + gnome ;; libnotify, image-viewers ;; sxiv, feh - xorg ;; xprop, xf86-input-libinput, xf86-video-fbdev, xinit... + pulseaudio ;; pavucontrol, pulseaudio, + suckless ;; dmenu, xdisorg ;; xdotool + xorg ;; xprop, xf86-input-libinput, xf86-video-fbdev, xinit... ) (define dwm-package @@ -39,7 +38,7 @@ (define bd-desktop-system-packages (list dmenu - flameshot + emacs libnotify pavucontrol picom |