diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ryan-config/base-system.scm | 7 | ||||
| -rw-r--r-- | modules/ryan-packages/wm.scm | 8 |
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 @@ | |||
| 11 | #:use-module (srfi srfi-1) | 11 | #:use-module (srfi srfi-1) |
| 12 | #:use-module (ryan-packages freedesktop) | 12 | #:use-module (ryan-packages freedesktop) |
| 13 | #:use-module (ryan-packages wm) | 13 | #:use-module (ryan-packages wm) |
| 14 | #:use-module (rosenthal packages wm) | ||
| 14 | #:use-module (gnu packages security-token) | 15 | #:use-module (gnu packages security-token) |
| 15 | #:use-module (gnu services security-token) | 16 | #:use-module (gnu services security-token) |
| 16 | #:use-module (gnu services cups) | 17 | #:use-module (gnu services cups) |
| @@ -104,6 +105,7 @@ | |||
| 104 | ;; under their own account: use 'guix search KEYWORD' to search | 105 | ;; under their own account: use 'guix search KEYWORD' to search |
| 105 | ;; for packages and 'guix install PACKAGE' to install a package. | 106 | ;; for packages and 'guix install PACKAGE' to install a package. |
| 106 | (packages (append (map specification->package (list "sway" | 107 | (packages (append (map specification->package (list "sway" |
| 108 | "hyprland" | ||
| 107 | "swaybg" | 109 | "swaybg" |
| 108 | "swayidle" | 110 | "swayidle" |
| 109 | ;"swaylock-effects" | 111 | ;"swaylock-effects" |
| @@ -114,11 +116,12 @@ | |||
| 114 | "hicolor-icon-theme" | 116 | "hicolor-icon-theme" |
| 115 | "git" | 117 | "git" |
| 116 | "nss-certs" | 118 | "nss-certs" |
| 117 | "waybar" | 119 | ;"waybar" |
| 118 | "gnupg" | 120 | "gnupg" |
| 119 | "light" | 121 | "light" |
| 120 | "mako" | 122 | "mako" |
| 121 | "grim" | 123 | "grim" |
| 124 | "grimblast" | ||
| 122 | "slurp" | 125 | "slurp" |
| 123 | "wl-clipboard" | 126 | "wl-clipboard" |
| 124 | "bluez" | 127 | "bluez" |
| @@ -138,7 +141,7 @@ | |||
| 138 | "wireplumber" | 141 | "wireplumber" |
| 139 | "wireshark" | 142 | "wireshark" |
| 140 | "zsh")) | 143 | "zsh")) |
| 141 | (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new) | 144 | (list my-ca-certs xdg-desktop-portal-wlr-new swaylock-effects-new waybar-new) |
| 142 | %my-base-packages )) | 145 | %my-base-packages )) |
| 143 | 146 | ||
| 144 | ;; Below is the list of system services. To search for available | 147 | ;; 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 @@ | |||
| 1 | (define-module (ryan-packages wm) | 1 | (define-module (ryan-packages wm) |
| 2 | #:use-module (guix download) | 2 | #:use-module (guix download) |
| 3 | #:use-module (guix packages) | 3 | #:use-module (guix packages) |
| 4 | #:use-module (guix gexp) | ||
| 4 | #:use-module (gnu packages) | 5 | #:use-module (gnu packages) |
| 5 | #:use-module (guix git-download) | 6 | #:use-module (guix git-download) |
| 6 | #:use-module (guix utils) | 7 | #:use-module (guix utils) |
| @@ -19,3 +20,10 @@ | |||
| 19 | (base32 | 20 | (base32 |
| 20 | "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) | 21 | "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h")))) |
| 21 | (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) | 22 | (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam"))))) |
| 23 | |||
| 24 | (define-public waybar-new | ||
| 25 | (package | ||
| 26 | (inherit waybar) | ||
| 27 | (arguments (list #:configure-flags #~(list "-Dexperimental=true"))))) | ||
| 28 | |||
| 29 | waybar-new | ||