From 2b846e701c77ebf036e9cf95b4e9d574f16d9679 Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Fri, 9 Jun 2023 22:19:29 -0400
Subject: [PATCH] added channel, initial switch to hyprland

---
 channels.scm                        |  9 +++++++++
 home-config/waybar/config           | 12 ++++++------
 home-config/waybar/style.css        |  2 +-
 modules/ryan-config/base-system.scm |  7 +++++--
 modules/ryan-packages/wm.scm        |  8 ++++++++
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/channels.scm b/channels.scm
index e751e55..76d8a53 100644
--- a/channels.scm
+++ b/channels.scm
@@ -20,4 +20,13 @@
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
             (openpgp-fingerprint
               "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+      (channel
+        (name 'rosenthal)
+        (url "https://github.com/rakino/rosenthal")
+        (branch "trunk")
+        (introduction
+          (make-channel-introduction
+            "7677db76330121a901604dfbad19077893865f35"
+            (openpgp-fingerprint
+              "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
       )
diff --git a/home-config/waybar/config b/home-config/waybar/config
index 10e27c7..9d4b88f 100644
--- a/home-config/waybar/config
+++ b/home-config/waybar/config
@@ -3,17 +3,17 @@
     "position": "top",
     "height": 30,
 
-    "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-center": ["sway/window"],
+    "modules-left": ["wlr/workspaces", "hyprland/submap"],
+    "modules-center": ["hyprland/window"],
     "modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
-    "sway/mode": {
+    "hyprland/submap": {
         "format": " {}"
     },
-    "sway/workspaces": {
+    "wlr/workspaces": {
         "format": "{name}",
         "disable-scroll": true
     },
-    "sway/window": {
+    "hyprland/window": {
         "max-length": 80,
         "tooltip": false
     },
@@ -43,7 +43,7 @@
             "ethernet": [""],
             "disconnected": ["睊"]
         },
-        "on-click": "alacritty -e iwctl",
+        "on-click": "alacritty -e doas nmtui",
         "tooltip": false
     },
     "pulseaudio": {
diff --git a/home-config/waybar/style.css b/home-config/waybar/style.css
index f785881..cf776ad 100644
--- a/home-config/waybar/style.css
+++ b/home-config/waybar/style.css
@@ -37,7 +37,7 @@ window#waybar.solo {
     color:      rgba(217, 216, 216, 1);
 }
 
-#workspaces button.focused {
+#workspaces button.active {
     border-top: 3px solid rgba(217, 216, 216, 1);
     border-bottom: 3px solid rgba(217, 216, 216, 0);
 }
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 36c14bb..8ff2581 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -11,6 +11,7 @@
                 #:use-module (srfi srfi-1)
                 #:use-module (ryan-packages freedesktop)
                 #:use-module (ryan-packages wm)
+                #:use-module (rosenthal packages wm)
                 #:use-module (gnu packages security-token)
                 #:use-module (gnu services security-token)
                 #:use-module (gnu services cups)
@@ -104,6 +105,7 @@
     ;; under their own account: use 'guix search KEYWORD' to search
     ;; for packages and 'guix install PACKAGE' to install a package.
     (packages (append (map specification->package (list   "sway"
+                                                         "hyprland"
                                                           "swaybg"
   			                                            "swayidle"
   			                                            ;"swaylock-effects"
@@ -114,11 +116,12 @@
                                                           "hicolor-icon-theme"
   			                                            "git"
   			                                            "nss-certs"
-  			                                            "waybar"
+  			                                            ;"waybar"
   			                                            "gnupg"
                                                           "light"
                                                           "mako"
                                                           "grim"
+                                                          "grimblast"
                                                           "slurp"
                                                           "wl-clipboard"
                                                           "bluez"
@@ -138,7 +141,7 @@
                                                           "wireplumber"
                                                           "wireshark"
                                                           "zsh"))
-                           (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new)
+                           (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new waybar-new)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm
index 3924011..dce1be0 100644
--- a/modules/ryan-packages/wm.scm
+++ b/modules/ryan-packages/wm.scm
@@ -1,6 +1,7 @@
 (define-module (ryan-packages wm)
                #:use-module (guix download)
                #:use-module (guix packages)
+               #:use-module (guix gexp)
                #:use-module (gnu packages)
                #:use-module (guix git-download)
                #:use-module (guix utils)
@@ -19,3 +20,10 @@
                 (base32
                   "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
     (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
+
+(define-public waybar-new
+  (package
+    (inherit waybar)
+    (arguments (list #:configure-flags #~(list "-Dexperimental=true")))))
+
+waybar-new