summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-26 12:07:12 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-26 12:07:12 +0100
commit223caedde6ea3c4fb3a5c285a0f70ea443dd7ef0 (patch)
tree6bdaa5f3034829c659c4b07ce387ea98fe5d316a
parent350ebdf52a181666d268cdb8da13231e886f9306 (diff)
Modify the channel contents to make it possible to pull by guix
Squashed commit of the following: commit e4e3cb849b51788056888355de5570874c128d46 Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 11:47:56 2024 +0100 Turn system-configuration.scm into a proper module This fixes the following error: (exception misc-error (value #f) (value "no code for module ~S") (value ((systems izumi system-configuration))) (value #f)) Additionaly, the call to load secrets' path is removed, because .guix-channel already depends on that directory. commit 6d2fc2ccdcf074fd27da7a9fe173717d95bd5525 Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 11:35:29 2024 +0100 Turn home-configuration.scm into a proper module This fixes the following error: (exception misc-error (value #f) (value "no code for module ~S") (value ((systems izumi home-configuration))) (value #f)) commit 9a81257dc40a886396d104e89450f374ded63c31 Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 11:27:56 2024 +0100 Make home-configuration.scm depend on (gnu home) This fixes the following error: (exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (home-environment)) (value #f)) commit d082d2a2aebeaa87245224d5d6c811826347505b Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 11:08:05 2024 +0100 Transfer nonguix to .guix-channel as dependency This fixes the following error: (exception misc-error (value #f) (value "no code for module ~S") (value ((nongnu packages mozilla))) (value #f)) commit 0da951183bb3d84ee161d8b31f7e5a6a59902a37 Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 10:27:23 2024 +0100 Turn channels.scm into a proper module By doing this and depending on (guix channels), the following error is fixed: (exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (channel)) (value #f)) commit a50480c8634dab2d6dc97742d489a17bbe51c450 Author: Marek Paśnikowski <marek@marekpasnikowski.pl> Date: Fri Jan 26 10:01:44 2024 +0100 Declare guix repository explicitly This fixes the following error message: (exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (%default-channels)) (value #f)) On top of that, set channel branch to "wip-channel-2"
-rw-r--r--.guix-channel14
-rw-r--r--systems/izumi/channels.scm40
-rw-r--r--systems/izumi/home-configuration.scm3
-rw-r--r--systems/izumi/izumi.org5
-rw-r--r--systems/izumi/system-configuration.scm2
5 files changed, 43 insertions, 21 deletions
diff --git a/.guix-channel b/.guix-channel
new file mode 100644
index 0000000..ba7fc11
--- /dev/null
+++ b/.guix-channel
@@ -0,0 +1,14 @@
+( channel
+ ( version 0 )
+ ( dependencies
+ ( channel
+ ( introduction
+ ( channel-introduction
+ ( version 0 )
+ ( commit "897c1a470da759236cc11798f4e0a5f7d4d59fbc" )
+ ( signer "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) )
+ ( name nonguix )
+ ( url "https://gitlab.com/nonguix/nonguix" ) )
+ ( channel
+ ( name secrets )
+ ( url "file:///home/marek/Dokumenty/secrets" ) ) ) )
diff --git a/systems/izumi/channels.scm b/systems/izumi/channels.scm
index 0d75a1e..7f9d318 100644
--- a/systems/izumi/channels.scm
+++ b/systems/izumi/channels.scm
@@ -1,19 +1,21 @@
-( append
- %default-channels
- ( list
- ( channel
- ( introduction
- ( make-channel-introduction
- "c24ce7cb11e74da13d491f9de3c4b7040a069f43"
- ( openpgp-fingerprint
- "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) )
- ( name 'channel )
- ( url "file:///home/marek/src/channel" ) )
- ( channel
- ( name 'nonguix )
- ( url "https://gitlab.com/nonguix/nonguix" )
- ( introduction
- ( make-channel-introduction
- "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
- ( openpgp-fingerprint
- "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) ) ) ) )
+( define-module ( systems izumi channels )
+ #:use-module ( guix channels ) )
+
+( list
+ ( channel
+ ( introduction
+ ( make-channel-introduction
+ "9edb3f66fd807b096b48283debdcddccfea34bad"
+ ( openpgp-fingerprint
+ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" ) ) )
+ ( name 'guix )
+ ( url "https://git.savannah.gnu.org/git/guix.git" ) )
+ ( channel
+ ( branch "wip-channel-2" )
+ ( introduction
+ ( make-channel-introduction
+ "c24ce7cb11e74da13d491f9de3c4b7040a069f43"
+ ( openpgp-fingerprint
+ "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) )
+ ( name 'channel )
+ ( url "file:///home/marek/src/channel" ) ) )
diff --git a/systems/izumi/home-configuration.scm b/systems/izumi/home-configuration.scm
index d6ad28a..3462bb3 100644
--- a/systems/izumi/home-configuration.scm
+++ b/systems/izumi/home-configuration.scm
@@ -1,4 +1,7 @@
+(define-module (systems izumi home-configuration))
+
(use-modules
+ (gnu home)
(gnu home services shells)
(gnu packages)
(gnu packages compression)
diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 0ff44cc..4580397 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -8,7 +8,7 @@
#+NAME: OPERATING-SYSTEM
#+BEGIN_SRC scheme :tangle system-configuration.scm
- ( add-to-load-path "/home/marek/Dokumenty/secrets/" )
+ ( define-module ( systems izumi system-configuration ) )
( use-modules
( marek )
@@ -720,7 +720,10 @@
* [[https://guix.gnu.org/manual/en/html_node/Home-Configuration.html][13 Home Configuration]]
#+BEGIN_SRC scheme :tangle home-configuration.scm
+ (define-module (systems izumi home-configuration))
+
(use-modules
+ (gnu home)
(gnu home services shells)
(gnu packages)
(gnu packages compression)
diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm
index fba55bf..2612400 100644
--- a/systems/izumi/system-configuration.scm
+++ b/systems/izumi/system-configuration.scm
@@ -1,4 +1,4 @@
-( add-to-load-path "/home/marek/Dokumenty/secrets/" )
+( define-module ( systems izumi system-configuration ) )
( use-modules
( marek )