sakura/packages/crates-io.scm

@@ -5,8 +5,8 @@
                #:use-module (guix download)
                #:use-module (guix build-system cargo)
                #:use-module (gnu packages)
-               #:use-module (gnu packages linux)
                #:use-module (gnu packages crates-io)
+               #:use-module (sakura packages linux)
                #:use-module (guix utils))
 
 
@@ -174,7 +174,7 @@
                                     ("rust-rand" ,rust-rand-0.8)
                                     ("rust-tokio" ,rust-tokio-1))))
     (inputs
-      (list bluez))
+      (list bluez-new))
 	  (home-page "https://github.com/bluez/bluer")
 	  (synopsis "Official Rust interface to the Linux Bluetooth protocol stack (BlueZ)")
 	  (description "todo")

sakura/packages/hypr.scm

@@ -578,7 +578,7 @@ mo  .")
                     sdbus-c++
                     slurp
                     qtbase
-                    pipewire
+                    pipewire-new
                     qtwayland
                     ; hypr
                     hyprland

sakura/packages/librewolf.scm

@@ -6,11 +6,12 @@
   #:use-module (gnu)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages librewolf))
+  #:use-module (gnu packages librewolf)
+  #:use-module (sakura packages linux))
 
-(define-public librewolf-wrapped
+(define-public librewolf-new
   (package
-    (name "librewolf-wrapped")
+    (name "librewolf-new")
     (source #f)
     (version "0.1")
     (synopsis "Simple wrapper for pipewire in librewolf")
@@ -19,7 +20,7 @@
     (license license:mpl2.0)
     (inputs
      `(("bash" ,bash-minimal)
-       ("pipewire" ,pipewire)
+       ("pipewire" ,pipewire-new)
        ("librewolf" ,librewolf)))
     (build-system trivial-build-system)
     (arguments

sakura/packages/linux.scm

@@ -0,0 +1,107 @@
+(define-module (sakura packages linux)
+               #:use-module (guix gexp)
+               #:use-module (guix utils)
+               #:use-module (guix packages)
+               #:use-module (guix download)
+               #:use-module (guix git-download)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages linux)
+               #:use-module (gnu packages python-xyz)
+               #:use-module (sakura packages pulseaudio))
+
+(define-public bluez-new
+  (package
+    (inherit bluez)
+    (version "5.78")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://kernel.org/linux/bluetooth/bluez-"
+               version ".tar.xz"))
+        (sha256
+          (base32
+            "1qy5fc6z1l3fvcqkvyszzz2xr86yzi2nyphgvsw7bly52lcys3w3"))))
+    (arguments (list
+                 #:configure-flags
+                 #~(list (string-append "--prefix=" #$output)
+                         "--sysconfdir=/etc"
+                         "--localstatedir=/var"
+                         "--enable-library"
+                         "--disable-manpages"
+                         "--disable-systemd"
+                         "--enable-hid2hci"
+                         (string-append "--with-dbusconfdir=" #$output "/etc")
+                         (string-append "--with-udevdir=" #$output "/lib/udev"))
+                 #:phases
+                 #~(modify-phases %standard-phases
+                     (add-after 'configure 'fix-makefile
+                       (lambda _
+                         (substitute* "Makefile"
+                           (("install-confDATA:") "install-IGNORED:")
+                           (("install-confDATA") "")
+                           (("bluetoothd-fix-permissions:") "install-IGNORED2:")
+                           (("bluetoothd-fix-permissions") "")))))
+                 ))
+    ))
+
+
+(define-public alsa-lib-new
+  (package
+    (inherit alsa-lib)
+    (name "alsa-lib")
+    (version "1.2.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1lnh38wii8mnwp3n4hnqa718rgi52rq6ix1llsjrs9r7hs8css28"))))))
+
+
+(define-public pipewire-new
+  (package
+    (inherit pipewire)
+    (name "pipewire")
+    (version "1.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/pipewire/pipewire")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0cvbyklzqcdr9zj7k7psb24xp8cxb9fdksrd74r68zvnbbix1qlx"))))
+    (inputs
+	    (modify-inputs (package-inputs pipewire)
+		    (delete "alsa-lib")
+        (delete "bluez")
+        (delete "pulseaudio")
+		    (prepend alsa-lib-new)
+        (prepend bluez-new)
+        (prepend pulseaudio-new)))))
+
+
+(define-public wireplumber-new
+  (package
+    (inherit wireplumber)
+    (name "wireplumber")
+    (version "0.5.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://gitlab.freedesktop.org/pipewire/wireplumber.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1s9p2hpi9v4w70j6hhqnsa4czhn3rzrk03j0qb7lz87qlw491yks"))))
+    (inputs
+	    (modify-inputs
+		  (package-inputs wireplumber)
+		  (delete "pipewire")
+		  (prepend pipewire-new)))))

sakura/packages/networking.scm

@@ -23,6 +23,7 @@
                #:use-module (gnu packages gettext)
                #:use-module (gnu packages rust)
                #:use-module (sakura packages)
+               #:use-module (sakura packages linux)
                #:use-module (sakura packages crates-io)
                #:use-module (sakura packages pulseaudio))
 
@@ -119,9 +120,20 @@
                   gcc-13
                   dbus
                   libadwaita
-                  pulseaudio
-                  bluez))
+                  pulseaudio-new
+                  bluez-new))
 	  (home-page "https://github.com/kaii-lb/overskride")
 	  (synopsis "A simple yet powerful bluetooth client.")
 	  (description "todo")
 	  (license license:gpl3+)))
+
+
+(define-public blueman-new
+  (package
+    (inherit blueman)
+    (inputs
+	    (modify-inputs
+		  (package-inputs blueman)
+		  (delete "bluez")
+		  (prepend bluez-new)))))
+

sakura/packages/pulseaudio.scm

@@ -0,0 +1,34 @@
+(define-module (sakura packages pulseaudio)
+               #:use-module (guix download)
+               #:use-module (guix git-download)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (guix utils)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages pulseaudio)
+               #:use-module (sakura packages linux))
+
+(define-public pulseaudio-new
+  (package
+    (inherit pulseaudio)
+    (name "pulseaudio")
+    (version "17.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://freedesktop.org/software/pulseaudio/releases/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments pulseaudio)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (delete 'check)))))
+    (inputs
+	    (modify-inputs (package-inputs pulseaudio)
+		    (delete "alsa-lib")
+        (delete "bluez")
+		    (prepend alsa-lib-new)
+        (prepend bluez-new)))))

sakura/packages/vim.scm

@@ -1,11 +1,21 @@
 (define-module (sakura packages vim)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (gnu packages)
+               #:use-module (gnu packages vim)
+               #:use-module (gnu packages gcc)
                #:use-module (guix packages)
                #:use-module (guix git-download)
                #:use-module (guix utils)
                #:use-module (guix build-system trivial))
 
+(define-public neovim-new
+  (package
+    (inherit neovim)
+    (name "neovim-new")
+    (native-inputs
+      (modify-inputs (package-native-inputs neovim)
+             (prepend gcc-12)))))
+
 (define-public vim-plug
   (package
    (name "vim-plug")

sakura/packages/wm.scm

@@ -28,6 +28,40 @@
                #:use-module (guix utils))
 
 
+(define-public swaylock-effects-new
+  (package
+    (inherit swaylock-effects)
+    (name "swaylock-effects-new")
+    (version "1.7.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/jirutka/swaylock-effects")
+                     (commit (string-append "v" version))))
+              (sha256
+                (base32
+                  "0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj"))))))
+
+
+(define-public waybar-new
+  (package
+    (inherit waybar)
+    (name "waybar-new")
+    (version "0.11.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Alexays/Waybar")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy"))))
+    (arguments
+      (list
+        #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))))
+
+
 (define-public vkroots
   (let ((commit "d5ef31abc7cb5c69aee4bcb67b10dd543c1ff7ac"))
   (package

sakura/services/pipewire.scm

@@ -5,12 +5,13 @@
                #:use-module (gnu services configuration)
                #:use-module (gnu home services)
                #:use-module (gnu home services shepherd)
+               #:use-module (sakura packages linux)
                #:use-module (sakura packages networking)
                #:use-module (guix gexp))
 
 (define (home-pipewire-profile-service config)
-  (list pipewire
-        wireplumber))
+  (list pipewire-new
+        wireplumber-new))
 
 
 (define (home-pipewire-shepherd-service config)
@@ -21,7 +22,7 @@
       (provision '(pipewire))
       (stop #~(make-kill-destructor))
       (start #~(make-forkexec-constructor
-                 (list #$(file-append pipewire "/bin/pipewire"))
+                 (list #$(file-append pipewire-new "/bin/pipewire"))
                  #:log-file (string-append
                               (or (getenv "XDG_LOG_HOME")
                                   (format #f "~a/.local/var/log"
@@ -36,7 +37,7 @@
       (provision '(pipewire-pulse))
       (stop #~(make-kill-destructor))
       (start #~(make-forkexec-constructor
-                 (list #$(file-append pipewire "/bin/pipewire-pulse"))
+                 (list #$(file-append pipewire-new "/bin/pipewire-pulse"))
                  #:log-file (string-append
                               (or (getenv "XDG_LOG_HOME")
                                   (format #f "~a/.local/var/log"
@@ -51,7 +52,7 @@
       (provision '(wireplumber))
       (stop #~(make-kill-destructor))
       (start #~(make-forkexec-constructor
-                 (list #$(file-append wireplumber "/bin/wireplumber"))
+                 (list #$(file-append wireplumber-new "/bin/wireplumber"))
                  #:log-file (string-append
                               (or (getenv "XDG_LOG_HOME")
                                   (format #f "~a/.local/var/log"
@@ -68,18 +69,18 @@
         #~(string-append
             "<"
             #$(file-append
-                pipewire "/share/alsa/alsa.conf.d/50-pipewire.conf")
+                pipewire-new "/share/alsa/alsa.conf.d/50-pipewire.conf")
             ">\n<"
             #$(file-append
-                pipewire "/share/alsa/alsa.conf.d/99-pipewire-default.conf")
+                pipewire-new "/share/alsa/alsa.conf.d/99-pipewire-default.conf")
             ">\n"
             "
             pcm_type.pipewire {
-              lib " #$(file-append pipewire "/lib/alsa-lib/libasound_module_pcm_pipewire.so")
+              lib " #$(file-append pipewire-new "/lib/alsa-lib/libasound_module_pcm_pipewire.so")
               "
             }
             ctl_type.pipewire {
-              lib " #$(file-append pipewire "/lib/alsa-lib/libasound_module_ctl_pipewire.so")
+              lib " #$(file-append pipewire-new "/lib/alsa-lib/libasound_module_ctl_pipewire.so")
               "
             }
             ")))))