From 130c9156127ec5fc5894fc600f84b56920ef3c37 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 22 Apr 2024 14:26:52 +0200 Subject: [PATCH] chore: bump flake inputs, remove unneeded element-desktop + slack overlays, update nvfetcher --- flake.lock | 23 +++-------------------- flake.nix | 2 +- overlays/default.nix | 3 +-- overlays/slack.nix | 9 --------- pkgs/_sources/generated.nix | 16 ++++++++-------- 5 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 overlays/slack.nix diff --git a/flake.lock b/flake.lock index 5e4fa9bb..815f9620 100644 --- a/flake.lock +++ b/flake.lock @@ -143,22 +143,6 @@ "type": "github" } }, - "fork": { - "locked": { - "lastModified": 1713522785, - "narHash": "sha256-vLlIYWQVDhzEXvmYvtOfLZZkpEgUNZRPfxbDmpNQATA=", - "owner": "teutat3s", - "repo": "nixpkgs", - "rev": "3a083ae7e2b12229f9dd0a3c7b56fcc7d0a4cf5b", - "type": "github" - }, - "original": { - "owner": "teutat3s", - "ref": "fix-element-desktop-screen-sharing", - "repo": "nixpkgs", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -265,11 +249,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -319,7 +303,6 @@ "deploy-rs": "deploy-rs", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "fork": "fork", "home-manager": "home-manager", "master": "master", "nix-darwin": "nix-darwin", diff --git a/flake.nix b/flake.nix index 2af86692..c320c40d 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; - fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing"; + #fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index b555ed44..39f21d16 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -26,7 +26,7 @@ }; in { - element-desktop = fork.element-desktop; + #element-desktop = fork.element-desktop; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; }) (import ../pkgs) @@ -34,7 +34,6 @@ (import ./mdbook-multilang.nix inputs) (import ./nix-index.nix) (import ./prr.nix) - (import ./slack.nix) (import ./neovim-plugins.nix) ]; }); diff --git a/overlays/slack.nix b/overlays/slack.nix deleted file mode 100644 index 90796ef5..00000000 --- a/overlays/slack.nix +++ /dev/null @@ -1,9 +0,0 @@ -final: prev: { - # https://askubuntu.com/questions/1490447/slack-with-webrtcpipewirecapture-wyaland-black-screen-sharing-but-works-on-chrom - slack = prev.slack.overrideAttrs (oldAttrs: rec { - - postInstall = '' - sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar - ''; - }); -} diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 577c5c78..732c6571 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -3,17 +3,17 @@ { blesh-nvfetcher = { pname = "blesh-nvfetcher"; - version = "27e6309ef2344d37a6cec49f37b958c70f660472"; + version = "70a325f95882f4850818542fc48b9ebb5db476bb"; src = fetchFromGitHub { owner = "akinomyoga"; repo = "ble.sh"; - rev = "27e6309ef2344d37a6cec49f37b958c70f660472"; + rev = "70a325f95882f4850818542fc48b9ebb5db476bb"; fetchSubmodules = true; deepClone = false; leaveDotGit = true; - sha256 = "sha256-Mp/oay4jDpA2UFUpsxaSbgw0gMDtSzVvWezhZ2SOW/E="; + sha256 = "sha256-AEs6AfeHYjyraSmCmyDiFar+OFt2eurjz1A6mro6iXc="; }; - date = "2024-02-06"; + date = "2024-04-20"; }; instant-nvim-nvfetcher = { pname = "instant-nvim-nvfetcher"; @@ -77,15 +77,15 @@ }; vimagit-nvfetcher = { pname = "vimagit-nvfetcher"; - version = "06afe48439d0118a77d622ef06eff0f7cd7d62ab"; + version = "fc7eda97da4f8182c8abbe6ea7befbd789b8b935"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "06afe48439d0118a77d622ef06eff0f7cd7d62ab"; + rev = "fc7eda97da4f8182c8abbe6ea7befbd789b8b935"; fetchSubmodules = false; - sha256 = "sha256-2kugFr32lZINgpmDyfTyBp5lNa2/dculKmcFGa2q/io="; + sha256 = "sha256-HievBzyVZke4AyCWAL9MlOw65X460cEEeOhwAL2brzs="; }; - date = "2024-01-04"; + date = "2024-03-28"; }; wik = { pname = "wik";