Reorganize! Delete cruft! Use guix home!

12 files changed, 132 insertions, 239 deletions

diff --git a/aigis.scm b/aigis.scm
deleted file mode 100644
index 46bdb82..0000000
--- a/aigis.scm
+++ /dev/null
@@ -1,64 +0,0 @@
-;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;;
-;;; This program is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation; either version 3 of the
-;;; License, or (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see
-;;; <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; HTPC configuration.
-
-(use-modules (srfi srfi-1)
-             (gnu)
-             (gnu services))
-(use-service-modules desktop networking ssh xorg)
-(use-package-modules certs kodi rsync)
-
-(define (wicd-service? service)
-  (eq? (service-kind service) wicd-service-type))
-
-(operating-system
-  (host-name "aigis")
-  (timezone "America/New_York")
-  (locale "en_US.UTF-8")
-  (bootloader (grub-configuration (device "/dev/sda")))
-  (file-systems (cons* (file-system
-                        (device "root")
-                        (title 'label)
-                        (mount-point "/")
-                        (type "ext4"))
-                       (file-system
-                        (device "home")
-                        (title 'label)
-                        (mount-point "/home")
-                        (type "ext4"))
-                       %base-file-systems))
-  (users (list (user-account
-                (name "dave")
-                (comment "David Thompson")
-                (group "users")
-                (supplementary-groups '("wheel" "netdev" "audio"
-                                        "video" "cdrom"))
-                (home-directory "/home/dave"))))
-  (packages (cons* nss-certs rsync %base-packages))
-  (services
-   (let ((kodi-session #~(string-append #$kodi "/bin/kodi-standalone")))
-     (cons* (static-networking-service "enp0s10" "192.168.1.222")
-            (lsh-service #:initialize? #t)
-            (modify-services (remove wicd-service? %desktop-services)
-              (slim-service-type config =>
-                                 (slim-configuration
-                                  (inherit config)
-                                  (auto-login? #t)
-                                  (default-user "dave")
-                                  (auto-login-session kodi-session))))))))
diff --git a/common-home.scm b/common-home.scm
new file mode 100644
index 0000000..e4b979c
--- /dev/null
+++ b/common-home.scm
@@ -0,0 +1,39 @@
+;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
+;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(use-modules (gnu home)
+             (gnu packages)
+             (gnu services)
+             (guix gexp)
+             (gnu home services)
+             (gnu home services shells))
+
+(define (dotfiles . file-names)
+  (define dir (dirname (current-filename)))
+  (map (lambda (file-name)
+         (list file-name
+               (local-file (string-append dir "/dotfiles/" file-name)
+                           (string-append "dotfile-" (basename file-name)))))
+       file-names))
+
+(define common-services
+  (list (service home-bash-service-type
+                 (home-bash-configuration
+                  (aliases '(("grep" . "grep --color=auto")
+                             ("ls" . "ls -ahlp --color=auto")))))
+        (simple-service 'dotfiles
+                        home-files-service-type
+                        (dotfiles ".emacs.d/init.el" ".guile"))))
diff --git a/ikaruga-home.scm b/ikaruga-home.scm
new file mode 100644
index 0000000..9b1e9b4
--- /dev/null
+++ b/ikaruga-home.scm
@@ -0,0 +1,71 @@
+;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
+;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(include "common-home.scm")
+
+(home-environment
+ (packages (specifications->packages
+            '("emacs"
+              "emacs-better-defaults"
+              "emacs-buffer-env"
+              "emacs-doom-modeline"
+              "emacs-doom-themes"
+              "emacs-flycheck-guile"
+              "emacs-geiser-guile"
+              "emacs-htmlize"
+              "emacs-js2-mode"
+              "emacs-magit"
+              "emacs-magit-annex"
+              "emacs-markdown-mode"
+              "emacs-org-reveal"
+              "emacs-paredit"
+              "emacs-racket-mode"
+              "emacs-rainbow-delimiters"
+              "emacs-smex"
+              "emacs-typo"
+              "emacs-use-package"
+              "emacs-web-mode"
+              "emacs-which-key"
+              "emacs-yaml-mode"
+              "firefox"
+              "font-google-noto-sans-cjk"
+              "font-google-noto-serif-cjk"
+              "font-inconsolata"
+              "gimp"
+              "git"
+              "git:send-email"
+              "git-annex"
+              "gnome-tweaks"
+              "gnupg"
+              "gst-plugins-bad"
+              "guile@3"
+              "keepassxc"
+              "libreoffice"
+              "libresprite"
+              "milkytracker"
+              "ncurses"
+              "obs"
+              "openssh"
+              "pavucontrol"
+              "pinentry"
+              "sfxr"
+              "sicp"
+              "steam"
+              "strace"
+              "tor"
+              "ungoogled-chromium"
+              "xournal")))
+ (services common-services))
diff --git a/ikaruga.scm b/ikaruga-os.scm
index c22883d..ac341bb 100644
--- a/ikaruga.scm
+++ b/ikaruga-os.scm
@@ -79,7 +79,7 @@
                                   (append (list "https://substitutes.nonguix.org")
                                           %default-substitute-urls))
                                  (authorized-keys
-                                  (append (list (local-file "./nonguix-signing-key.pub"))
+                                  (append (list (local-file "keys/nonguix-signing-key.pub"))
                                           %default-authorized-guix-keys))))))
  (mapped-devices (list (mapped-device
                         (source (uuid "02b1ffb4-d868-4e5f-ab9b-8be3092e3a3c"))
diff --git a/dave.pub b/keys/dave.pub
index 861655c..861655c 100644
--- a/dave.pub
+++ b/keys/dave.pub
diff --git a/nonguix-signing-key.pub b/keys/nonguix-signing-key.pub
index 56ee811..56ee811 100644
--- a/nonguix-signing-key.pub
+++ b/keys/nonguix-signing-key.pub
diff --git a/signing-key.pub b/keys/signing-key.pub
index 27151f3..27151f3 100644
--- a/signing-key.pub
+++ b/keys/signing-key.pub
diff --git a/laptop-manifest.scm b/laptop-manifest.scm
deleted file mode 100644
index 1fa1b43..0000000
--- a/laptop-manifest.scm
+++ /dev/null
@@ -1,104 +0,0 @@
-;;; Copyright © 2022 David Thompson <davet@gnu.org>
-;;;
-;;; This program is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation; either version 3 of the
-;;; License, or (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see
-;;; <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; User package profile.
-;;
-;; To install this profile, run:
-;;
-;;    guix package -m profile.scm
-
-(use-modules (guix git-download)
-             (guix packages)
-	     (nongnu packages mozilla)
-             (nongnu packages steam-client))
-(use-package-modules chromium
-                     emacs
-                     emacs-xyz
-                     fonts
-                     game-development
-                     gimp
-                     gnome
-                     gnupg
-                     gstreamer
-                     guile
-                     haskell-apps
-                     libreoffice
-                     linux
-                     music
-                     ncurses
-                     password-utils
-                     pdf
-                     pulseaudio
-                     version-control
-                     scheme
-                     ssh
-                     tor
-                     video)
-
-(packages->manifest
- (list emacs
-       emacs-better-defaults
-       emacs-buffer-env
-       emacs-doom-modeline
-       emacs-doom-themes
-       emacs-flycheck-guile
-       emacs-geiser-guile
-       emacs-htmlize
-       ;;emacs-ido-ubiquitous
-       emacs-js2-mode
-       emacs-magit
-       emacs-magit-annex
-       emacs-markdown-mode
-       emacs-org-reveal
-       emacs-paredit
-       emacs-racket-mode
-       emacs-rainbow-delimiters
-       emacs-smex
-       emacs-typo
-       emacs-use-package
-       emacs-web-mode
-       emacs-which-key
-       emacs-yaml-mode
-       firefox
-       font-google-noto-sans-cjk
-       font-google-noto-serif-cjk
-       font-inconsolata
-       gimp
-       git
-       (list git "send-email")
-       git-annex
-       gnome-tweaks
-       gnupg
-       gst-plugins-bad
-       guile-3.0
-       keepassxc
-       libreoffice
-       libresprite
-       milkytracker
-       ncurses
-       obs
-       openssh
-       pavucontrol
-       pinentry
-       sfxr
-       sicp
-       steam
-       strace
-       tor
-       ungoogled-chromium
-       xournal))
diff --git a/rise-home.scm b/rise-home.scm
index ae5051c..bc1dd47 100644
--- a/rise-home.scm
+++ b/rise-home.scm
@@ -1,17 +1,20 @@
-(use-modules (gnu home)
-             (gnu packages)
-             (gnu services)
-             (guix gexp)
-             (gnu home services)
-             (gnu home services shells))
+;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
+;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
 
-(define (dotfiles . file-names)
-  (define dir (dirname (current-filename)))
-  (map (lambda (file-name)
-         (list file-name
-               (local-file (string-append dir "/dotfiles/" file-name)
-                           (string-append "dotfile-" (basename file-name)))))
-       file-names))
+(include "common-home.scm")
 
 (home-environment
  (packages (specifications->packages
@@ -52,11 +55,4 @@
               "qjackctl"
 	      "sfxr"
               "x42-plugins")))
- (services
-  (list (service home-bash-service-type
-                 (home-bash-configuration
-                  (aliases '(("grep" . "grep --color=auto")
-                             ("ls" . "ls -ahlp --color=auto")))))
-        (simple-service 'dotfiles
-                        home-files-service-type
-                        (dotfiles ".emacs.d/init.el" ".guile")))))
+ (services common-services))
diff --git a/rise-os.scm b/rise-os.scm
index ce8f039..7dc5247 100644
--- a/rise-os.scm
+++ b/rise-os.scm
@@ -102,7 +102,7 @@
                                  (append (list "https://substitutes.nonguix.org")
                                          %default-substitute-urls))
                                 (authorized-keys
-                                 (append (list (local-file "./nonguix-signing-key.pub"))
+                                 (append (list (local-file "keys/nonguix-signing-key.pub"))
                                          %default-authorized-guix-keys))))))
  (mapped-devices (list (mapped-device
                         (source (uuid "ee0a37d1-36d6-4e50-8af0-fc0bfe8c22ef"))
@@ -116,5 +116,5 @@
                        (mount-point "/")
                        (device "/dev/mapper/cryptroot")
                        (type "ext4")
-                       (dependencies mapped-devices)) %base-file-systems)) 
+                       (dependencies mapped-devices)) %base-file-systems))
  (name-service-switch %mdns-host-lookup-nss))
diff --git a/takemi.scm b/takemi-os.scm
index 0b74473..bd24040 100644
--- a/takemi.scm
+++ b/takemi-os.scm
@@ -5,7 +5,7 @@
   "/etc/letsencrypt/live/dthompson.us/fullchain.pem")
 (define letsencrypt-cert-key
   "/etc/letsencrypt/live/dthompson.us/privkey.pem")
-(define dave-pub-key (local-file "dave.pub"))
+(define dave-pub-key (local-file "keys/dave.pub"))
 
 (define nginx-accounts
   (list (user-group (name "nginx") (system? #t))
@@ -207,7 +207,7 @@
             (if (eq? (service-kind s) guix-service-type)
                 (service guix-service-type
                          (guix-configuration
-                          (authorized-keys (cons (local-file "signing-key.pub")
+                          (authorized-keys (cons (local-file "keys/signing-key.pub")
                                                  %default-authorized-guix-keys))))
                 s))
           %base-services)))
diff --git a/vhl-profile.scm b/vhl-profile.scm
deleted file mode 100644
index 5459b2e..0000000
--- a/vhl-profile.scm
+++ /dev/null
@@ -1,45 +0,0 @@
-(use-modules (guix git-download)
-             (guix packages))
-(use-package-modules emacs emacs-xyz guile version-control)
-
-;; (define emacs-flycheck-guile*
-;;   (let ((commit "e3ab25245b14fdb267c41532f8035f8aff329952"))
-;;     (package
-;;       (inherit emacs-flycheck-guile)
-;;       (version (git-version "0.2" "1" commit))
-;;       (source
-;;        (origin
-;;          (method git-fetch)
-;;          (uri
-;;           (git-reference
-;;            (url "https://github.com/flatwhatson/flycheck-guile")
-;;            (commit commit)))
-;;          (file-name (git-file-name (package-name emacs-flycheck-guile) version))
-;;          (sha256
-;;           (base32 "1lxrcp4j7bapq3b4xbh4l042wakkbq6jjqp0i2aj8kdnpqq8z42g")))))))
-
-(packages->manifest
- (list emacs
-       emacs-better-defaults
-       ;;emacs-buffer-env
-       emacs-doom-modeline
-       emacs-doom-themes
-       emacs-flycheck-guile
-       emacs-geiser-guile
-       emacs-guix
-       emacs-ido-ubiquitous
-       ;;emacs-inheritenv
-       emacs-js2-mode
-       emacs-magit
-       emacs-markdown-mode
-       emacs-paredit
-       emacs-rainbow-delimiters
-       emacs-smex
-       emacs-typo
-       emacs-use-package
-       emacs-web-mode
-       emacs-which-key
-       emacs-yaml-mode
-       git
-       (list git "send-email")
-       guile-3.0))