From 4b19dcfc6883a794cf41376eb2489f2ba6f3e813 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Wed, 10 Apr 2024 20:21:04 +0200
Subject: surltesh-echer: update guix, fix guix channel in home config

thanks to change Id90e1e1ff399afe54fff68167f497f0484d2c218 being
merged into guix (d082573db1b86d922965dc746627bf0f0cc18af4), the
hikari package from upstream is no longer broken.
---
 surltesh-echer/configuration.scm           | 24 ++----------------------
 surltesh-echer/home/home-configuration.scm | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 23 deletions(-)

(limited to 'surltesh-echer')

diff --git a/surltesh-echer/configuration.scm b/surltesh-echer/configuration.scm
index bea816a..e97a9f3 100644
--- a/surltesh-echer/configuration.scm
+++ b/surltesh-echer/configuration.scm
@@ -17,26 +17,6 @@
 (use-service-modules desktop
                      base)
 
-(define wlroots-0.15
-  (package
-    (inherit wlroots)
-    (version "0.15.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-                    (commit version)))
-              (file-name (git-file-name "wlroots" version))
-              (sha256
-               (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))))
-
-
-(define-public hikari-patched
-  (package
-    (inherit hikari)
-    (inputs (modify-inputs (package-inputs hikari) 
-               (replace "wlroots" wlroots-0.15)))))
-
 
 (operating-system
   (host-name "surltesh-echer")
@@ -70,7 +50,7 @@
   ;; the log-in screen with F1.
   (packages (append (list
                      ;; window managers
-                     hikari-patched
+                     hikari
                      emacs kitty fuzzel git
                      fish
                      ;; for HTTPS access
@@ -93,7 +73,7 @@
                   (terminal-switch #t)
                   (default-session-command
                     (greetd-agreety-session
-                     (command (file-append hikari-patched "/bin/hikari"))
+                     (command (file-append hikari "/bin/hikari"))
                      (command-args '("-c" "hikari.conf"))
                      ))
                   )))))
diff --git a/surltesh-echer/home/home-configuration.scm b/surltesh-echer/home/home-configuration.scm
index f44a68b..9e87bac 100644
--- a/surltesh-echer/home/home-configuration.scm
+++ b/surltesh-echer/home/home-configuration.scm
@@ -9,6 +9,7 @@
              (gnu packages)
              (gnu services)
              (guix gexp)
+             (guix channels)
              (gnu home services shells)
              (gnu home services ssh)
              (gnu home services guix))
@@ -63,4 +64,16 @@
                               ("pj" . "pijul")))
                    (bashrc (list (local-file "bashrc" "bashrc")))
                    (bash-profile (list (local-file "bash_profile"
-                                                   "bash_profile"))))))))
+                                                   "bash_profile")))))
+    (service home-channels-service-type
+             (list (channel
+                    (name 'guix)
+                    (url "https://git.savannah.gnu.org/git/guix.git")
+                    (branch "master")
+                    (commit
+                     "5a95cf76e1d0f9fdff5b232b42337c657b76d1d4")
+                    (introduction
+                     (make-channel-introduction
+                      "9edb3f66fd807b096b48283debdcddccfea34bad"
+                      (openpgp-fingerprint
+                       "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))))))
-- 
cgit v1.2.3