Add steam, modified picom to hel, xauth to both systems

1 files changed, 60 insertions, 54 deletions

diff --git a/kolwynia/home/bdunahu/packages.scm b/kolwynia/home/bdunahu/packages.scm
index 7d0e510..450ab9b 100644
--- a/kolwynia/home/bdunahu/packages.scm
+++ b/kolwynia/home/bdunahu/packages.scm
@@ -3,6 +3,7 @@
   #:use-module (gnu)
   #:use-module (gnu system)
   #:use-module (guix packages)
+  #:use-module (kolwynia utils)
   #:use-module (tanelorn packages fonts)
   #:use-module (tanelorn packages wm)
   #:use-module (tanelorn packages engineering)
@@ -22,61 +23,65 @@
             emulators
             games))
 
+(when hel?
+  (use-modules (nongnu packages nvidia)
+               (nongnu packages game-client)))
+
 ;;; Commentary:
 ;;; Code:
 
 (use-package-modules
- admin ;; netcat
- algebra ;; bc
- aspell ;; aspell, aspell-dict-en
- assembly ;; nasm
- base ;; make
- chromium ;; ungoogled-chromium
- clojure ;; clojure
- commencement ;; gcc-toolchain
- compton ;; picom
- cpp ;; ccls
- education ;; anki
- emacs-build ;; emacs-dash
- emacs ;; emacs-next
- emacs-xyz ;; emacs-emms, etc.
- emulators ;; mupen64plus*, bsnes, mgba
- engineering ;; radare2, iaito
- fonts ;; font-terminus, font-openmoji
- fontutils ;; fontconfig
- freedesktop ;; xdg-utils
- games ;; nethack
- gdb ;; gdb
- gimp ;; gimp-next
- gnome ;; brightnessctl
- gnupg ;; gnupg, pinentry-emacs
- graphviz ;; graphviz
- haskell-xyz ;; pandoc
- image ;; flameshot
- imagemagick ;; imagemagick
- image-viewers ;; feh, nsxiv
- libreoffice ;; libreoffice
- librewolf ;; librewolf
- linux ;; tlp, alsa-plugins
- lisp ;; sbcl
- luanti ;; luanti
+ admin            ;; netcat
+ algebra          ;; bc
+ aspell           ;; aspell, aspell-dict-en
+ assembly         ;; nasm
+ base             ;; make
+ chromium         ;; ungoogled-chromium
+ clojure          ;; clojure
+ commencement     ;; gcc-toolchain
+ compton          ;; picom
+ cpp              ;; ccls
+ education        ;; anki
+ emacs-build      ;; emacs-dash
+ emacs            ;; emacs-next
+ emacs-xyz        ;; emacs-emms, etc.
+ emulators        ;; mupen64plus*, bsnes, mgba
+ engineering      ;; radare2, iaito
+ fonts            ;; font-terminus, font-openmoji
+ fontutils        ;; fontconfig
+ freedesktop      ;; xdg-utils
+ games            ;; nethack
+ gdb              ;; gdb
+ gimp             ;; gimp-next
+ gnome            ;; brightnessctl
+ gnupg            ;; gnupg, pinentry-emacs
+ graphviz         ;; graphviz
+ haskell-xyz      ;; pandoc
+ image            ;; flameshot
+ imagemagick      ;; imagemagick
+ image-viewers    ;; feh, nsxiv
+ libreoffice      ;; libreoffice
+ librewolf        ;; librewolf
+ linux            ;; tlp, alsa-plugins
+ lisp             ;; sbcl
+ luanti           ;; luanti
  machine-learning ;; llama-cpp
- mail ;; offlineimap
- password-utils ;; pass-otp, password-store
- pdf ;; xpdf, pdfgrep, zathura, zathura-pdf-mupdf
- photo ;; perl-image-exiftool
- pkg-config ;; pkg-config
- pulseaudio ;; pavucontrol, pulseaudio,
- python ;; python
- python-xyz ;; python-lsp-server
- rsync ;; rsync
- texlive ;; texlive, texlive-biber
- tex ;; texlive-dvipng
- tor-browsers ;; torbrowser
- video ;; ffmpeg, mpv, yt-dlp
- virtualization ;; qemu
- web ;; jq
- xdisorg ;; xdotool, xrdb, wmctrl
+ mail             ;; offlineimap
+ password-utils   ;; pass-otp, password-store
+ pdf              ;; xpdf, pdfgrep, zathura, zathura-pdf-mupdf
+ photo            ;; perl-image-exiftool
+ pkg-config       ;; pkg-config
+ pulseaudio       ;; pavucontrol, pulseaudio,
+ python           ;; python
+ python-xyz       ;; python-lsp-server
+ rsync            ;; rsync
+ texlive          ;; texlive, texlive-biber
+ tex              ;; texlive-dvipng
+ tor-browsers     ;; torbrowser
+ video            ;; ffmpeg, mpv, yt-dlp
+ virtualization   ;; qemu
+ web              ;; jq
+ xdisorg          ;; xdotool, xrdb, wmctrl
  xorg) ;; xf86-input-libinput, xf86-video-fbdev, xinit...
 
 
@@ -152,13 +157,13 @@
   (list alsa-plugins
         eww/x11
         pavucontrol
-        picom
+        (if hel? (replace-mesa picom) picom)
         pulseaudio
         setxkbmap
+        xauth
         xdg-utils
         xf86-input-libinput
         xf86-video-fbdev
-        xinit
         xinput
         xkbcomp
         xorg-server
@@ -215,7 +220,8 @@
         mupen64plus-video-glide64mk2))
 
 (define games
-  (list crawl-tiles
-        luanti))
+  (cons* crawl-tiles
+         luanti
+         (if hel? (list steam-nvidia) '())))
 
 ;;; packages.scm ends here