diff options
Diffstat (limited to 'tw/packages')
| -rw-r--r-- | tw/packages/catppuccin.scm | 26 | ||||
| -rw-r--r-- | tw/packages/zoom.scm | 141 |
2 files changed, 166 insertions, 1 deletions
diff --git a/tw/packages/catppuccin.scm b/tw/packages/catppuccin.scm index e79c6be2..85a92630 100644 --- a/tw/packages/catppuccin.scm +++ b/tw/packages/catppuccin.scm @@ -137,7 +137,7 @@ Cursors with a Catppuccin palettes.") (package (name (string-append "catppuccin-" program "-theme")) ;; See info '(guix)Version Numbers' for advice. - (version (git-version "0.0.0" revision commit)) + (version (git-version version revision commit)) (home-page (string-append "https://github.com/catppuccin/" program)) (source (origin @@ -178,6 +178,14 @@ Catppuccin color palette.")) #:repo-hash "1cv46rqdd159plnqdkl74zwcgmbndq81d02g41a327hdwbpahp6v" #:install-plan '(("catppuccin-theme.el" "share/catppuccin/emacs/")))) +(define-public catppuccin-foot-theme + (catppuccin-theme-package + #:program "foot" + #:commit "307611230661b7b1787feb7f9d122e851bae97e9" + #:revision "44" ; total number of commits since repo beginning + #:repo-hash "0ki01m4r3rxsx0vqjylwa3i6f6k8lf1xbsx2kv1xfzbd68fdhhws" + #:install-plan '(("themes/" "share/catppuccin/foot/")))) + (define-public catppuccin-kde-theme (catppuccin-theme-package #:program "kde" @@ -221,6 +229,14 @@ Catppuccin color palette.")) #:repo-hash "15phrl9qlbzjxmp29hak3a5k015x60w2hxjif90q82vp55zjpnhc" #:install-plan '(("basic/.local/share/rofi/themes/" "share/catppuccin/rofi/")))) +(define-public catppuccin-swaylock-theme + (catppuccin-theme-package + #:program "swaylock" + #:revision "41" + #:commit "77246bbbbf8926bdb8962cffab6616bc2b9e8a06" + #:repo-hash "02nql7ry71fxlhj0vsbsxi3jrmfajxmapr9gg0mzp0k0bxwqxa00" + #:install-plan '(("themes/" "share/catppuccin/swaylock/")))) + (define-public catppuccin-vim-theme (catppuccin-theme-package #:program "vim" @@ -230,6 +246,14 @@ Catppuccin color palette.")) #:install-plan '(("colors/" "share/catppuccin/vim/colors/") ("autoload/" "share/catppuccin/vim/autoload/")))) +(define-public catppuccin-waybar-theme + (catppuccin-theme-package + #:program "waybar" + #:version "1.1" + #:commit "0830796af6aa64ce8bc7453d42876a628777ac68" + #:repo-hash "0np88b9zi6zk21fy5w4kmgjg1clqp4ggw1hijlv9qvlka2zkwmpn" + #:install-plan '(("themes/" "share/catppuccin/waybar/")))) + (define-public catppuccin-zathura-theme (catppuccin-theme-package #:program "zathura" diff --git a/tw/packages/zoom.scm b/tw/packages/zoom.scm new file mode 100644 index 00000000..be64d4d2 --- /dev/null +++ b/tw/packages/zoom.scm @@ -0,0 +1,141 @@ +(define-module (tw packages zoom) + #:use-module (ice-9 match) + #:use-module (nongnu packages messaging) + #:use-module (guix gexp) + #:use-module (guix packages)) + +;; One Wayland, Zoom needs two extra environment variables to be set: +;; - XDG_CURRENT_DESKTOP=GNOME (to get past the refusal to try sharing the screen) +;; - QT_QPA_PLATFORM= (since QT_QPA_PLATFORM=wayland makes zoom fail to start) +;; The following package definition patches it to set those variables. + +(define plist-delete + (match-lambda* + ((() _) '()) + (((unpaired-item) _) + (error "Found unpaired item in plist" unpaired-item)) + (((key-to-delete _ . rest) key-to-delete) + (plist-delete rest key-to-delete)) + (((key value . rest) key-to-delete) + (cons* key value (plist-delete rest key-to-delete))))) + +(define-public zoom/wayland + (package + (inherit zoom) + (arguments + (apply + (lambda* (#:key phases #:allow-other-keys . args) + (cons* + #:phases + #~(modify-phases #$phases + (replace 'wrap-where-patchelf-does-not-work + (lambda _ + (wrap-program (string-append #$output "/lib/zoom/zopen") + `("LD_LIBRARY_PATH" prefix + ,(list #$@(map (lambda (pkg) + (file-append (this-package-input pkg) "/lib")) + '("fontconfig-minimal" + "freetype" + "gcc" + "glib" + "libxcomposite" + "libxdamage" + "libxkbcommon" + "libxkbfile" + "libxrandr" + "libxrender" + "zlib"))))) + (wrap-program (string-append #$output "/lib/zoom/zoom") + '("XDG_CURRENT_DESKTOP" = ("GNOME")) ; tw: added + '("QT_QPA_PLATFORM" = ()) ; tw: added + '("QML2_IMPORT_PATH" = ()) + '("QT_PLUGIN_PATH" = ()) + '("QT_SCREEN_SCALE_FACTORS" = ()) + `("FONTCONFIG_PATH" ":" prefix + (,(string-join + (list + (string-append #$(this-package-input "fontconfig-minimal") "/etc/fonts") + #$output) + ":"))) + `("LD_LIBRARY_PATH" prefix + ,(list (string-append #$(this-package-input "nss") "/lib/nss") + #$@(map (lambda (pkg) + (file-append (this-package-input pkg) "/lib")) + ;; TODO: Reuse this long list as it is + ;; needed for aomhost. Or perhaps + ;; aomhost has a shorter needed list, + ;; but untested. + '("alsa-lib" + "atk" + "at-spi2-atk" + "at-spi2-core" + "cairo" + "cups" + "dbus" + "eudev" + "expat" + "gcc" + "glib" + "mesa" + "mit-krb5" + "nspr" + "libxcb" + "libxcomposite" + "libxdamage" + "libxext" + "libxkbcommon" + "libxkbfile" + "libxrandr" + "libxshmfence" + "pango" + "pulseaudio" + "xcb-util" + "xcb-util-image" + "xcb-util-keysyms" + "xcb-util-wm" + "xcb-util-renderutil" + "zlib"))))) + (wrap-program (string-append #$output "/lib/zoom/aomhost") + `("FONTCONFIG_PATH" ":" prefix + (,(string-join + (list + (string-append #$(this-package-input "fontconfig-minimal") "/etc/fonts") + #$output) + ":"))) + `("LD_LIBRARY_PATH" prefix + ,(list (string-append #$(this-package-input "nss") "/lib/nss") + #$@(map (lambda (pkg) + (file-append (this-package-input pkg) "/lib")) + '("alsa-lib" + "atk" + "at-spi2-atk" + "at-spi2-core" + "cairo" + "cups" + "dbus" + "eudev" + "expat" + "gcc" + "glib" + "mesa" + "mit-krb5" + "nspr" + "libxcb" + "libxcomposite" + "libxdamage" + "libxext" + "libxkbcommon" + "libxkbfile" + "libxrandr" + "libxshmfence" + "pango" + "pulseaudio" + "xcb-util" + "xcb-util-image" + "xcb-util-keysyms" + "xcb-util-wm" + "xcb-util-renderutil" + "zlib")))))))) + ;; ARGS still contains the old "#:phases ..." entry, so delete it. + (plist-delete args #:phases))) + (package-arguments zoom))))) |