diff --git a/nixos/essential.nix b/nixos/essential.nix index be45afb0..90d2e334 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -1,4 +1,10 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: +let + keepbook = inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook.overrideAttrs (_: { + # Upstream checks currently depend on TS artifacts that are not built in Nix. + doCheck = false; + }); +in { nixpkgs.config.allowBroken = true; @@ -36,6 +42,7 @@ ispell jq just + keepbook lshw lsof magic-wormhole-rs diff --git a/nixos/flake.lock b/nixos/flake.lock index 0dab3f10..65145165 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1318,11 +1318,11 @@ ] }, "locked": { - "lastModified": 1771447274, - "narHash": "sha256-W5TTADv4NGn0tpap2nkOTZAxVUGiJI7m2UiKQvfW+WY=", + "lastModified": 1771570718, + "narHash": "sha256-vmFe1a9gIOLcT8UdE/b+Z9Cb0KQzGQonwtrxcZX9hx8=", "owner": "colonelpanic8", "repo": "keepbook", - "rev": "d0feb8deed6a439fb0f673ce1b9026afb2240b70", + "rev": "c0154c4e701dc3726cc709b15ec01cad1175d4f8", "type": "github" }, "original": { diff --git a/nixos/keepbook-sync.nix b/nixos/keepbook-sync.nix index 6a3b0e85..1b36a025 100644 --- a/nixos/keepbook-sync.nix +++ b/nixos/keepbook-sync.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, inputs, makeEnable, ... }: - let - cfg = config.myModules."keepbook-sync"; - keepbookTray = - inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook-tray.overrideAttrs (old: { - # Upstream currently includes a contract test that expects a built TS CLI - # entrypoint under ts/dist/, but the Nix build does not build the TS - # artifacts first. Skip checks to keep the package usable on NixOS. - doCheck = false; - }); +let + cfg = config.myModules."keepbook-sync"; + keepbookTray = + inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook-tray.overrideAttrs (_: { + # Upstream currently includes a contract test that expects a built TS CLI + # entrypoint under ts/dist/, but the Nix build does not build the TS + # artifacts first. Skip checks to keep the package usable on NixOS. + doCheck = false; + }); daemonArgs = [ "--config" cfg.configPath @@ -24,6 +24,8 @@ daemonExec = lib.escapeShellArgs ([ "${keepbookTray}/bin/keepbook-sync-daemon" ] ++ daemonArgs); enabledModule = makeEnable config "myModules.keepbook-sync" false { + environment.systemPackages = [ keepbookTray ]; + home-manager.users.${cfg.user} = { systemd.user.services.keepbook-sync-daemon = { Unit = {