added hyprland to flakes and added cursor theme

4 files changed, 69 insertions, 5 deletions

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 6364e7c..0dea854 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -123,7 +123,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"
+                                                         ;"hyprland"
                                                           "swaybg"
                                                                     ;"swayidle"
                                                                     ;"swaylock-effects"
@@ -150,7 +150,7 @@
                                                           "opendoas"
                                                           ;"xdg-desktop-portal-wlr"
                                                           ;"xdg-desktop-portal"
-                                                          "xdg-desktop-portal-gtk"
+                                                          ;"xdg-desktop-portal-gtk"
                                                           "v4l2loopback-linux-module"
                                                           "pipewire"
                                                           "docker"
@@ -161,7 +161,7 @@
                                                           "wireshark"
                                                           "webkitgtk-with-libsoup2" ; Needed for Go wails development
                                                           "zsh"))
-                           (list my-ca-certs xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
+                           (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
diff --git a/modules/ryan-packages/binaries.scm b/modules/ryan-packages/binaries.bak
index f05636d..fcda5de 100644
--- a/modules/ryan-packages/binaries.scm
+++ b/modules/ryan-packages/binaries.bak
@@ -52,4 +52,17 @@
       "Terminal file-manager written in Go that is modern and extensible.")
     (license license:expat)))
 
-superfile-bin
+(define-public brave-bin
+  (package
+    (name "brave-bin")
+    (version "nightly_1.72.12")
+    (source (origin
+              (method url-fetch)
+              (url (string-append "https://github.com/brave/brave-browser/releases/download/v1.72.12/brave-browser-" version "_amd64.deb"))
+              (sha256
+                (base32
+                  "1ry62ck61gn4bxnkih3775pdlndp2ldxwifbjkxbj3wfd4f67xiv"))))
+    (build-system copy-build-system)
+    (arguments
+      (list #:install-plan
+            #~'(("bin" "bin" #:include ("wrap
diff --git a/modules/ryan-packages/calcurse.scm b/modules/ryan-packages/calcurse.scm
index fa7fe63..241bb53 100644
--- a/modules/ryan-packages/calcurse.scm
+++ b/modules/ryan-packages/calcurse.scm
@@ -1,10 +1,16 @@
 (define-module (ryan-packages calcurse)
                #:use-module (guix download)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (guix build-system cmake)
                #:use-module (guix packages)
                #:use-module (guix gexp)
                #:use-module (gnu packages)
                #:use-module (gnu packages calcurse)
                #:use-module (gnu packages python-web)
+               #:use-module (gnu packages rust)
+               #:use-module (gnu packages rust-apps)
+               #:use-module (gnu packages tls)
+               #:use-module (gnu packages linux)
                #:use-module (guix git-download)
                #:use-module (guix utils))
 
@@ -21,4 +27,3 @@
         (base32 "02l3spj2ai97b87winz3kvsxvf66g74lm46b7kcbhsgx2iqb6syq"))))
     (propagated-inputs (list python-httplib2))))
 
-calcurse-fixed
diff --git a/modules/ryan-packages/hyprland.-ryan.bak b/modules/ryan-packages/hyprland.-ryan.bak
new file mode 100644
index 0000000..aec8286
--- /dev/null
+++ b/modules/ryan-packages/hyprland.-ryan.bak
@@ -0,0 +1,46 @@
+(define-module (ryan-packages hyprland)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix download))
+
+(define aquamarine
+  (package
+    (name "aquamarine")
+    (version "0.4.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/hyprwm/aquamarine")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+                (base32
+                  "114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s"))))
+    (build-system cmake-build-system)
+    (arguments
+      (list
+        #:tests? #f))
+    (native-inputs
+      (list
+        gcc-14
+        pkg-config
+        mesa-headers
+        hyprwayland-scanner
+        hwdata))
+    (inputs
+      (list
+        libglvnd
+        mesa-libglvnd
+        libseat
+        libinput
+        libxkbcommon
+        libdisplay-info
+        libxcb
+        libxinerama
+        libxcursor
+        wayland
+        wayland-protocols