ryan77627/guix-dotfiles
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix-config.git synced 2025-02-04 17:11:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

WAYBAR FIXED. LETS FUCKING GOOOOO

Browse source
This commit is contained in:
Ryan 2023-10-11 23:45:39 -04:00
parent cc8f9e2f8e
commit ada2a99fe5
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
5 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home-config/home-configuration.scm
View file

@ -60,6 +60,7 @@
"tor" "tor"
"unzip" "unzip"
"alacritty" "alacritty"
"foot"
"htop" "htop"
"curl" "curl"
"pandoc" "pandoc"

1
home-config/nix-home-manager/home.nix
View file

@ -32,7 +32,6 @@
rustup rustup
gcc gcc
pkg-config pkg-config
waybar
# # It is sometimes useful to fine-tune packages, for example, by applying # # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the # # overrides. You can do that directly here, just don't forget the

2
modules/ryan-config/base-system.scm
View file

@ -146,7 +146,7 @@
"wireplumber" "wireplumber"
"wireshark" "wireshark"
"zsh")) "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 )) %my-base-packages ))
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available

27
modules/ryan-packages/gtk.scm
View file

@ -1,30 +1,45 @@
(define-module (ryan-packages gtk) (define-module (ryan-packages gtk)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages gtk)) #: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 (define-public pangomm-ryan
(package (package
(inherit pangomm-2.46) (inherit pangomm-2.46)
(propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (delete "glibmm"))) (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (replace "glibmm" glibmm-2.66)))))
(native-inputs (modify-inputs (package-native-inputs pangomm-2.46) (prepend glibmm-2.64)))))
(define-public atkmm-ryan (define-public atkmm-ryan
(package (package
(inherit atkmm-2.28) (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 (define-public cairomm-ryan
(package (package
(inherit cairomm-1.14) (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 (define-public gtkmm-ryan
(package (package
(inherit gtkmm-3) (inherit gtkmm-3)
(propagated-inputs (list gtk+ glibmm cairomm-ryan)) (propagated-inputs (list gtk+ glibmm cairomm-1.14 atkmm-ryan pangomm-ryan))))
(native-inputs (modify-inputs (package-native-inputs gtkmm-3) (prepend cmake atkmm-2.28 pangomm-2.46)))))
gtkmm-ryan gtkmm-ryan

6
modules/ryan-packages/wm.scm
View file

@ -6,7 +6,7 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
; #:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages check) #:use-module (gnu packages check)
@ -46,6 +46,6 @@
(arguments (arguments
(list (list
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))) #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))
(inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))) ;(prepend python cava catch2 gtkmm))))) (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))))) ;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13)))))
waybar-new waybar-new