summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kolwynia/home/bdunahu.scm214
-rw-r--r--kolwynia/home/bdunahu/files/.config/emacs/init.el3
-rw-r--r--kolwynia/os/garmr.scm2
-rw-r--r--kolwynia/os/hel.scm2
4 files changed, 136 insertions, 85 deletions
diff --git a/kolwynia/home/bdunahu.scm b/kolwynia/home/bdunahu.scm
index b86af48..e2504b2 100644
--- a/kolwynia/home/bdunahu.scm
+++ b/kolwynia/home/bdunahu.scm
@@ -28,56 +28,28 @@
#:use-module ((kolwynia home bdunahu mail) ;gitignored
#:prefix mail:)
#:use-module (gnu home)
- #:export (bdunahu))
+ #:export (bdunahu-main
+ bdunahu-games))
;;; Commentary:
;;; Code:
-(define bdunahu
+(define bdunahu-base-packages
+ `(,@pkgs:emacs
+ ,@pkgs:browser))
+
+(define bdunahu-base
(home-environment
- (packages
- `(,@pkgs:emacs
- ,@pkgs:emacs-desktop
- ,@pkgs:emacs-devel
- ,@pkgs:browser
- ,@pkgs:pass
- ,@pkgs:media
- ,@pkgs:mail
- ,@pkgs:tex
- ,@pkgs:desktop
- ,@pkgs:pdf
- ,@pkgs:fonts
- ,@pkgs:development
- ,@pkgs:reverse-engineering
- ,@pkgs:university
- ,@pkgs:emulators
- ,@pkgs:games))
+ (packages bdunahu-base-packages)
(services
(list (service home-shepherd-service-type)
(service home-dicod-service-type)
(service home-syncthing-service-type)
- (if hel? (service home-startx-command-service-type
- (xorg-configuration
- (modules (cons (specification->package "nvda")
- %default-xorg-modules))
- (drivers '("nvidia"))))
- (service home-startx-command-service-type))
(service home-channels-service-type
- (cons* channel:guix
- channel:tanelorn
- (if hel? (list channel:nonguix) '())))
+ (list channel:guix channel:tanelorn))
(service home-dotfiles-service-type
(home-dotfiles-configuration
(directories '("./bdunahu/files"))))
- (service home-gpg-agent-service-type
- (home-gpg-agent-configuration
- (pinentry-program
- (file-append pinentry-emacs "/bin/pinentry-emacs"))
- (ssh-support? #t)
- (default-cache-ttl 28800)
- (max-cache-ttl 28800)
- (default-cache-ttl-ssh 28800)
- (max-cache-ttl-ssh 28800)))
(service home-xdg-user-directories-service-type
(home-xdg-user-directories-configuration
(desktop "$HOME/dl")
@@ -128,41 +100,6 @@ alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g;
ssh-host:nott
ssh-host:surt
ssh-host:codeberg))))
- (service home-mcron-service-type
- (home-mcron-configuration
- (jobs
- (list
- #~(job
- ;; twenty minutes
- (lambda (current-time) (+ current-time (* 20 60)))
- "offlineimap")
- #~(job
- (lambda (current-time) (+ current-time (* 5 60)))
- "~/.local/bin/set-t1")))))
- (service home-xdg-configuration-files-service-type
- `(("gdbinit"
- ,(plain-file
- (plain-file-name %default-gdbinit)
- (string-append (plain-file-content %default-gdbinit)
- "set disassembly-flavor intel
-set confirm no
-set history filename ~/.cache/gdb/history
-set history save on
-set history size unlimited")))))
- (service home-msmtp-service-type
- (home-msmtp-configuration
- (defaults
- (msmtp-configuration
- (port 587)
- (tls? #t)
- (tls-starttls? #t)
- (log-file "/home/bdunahu/.local/state/msmtp.log")
- (auth? #t)))
- (accounts
- (list
- mail:operationnull
- mail:umass))
- (default-account "operationnull")))
(service home-xdg-mime-applications-service-type
(home-xdg-mime-applications-configuration
(default app:mime-app-alist)
@@ -172,20 +109,133 @@ set history size unlimited")))))
(file "torrent")
(name "Torrent")
(type 'application)
- (config '((exec . "transmission-remote -a %u"))))))))
- (simple-service 'xorg-dot
- home-files-service-type
- `((".Xresources"
- ,(plain-file "Xresources" "
+ (config '((exec . "transmission-remote -a %u"))))))))))))
+
+(define bdunahu-xorg
+ (home-environment
+ (inherit bdunahu-base)
+ (packages
+ `(,@bdunahu-base-packages
+ ,@pkgs:desktop
+ ,@pkgs:emacs-desktop
+ ,@pkgs:fonts
+ ,@pkgs:media
+ ,@pkgs:pdf))
+ (services
+ (cons* (service home-mcron-service-type
+ (home-mcron-configuration
+ (jobs
+ (list
+ #~(job
+ (lambda (current-time) (+ current-time (* 5 60)))
+ "~/.local/bin/set-t1")))))
+ (simple-service 'xorg-dot
+ home-files-service-type
+ `((".Xresources"
+ ,(plain-file "Xresources" "
Nsxiv.window.background: #000000
Nsxiv.window.foreground: #FFFFFF
Nsxiv.bar.font: MedievalSharp:size=9
"))
- (".config/gtk-2.0/settings.ini"
- ,(plain-file "settings.ini" "[Settings]
+ (".config/gtk-2.0/settings.ini"
+ ,(plain-file "settings.ini" "[Settings]
gtk-application-prefer-dark-theme=1\n"))
- (".config/gtk-3.0/settings.ini"
- ,(plain-file "settings.ini" "[Settings]
-gtk-application-prefer-dark-theme=1\n"))))))))
+ (".config/gtk-3.0/settings.ini"
+ ,(plain-file "settings.ini" "[Settings]
+gtk-application-prefer-dark-theme=1\n"))))
+
+ (home-environment-user-services bdunahu-base)))))
+
+(define bdunahu-main
+ (home-environment
+ (inherit bdunahu-xorg)
+ (packages
+ `(,@bdunahu-base-packages
+ ,@pkgs:desktop
+ ,@pkgs:development
+ ,@pkgs:emacs-desktop
+ ,@pkgs:emacs-devel
+ ,@pkgs:emulators
+ ,@pkgs:fonts
+ ,@pkgs:mail
+ ,@pkgs:media
+ ,@pkgs:pass
+ ,@pkgs:pdf
+ ,@pkgs:reverse-engineering
+ ,@pkgs:tex
+ ,@pkgs:university
+ ,@pkgs:games))
+ (services
+ (cons* (service home-startx-command-service-type)
+ (service home-gpg-agent-service-type
+ (home-gpg-agent-configuration
+ (pinentry-program
+ (file-append pinentry-emacs "/bin/pinentry-emacs"))
+ (ssh-support? #t)
+ (default-cache-ttl 28800)
+ (max-cache-ttl 28800)
+ (default-cache-ttl-ssh 28800)
+ (max-cache-ttl-ssh 28800)))
+ (service home-xdg-configuration-files-service-type
+ `(("gdbinit"
+ ,(plain-file
+ (plain-file-name %default-gdbinit)
+ (string-append (plain-file-content %default-gdbinit)
+ "set disassembly-flavor intel
+set confirm no
+set history filename ~/.cache/gdb/history
+set history save on
+set history size unlimited")))))
+ (service home-msmtp-service-type
+ (home-msmtp-configuration
+ (defaults
+ (msmtp-configuration
+ (port 587)
+ (tls? #t)
+ (tls-starttls? #t)
+ (log-file "/home/bdunahu/.local/state/msmtp.log")
+ (auth? #t)))
+ (accounts
+ (list
+ mail:operationnull
+ mail:umass))
+ (default-account "operationnull")))
+
+ (modify-services (home-environment-user-services bdunahu-xorg)
+ (home-mcron-service-type
+ config =>
+ (home-mcron-configuration
+ (jobs
+ (list
+ #~(job
+ ;; twenty minutes
+ (lambda (current-time) (+ current-time (* 20 60)))
+ "offlineimap")
+ #~(job
+ (lambda (current-time) (+ current-time (* 5 60)))
+ "~/.local/bin/set-t1"))))))))))
+
+(define bdunahu-games
+ (home-environment
+ (inherit bdunahu-xorg)
+ (packages `(,@bdunahu-base-packages
+ ,@pkgs:desktop
+ ,@pkgs:emacs-desktop
+ ,@pkgs:fonts
+ ,@pkgs:media
+ ,@pkgs:pdf
+ ,@pkgs:games))
+ (services
+ (cons* (service home-startx-command-service-type
+ (xorg-configuration
+ (modules (cons (specification->package "nvda")
+ %default-xorg-modules))
+ (drivers '("nvidia"))))
+ (modify-services (home-environment-user-services bdunahu-xorg)
+ (home-channels-service-type
+ config =>
+ (list channel:guix
+ channel:tanelorn
+ channel:nonguix)))))))
;;; bdunahu.scm ends here
diff --git a/kolwynia/home/bdunahu/files/.config/emacs/init.el b/kolwynia/home/bdunahu/files/.config/emacs/init.el
index 7243419..cd545fd 100644
--- a/kolwynia/home/bdunahu/files/.config/emacs/init.el
+++ b/kolwynia/home/bdunahu/files/.config/emacs/init.el
@@ -114,7 +114,8 @@
(require 'bd--minibuffer)
(require 'bd--buffer)
(require 'bd--window)
-(require 'bd--devel)
+(if (string= (system-name) "garmr") ; tmp: guix should set env var
+ (require 'bd--devel))
(require 'bd--org)
(require 'bd--notes)
(require 'bd--emms)
diff --git a/kolwynia/os/garmr.scm b/kolwynia/os/garmr.scm
index ad6cace..af93506 100644
--- a/kolwynia/os/garmr.scm
+++ b/kolwynia/os/garmr.scm
@@ -51,7 +51,7 @@
profile-service-type
(list network-manager-applet))
(service guix-home-service-type
- `((,users:bdunahu-str ,bdunahu)))
+ `((,users:bdunahu-str ,bdunahu-main)))
(operating-system-user-services ymir)))
diff --git a/kolwynia/os/hel.scm b/kolwynia/os/hel.scm
index 0aadc0f..5db5d16 100644
--- a/kolwynia/os/hel.scm
+++ b/kolwynia/os/hel.scm
@@ -44,7 +44,7 @@
profile-service-type
(list network-manager-applet))
(service guix-home-service-type
- `((,users:bdunahu-str ,bdunahu)))
+ `((,users:bdunahu-str ,bdunahu-games)))
(service nvidia-service-type)
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-15 21:57:40 +0000