Update guix stuff

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
Skylar "The Cobra" Widulski 2024-05-09 16:59:45 -04:00
parent a391da1639
commit f5576c76c7
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
3 changed files with 26 additions and 30 deletions

View File

@ -122,6 +122,7 @@
;"kodi"
"mpv"
;"mpv-mpris"
"ncmpcpp"
"reptyr"
"ripit"

View File

@ -75,6 +75,29 @@
"ENV{ID_INPUT_TABLET}=\"1\"\n"
"LABEL=\"wacom_end\"\n")))
(define %flipper-udev-rule
(udev-rule
"42-flipperzero.rules"
(string-append "#Flipper Zero serial port\n"
"SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"0483\", "
"ATTRS{idProduct}==\"5740\", ATTRS{manufacturer}=="
"\"Flipper Devices Inc.\", TAG+=\"uaccess\", "
"GROUP=\"dialout\"\n"
"#Flipper Zero DFU\n"
"SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"0483\", "
"ATTRS{idProduct}==\"df11\", "
"ATTRS{manufacturer}==\"STMicroelectronics\", "
"TAG+=\"uaccess\", GROUP=\"dialout\"\n"
"#Flipper ESP32s2 BlackMagic\n"
"SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"303a\", "
"ATTRS{idProduct}==\"40??\", ATTRS{manufacturer}=="
"\"Flipper Devices Inc.\", TAG+=\"uaccess\", "
"GROUP=\"dialout\"\n"
"#Flipper U2F\n"
"SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"0483\", "
"ATTRS{idProduct}==\"5741\", ATTRS{manufacturer}=="
"\"Flipper Devices Inc.\", ENV{ID_SECURITY_TOKEN}=\"1\"\n")))
(define service-list
(cons*
;; Bluetooth
@ -138,7 +161,8 @@
(udev-service-type config =>
(udev-configuration (inherit config)
(rules (append (udev-configuration-rules config)
(list %wacom-udev-rule))))))))
(list %wacom-udev-rule
%flipper-udev-rule))))))))
(define package-list
(append
@ -171,7 +195,6 @@
"v4l2loopback-linux-module"
;; Network
"nss-certs"
"modem-manager"
"torsocks"
"tor"
@ -207,7 +230,6 @@
"virt-manager"
"qemu"))
(cons* mesa-i915
ncmpcpp-master
font-nerd-fonts-fira-code
font-nerd-fonts-fira-mono
%base-packages)))

View File

@ -38,33 +38,6 @@
"-Dbuild-tests=true"
"-Dllvm=enabled")))))
(define-public ncmpcpp-master
(package (inherit ncmpcpp)
(name "ncmpcpp-master")
(version "master")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ncmpcpp/ncmpcpp")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0hdd08dh3697c4sd9nc6m5dk8q27axl7ap3k0m2xbi2973krdz6x"))))
(inputs (list libmpdclient
boost
readline
ncurses
taglib
icu4c
curl
fftw))
(native-inputs
(list autoconf
automake
libtool
pkg-config))))
;; Taken and modified from issue #44575
(define-public font-nerd-fonts-fira-code