From a6612db1b1ba78b7833e905d331aa4b67175f2b7 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 2 Apr 2025 18:19:56 -0400 Subject: [PATCH] taskwarrior web package --- flake.lock | 39 ++++++++--------------------------- flake.nix | 4 ---- homes/emenel/default.nix | 10 ++++----- homes/media/default.nix | 3 ++- hosts/eddie/configuration.nix | 1 - packages/taskwarrior-web.nix | 29 ++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 packages/taskwarrior-web.nix diff --git a/flake.lock b/flake.lock index fcd3b80..764336d 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1743584818, - "narHash": "sha256-6iCK1WgpULxnqg8iPgEVpEZ5nqZI0OBIi19sYCVuG58=", + "lastModified": 1743614257, + "narHash": "sha256-Twr8RN+jwMtZjbR5DnU1LpsD1AFbkZtoBGRDpPD6isc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b2863692cfdfa842ee357d7d93e9c781feb92dc7", + "rev": "513da799bd6dc36b9ee69db71f102257dab665e6", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "lastModified": 1743607567, + "narHash": "sha256-kTzKPDFmNzwO1cK4fiJgPB/iSw7HgBAmknRTeAPJAeI=", "owner": "nix-community", "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "rev": "49748c74cdbae03d70381f150b810f92617f23aa", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1743294814, - "narHash": "sha256-HqzVTylWZA0+cf4cpMGQOgcidJuCogjv51fJShrGxlI=", + "lastModified": 1743624959, + "narHash": "sha256-xsSVHatubv6MFexuqZsYQJgjjQ1Mlwn+L8FtGGBhVDs=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "1ebbc35c55ba9e43d53c4f1038c897be7239c903", + "rev": "0b1f2a97ef10cfd10669cbfbb3e45d1cab1073a0", "type": "github" }, "original": { @@ -1159,26 +1159,6 @@ "type": "github" } }, - "pyproject-nix_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743438845, - "narHash": "sha256-1GSaoubGtvsLRwoYwHjeKYq40tLwvuFFVhGrG8J9Oek=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "8063ec98edc459571d042a640b1c5e334ecfca1e", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "affinity-nix": "affinity-nix", @@ -1199,7 +1179,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_4", - "pyproject-nix": "pyproject-nix_2", "sops-nix": "sops-nix", "wezterm": "wezterm", "xwayland-satellite": "xwayland-satellite", diff --git a/flake.nix b/flake.nix index 7262703..549e1b3 100644 --- a/flake.nix +++ b/flake.nix @@ -94,9 +94,6 @@ emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates"; nix-way-templates.url = "github:the-nix-way/dev-templates"; - pyproject-nix.url = "github:pyproject-nix/pyproject.nix"; - pyproject-nix.inputs.nixpkgs.follows = "nixpkgs"; - }; outputs = @@ -146,7 +143,6 @@ pkgs: packagesFromDirectoryRecursive { inherit (pkgs) callPackage; - directory = ./packages; } ); diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 81ca072..baf29b8 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -15,11 +15,11 @@ home = { packages = lib.mkMerge [ - [ - inputs.affinity-nix.packages.x86_64-linux.photo - inputs.affinity-nix.packages.x86_64-linux.publisher - inputs.affinity-nix.packages.x86_64-linux.designer - ] + (with inputs.affinity-nix.packages.x86_64-linux; [ + photo + publisher + designer + ]) (with pkgs; [ dconf diff --git a/homes/media/default.nix b/homes/media/default.nix index 8bda772..81cf642 100644 --- a/homes/media/default.nix +++ b/homes/media/default.nix @@ -1,4 +1,4 @@ -{ nix-config, config, lib, pkgs, inputs, ... }: +{ nix-config, config, pkgs, ... }: { imports = with nix-config.homeModules; [ @@ -11,6 +11,7 @@ home = { packages = with pkgs; [ btop + nix-config.packages.x86_64-linux.taskwarrior-web ]; username = "media"; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index a171909..4dc934e 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -154,7 +154,6 @@ spice-protocol win-virtio win-spice - xwayland-satellite ]; diff --git a/packages/taskwarrior-web.nix b/packages/taskwarrior-web.nix new file mode 100644 index 0000000..e434d21 --- /dev/null +++ b/packages/taskwarrior-web.nix @@ -0,0 +1,29 @@ +{ stdenv, pkgs, fetchurl, lib, ... }: + +stdenv.mkDerivation { + pname = "taskwarrior-web"; + version = "2025-04-01"; + + src = fetchurl { + url = "https://github.com/tmahmood/taskwarrior-web/releases/download/2025-04-01/tw-web-2025-04-01.tar.gz"; + sha256 = "sha256-1zEW9fEqZiQ1vWfB1rWSrJz7k+oaYZuHb9AA/9lpEZY="; + }; + + nativeBuildInputs = [ pkgs.gnutar ]; + + unpackPhase = '' + mkdir tww + tar -zxvf $src -C tww + ''; + + installPhase = '' + mkdir -p $out/bin + cp -r tww/* $out/bin + ''; + + meta = with lib; { + homepage = ""; + description = ""; + platforms = platforms.linux; + }; +}