From f302a05874bc25b48299e7464feb61ccf63c2e31 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 15 Sep 2023 13:01:03 +1200 Subject: [PATCH] test: flake and buds custom pkg --- flake.lock | 30 +++++++++++++-------------- flake.nix | 7 ++++++- home/ooks/opt/shell/default.nix | 1 + home/ooks/opt/shell/live-buds-cli.nix | 5 +++++ pkgs/default.nix | 3 +-- pkgs/live-buds-cli/default.nix | 2 +- 6 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 home/ooks/opt/shell/live-buds-cli.nix diff --git a/flake.lock b/flake.lock index 6213145..167706e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1690776143, - "narHash": "sha256-QwcKl+CuyGhXw/Y4j1Uf2KF/xpjIEsfQm9eKv0QPk9Y=", + "lastModified": 1694643084, + "narHash": "sha256-t3BBrWnaoZn/iRnEPCr7jsHgv+RhRiwGQlwNGJ36aO0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9e6f194e234bc929624d7bd72111e469b8af60d6", + "rev": "03b1d923dad88c6f76638d82dd8629a5b40d18b7", "type": "gitlab" }, "original": { @@ -56,11 +56,11 @@ }, "hardware": { "locked": { - "lastModified": 1690704397, - "narHash": "sha256-sgIWjcz0e+x87xlKg324VtHgH55J5rIuFF0ZWRDvQoE=", + "lastModified": 1694710316, + "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "96e5a0a0e8568c998135ea05575a9ed2c87f5492", + "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1690084763, - "narHash": "sha256-Nw680m/pyVoosSgXZW415Z657mfVM2BxaxDPjEk48Z0=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb03fa5516d4e86059d24ab35a611ffa3a359547", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1690635289, - "narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=", + "lastModified": 1693997747, + "narHash": "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=", "owner": "hyprwm", "repo": "contrib", - "rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4", + "rev": "5b67181fced4fb06d26afcf9614b35765c576168", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690031011, - "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12303c652b881435065a98729eb7278313041e49", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0167f23..d212acd 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,11 @@ }; }; + hyprland = { + url = "github:hyprwm/hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + outputs = { self, nixpkgs, home-manager, ... }@inputs: let inherit (self) outputs; @@ -55,7 +60,7 @@ pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; - # X1 Carbon + # T480s "ooks@ookst480s" = lib.homeManagerConfiguration { modules = [ ./home/ooks/ookst480s.nix ]; pkgs = pkgsFor.x86_64-linux; diff --git a/home/ooks/opt/shell/default.nix b/home/ooks/opt/shell/default.nix index 2af9949..087691d 100644 --- a/home/ooks/opt/shell/default.nix +++ b/home/ooks/opt/shell/default.nix @@ -8,6 +8,7 @@ ./starship.nix ./joshuto ./helix + ./live-buds-cli.nix ]; home.packages = with pkgs; [ bc # Calculator diff --git a/home/ooks/opt/shell/live-buds-cli.nix b/home/ooks/opt/shell/live-buds-cli.nix new file mode 100644 index 0000000..cb15704 --- /dev/null +++ b/home/ooks/opt/shell/live-buds-cli.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + home.packages = [ pkgs.live-buds-cli ]; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index c7cd71d..407610c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,4 @@ -{ pkgs ? (import ../nixpkgs.nix) { } }: { +{ pkgs ? import {} }: rec { live-buds-cli = pkgs.callPackage ./live-buds-cli { }; - } diff --git a/pkgs/live-buds-cli/default.nix b/pkgs/live-buds-cli/default.nix index 8f75d74..9ba9cd6 100644 --- a/pkgs/live-buds-cli/default.nix +++ b/pkgs/live-buds-cli/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A free cli tool to control your Galaxy buds live, Galaxy Buds+, Galaxy Buds Pro, Galaxy Buds 2 and Galaxy Buds 2 Pro"; license = licenses.gpl3; - maintainers = [ maintainers.ooks-io ]; # replace with your maintainer info + #maintainers = [ maintainers.ooks-io ]; # replace with your maintainer info platforms = platforms.unix; }; }