diff options
-rw-r--r-- | .guix-channel | 14 | ||||
-rw-r--r-- | systems/izumi/channels.scm | 40 | ||||
-rw-r--r-- | systems/izumi/home-configuration.scm | 3 | ||||
-rw-r--r-- | systems/izumi/izumi.org | 5 | ||||
-rw-r--r-- | systems/izumi/system-configuration.scm | 2 |
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 ) |