From dae7ceec9603208cab6412534aa84b918071606c Mon Sep 17 00:00:00 2001
From: jdlugosz963 <jdlugosz963@gmail.com>
Date: Fri, 4 Oct 2024 08:50:39 +0200
Subject: Change channels and combine home with system config.

---
 files/.bin/home-reconfigure     |  4 ++--
 files/.bin/system-reconfigure   |  4 ++--
 files/.config/guix/channels.scm | 24 +++++-------------------
 3 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'files')

diff --git a/files/.bin/home-reconfigure b/files/.bin/home-reconfigure
index 4d16cc0..f55b896 100755
--- a/files/.bin/home-reconfigure
+++ b/files/.bin/home-reconfigure
@@ -2,8 +2,8 @@
 
 if [ -n "$1" ]; then
     guix home -L $1 reconfigure \
-	 -e '((@@ (jd utils) current-home))'
+	 -e '((@ (jd utils) current-home))'
 else
     guix home reconfigure \
-	 -e '((@@ (jd utils) current-home))'
+	 -e '((@ (jd utils) current-home))'
 fi;
diff --git a/files/.bin/system-reconfigure b/files/.bin/system-reconfigure
index dae18f6..e76ba27 100755
--- a/files/.bin/system-reconfigure
+++ b/files/.bin/system-reconfigure
@@ -2,9 +2,9 @@
 
 if [ -n "$1" ]; then
     sudo -E guix system -L $1 reconfigure \
-	 -e '((@@ (jd utils) current-operating-system))'
+	 -e '((@ (jd utils) current-operating-system))'
 else
     sudo -E guix system reconfigure \
-	 -e '((@@ (jd utils) current-operating-system))'
+	 -e '((@ (jd utils) current-operating-system))'
 fi;
 
diff --git a/files/.config/guix/channels.scm b/files/.config/guix/channels.scm
index 13bee44..cb25ece 100755
--- a/files/.config/guix/channels.scm
+++ b/files/.config/guix/channels.scm
@@ -1,19 +1,5 @@
-(cons*  (channel
-	 (name 'rustup)
-	 (url "https://github.com/declantsien/guix-rustup")
-	 (introduction
-	  (make-channel-introduction
-	   "325d3e2859d482c16da21eb07f2c6ff9c6c72a80"
-	   (openpgp-fingerprint
-	    "F695 F39E C625 E081 33B5  759F 0FC6 8703 75EF E2F5"))))
-	
-	(channel
-         (name 'nonguix)
-         (url "https://gitlab.com/nonguix/nonguix")
-         ;; Enable signature verification:
-         (introduction
-          (make-channel-introduction
-           "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-           (openpgp-fingerprint
-            "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-	%default-channels)
+(cons* (channel
+	(name 'jdlugosz)
+	(branch "main")
+	(url "https://github.com/jdlugosz963/dotfiles"))
+       %default-channels)
-- 
cgit v1.2.3