home-environments/radio.scm

@@ -25,17 +25,11 @@
   #|C|# #:use-module (guix channels)
   #|P|# #:use-module (guix packages)
 
-  #|Home environments radio|#
+  #|Radio|#
-  #|C|# #:use-module ((home-environments radio channels)
+  #|C|# #:use-module ((radio channels) #:prefix channel:)
-                      #:prefix channel:)
+  #|P|# #:use-module ((radio packages) #:prefix packages:)
-  #|F|# #:use-module ((home-environments radio fish-configs)
+  #|M|# #:use-module ((radio mime-types) #:prefix mime-types:)
-                      #:prefix fish-config:)
+  #|S|# #:use-module ((radio shepherd-services) #:prefix shepherd-service:)
-  #|P|# #:use-module ((home-environments radio packages)
-                      #:prefix packages:)
-  #|M|# #:use-module ((home-environments radio mime-types)
-                      #:prefix mime-types:)
-  #|S|# #:use-module ((home-environments radio shepherd-services)
-                      #:prefix shepherd-service:)
 
   #|Radix|#
   #|C|# #:use-module (radix combinators)
@@ -43,7 +37,6 @@
 
   #|Radix packages|#
   #|F|# #:use-module (radix packages fish-xyz)
-  #|S|# #:use-module (radix packages shepherd)
 
   #|Radix home services|#
   #|•|# #:use-module (radix home services)
@@ -115,7 +108,7 @@
           #|Shepherd services|#
           (service home-shepherd-service-type
                    (home-shepherd-configuration
-                     (shepherd shepherd-next)
+                     (shepherd (@ (shepherd-package) shepherd))
                      (services (list shepherd-service:repl
                                      shepherd-service:timer
                                      shepherd-service:wake-up))))
@@ -243,21 +236,28 @@
                             (plugins
                               (list fish-fzf))
                             (config
-                              (list fish-config:fzf))
+                              (list (plain-file "fish-fzf.fish"
+                                      (string-join
+                                        `("fzf_configure_bindings"
+                                          "--directory=@@"
+                                          "--git_log=@l"
+                                          "--git_status=@s"
+                                          "--history=@h"
+                                          "--processes="
+                                          "--variables=")))))
                             (environment-variables
                               `(("LS_COLORS" . "'di=01;34:ln=01;36:or=01;31'")
-                                ("fzf_preview_dir_cmd" . "''")
                                 ("FZF_DEFAULT_OPTS"
-                                 . ("--color=fg:blue:bold,hl:#cccccc"
+                                 . ("--filepath-word"
-                                    "--color=fg+:blue:bold,hl+:#cccccc"
+                                    "--height=~40%"
-                                    "--color=prompt:blue,pointer:blue"
-                                    "--color=info:#ffffff,border:#000000"
-                                    "--filepath-word"
-                                    "--height=~60%"
                                     "--layout=reverse"
                                     "--preview=''"
                                     "--scheme=path"
-                                    "--scroll-off=2"))
+                                    "--scroll-off=2"
+                                    "--color=fg:blue:bold,hl:#cccccc"
+                                    "--color=fg+:blue:bold,hl+:#cccccc"
+                                    "--color=prompt:blue,pointer:blue"
+                                    "--color=info:#ffffff,border:#000000"))
                                 ("fzf_base_fd_opts" . ("--exclude='\\..*'"
                                                        "--follow"
                                                        "--type directory"))
@@ -282,10 +282,14 @@
                             ("GUILE_HISTORY" . "$XDG_CACHE_HOME/guile/history")
                             ("GUILE_LOAD_PATH"
                              . ,(format #f "~?~?"
-                                           "~@{$HOME/areas/code/scm/~a:~}"
+                                           "~@{:$HOME/areas/code/scm/~a~}"
-                                           '(shepherd/modules
+                                           '(radix
-                                             zero)
+                                             shepherd/modules
-                                           "~@{~a/share/guile/site/3.0:~}"
+                                             shepherd/.guix/modules
+                                             zero
+                                             zero/operating-systems
+                                             zero/home-environments)
+                                           "~@{:~a/share/guile/site/3.0~}"
                                            '($HOME/.guix-home/profile
                                              $XDG_CONFIG_HOME/guix/current
                                              /run/current-system/profile)))

home-environments/radio/channels.scm

@@ -1,8 +1,8 @@
-(define-module (home-environments radio channels)
+(define-module (radio channels)
   #:use-module (guix channels)
   #:use-module (gnu packages package-management)
 
-  #:export (guix radix saayix shepherd))
+  #:export (guix radix saayix))
 
 (define guix
   (channel
@@ -36,14 +36,3 @@
         "12540f593092e9a177eb8a974a57bb4892327752"
         (openpgp-fingerprint
           "3FFA 7335 973E 0A49 47FC  0A8C 38D5 96BE 07D3 34AB")))))
-
-(define shepherd
-   (channel
-     (name 'shepherd)
-     (url "https://git.savannah.gnu.org/git/shepherd.git")
-     (branch "main")
-     (introduction
-      (make-channel-introduction
-       "788a6d6f1d5c170db68aa4bbfb77024fdc468ed3"
-       (openpgp-fingerprint
-        "3CE464558A84FDC69DB40CFB090B11993D9AEBB5")))))

home-environments/radio/fish-configs.scm

@@ -1,11 +0,0 @@
-(define-module (home-environments radio fish-configs)
-  #:use-module (guix gexp)
-
-  #:export (fzf))
-
-(define fzf
-  (plain-file "fish-fzf.fish"
-    (string-join
-      `("fzf_configure_bindings --directory=@@ --history= --processes= "
-        "bind -M default / _fzf_search_history")
-     "\n")))

home-environments/radio/mime-types.scm

@@ -1,4 +1,4 @@
-(define-module (home-environments radio mime-types)
+(define-module (radio mime-types)
   #:export (browser editor file-manager audio video image document))
 
 (define browser

home-environments/radio/packages.scm

@@ -1,4 +1,4 @@
-(define-module (home-environments radio packages)
+(define-module (radio packages)
   #|GNU packages|#
   #|A|# #:use-module (gnu packages admin)
   #|B|# #:use-module (gnu packages bittorrent)

home-environments/radio/shepherd-services.scm

@@ -1,4 +1,4 @@
-(define-module (home-environments radio shepherd-services)
+(define-module (radio shepherd-services)
   #:use-module (guix gexp)
   #:use-module (gnu services shepherd)
   #:use-module (shepherd service timer)

operating-systems/buer.scm

@@ -55,7 +55,6 @@
   #|Radix packages|#
   #|A|# #:use-module (radix packages admin)
   #|L|# #:use-module (radix packages linux)
-  #|S|# #:use-module (radix packages shepherd)
   #|T|# #:use-module (radix packages text-editors)
 
   #|Radix services|#
@@ -69,23 +68,23 @@
   #|M|# #:use-module (radix system monitoring)
 
   #|Buer|#
-  #|B|# #:use-module ((operating-systems buer build-machines)
+  #|B|# #:use-module ((buer build-machines)
                       #:prefix build-machine:)
-  #|C|# #:use-module ((operating-systems buer channels)
+  #|C|# #:use-module ((buer channels)
                       #:prefix channel:)
-  #|F|# #:use-module ((operating-systems buer files)
+  #|F|# #:use-module ((buer files)
                       #:prefix file:)
-        #:use-module ((operating-systems buer file-systems)
+        #:use-module ((buer file-systems)
                       #:prefix file-system:)
-  #|P|# #:use-module ((operating-systems buer privilege)
+  #|P|# #:use-module ((buer privilege)
                       #:prefix privileged-programs:)
-  #|R|# #:use-module ((operating-systems buer rules)
+  #|R|# #:use-module ((buer rules)
                       #:prefix rules:)
-  #|S|# #:use-module ((operating-systems buer shepherd-services)
+  #|S|# #:use-module ((buer shepherd-services)
                       #:prefix shepherd-service:)
-        #:use-module ((operating-systems buer substitute-keys)
+        #:use-module ((buer substitute-keys)
                       #:prefix substitute-key:)
-  #|U|# #:use-module ((operating-systems buer users)
+  #|U|# #:use-module ((buer users)
                       #:prefix user:)
 
   #|SRFIs|#
@@ -177,7 +176,7 @@
       (operating-system-default-essential-services this-operating-system)
       (shepherd-root-service-type
         _ => (shepherd-configuration
-               (shepherd shepherd-next)
+               (shepherd (@ (shepherd-package) shepherd))
                (services (list shepherd-service:guix-gc
                                shepherd-service:snapshot-@home
                                shepherd-service:timer))))))

operating-systems/buer/build-machines.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer build-machines)
+(define-module (buer build-machines)
   #:use-module ((buer ssh-keys) #:prefix ssh-key:)
   #:use-module (guix gexp)
 

operating-systems/buer/channels.scm

@@ -1,8 +1,8 @@
-(define-module (operating-systems buer channels)
+(define-module (buer channels)
   #:use-module (guix channels)
   #:use-module (gnu packages package-management)
 
-  #:export (guix radix shepherd))
+  #:export (guix radix))
 
 (define guix
   (channel
@@ -25,14 +25,3 @@
         "f9130e11e35d2c147c6764ef85542dc58dc09c4f"
         (openpgp-fingerprint
           "F164 709E 5FC7 B32B AEC7  9F37 1F2E 76AC E3F5 31C8")))))
-
-(define shepherd
-   (channel
-     (name 'shepherd)
-     (url "https://git.savannah.gnu.org/git/shepherd.git")
-     (branch "main")
-     (introduction
-      (make-channel-introduction
-       "788a6d6f1d5c170db68aa4bbfb77024fdc468ed3"
-       (openpgp-fingerprint
-        "3CE464558A84FDC69DB40CFB090B11993D9AEBB5")))))

operating-systems/buer/file-systems.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer file-systems)
+(define-module (buer file-systems)
   #:use-module (gnu system file-systems)
 
   #:export (partition:guix

operating-systems/buer/files.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer files)
+(define-module (buer files)
   #:use-module (gnu)
   #:export (thinkfan-config))
 

operating-systems/buer/kernel.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer kernel)
+(define-module (buer kernel)
   #:use-module (guix gexp)
   #:use-module (gnu packages linux))
 

operating-systems/buer/privilege.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer privilege)
+(define-module (buer privilege)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages linux)
   #:use-module (gnu system privilege)

operating-systems/buer/rules.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer rules)
+(define-module (buer rules)
   #:use-module (radix services admin)
   #:use-module (radix utils)
   #:export (general

operating-systems/buer/secrets.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer secrets)
+(define-module (buer secrets)
   #:use-module (gnu)
   #:export (%radio-password %root-password))
 

operating-systems/buer/shepherd-services.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer shepherd-services)
+(define-module (buer shepherd-services)
   #:use-module (guix gexp)
   #:use-module (gnu services shepherd)
   #:use-module (shepherd service repl)

operating-systems/buer/ssh-keys.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer ssh-keys)
+(define-module (buer ssh-keys)
   #:use-module (gnu)
   #:export (yumiko.pub))
 

operating-systems/buer/substitute-keys.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer substitute-keys)
+(define-module (buer substitute-keys)
   #:use-module (gnu)
   #:export (berlin.pub
             genenetwork.pub

operating-systems/buer/users.scm

@@ -1,4 +1,4 @@
-(define-module (operating-systems buer users)
+(define-module (buer users)
   #:use-module (buer secrets)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages shells)