From fbdda940f5bc4355c1a2508c8edda67d741cce50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Wed, 13 Mar 2024 11:52:27 +0100 Subject: [PATCH] Add some k8s tools --- flake.lock | 30 ++++++++++++++-------------- home/packages/default.nix | 8 +++++++- home/programs/obs-studio/default.nix | 17 +++++++++++++++- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index dabccd5..a524629 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709428628, - "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709677081, - "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709356872, - "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=", + "lastModified": 1709968316, + "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "458b097d81f90275b3fdf03796f0563844926708", + "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710039806, + "narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4", "type": "github" }, "original": { diff --git a/home/packages/default.nix b/home/packages/default.nix index 92ed7f4..ded7ff6 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -32,7 +32,13 @@ spotify spicetify-cli sshfs - talosctl + + # k8s tools + unstable.talosctl + unstable.k9s + unstable.cilium-cli + unstable.kubernetes-helm + unstable.cmctl # steam # steam-run diff --git a/home/programs/obs-studio/default.nix b/home/programs/obs-studio/default.nix index b635cc7..c7ba16e 100644 --- a/home/programs/obs-studio/default.nix +++ b/home/programs/obs-studio/default.nix @@ -1,8 +1,23 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +# let +# obs-backgroundremoval_1_1_10 = (pkgs.obs-studio-plugins.obs-backgroundremoval.overrideAttrs { +# version = "1.1.10"; +# src = pkgs.fetchFromGitHub { +# owner = "occ-ai"; +# repo = "obs-backgroundremoval"; +# rev = "1.1.10"; +# hash = "sha256-6OTtmjXS3fiorEPUSjjqrS8u9fVJnnZZoD722W3JQO8="; +# }; +# }).override { +# onnxruntime = pkgs.unstable.onnxruntime; +# }; +# in +{ programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ obs-backgroundremoval ]; + #plugins = [ obs-backgroundremoval_1_1_10 ]; }; }