From 0a52f3f16e5e98ed782fc8a5e09e89a33e687295 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 12 Aug 2024 21:38:59 -0600 Subject: Move "hati" and "vali" to the graveyard --- .config/guix/graveyard/hati.scm | 77 +++++++++++++++++++++++++++++++++++++++ .config/guix/graveyard/vali.scm | 81 +++++++++++++++++++++++++++++++++++++++++ .config/guix/hati.scm | 77 --------------------------------------- .config/guix/modules/base.scm | 15 ++++++++ .config/guix/vali.scm | 81 ----------------------------------------- 5 files changed, 173 insertions(+), 158 deletions(-) create mode 100644 .config/guix/graveyard/hati.scm create mode 100644 .config/guix/graveyard/vali.scm delete mode 100644 .config/guix/hati.scm delete mode 100644 .config/guix/vali.scm (limited to '.config') diff --git a/.config/guix/graveyard/hati.scm b/.config/guix/graveyard/hati.scm new file mode 100644 index 0000000..2c08f4e --- /dev/null +++ b/.config/guix/graveyard/hati.scm @@ -0,0 +1,77 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This configuration adapts the base-level 'ymir' ;; +;; OS declaration for 'hati', a desktop. ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-module (hati) + #:use-module (gnu) + #:use-module (gnu home) + #:use-module (gnu home services) + #:use-module (gnu home services syncthing) + #:use-module (gnu packages) + #:use-module (gnu packages xorg) + #:use-module (gnu services) + #:use-module (gnu services guix) + #:use-module (guix gexp) + #:use-module (modules base) + #:use-module (modules dwm) + #:use-module (modules utils) + #:use-module (modules xorg) + #:use-module (modules ymir) + #:use-module (modules pdf)) + + +(define home + (home-environment + (services + `(,@bd-base-home-services + ,@bd-desktop-home-services + ,@bd-pdf-services + ,@bd-dwm-home-services + ,(service home-syncthing-service-type))))) + + +(operating-system + (inherit ymir) + (host-name "hati") + + ;; (all packages are system wide) + (packages + `(,@bd-base-system-packages + ,@bd-desktop-system-packages + ,@bd-dwm-system-packages + ,@bd-mpd-package + + ;; machine-specific packages + ,@(list + xf86-video-nouveau))) + + (services + `(,@bd-base-system-services + ,@bd-desktop-system-services + ,@bd-mpd-service + ,(service guix-home-service-type + `((,username ,home))))) + + (mapped-devices (list (mapped-device + (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563")) + (target "hidden") + (type luks-device-mapping)))) + + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + "1448-51AE" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home") + (device "/dev/mapper/hidden") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/") + (device (uuid + "df334be4-5828-45b4-842a-9a8d97cfa40a" + 'ext4)) + (type "ext4")) %base-file-systems))) diff --git a/.config/guix/graveyard/vali.scm b/.config/guix/graveyard/vali.scm new file mode 100644 index 0000000..5c34540 --- /dev/null +++ b/.config/guix/graveyard/vali.scm @@ -0,0 +1,81 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This configuration adapts the base-level 'ymir' ;; +;; OS declaration for 'vali', a laptop. ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-module (vali) + #:use-module (gnu) + #:use-module (gnu home) + #:use-module (gnu home services) + #:use-module (gnu home services syncthing) + #:use-module (gnu packages) + #:use-module (gnu packages linux) + #:use-module (gnu services) + #:use-module (gnu services guix) + #:use-module (gnu services pm) + #:use-module (guix gexp) + #:use-module (modules base) + #:use-module (modules dwm) + #:use-module (modules utils) + #:use-module (modules xorg) + #:use-module (modules ymir) + #:use-module (modules pdf)) + + +(define home + (home-environment + (services + `(,@bd-base-home-services + ,@bd-desktop-home-services + ,@bd-pdf-services + ,@bd-dwm-home-services + ,(service home-syncthing-service-type))))) + + +(operating-system + (inherit ymir) + (host-name "vali") + + ;; (all packages are system wide) + (packages + `(,@bd-base-system-packages + ,@bd-desktop-system-packages + ,@bd-dwm-system-packages + ,@bd-mpd-package + ,@bd-games-packages + + ;; machine-specific packages + ,@(list + brightnessctl + tlp))) + + (services + `(,@bd-base-system-services + ,@bd-desktop-system-services + ,@bd-mpd-service + ,(service guix-home-service-type + `((,username ,home))) + ,(service tlp-service-type))) + + (mapped-devices (list (mapped-device + (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c")) + (target "hidden") + (type luks-device-mapping)))) + + (file-systems (cons* (file-system + (mount-point "/boot/efi") + (device (uuid + "8A13-7018" + 'fat32)) + (type "vfat")) + (file-system + (mount-point "/home") + (device "/dev/mapper/hidden") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (mount-point "/") + (device (uuid + "69a3593b-12bd-40ad-a932-007674a8cfe8" + 'ext4)) + (type "ext4")) %base-file-systems))) diff --git a/.config/guix/hati.scm b/.config/guix/hati.scm deleted file mode 100644 index 2c08f4e..0000000 --- a/.config/guix/hati.scm +++ /dev/null @@ -1,77 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; This configuration adapts the base-level 'ymir' ;; -;; OS declaration for 'hati', a desktop. ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define-module (hati) - #:use-module (gnu) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu home services syncthing) - #:use-module (gnu packages) - #:use-module (gnu packages xorg) - #:use-module (gnu services) - #:use-module (gnu services guix) - #:use-module (guix gexp) - #:use-module (modules base) - #:use-module (modules dwm) - #:use-module (modules utils) - #:use-module (modules xorg) - #:use-module (modules ymir) - #:use-module (modules pdf)) - - -(define home - (home-environment - (services - `(,@bd-base-home-services - ,@bd-desktop-home-services - ,@bd-pdf-services - ,@bd-dwm-home-services - ,(service home-syncthing-service-type))))) - - -(operating-system - (inherit ymir) - (host-name "hati") - - ;; (all packages are system wide) - (packages - `(,@bd-base-system-packages - ,@bd-desktop-system-packages - ,@bd-dwm-system-packages - ,@bd-mpd-package - - ;; machine-specific packages - ,@(list - xf86-video-nouveau))) - - (services - `(,@bd-base-system-services - ,@bd-desktop-system-services - ,@bd-mpd-service - ,(service guix-home-service-type - `((,username ,home))))) - - (mapped-devices (list (mapped-device - (source (uuid "1e9c3cd7-97c2-411a-975a-40222d185563")) - (target "hidden") - (type luks-device-mapping)))) - - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - "1448-51AE" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/home") - (device "/dev/mapper/hidden") - (type "ext4") - (dependencies mapped-devices)) - (file-system - (mount-point "/") - (device (uuid - "df334be4-5828-45b4-842a-9a8d97cfa40a" - 'ext4)) - (type "ext4")) %base-file-systems))) diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm index ae6e708..a485336 100644 --- a/.config/guix/modules/base.scm +++ b/.config/guix/modules/base.scm @@ -10,6 +10,7 @@ #:use-module (gnu home services) #:use-module (gnu home services dict) #:use-module (gnu home services gnupg) + #:use-module (gnu home services mcron) #:use-module (gnu home services shells) #:use-module (gnu home services shepherd) #:use-module (gnu home services ssh) @@ -27,6 +28,7 @@ (use-package-modules admin ;; netcat + algebra ;; bc bittorrent ;; transmission compression ;; unzip cryptsetup ;; cryptsetup @@ -64,6 +66,7 @@ xpdf ; pdftotext yt-dlp + bc cryptsetup curl git @@ -193,6 +196,18 @@ alias | sed -E \"s/^alias ([^=]+)='(.*)'$/alias \\1 \\2 \\$*/g; s/'\\\\\\''/'/g; ("PATH" . "$HOME/.local/bin:$PATH") )))) + (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-openssh-service-type (home-openssh-configuration (hosts diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm deleted file mode 100644 index 5c34540..0000000 --- a/.config/guix/vali.scm +++ /dev/null @@ -1,81 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; This configuration adapts the base-level 'ymir' ;; -;; OS declaration for 'vali', a laptop. ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define-module (vali) - #:use-module (gnu) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu home services syncthing) - #:use-module (gnu packages) - #:use-module (gnu packages linux) - #:use-module (gnu services) - #:use-module (gnu services guix) - #:use-module (gnu services pm) - #:use-module (guix gexp) - #:use-module (modules base) - #:use-module (modules dwm) - #:use-module (modules utils) - #:use-module (modules xorg) - #:use-module (modules ymir) - #:use-module (modules pdf)) - - -(define home - (home-environment - (services - `(,@bd-base-home-services - ,@bd-desktop-home-services - ,@bd-pdf-services - ,@bd-dwm-home-services - ,(service home-syncthing-service-type))))) - - -(operating-system - (inherit ymir) - (host-name "vali") - - ;; (all packages are system wide) - (packages - `(,@bd-base-system-packages - ,@bd-desktop-system-packages - ,@bd-dwm-system-packages - ,@bd-mpd-package - ,@bd-games-packages - - ;; machine-specific packages - ,@(list - brightnessctl - tlp))) - - (services - `(,@bd-base-system-services - ,@bd-desktop-system-services - ,@bd-mpd-service - ,(service guix-home-service-type - `((,username ,home))) - ,(service tlp-service-type))) - - (mapped-devices (list (mapped-device - (source (uuid "8d3ccf19-035a-4956-8ba7-7c00dfa3a02c")) - (target "hidden") - (type luks-device-mapping)))) - - (file-systems (cons* (file-system - (mount-point "/boot/efi") - (device (uuid - "8A13-7018" - 'fat32)) - (type "vfat")) - (file-system - (mount-point "/home") - (device "/dev/mapper/hidden") - (type "ext4") - (dependencies mapped-devices)) - (file-system - (mount-point "/") - (device (uuid - "69a3593b-12bd-40ad-a932-007674a8cfe8" - 'ext4)) - (type "ext4")) %base-file-systems))) -- cgit v1.2.3