From 67e10bef6d185373a416f3d4aa2f2a77ef7bcda7 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Thu, 4 Apr 2024 10:08:28 +0200
Subject: guix-channel: remove dependency on private-inputs: interference with
 other systems

---
 .guix-channel                          |  5 +----
 channels.scm                           |  2 +-
 systems/izumi/izumi.org                | 17 ++++++++++-------
 systems/izumi/system-configuration.scm | 17 ++++++++++-------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.guix-channel b/.guix-channel
index c21b298..cedd802 100644
--- a/.guix-channel
+++ b/.guix-channel
@@ -8,7 +8,4 @@
 	  ( commit "897c1a470da759236cc11798f4e0a5f7d4d59fbc" )
 	  ( signer "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) )
       ( name nonguix )
-      ( url "https://gitlab.com/nonguix/nonguix" ) )
-    ( channel
-      ( name private-inputs )
-      ( url "file:///home/marek/Dokumenty/private-guix-inputs" ) ) ) )
+      ( url "https://gitlab.com/nonguix/nonguix" ) ) ) )
diff --git a/channels.scm b/channels.scm
index 93773d4..d192c5b 100644
--- a/channels.scm
+++ b/channels.scm
@@ -86,4 +86,4 @@
 
 ;;; Testing data
 
-aisaka-channels
+izumi-channels
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 7678341..92920fb 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -10,8 +10,11 @@
 #+BEGIN_SRC scheme :tangle system-configuration.scm
   ( define-module ( systems izumi system-configuration ) )
 
+  (define smtpd-keys "/secrets/smtpd")
+  (define radicale-keys "/secrets/radicale")
+  (define dovecot-keys "/secrets/dovecot")
+
   ( use-modules
-    ( marek )
     ( gnu )
     ( guix records )
     ( ice-9 match )
@@ -395,7 +398,7 @@
         ( passdbs
           ( list
             ( passdb-configuration
-              ( args ( list "username_format=%n" "/etc/dovecot-passwd" ) )
+              ( args ( list "username_format=%n" "/secrets/dovecot" ) )
               ( driver "passwd-file" ) ) ) )
         ( protocols
           ( list
@@ -555,7 +558,7 @@
                         "marekpasnikowski.pl"
                         "git.marekpasnikowski.pl"
                         "radicale.marekpasnikowski.pl" ) ) ) ) )
-              ( email certbot-mail )
+              ( email "marek@marekpasnikowski.pl" )
               ( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
           ( service cgit-service-type
             ( cgit-configuration
@@ -597,8 +600,9 @@
           ( service fcgiwrap-service-type )
           ( service gitolite-service-type
             ( gitolite-configuration
-              ( admin-pubkey gitolite-keys )
-              ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) ) ) )
+              ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) )
+              ( admin-pubkey ( plain-file  "gitolite-admin.pub"
+                                           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
           ( service gnome-desktop-service-type )
           ( service nginx-service-type
             ( nginx-configuration
@@ -662,8 +666,7 @@
             'etc-files
             etc-service-type
             ( list
-              `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) )
-              `( "dovecot-passwd" ,dovecot-keys ) ) ) ) ) )
+              `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) ) ) ) ) ) )
     ( sudoers-file ( local-file "system-files/sudoers" ) )
     ( swap-devices
       ( list
diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm
index 2612400..e14601e 100644
--- a/systems/izumi/system-configuration.scm
+++ b/systems/izumi/system-configuration.scm
@@ -1,7 +1,10 @@
 ( define-module ( systems izumi system-configuration ) )
 
+(define smtpd-keys "/secrets/smtpd")
+(define radicale-keys "/secrets/radicale")
+(define dovecot-keys "/secrets/dovecot")
+
 ( use-modules
-  ( marek )
   ( gnu )
   ( guix records )
   ( ice-9 match )
@@ -385,7 +388,7 @@
       ( passdbs
         ( list
           ( passdb-configuration
-            ( args ( list "username_format=%n" "/etc/dovecot-passwd" ) )
+            ( args ( list "username_format=%n" "/secrets/dovecot" ) )
             ( driver "passwd-file" ) ) ) )
       ( protocols
         ( list
@@ -545,7 +548,7 @@
                       "marekpasnikowski.pl"
                       "git.marekpasnikowski.pl"
                       "radicale.marekpasnikowski.pl" ) ) ) ) )
-            ( email certbot-mail )
+            ( email "marek@marekpasnikowski.pl" )
             ( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
         ( service cgit-service-type
           ( cgit-configuration
@@ -587,8 +590,9 @@
         ( service fcgiwrap-service-type )
         ( service gitolite-service-type
           ( gitolite-configuration
-            ( admin-pubkey gitolite-keys )
-            ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) ) ) )
+            ( rc-file ( gitolite-rc-file ( umask #o0022 ) ) )
+            ( admin-pubkey ( plain-file  "gitolite-admin.pub"
+                                         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4THTYnHCc/ihCJNKJtGTNu1zCnLndbMHnxnrxzJk+N marek@izumi\n") ) ) )
         ( service gnome-desktop-service-type )
         ( service nginx-service-type
           ( nginx-configuration
@@ -652,8 +656,7 @@
           'etc-files
           etc-service-type
           ( list
-            `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) )
-            `( "dovecot-passwd" ,dovecot-keys ) ) ) ) ) )
+            `( "mailname" ,( plain-file "mailname" "marekpasnikowski.pl\n" ) ) ) ) ) ) )
   ( sudoers-file ( local-file "system-files/sudoers" ) )
   ( swap-devices
     ( list
-- 
cgit v1.2.3