aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2026-03-10 09:34:22 -0700
committerGravatar Tom Willemse2026-03-30 10:27:49 -0700
commitbd8789b9fe35828432777cf42fc8191ed9419655 (patch)
treebe8b10b1a5e6fc338a71a21928b1ef3e2428373a
parent7dd3388daf58981904d43cf6b5c065a10cf62174 (diff)
downloadnew-dotfiles-bd8789b9fe35828432777cf42fc8191ed9419655.tar.gz
new-dotfiles-bd8789b9fe35828432777cf42fc8191ed9419655.zip
pop-os: Simplify package listing
-rw-r--r--oni/home/config/pop-os.scm93
1 files changed, 39 insertions, 54 deletions
diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index ab6add4..0e3e9df 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -4,21 +4,10 @@
#:use-module ((gnu home services gnupg)
#:select (home-gpg-agent-service-type
home-gpg-agent-configuration))
- #:use-module ((gnu packages)
- #:select (specification->package+output))
- #:use-module ((gnu packages admin)
- #:select (htop))
- #:use-module ((gnu packages emacs)
- #:select (emacs))
- #:use-module (gnu packages emacs-xyz)
- #:use-module ((gnu packages hunspell)
- #:select (hunspell
- hunspell-dict-en-ca))
- #:use-module ((gnu packages music)
- #:select (playerctl))
- #:use-module ((gnu packages pulseaudio)
- #:select (pamixer))
- #:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages emacs)
+ #:use-module (gnu packages music)
+ #:use-module (gnu packages pulseaudio)
#:use-module ((gnu services)
#:select (service))
#:use-module ((guix gexp)
@@ -207,20 +196,39 @@
(home-module
(packages (append
foreign-distro-compatibility-packages
- (list (specification->package+output "font-fantasque-sans")
- (specification->package+output "font-dosis")
- (specification->package+output "font-comic-neue")
- (specification->package "wezterm")
- (specification->package "tree-sitter-php")
- (specification->package "tree-sitter-phpdoc")
- (specification->package "tree-sitter-html")
- (specification->package "tree-sitter-javascript")
- (specification->package "tree-sitter-jsdoc")
- (specification->package "tree-sitter-css")
- (specification->package "emacs-popup")
- (specification->package "emacs-git-messenger")
- (specification->package "emacs-csv-mode")
- emacs-oni-core
+ (map specification->package '("font-fantasque-sans"
+ "font-dosis"
+ "wezterm"
+ "tree-sitter-php"
+ "tree-sitter-phpdoc"
+ "tree-sitter-html"
+ "tree-sitter-javascript"
+ "tree-sitter-jsdoc"
+ "tree-sitter-css"
+ "emacs-popup"
+ "emacs-git-messenger"
+ "emacs-csv-mode"
+ "htop"
+ "emacs-deft"
+ "emacs-dashboard"
+ "emacs-org-mem"
+ "emacs-typescript-mode"
+ "hunspell"
+ "hunspell-dict-en-ca"
+ "emacs-dired-git-info"
+ "playerctl"
+ "pamixer"
+ ;; need to have a file
+ ;; /etc/udev/rules.d/40-monitor-hotplug.rules
+ ;; ACTION=="change", SUBSYSTEM=="drm", RUN+="/var/guix/profiles/per-user/tomwillemsen/guix-home/profile/bin/autorandr --batch --change --default default"
+ "autorandr"
+ "emacs-guix"
+ "emacs-rainbow-identifiers"
+ "emacs-forge"
+ "emacs-vundo"
+ "emacs-sops"
+ "emacs-dockerfile-mode"))
+ (list emacs-oni-core
emacs-oni-compilation
emacs-oni-common-lisp
emacs-oni-browse-url
@@ -242,41 +250,18 @@
emacs-oni-grep
emacs-oni-shr
emacs-oni-css
- emacs-dockerfile-mode
emacs-oni-yaml
emacs-oni-web-mode
emacs-oni-php
emacs-oni-projectile
- htop
- ;; emacs-php-ts-mode
emacs-oni-lua
emacs-oni-sh
- emacs-deft
- emacs-dashboard
- emacs-flycheck-phpstan
- emacs-org-mem
- emacs-typescript-mode
emacs-oni-js
- hunspell
- hunspell-dict-en-ca
- emacs-dired-git-info
emacs-oni-elfeed
- shutdown-rofi
- playerctl
- pamixer
- ;; need to have a file
- ;; /etc/udev/rules.d/40-monitor-hotplug.rules
- ;; ACTION=="change", SUBSYSTEM=="drm", RUN+="/var/guix/profiles/per-user/tomwillemsen/guix-home/profile/bin/autorandr --batch --change --default default"
- autorandr
-
- emacs-guix
- emacs-rainbow-identifiers
- emacs-forge
-
- emacs-vundo
+ emacs-flycheck-phpstan
- emacs-sops)))
+ shutdown-rofi)))
(services (append
home-zsh-services
(list home-channels-service