From 84fbfad9e9ac3b5a71683818310c5f0b2b03876d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 9 Oct 2024 16:59:03 +0200 Subject: [PATCH] things --- flake.nix | 5 +++-- hosts/sopp/configuration.nix | 4 ++++ pkgs/v4l2-play/script.sh | 0 users/pbsds/home/default.nix | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) mode change 100644 => 100755 pkgs/v4l2-play/script.sh diff --git a/flake.nix b/flake.nix index f3745d7..591505d 100644 --- a/flake.nix +++ b/flake.nix @@ -182,16 +182,17 @@ networking.hostName = hostname; networking.domain = domain; networking.search = [ domain ]; + nixpkgs.overlays = [ self.overlays.pbsdspkgs (final: prev: { - #unstable = unstable.legacyPackages.${final.system}; unstable = import inputs.unstable { inherit system; config = final.pkgs.config; }; }) ]; + # This makes commandline tools like 'nix run nixpkgs#hello' # and 'nix-shell -p hello' use the same channel as system was built with nix.registry.nixpkgs.flake = inputs.nixpkgs; @@ -312,7 +313,7 @@ #pdoc3-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs3; }); }; - wl-clipboard-timeout = ./overlays/wl-clipboard-timeout.nix; + wl-clipboard-timeout = import ./overlays/wl-clipboard-timeout.nix; default = self.overlays.pbsdspkgs; }; diff --git a/hosts/sopp/configuration.nix b/hosts/sopp/configuration.nix index 998d6f5..84900d2 100644 --- a/hosts/sopp/configuration.nix +++ b/hosts/sopp/configuration.nix @@ -56,6 +56,10 @@ networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery + environment.systemPackages = [ + pkgs.pbsds.v4l2-play + ]; + # Networking /**/ networking.networkmanager.enable = true; diff --git a/pkgs/v4l2-play/script.sh b/pkgs/v4l2-play/script.sh old mode 100644 new mode 100755 diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index d0db332..2a5a10f 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -38,6 +38,11 @@ else alias clip="wl-copy --trim-newline --type text/plain"; fi + + nix-prefetch-sri() { + url="$1"; shift + nix hash to-sri --type sha256 "$@" "$(nix-prefetch-url "$url")" + } ''; home.packages = with pkgs; [