From d1264e3b47a5aa36d6c436c38436a38709a333ae Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 22 Nov 2024 13:21:28 +0700 Subject: [PATCH] :package: add share-http --- flake.lock | 95 +++++++++++++++++++++++++++++++---- flake.nix | 4 ++ homes/palo/packages/media.nix | 3 ++ 3 files changed, 92 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index c679c79..427429f 100644 --- a/flake.lock +++ b/flake.lock @@ -311,6 +311,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_7": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, "locked": { "lastModified": 1726153070, "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", @@ -325,9 +343,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1730504689, @@ -800,6 +818,18 @@ } }, "nixpkgs-lib_4": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, + "nixpkgs-lib_5": { "locked": { "lastModified": 1725233747, "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", @@ -811,7 +841,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-lib_5": { + "nixpkgs-lib_6": { "locked": { "lastModified": 1730504152, "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", @@ -1042,11 +1072,35 @@ "polygon-art": "polygon-art", "private-parts": "private-parts", "retiolum": "retiolum", + "share-http": "share-http", "srvos": "srvos", "stylix": "stylix", "taskwarrior": "taskwarrior", "telemetry": "telemetry", - "treefmt-nix": "treefmt-nix_7" + "treefmt-nix": "treefmt-nix_8" + } + }, + "share-http": { + "inputs": { + "flake-parts": "flake-parts_6", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_5" + }, + "locked": { + "lastModified": 1731803554, + "narHash": "sha256-Abbc2hLo5R/cvgi5dS57EC3SXEXRwXaLToTKtFMvG/o=", + "ref": "main", + "rev": "053268c75d347c4d7322a6a7753f635ec47bd008", + "revCount": 7, + "type": "git", + "url": "ssh://forgejo@git.ingolf-wagner.de:2222/palo/share-host.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://forgejo@git.ingolf-wagner.de:2222/palo/share-host.git" } }, "sops-nix": { @@ -1206,12 +1260,12 @@ }, "taskwarrior": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nixpkgs" ], "taskshell": "taskshell", - "treefmt-nix": "treefmt-nix_5" + "treefmt-nix": "treefmt-nix_6" }, "locked": { "lastModified": 1727417586, @@ -1229,11 +1283,11 @@ }, "telemetry": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_6" + "treefmt-nix": "treefmt-nix_7" }, "locked": { "lastModified": 1731905778, @@ -1384,6 +1438,27 @@ } }, "treefmt-nix_5": { + "inputs": { + "nixpkgs": [ + "share-http", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_6": { "inputs": { "nixpkgs": [ "taskwarrior", @@ -1404,7 +1479,7 @@ "type": "github" } }, - "treefmt-nix_6": { + "treefmt-nix_7": { "inputs": { "nixpkgs": [ "telemetry", @@ -1425,7 +1500,7 @@ "type": "github" } }, - "treefmt-nix_7": { + "treefmt-nix_8": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index c07d15a..291edaf 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,8 @@ private-parts.url = "git+ssh://forgejo@git.ingolf-wagner.de:2222/palo/nixos-private-parts.git?ref=main"; #private-parts.url = "git+file:///home/palo/dev/nixos/nixos-private-parts"; retiolum.url = "github:Mic92/retiolum"; + share-http.inputs.nixpkgs.follows = "nixpkgs"; # only private input + share-http.url = "git+ssh://forgejo@git.ingolf-wagner.de:2222/palo/share-host.git?ref=main"; srvos.url = "github:nix-community/srvos"; stylix.inputs.home-manager.follows = "home-manager"; stylix.inputs.nixpkgs.follows = "nixpkgs"; @@ -79,6 +81,7 @@ private-parts, retiolum, self, + share-http, srvos, stylix, taskwarrior, @@ -136,6 +139,7 @@ }; polygon-art = polygon-art.packages.${system}; landingpage = landingpage.packages.${system}.plain; + share-via-http = share-http.packages.${system}.default; inherit (taskwarrior.packages.${system}) bugwarrior tasksh diff --git a/homes/palo/packages/media.nix b/homes/palo/packages/media.nix index 036c0bf..fd8fcf0 100644 --- a/homes/palo/packages/media.nix +++ b/homes/palo/packages/media.nix @@ -11,6 +11,9 @@ with lib; (mkIf config.gui.enable { home.packages = [ + + pkgs.share-via-http + pkgs.freetube pkgs.vlc