Changed files
| File | Changes | |
|---|---|---|
| home-config/home-configuration.scm | +1 −0 | raw |
| home-config/nix-home-manager/home.nix | +0 −1 | raw |
| modules/ryan-config/base-system.scm | +1 −1 | raw |
| modules/ryan-packages/gtk.scm | +21 −6 | raw |
| modules/ryan-packages/wm.scm | +3 −3 | raw |
WAYBAR FIXED. LETS FUCKING GOOOOO
ada2a99fe56a…
· Ryan Schanzenbacher ·
@@ -60,6 +60,7 @@
"tor"
"unzip"
"alacritty"
+ "foot"
"htop"
"curl"
"pandoc"
@@ -32,7 +32,6 @@
rustup
gcc
pkg-config
- waybar
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
@@ -146,7 +146,7 @@
"wireplumber"
"wireshark"
"zsh"))
- (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland virt-manager-ovmf)
+ (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland waybar-new virt-manager-ovmf)
%my-base-packages ))
;; Below is the list of system services. To search for available
@@ -1,30 +1,45 @@
(define-module (ryan-packages gtk)
#:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages glib)
#:use-module (gnu packages cmake)
#:use-module (gnu packages gtk))
+(define-public glibmm-2.66
+ (package
+ (inherit glibmm-2.64)
+ (name "glibmm")
+ (version "2.66.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/glibmm/"
+ (version-major+minor version)
+ "/glibmm-" version ".tar.xz"))
+ (sha256
+ (base32 "0jf1drbb585lcyvh45krkbcjpnq5mwr1scvh0mnbihvfvmi4cf3v"))))))
+
(define-public pangomm-ryan
(package
(inherit pangomm-2.46)
- (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (delete "glibmm")))
- (native-inputs (modify-inputs (package-native-inputs pangomm-2.46) (prepend glibmm-2.64)))))
+ (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (replace "glibmm" glibmm-2.66)))))
(define-public atkmm-ryan
(package
(inherit atkmm-2.28)
- (propagated-inputs (modify-inputs (package-propagated-inputs atkmm-2.28) (replace "glibmm" glibmm)))))
+ (propagated-inputs (modify-inputs (package-propagated-inputs atkmm-2.28) (replace "glibmm" glibmm-2.66)))))
(define-public cairomm-ryan
(package
(inherit cairomm-1.14)
- (propagated-inputs (modify-inputs (package-propagated-inputs cairomm-1.14) (replace "glibmm" glibmm)))))
+ (propagated-inputs (modify-inputs (package-propagated-inputs cairomm-1.14) (replace "glibmm" glibmm-2.66)))))
(define-public gtkmm-ryan
(package
(inherit gtkmm-3)
- (propagated-inputs (list gtk+ glibmm cairomm-ryan))
- (native-inputs (modify-inputs (package-native-inputs gtkmm-3) (prepend cmake atkmm-2.28 pangomm-2.46)))))
+ (propagated-inputs (list gtk+ glibmm cairomm-1.14 atkmm-ryan pangomm-ryan))))
gtkmm-ryan
@@ -6,7 +6,7 @@
#:use-module (gnu packages python)
#:use-module (gnu packages audio)
#:use-module (gnu packages glib)
-; #:use-module (gnu packages gtk)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages llvm)
#:use-module (gnu packages gcc)
#:use-module (gnu packages check)
@@ -46,6 +46,6 @@
(arguments
(list
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))
- (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))) ;(prepend python cava catch2 gtkmm)))))
- (native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13)))))
+ (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm)))))
+ ;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13)))))
waybar-new