added channel, initial switch to hyprland

2 files changed, 13 insertions, 2 deletions

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