From b04c0fb18e4d250e68880051284065306cb30932 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 5 Jul 2023 15:58:17 -0500
Subject: [PATCH] updating and adding gimp

---
 .config/waybar/config           |  1 +
 guix/channels.scm               | 66 +++++++++++++++------------------
 guix/home-services/hyprland.scm |  8 ++--
 guix/home.scm                   |  1 +
 4 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/.config/waybar/config b/.config/waybar/config
index 0555581..178f2a7 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,5 +1,6 @@
 {
     "layer": "top", // Waybar at top layer
+    "output": "DP-1",
     "position": "bottom", // Waybar position (top|bottom|left|right)
     "height": 35, // Waybar height (to be removed for auto height)
     "width": 1400, // Waybar width
diff --git a/guix/channels.scm b/guix/channels.scm
index 2032891..b4925f3 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -1,52 +1,44 @@
 (list (channel
-        (name 'guix)
-        (url "https://git.savannah.gnu.org/git/guix.git")
+        (name 'rde)
+        (url "https://git.sr.ht/~abcdw/rde")
         (branch "master")
-        ;; (commit
-        ;;   "654fcf9971bb01389d577be07c6ec0f68940c743")
-        (commit "d884fc9e2efecfba09af4694f5a13ad7fc6f704f")
+        (commit
+          "4384afa60786b9427874961fcb289eb0f7e06fb9")
         (introduction
           (make-channel-introduction
-            "9edb3f66fd807b096b48283debdcddccfea34bad"
+            "257cebd587b66e4d865b3537a9a88cccd7107c95"
             (openpgp-fingerprint
-              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
+              "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0"))))
+      (channel
+        (name 'rosenthal)
+        (url "https://codeberg.org/hako/rosenthal.git")
+        (branch "trunk")
+        (commit
+          "b810c93083453d5912472c385fe6d5ab3d306b15")
+        (introduction
+          (make-channel-introduction
+            "7677db76330121a901604dfbad19077893865f35"
+            (openpgp-fingerprint
+              "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
       (channel
         (name 'nonguix)
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
-        ;; (commit
-        ;;   "c323f4c866cdf7c9fb958ed968b80e0911ecd899")
-        (commit "bf13c6b5f32980582e8c19b509c6825e86b953dd")
+        (commit
+          "e585f07f52122ac37e0cfd6995fd2f3e54184d5c")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
             (openpgp-fingerprint
-             "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
       (channel
-       (name 'rosenthal)
-       (url "https://codeberg.org/hako/rosenthal.git")
-       (branch "trunk")
-       (commit
-        "5cf74520915e50c92b4b327bfacbd25a5b0d1369")
-       (introduction
-        (make-channel-introduction
-         "7677db76330121a901604dfbad19077893865f35"
+        (name 'guix)
+        (url "https://git.savannah.gnu.org/git/guix.git")
+        (branch "master")
+        (commit
+          "a00e1ee3104936a46ab71507cc6287bbbe4dfa99")
+        (introduction
+          (make-channel-introduction
+            "9edb3f66fd807b096b48283debdcddccfea34bad"
             (openpgp-fingerprint
-             "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
-      (channel
-       (name 'rde)
-       (url "https://git.sr.ht/~abcdw/rde")
-       (introduction
-        (make-channel-introduction
-         "257cebd587b66e4d865b3537a9a88cccd7107c95"
-         (openpgp-fingerprint
-          "2841 9AC6 5038 7440 C7E9  2FFA 2208 D209 58C1 DEB0"))))
-      ;; (channel
-      ;;  (name 'emacs)
-      ;;  (url "https://github.com/babariviere/guix-emacs")
-      ;;  (introduction
-      ;;   (make-channel-introduction
-      ;;    "72ca4ef5b572fea10a4589c37264fa35d4564783"
-      ;;    (openpgp-fingerprint
-      ;;     "261C A284 3452 FB01 F6DF  6CF4 F9B7 864F 2AB4 6F18"))))
-      )
+              "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA")))))
diff --git a/guix/home-services/hyprland.scm b/guix/home-services/hyprland.scm
index da03436..4ed4685 100644
--- a/guix/home-services/hyprland.scm
+++ b/guix/home-services/hyprland.scm
@@ -1,5 +1,5 @@
-(define-module (hyprland)
-  #:use-module (ice-9 popen)
-  #:use-module (ice-9 rdelim))
+;; (define-module (hyprland)
+;;   #:use-module (ice-9 popen)
+;;   #:use-module (ice-9 rdelim))
 
-(read-line)
+;; (read-line)
diff --git a/guix/home.scm b/guix/home.scm
index 21b3852..7a03a56 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -90,6 +90,7 @@
         "dolphin"
         "ark"
         "kdenlive"
+        "gimp"
         "mediainfo"
         ;; "tridactyl-native"
         "qtwayland@5.15.8"