Compare commits
3 Commits
9bcca96597
...
ccf38c2da2
| Author | SHA1 | Date | |
|---|---|---|---|
| ccf38c2da2 | |||
| b1107ae904 | |||
| 48f53b3884 |
66
flake.lock
generated
66
flake.lock
generated
@@ -38,11 +38,11 @@
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1756719547,
|
||||
"narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=",
|
||||
"lastModified": 1762286984,
|
||||
"narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
|
||||
"owner": "serokell",
|
||||
"repo": "deploy-rs",
|
||||
"rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2",
|
||||
"rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -58,11 +58,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760701190,
|
||||
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -111,11 +111,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759362264,
|
||||
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
|
||||
"lastModified": 1762440070,
|
||||
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
|
||||
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -328,11 +328,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752054764,
|
||||
"narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
|
||||
"lastModified": 1762090880,
|
||||
"narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixgl",
|
||||
"rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
|
||||
"rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -400,11 +400,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1760958188,
|
||||
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
|
||||
"lastModified": 1762847253,
|
||||
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
|
||||
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -446,11 +446,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1760878510,
|
||||
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
|
||||
"lastModified": 1762596750,
|
||||
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
|
||||
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -474,11 +474,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1760862643,
|
||||
"narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
|
||||
"lastModified": 1762756533,
|
||||
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
|
||||
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -498,11 +498,11 @@
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760795571,
|
||||
"narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=",
|
||||
"lastModified": 1762722066,
|
||||
"narHash": "sha256-Kph9HBaDqN0dOvsb8fnhoyj4mpxF6RfoqzVqXxvpzVY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043",
|
||||
"rev": "b36fcf1d64e782488fc6296eaa4f26d6cae4e090",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -522,11 +522,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760652422,
|
||||
"narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -585,11 +585,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760998189,
|
||||
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
|
||||
"lastModified": 1762812535,
|
||||
"narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
|
||||
"rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -724,11 +724,11 @@
|
||||
"yazi-flavors": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1761030755,
|
||||
"narHash": "sha256-0CZrJ1f5lDY75XF5eR6m4hbg973pTZoAxzJKMCv+hag=",
|
||||
"lastModified": 1761204921,
|
||||
"narHash": "sha256-bavHcmeGZ49nNeM+0DSdKvxZDPVm3e6eaNmfmwfCid0=",
|
||||
"owner": "yazi-rs",
|
||||
"repo": "flavors",
|
||||
"rev": "f9ae9f271812628191c67f3f6801c52bce5a96d0",
|
||||
"rev": "f6b425a6d57af39c10ddfd94790759f4d7612332",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -43,15 +43,15 @@
|
||||
nomacs # Image viewer
|
||||
kdePackages.okular # Pdf reader with many features, good for commenting documents
|
||||
pavucontrol
|
||||
pdfsam-basic # Split, merge, etc for pdfs
|
||||
unstable.pdfsam-basic # Split, merge, etc for pdfs
|
||||
qalculate-gtk # Nice gui calculator
|
||||
qpdfview
|
||||
# qutebrowser
|
||||
# realvnc-vnc-viewer
|
||||
rpi-imager # make isos
|
||||
# rpi-imager # make isos
|
||||
# rustdesk
|
||||
tor-browser
|
||||
unstable.path-of-building # Path of Building
|
||||
unstable.rusty-path-of-building # Path of Building for poe1 and poe2
|
||||
# frajul.pob-dev-version # Path of Building
|
||||
vlc
|
||||
wineWowPackages.stable # 32-bit and 64-bit wine
|
||||
|
||||
@@ -71,15 +71,12 @@ in {
|
||||
nomacs # Image viewer
|
||||
kdePackages.okular # Pdf reader with many features, good for commenting documents
|
||||
pavucontrol
|
||||
pdfsam-basic # Split, merge, etc for pdfs
|
||||
qalculate-gtk # Nice gui calculator
|
||||
qpdfview
|
||||
# qutebrowser
|
||||
# realvnc-vnc-viewer
|
||||
rpi-imager # make isos
|
||||
# rustdesk
|
||||
tor-browser
|
||||
unstable.path-of-building # Path of Building
|
||||
# frajul.pob-dev-version # Path of Building
|
||||
vlc
|
||||
wineWowPackages.stable # 32-bit and 64-bit wine
|
||||
|
||||
@@ -88,6 +88,9 @@
|
||||
enable = true;
|
||||
overrideSettings = true;
|
||||
};
|
||||
pianoLEDVisualizer = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Enable the Desktop Environment.
|
||||
@@ -196,4 +199,39 @@
|
||||
# boot.loader.raspberryPi.firmwareConfig = ''
|
||||
# dtparam=audio=on
|
||||
# '';
|
||||
|
||||
## Enable SPI
|
||||
hardware.raspberry-pi."4".apply-overlays-dtmerge.enable = true;
|
||||
hardware.deviceTree = {
|
||||
enable = true;
|
||||
filter = "*-rpi-*.dtb";
|
||||
overlays = [
|
||||
{
|
||||
name = "spi";
|
||||
dtsoFile = ./spi0-0cd.dtso;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
users.groups.spi = {};
|
||||
|
||||
# services.udev.extraRules = ''
|
||||
# SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
|
||||
# '';
|
||||
|
||||
## Use GPIO as non-root
|
||||
# Create gpio group
|
||||
users.groups.gpio = {};
|
||||
|
||||
# Change permissions gpio devices
|
||||
services.udev.extraRules = ''
|
||||
SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
|
||||
|
||||
SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="gpio",MODE="0660"
|
||||
SUBSYSTEM=="gpio", KERNEL=="gpiochip*", ACTION=="add", RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys/class/gpio/export /sys/class/gpio/unexport ; chmod 220 /sys/class/gpio/export /sys/class/gpio/unexport'"
|
||||
SUBSYSTEM=="gpio", KERNEL=="gpio*", ACTION=="add",RUN+="${pkgs.bash}/bin/bash -c 'chown root:gpio /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value ; chmod 660 /sys%p/active_low /sys%p/direction /sys%p/edge /sys%p/value'"
|
||||
'';
|
||||
|
||||
# Add user to group
|
||||
users.users.julian.extraGroups = ["gpio"];
|
||||
}
|
||||
|
||||
BIN
hosts/pianonix/spi0-0cs.dtbo
Normal file
BIN
hosts/pianonix/spi0-0cs.dtbo
Normal file
Binary file not shown.
@@ -2,4 +2,5 @@
|
||||
# hydra-auto-upgrade = import ./hydra-auto-upgrade.nix;
|
||||
syncthing = import ./syncthing.nix;
|
||||
frajulAutoUpgrade = import ./frajul-auto-upgrade.nix;
|
||||
pianoLEDVisualizer = import ./piano-led-visualizer.nix;
|
||||
}
|
||||
|
||||
47
modules/nixos/piano-led-visualizer.nix
Normal file
47
modules/nixos/piano-led-visualizer.nix
Normal file
@@ -0,0 +1,47 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.services.piano-led-visualizer;
|
||||
in {
|
||||
options.services.piano-led-visualizer = {
|
||||
enable = lib.mkEnableOption "Enable Piano LED Visualizer";
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "plv";
|
||||
description = "User to run the Piano LED Visualizer service.";
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "plv";
|
||||
description = "Group to run the Piano LED Visualizer service.";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
users.users.${cfg.user} = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
};
|
||||
users.groups.${cfg.group} = {};
|
||||
|
||||
systemd.services.piano-led-visualizer = {
|
||||
description = "Piano LED Visualizer";
|
||||
after = ["network-online.target"];
|
||||
wants = ["network-online.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.frajul.piano-led-visualizer}/bin/piano-led-visualizer";
|
||||
Restart = "always";
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -14,4 +14,5 @@
|
||||
wl-ocr = pkgs.callPackage ./wl-ocr {};
|
||||
rtklib = pkgs.qt6Packages.callPackage ./rtklib {};
|
||||
pob2-frajul = pkgs.callPackage ./pob2-frajul {};
|
||||
piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {};
|
||||
}
|
||||
|
||||
60
pkgs/piano-led-visualizer/default.nix
Normal file
60
pkgs/piano-led-visualizer/default.nix
Normal file
@@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}: let
|
||||
pythonPackages = python3.pkgs;
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "piano-led-visualizer";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onlaj";
|
||||
repo = "Piano-LED-Visualizer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SkNNu2pqVG40HBZZYJMCCKiRj1h1QdkteaPR3Ek2P7I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-log-dir.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
setuptools
|
||||
|
||||
numpy
|
||||
pillow
|
||||
flask
|
||||
rpi-gpio
|
||||
webcolors
|
||||
psutil
|
||||
mido
|
||||
rtmidi-python
|
||||
spidev
|
||||
waitress
|
||||
websockets
|
||||
werkzeug
|
||||
# rpi_ws281x
|
||||
];
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
preBuild = ''
|
||||
cp ${./setup.py} setup.py
|
||||
sed -i 's/PLACEHOLDER_VERSION/${version}/' setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv -v $out/bin/visualizer.py $out/bin/piano-led-visualizer
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Piano LED Visualizer for Raspberry Pi";
|
||||
homepage = "https://github.com/onlaj/Piano-LED-Visualizer";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
24
pkgs/piano-led-visualizer/fix-log-dir.patch
Normal file
24
pkgs/piano-led-visualizer/fix-log-dir.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
diff --git a/lib/log_setup.py b/lib/log_setup.py
|
||||
index 34f9156..e164d14 100644
|
||||
--- a/lib/log_setup.py
|
||||
+++ b/lib/log_setup.py
|
||||
@@ -1,6 +1,7 @@
|
||||
import logging
|
||||
from logging.handlers import RotatingFileHandler
|
||||
import sys
|
||||
+import os
|
||||
|
||||
# Create a custom logger
|
||||
logger = logging.getLogger("my_app")
|
||||
@@ -10,7 +11,10 @@ logger.setLevel(logging.DEBUG)
|
||||
|
||||
# Create handlers
|
||||
console_handler = logging.StreamHandler()
|
||||
-file_handler = RotatingFileHandler('/home/Piano-LED-Visualizer/visualizer.log', maxBytes=500000, backupCount=10)
|
||||
+
|
||||
+log_path = os.path.expanduser('~/Piano-LED-Visualizer/visualizer.log')
|
||||
+os.makedirs(os.path.dirname(log_path), exist_ok=True)
|
||||
+file_handler = RotatingFileHandler(log_path, maxBytes=500000, backupCount=10)
|
||||
|
||||
|
||||
# Set the level for handlers
|
||||
24
pkgs/piano-led-visualizer/setup.py
Normal file
24
pkgs/piano-led-visualizer/setup.py
Normal file
@@ -0,0 +1,24 @@
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="piano_led_visualizer",
|
||||
version="PLACEHOLDER_VERSION",
|
||||
py_modules=["visualizer"],
|
||||
packages=find_packages(), # includes all packages with __init__.py
|
||||
install_requires=[
|
||||
"numpy",
|
||||
"pillow",
|
||||
"flask",
|
||||
"rpi-gpio",
|
||||
"webcolors",
|
||||
"psutil",
|
||||
"mido",
|
||||
"rtmidi",
|
||||
"spidev",
|
||||
"waitress",
|
||||
"websockets",
|
||||
"werkzeug",
|
||||
"rpi_ws281x",
|
||||
],
|
||||
scripts=["visualizer.py"],
|
||||
)
|
||||
Reference in New Issue
Block a user