forked from pub-solar/os
chore: bump flake inputs, remove unneeded
element-desktop + slack overlays, update nvfetcher
This commit is contained in:
parent
ccc098d379
commit
130c915612
23
flake.lock
23
flake.lock
|
@ -143,22 +143,6 @@
|
||||||
"type": "github"
|
"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": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -265,11 +249,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713297878,
|
"lastModified": 1713714899,
|
||||||
"narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
|
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
|
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -319,7 +303,6 @@
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"fork": "fork",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"master": "master",
|
"master": "master",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
master.url = "github:nixos/nixpkgs/master";
|
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.url = "github:edolstra/flake-compat";
|
||||||
flake-compat.flake = false;
|
flake-compat.flake = false;
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
element-desktop = fork.element-desktop;
|
#element-desktop = fork.element-desktop;
|
||||||
#vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
|
#vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
|
||||||
})
|
})
|
||||||
(import ../pkgs)
|
(import ../pkgs)
|
||||||
|
@ -34,7 +34,6 @@
|
||||||
(import ./mdbook-multilang.nix inputs)
|
(import ./mdbook-multilang.nix inputs)
|
||||||
(import ./nix-index.nix)
|
(import ./nix-index.nix)
|
||||||
(import ./prr.nix)
|
(import ./prr.nix)
|
||||||
(import ./slack.nix)
|
|
||||||
(import ./neovim-plugins.nix)
|
(import ./neovim-plugins.nix)
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
|
@ -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
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
}
|
|
|
@ -3,17 +3,17 @@
|
||||||
{
|
{
|
||||||
blesh-nvfetcher = {
|
blesh-nvfetcher = {
|
||||||
pname = "blesh-nvfetcher";
|
pname = "blesh-nvfetcher";
|
||||||
version = "27e6309ef2344d37a6cec49f37b958c70f660472";
|
version = "70a325f95882f4850818542fc48b9ebb5db476bb";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinomyoga";
|
owner = "akinomyoga";
|
||||||
repo = "ble.sh";
|
repo = "ble.sh";
|
||||||
rev = "27e6309ef2344d37a6cec49f37b958c70f660472";
|
rev = "70a325f95882f4850818542fc48b9ebb5db476bb";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
deepClone = false;
|
deepClone = false;
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
sha256 = "sha256-Mp/oay4jDpA2UFUpsxaSbgw0gMDtSzVvWezhZ2SOW/E=";
|
sha256 = "sha256-AEs6AfeHYjyraSmCmyDiFar+OFt2eurjz1A6mro6iXc=";
|
||||||
};
|
};
|
||||||
date = "2024-02-06";
|
date = "2024-04-20";
|
||||||
};
|
};
|
||||||
instant-nvim-nvfetcher = {
|
instant-nvim-nvfetcher = {
|
||||||
pname = "instant-nvim-nvfetcher";
|
pname = "instant-nvim-nvfetcher";
|
||||||
|
@ -77,15 +77,15 @@
|
||||||
};
|
};
|
||||||
vimagit-nvfetcher = {
|
vimagit-nvfetcher = {
|
||||||
pname = "vimagit-nvfetcher";
|
pname = "vimagit-nvfetcher";
|
||||||
version = "06afe48439d0118a77d622ef06eff0f7cd7d62ab";
|
version = "fc7eda97da4f8182c8abbe6ea7befbd789b8b935";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jreybert";
|
owner = "jreybert";
|
||||||
repo = "vimagit";
|
repo = "vimagit";
|
||||||
rev = "06afe48439d0118a77d622ef06eff0f7cd7d62ab";
|
rev = "fc7eda97da4f8182c8abbe6ea7befbd789b8b935";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
sha256 = "sha256-2kugFr32lZINgpmDyfTyBp5lNa2/dculKmcFGa2q/io=";
|
sha256 = "sha256-HievBzyVZke4AyCWAL9MlOw65X460cEEeOhwAL2brzs=";
|
||||||
};
|
};
|
||||||
date = "2024-01-04";
|
date = "2024-03-28";
|
||||||
};
|
};
|
||||||
wik = {
|
wik = {
|
||||||
pname = "wik";
|
pname = "wik";
|
||||||
|
|
Loading…
Reference in a new issue