jordan/nix-config
1
1
Fork 0
Code Issues 14 Pull Requests Actions Projects 3 Wiki Activity

treewide: fix whitespace
All checks were successful
Check flake / build-amd64-linux (push) Successful in 3m12s
Details

Browse Source
This commit is contained in:
Jordan Holt 2025-01-19 13:19:45 +00:00
parent 0473348ad2
commit 00d8cdf92b
Signed by: jordan
GPG Key ID: B8CFFF61F1CCF520
10 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -52,4 +52,3 @@ tailscale up --login-server https://headscale.vimium.net
then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`. then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.
The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`. The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.

11
hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
View File

@ -15,7 +15,7 @@ index d5a8182cf..be722c43a 100644
@@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params) @@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params)
} }
} }
+typedef struct { +typedef struct {
+ u64 version; + u64 version;
+ void (*set_os_version) (const char *os_version); + void (*set_os_version) (const char *os_version);
@ -73,13 +73,13 @@ index d5a8182cf..be722c43a 100644
+ +
+ return status; + return status;
+} +}
static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status) static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
{ {
@@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle, @@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
setup_unaccepted_memory(); setup_unaccepted_memory();
+ apple_set_os(); + apple_set_os();
+ +
status = exit_boot(boot_params, handle); status = exit_boot(boot_params, handle);
@ -97,6 +97,5 @@ index d59b0947f..81158014f 100644
#define EFI_TCG2_PROTOCOL_GUID EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f) #define EFI_TCG2_PROTOCOL_GUID EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
#define EFI_TCG2_FINAL_EVENTS_TABLE_GUID EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)
#define EFI_LOAD_FILE_PROTOCOL_GUID EFI_GUID(0x56ec3091, 0x954c, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b) #define EFI_LOAD_FILE_PROTOCOL_GUID EFI_GUID(0x56ec3091, 0x954c, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
-- --
2.42.0 2.42.0

1
hosts/library/README.md
View File

@ -43,4 +43,3 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase
### Networks ### Networks
- DHCP on `10.0.1.0/24` subnet. - DHCP on `10.0.1.0/24` subnet.
- Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`. - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.

1
hosts/mail/README.md
View File

@ -15,4 +15,3 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
### Networks ### Networks
- DHCP on `10.0.1.0/24` subnet. - DHCP on `10.0.1.0/24` subnet.
- Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`. - Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.

1
hosts/skycam/README.md
View File

@ -26,4 +26,3 @@ To generate a compressed SD card image for Skycam, run:
Once a card is imaged, the existing SSH host keys should be copied to Once a card is imaged, the existing SSH host keys should be copied to
`/etc/ssh` manually to enable secret decryption. `/etc/ssh` manually to enable secret decryption.

1
hosts/vps1/README.md
View File

@ -15,4 +15,3 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
### Networks ### Networks
- DHCP on `10.0.1.0/24` subnet. - DHCP on `10.0.1.0/24` subnet.
- Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`. - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.

17
modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
View File

@ -15,16 +15,16 @@ index ab5fed9f55b6..da50a4782414 100644
--- a/sound/usb/format.c --- a/sound/usb/format.c
+++ b/sound/usb/format.c +++ b/sound/usb/format.c
@@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip, @@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
for (rate = min; rate <= max; rate += res) { for (rate = min; rate <= max; rate += res) {
- /* Filter out invalid rates on Presonus Studio 1810c */ - /* Filter out invalid rates on Presonus Studio 1810c */
- if (chip->usb_id == USB_ID(0x194f, 0x010c) && - if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
+ /* Filter out invalid rates on Presonus Studio 1824c */ + /* Filter out invalid rates on Presonus Studio 1824c */
+ if (chip->usb_id == USB_ID(0x194f, 0x010d) && + if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
!s1810c_valid_sample_rate(fp, rate)) !s1810c_valid_sample_rate(fp, rate))
goto skip_rate; goto skip_rate;
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 898bc3baca7b..c3135459c38c 100644 index 898bc3baca7b..c3135459c38c 100644
--- a/sound/usb/mixer_quirks.c --- a/sound/usb/mixer_quirks.c
@ -32,7 +32,7 @@ index 898bc3baca7b..c3135459c38c 100644
@@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) @@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
err = snd_rme_controls_create(mixer); err = snd_rme_controls_create(mixer);
break; break;
- case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */ - case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
+ case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */ + case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
err = snd_sc1810_init_mixer(mixer); err = snd_sc1810_init_mixer(mixer);
@ -44,7 +44,7 @@ index fac4bbc6b275..5bc2e66d452c 100644
+++ b/sound/usb/mixer_s1810c.c +++ b/sound/usb/mixer_s1810c.c
@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer) @@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
return 0; return 0;
dev_info(&dev->dev, dev_info(&dev->dev,
- "Presonus Studio 1810c, device_setup: %u\n", chip->setup); - "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
+ "Presonus Studio 1824c, device_setup: %u\n", chip->setup); + "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
@ -64,8 +64,7 @@ index ab2b938502eb..b86832edaaa0 100644
+ /* presonus studio 1824c: skip altsets incompatible with device_setup */ + /* presonus studio 1824c: skip altsets incompatible with device_setup */
+ if (chip->usb_id == USB_ID(0x194f, 0x010d)) + if (chip->usb_id == USB_ID(0x194f, 0x010d))
return s1810c_skip_setting_quirk(chip, iface, altno); return s1810c_skip_setting_quirk(chip, iface, altno);
--
2.42.0
--
2.42.0

7
overlays/0001-Ignore-IPA-signing.patch
View File

@ -14,12 +14,11 @@ index 6d5bbd05..43004175 100644
@@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const @@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
if (data.empty()) if (data.empty())
return false; return false;
- bool valid = pubKey_.verify(data, ipa->signature()); - bool valid = pubKey_.verify(data, ipa->signature());
+ bool valid = true; + bool valid = true;
LOG(IPAManager, Debug) LOG(IPAManager, Debug)
<< "IPA module " << ipa->path() << " signature is " << "IPA module " << ipa->path() << " signature is "
-- --
2.44.1 2.44.1

17
overlays/0001-Remove-relative-config-lookups.patch
View File

@ -16,7 +16,7 @@ index f4e0b633..6d5bbd05 100644
@@ -131,22 +131,6 @@ IPAManager::IPAManager() @@ -131,22 +131,6 @@ IPAManager::IPAManager()
<< "No IPA found in '" << modulePaths << "'"; << "No IPA found in '" << modulePaths << "'";
} }
- /* - /*
- * When libcamera is used before it is installed, load IPAs from the - * When libcamera is used before it is installed, load IPAs from the
- * same build directory as the libcamera library itself. - * same build directory as the libcamera library itself.
@ -35,7 +35,7 @@ index f4e0b633..6d5bbd05 100644
- -
/* Finally try to load IPAs from the installed system path. */ /* Finally try to load IPAs from the installed system path. */
ipaCount += addDir(IPA_MODULE_DIR); ipaCount += addDir(IPA_MODULE_DIR);
diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
index 69975d8f..cd9284a3 100644 index 69975d8f..cd9284a3 100644
--- a/src/libcamera/ipa_proxy.cpp --- a/src/libcamera/ipa_proxy.cpp
@ -43,7 +43,7 @@ index 69975d8f..cd9284a3 100644
@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name, @@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
} }
} }
- std::string root = utils::libcameraSourcePath(); - std::string root = utils::libcameraSourcePath();
- if (!root.empty()) { - if (!root.empty()) {
- /* - /*
@ -74,12 +74,12 @@ index 69975d8f..cd9284a3 100644
- return confPath; - return confPath;
- } - }
} }
if (fallbackName.empty()) { if (fallbackName.empty()) {
@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const @@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
} }
} }
- /* - /*
- * When libcamera is used before it is installed, load proxy workers - * When libcamera is used before it is installed, load proxy workers
- * from the same build directory as the libcamera directory itself. - * from the same build directory as the libcamera directory itself.
@ -112,7 +112,7 @@ index 5ea2ca78..fd8555ca 100644
@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir, @@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
struct stat statbuf; struct stat statbuf;
int ret; int ret;
- std::string root = utils::libcameraSourcePath(); - std::string root = utils::libcameraSourcePath();
- if (!root.empty()) { - if (!root.empty()) {
- /* - /*
@ -134,9 +134,8 @@ index 5ea2ca78..fd8555ca 100644
- } - }
+ confPath = std::string(LIBCAMERA_DATA_DIR) + confPath = std::string(LIBCAMERA_DATA_DIR)
+ + "/pipeline/" + subdir + '/' + name; + + "/pipeline/" + subdir + '/' + name;
ret = stat(confPath.c_str(), &statbuf); ret = stat(confPath.c_str(), &statbuf);
if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG) if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
-- --
2.44.1 2.44.1

5
pkgs/camera-streamer/0001-Disable-libdatachannel.patch
View File

@ -17,9 +17,8 @@ index d5029bd..e50ba1a 100644
USE_RTSP ?= $(shell pkg-config live555 && echo 1) USE_RTSP ?= $(shell pkg-config live555 && echo 1)
-USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1) -USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1)
+USE_LIBDATACHANNEL ?= 0 +USE_LIBDATACHANNEL ?= 0
ifeq (1,$(DEBUG)) ifeq (1,$(DEBUG))
CFLAGS += -g CFLAGS += -g
-- --
2.44.1 2.44.1