Compare commits
5 Commits
275d3a36f7
...
ed51b019f3
| Author | SHA1 | Date |
|---|---|---|
Ari Gerus
|
ed51b019f3 | |
|
Ari Gerus
|
cda000a330 | |
|
Ari Gerus
|
1685cbc6d0 | |
|
Ari Gerus
|
001e2c3229 | |
|
Ari Gerus
|
a73c8fde58 |
36
flake.lock
36
flake.lock
|
|
@ -304,11 +304,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714377222,
|
||||
"narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=",
|
||||
"lastModified": 1715077503,
|
||||
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49",
|
||||
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -340,11 +340,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714235105,
|
||||
"narHash": "sha256-QCEp+JZOQzFWsNSs3KMCAMf4Ik+YglNdrQJXq10yYaw=",
|
||||
"lastModified": 1714803703,
|
||||
"narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "03448a4e169d4590d21138f0ac65ab64bd1a2d85",
|
||||
"rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -388,11 +388,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714072181,
|
||||
"narHash": "sha256-MOxTGzM8lgq8uo6zAy6e4ZUdzUpF/eSQPBXeH5G5BtE=",
|
||||
"lastModified": 1714764302,
|
||||
"narHash": "sha256-MmIZR67wOP3Nr9b3XpsvHSZSTDcTmd9cQn2Z8pW1/Hw=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "ac28e21ac336dbe01b1f1bcab01fd31db3855e40",
|
||||
"rev": "e9977efbe34b554c3e393dc9a18509905a4080e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -469,11 +469,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714273701,
|
||||
"narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
|
||||
"lastModified": 1714878592,
|
||||
"narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "941c4973c824509e0356be455d89613611f76c8a",
|
||||
"rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -484,11 +484,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1714201532,
|
||||
"narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
|
||||
"lastModified": 1715010655,
|
||||
"narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
|
||||
"rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -709,11 +709,11 @@
|
|||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714298568,
|
||||
"narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=",
|
||||
"lastModified": 1714720456,
|
||||
"narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d",
|
||||
"rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
'';
|
||||
cageScript = pkgs.writeScriptBin "klipperCageScript" ''
|
||||
#!${pkgs.runtimeShell}
|
||||
${pkgs.wlr-randr}/bin/wlr-randr --output HDMI-A-1 --transform 180
|
||||
${pkgs.wlr-randr}/bin/wlr-randr --output Unknown-1 --transform 180
|
||||
sounds=( /home/ar/startup-sounds/* )
|
||||
${pkgs.mpv}/bin/mpv ''${sounds[ $RANDOM % ''${#sounds[@]}]} &
|
||||
${pkgs.klipperscreen}/bin/KlipperScreen --configfile ${klipperScreenConfig}
|
||||
|
|
@ -294,9 +294,9 @@ in {
|
|||
mcu = {
|
||||
enableKlipperFlash = false;
|
||||
enable = true;
|
||||
configFile = ./klipper-smoothie.cfg;
|
||||
configFile = ./klipper-octopus.cfg;
|
||||
serial =
|
||||
"/dev/serial/by-id/usb-Klipper_lpc1769_05E0FF0B27201CAF6CDBCA59C62000F5-if00";
|
||||
"/dev/serial/by-id/usb-Klipper_stm32f429xx_400048000251313133383438-if00";
|
||||
package = pkgs.klipper-firmware.override {
|
||||
gcc-arm-embedded = pkgs.gcc-arm-embedded-11;
|
||||
klipper = klipperOld;
|
||||
|
|
@ -317,7 +317,7 @@ in {
|
|||
};
|
||||
mcu = {
|
||||
serial =
|
||||
"/dev/serial/by-id/usb-Klipper_lpc1769_05E0FF0B27201CAF6CDBCA59C62000F5-if00";
|
||||
"/dev/serial/by-id/usb-Klipper_stm32f429xx_400048000251313133383438-if00";
|
||||
};
|
||||
"mcu rpi" = { serial = "/run/klipper-mcu/mcu-rpi"; };
|
||||
virtual_sdcard = { path = "/var/lib/moonraker/gcodes"; };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
CONFIG_LOW_LEVEL_OPTIONS=y
|
||||
# CONFIG_MACH_AVR is not set
|
||||
# CONFIG_MACH_ATSAM is not set
|
||||
# CONFIG_MACH_ATSAMD is not set
|
||||
# CONFIG_MACH_LPC176X is not set
|
||||
CONFIG_MACH_STM32=y
|
||||
# CONFIG_MACH_HC32F460 is not set
|
||||
# CONFIG_MACH_RP2040 is not set
|
||||
# CONFIG_MACH_PRU is not set
|
||||
# CONFIG_MACH_AR100 is not set
|
||||
# CONFIG_MACH_LINUX is not set
|
||||
# CONFIG_MACH_SIMU is not set
|
||||
CONFIG_BOARD_DIRECTORY="stm32"
|
||||
CONFIG_MCU="stm32f429xx"
|
||||
CONFIG_CLOCK_FREQ=168000000
|
||||
CONFIG_USBSERIAL=y
|
||||
CONFIG_FLASH_SIZE=0x80000
|
||||
CONFIG_FLASH_BOOT_ADDRESS=0x8000000
|
||||
CONFIG_RAM_START=0x20000000
|
||||
CONFIG_RAM_SIZE=0x20000
|
||||
CONFIG_STACK_SIZE=512
|
||||
CONFIG_FLASH_APPLICATION_ADDRESS=0x8008000
|
||||
CONFIG_STM32_SELECT=y
|
||||
# CONFIG_MACH_STM32F103 is not set
|
||||
# CONFIG_MACH_STM32F207 is not set
|
||||
# CONFIG_MACH_STM32F401 is not set
|
||||
# CONFIG_MACH_STM32F405 is not set
|
||||
# CONFIG_MACH_STM32F407 is not set
|
||||
CONFIG_MACH_STM32F429=y
|
||||
# CONFIG_MACH_STM32F446 is not set
|
||||
# CONFIG_MACH_STM32F765 is not set
|
||||
# CONFIG_MACH_STM32F031 is not set
|
||||
# CONFIG_MACH_STM32F042 is not set
|
||||
# CONFIG_MACH_STM32F070 is not set
|
||||
# CONFIG_MACH_STM32F072 is not set
|
||||
# CONFIG_MACH_STM32G070 is not set
|
||||
# CONFIG_MACH_STM32G071 is not set
|
||||
# CONFIG_MACH_STM32G0B0 is not set
|
||||
# CONFIG_MACH_STM32G0B1 is not set
|
||||
# CONFIG_MACH_STM32G431 is not set
|
||||
# CONFIG_MACH_STM32H723 is not set
|
||||
# CONFIG_MACH_STM32H743 is not set
|
||||
# CONFIG_MACH_STM32H750 is not set
|
||||
# CONFIG_MACH_STM32L412 is not set
|
||||
# CONFIG_MACH_N32G452 is not set
|
||||
# CONFIG_MACH_N32G455 is not set
|
||||
CONFIG_MACH_STM32F4=y
|
||||
CONFIG_MACH_STM32F4x5=y
|
||||
CONFIG_HAVE_STM32_USBOTG=y
|
||||
CONFIG_HAVE_STM32_CANBUS=y
|
||||
CONFIG_HAVE_STM32_USBCANBUS=y
|
||||
CONFIG_STM32_DFU_ROM_ADDRESS=0x1fff0000
|
||||
CONFIG_STM32_FLASH_START_8000=y
|
||||
# CONFIG_STM32_FLASH_START_20200 is not set
|
||||
# CONFIG_STM32_FLASH_START_C000 is not set
|
||||
# CONFIG_STM32_FLASH_START_10000 is not set
|
||||
# CONFIG_STM32_FLASH_START_4000 is not set
|
||||
# CONFIG_STM32_FLASH_START_0000 is not set
|
||||
CONFIG_STM32_CLOCK_REF_8M=y
|
||||
# CONFIG_STM32_CLOCK_REF_12M is not set
|
||||
# CONFIG_STM32_CLOCK_REF_16M is not set
|
||||
# CONFIG_STM32_CLOCK_REF_20M is not set
|
||||
# CONFIG_STM32_CLOCK_REF_24M is not set
|
||||
# CONFIG_STM32_CLOCK_REF_25M is not set
|
||||
# CONFIG_STM32_CLOCK_REF_INTERNAL is not set
|
||||
CONFIG_CLOCK_REF_FREQ=8000000
|
||||
CONFIG_STM32F0_TRIM=16
|
||||
CONFIG_STM32_USB_PA11_PA12=y
|
||||
# CONFIG_STM32_SERIAL_USART1 is not set
|
||||
# CONFIG_STM32_SERIAL_USART1_ALT_PB7_PB6 is not set
|
||||
# CONFIG_STM32_SERIAL_USART2 is not set
|
||||
# CONFIG_STM32_SERIAL_USART2_ALT_PD6_PD5 is not set
|
||||
# CONFIG_STM32_SERIAL_USART3 is not set
|
||||
# CONFIG_STM32_SERIAL_USART3_ALT_PD9_PD8 is not set
|
||||
# CONFIG_STM32_CANBUS_PA11_PA12 is not set
|
||||
# CONFIG_STM32_CANBUS_PA11_PB9 is not set
|
||||
# CONFIG_STM32_MMENU_CANBUS_PB8_PB9 is not set
|
||||
# CONFIG_STM32_MMENU_CANBUS_PI9_PH13 is not set
|
||||
# CONFIG_STM32_MMENU_CANBUS_PB5_PB6 is not set
|
||||
# CONFIG_STM32_MMENU_CANBUS_PB12_PB13 is not set
|
||||
# CONFIG_STM32_MMENU_CANBUS_PD0_PD1 is not set
|
||||
# CONFIG_STM32_USBCANBUS_PA11_PA12 is not set
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_VENDOR_ID=0x1d50
|
||||
CONFIG_USB_DEVICE_ID=0x614e
|
||||
CONFIG_USB_SERIAL_NUMBER_CHIPID=y
|
||||
CONFIG_USB_SERIAL_NUMBER="12345"
|
||||
|
||||
#
|
||||
# USB ids
|
||||
#
|
||||
# end of USB ids
|
||||
|
||||
CONFIG_WANT_GPIO_BITBANGING=y
|
||||
CONFIG_WANT_DISPLAYS=y
|
||||
CONFIG_WANT_SENSORS=y
|
||||
CONFIG_WANT_LIS2DW=y
|
||||
CONFIG_WANT_SOFTWARE_I2C=y
|
||||
CONFIG_WANT_SOFTWARE_SPI=y
|
||||
CONFIG_NEED_SENSOR_BULK=y
|
||||
CONFIG_CANBUS_FREQUENCY=1000000
|
||||
CONFIG_INITIAL_PINS=""
|
||||
CONFIG_HAVE_GPIO=y
|
||||
CONFIG_HAVE_GPIO_ADC=y
|
||||
CONFIG_HAVE_GPIO_SPI=y
|
||||
CONFIG_HAVE_GPIO_SDIO=y
|
||||
CONFIG_HAVE_GPIO_I2C=y
|
||||
CONFIG_HAVE_GPIO_HARD_PWM=y
|
||||
CONFIG_HAVE_STRICT_TIMING=y
|
||||
CONFIG_HAVE_CHIPID=y
|
||||
CONFIG_HAVE_STEPPER_BOTH_EDGE=y
|
||||
CONFIG_HAVE_BOOTLOADER_REQUEST=y
|
||||
CONFIG_INLINE_STEPPER_HACK=y
|
||||
|
|
@ -509,7 +509,7 @@
|
|||
|
||||
programs.java = {
|
||||
enable = true;
|
||||
package = pkgs.openjdk17;
|
||||
package = pkgs.openjdk21;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ john restic weechat ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests, yarn, callPackage, ruby
|
||||
, writeShellScript, fetchYarnDeps, prefetch-yarn-deps, brotli
|
||||
, writeShellScript, fetchYarnDeps, prefetch-yarn-deps, brotli, fixup-yarn-lock
|
||||
|
||||
# Allow building a fork or custom version of Mastodon:
|
||||
, pname ? "mastodon", version ? srcOverride.version, patches ? [ ]
|
||||
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
prefetch-yarn-deps
|
||||
nodejs-slim
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
mastodonGems
|
||||
mastodonGems.wrappedRuby
|
||||
brotli
|
||||
|
|
|
|||
Loading…
Reference in New Issue