From 302a8ec1b355f6faacd7b65262a1308c24967a7b Mon Sep 17 00:00:00 2001 From: Kate Adkins Date: Wed, 23 Jul 2025 14:46:17 +0200 Subject: [PATCH] add packages for sdr, add superprod, fix hinata --- nixos/hosts/hinata.nix | 33 ++++++++++----------------------- nixos/packages/default.pkgs.nix | 1 + nixos/packages/flatpak.nix | 4 ++++ nixos/packages/offline.pkgs.nix | 3 +++ 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/nixos/hosts/hinata.nix b/nixos/hosts/hinata.nix index d1652ad..8773dfe 100644 --- a/nixos/hosts/hinata.nix +++ b/nixos/hosts/hinata.nix @@ -13,17 +13,15 @@ }: let # libfprint with patches for the GPD-provided reader - libfprint-gpd = - pkgs.libfprint.overrideAttrs - (prev: { - version = "git"; + libfprint-gpd = pkgs.libfprint.overrideAttrs (prev: { + version = "git"; - src = pkgs.fetchFromGitHub { - owner = "ericlinagora"; - repo = "libfprint-CS9711"; - rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377"; - sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids="; - }; + src = pkgs.fetchFromGitHub { + owner = "ericlinagora"; + repo = "libfprint-CS9711"; + rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377"; + sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids="; + }; nativeBuildInputs = prev.nativeBuildInputs @@ -34,19 +32,8 @@ let nss ]); - installCheckPhase = ""; - - }).overrideAttrs - (prev: rec { - version = "1.94.4"; - src = pkgs.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libfprint"; - repo = "fprintd"; - rev = "refs/tags/v${version}"; - hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; - }; - }); + installCheckPhase = ""; + }); in { diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix index 012371d..5990c36 100644 --- a/nixos/packages/default.pkgs.nix +++ b/nixos/packages/default.pkgs.nix @@ -26,6 +26,7 @@ with pkgs; deprekages._7zz gnused gnugrep + just # Backup things. keepassxc diff --git a/nixos/packages/flatpak.nix b/nixos/packages/flatpak.nix index dce7a3d..714fe4d 100644 --- a/nixos/packages/flatpak.nix +++ b/nixos/packages/flatpak.nix @@ -17,6 +17,10 @@ appId = "io.emeric.toolblex"; origin = "flathub"; } + { + appId = "com.super_productivity.SuperProductivity"; + origin = "flathub"; + } ]; services.flatpak.overrides = { diff --git a/nixos/packages/offline.pkgs.nix b/nixos/packages/offline.pkgs.nix index 1ed554b..4872713 100644 --- a/nixos/packages/offline.pkgs.nix +++ b/nixos/packages/offline.pkgs.nix @@ -42,6 +42,9 @@ with pkgs; gnuradioPackages.bladeRF gnuradioPackages.fosphor gnuradioPackages.lora_sdr + rtl-sdr + rtl-sdr-osmocom + soapyrtlsdr # hax btlejack