Flake Inputs: • Updated input 'home-manager': 'github:nix-community/home-manager' (2025-02-13) rev: 22b418c13fb0be43f4bc5c185f323a3237028594 → 'github:nix-community/home-manager' (2025-02-14) rev: 9daae9a67af7b4d341e2c806fa274a9c0925d7cf • Updated input 'hyprland': 'github:hyprwm/Hyprland' (2025-02-13) rev: 40adb3dfb4b6f8cf0c5093f095954e3ef162a8eb → 'github:hyprwm/Hyprland' (2025-02-14) rev: df3fba157279de53c582344b59699a21ac5d62b5 • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2025-02-13) rev: 27f77b393bb2cf8740d2275cb59254f742469f64 → 'github:Jovian-Experiments/Jovian-NixOS' (2025-02-14) rev: 740e8e359a21b4d0ab5421f33ba328a43e768652 • Updated input 'modernz-src': 'github:Samillion/ModernZ' (2025-02-08) rev: 1b8d849242ab293b6e41fc5dffd01a1b0fde5723 → 'github:Samillion/ModernZ' (2025-02-14) rev: 124b836109453ef06c2ee3ab7711d2118691dd02 • Updated input 'nix-eval-jobs': 'github:nix-community/nix-eval-jobs' (2025-02-13) rev: 6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7 → 'github:nix-community/nix-eval-jobs' (2024-12-10) rev: 8e82a79fe9329f3be4836ad45d4edf2383e7723a • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-02-13) rev: 78967efda12abfb171fa837c7b9f9d1043277a15 → 'github:fufexan/nix-gaming' (2025-02-14) rev: 78c53283c9c7a4f1ac83ac0354e5f74ef8eacc01 • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-02-10) rev: 64e75cd44acf21c7933d61d7721e812eac1b5a0a → 'github:NixOS/nixpkgs' (2025-02-13) rev: 2ff53fe64443980e139eaa286017f53f88336dd0 • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-02-13) rev: 731a05226213f16fac030f6da40f3d86918dd565 → 'github:nix-community/nixpkgs-wayland' (2025-02-14) rev: 97697872a3ae429185f71e08b0832d2a574c7475 • Updated input 'vimplugin-roslyn-nvim-src': 'github:seblj/roslyn.nvim' (2025-02-07) rev: fcf98a8ee39f34287cec3cafdef7f95583e412db → 'github:seblj/roslyn.nvim' (2025-02-14) rev: 63b0c30bb6b82b1f5b100cde3a212a5a3a677869 Docker Images: • postgres 14: sha256:2a453914efff6156786247b2399e6f9f18d7fc37e1ca5574a23aba172cf37d3e → sha256:5d8330e221083215ffbb3c5feeb2cfe44aadda827bc3f0dad9bbf3e58ed2e895 • rssbridge/rss-bridge latest: sha256:c916ebd227c19c1dbe81f2cd594678c7bf6f07ef2d34b3e2f12816d205261109 → sha256:222e1ad7f207a58bfb49c69925b233405d2eff8a7a61cd5ab094631de02765f8 • nextcloud fpm: sha256:1654f68700a482a13feca52c3235b949d8771624d738c17e9c82e437fe5de5ec → sha256:35816840281aa2fa2d5630d981ce32c72388f5e885d9ea1be43b38c76ab95d42 • postgres 15-alpine: sha256:a58cec2ba7a60b4c08d51f2ca93c1ad65fbf96e75cf0c89b7c0d2684860d3bb3 → sha256:0cb7397b0ef9c951f642398a24141a61e48168fbc88eeb7b3ad47618e1176ffb Node modules: @types/node: 22.13.2 -> 22.13.4 Caddy Plugins: cloudflare: v0.0.0-20240703190432-89f16b99c18e -> v0.0.0-20250214163716-188b4850c0f2
This commit is contained in:
parent
0008a861d8
commit
7c362318aa
18 changed files with 177 additions and 180 deletions
|
@ -10,7 +10,7 @@
|
||||||
}:
|
}:
|
||||||
buildApp {
|
buildApp {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
npmDepsHash = "sha256-bo9a9V0tP69oT3KWKL3F5AHWvVHES10Tadb/2+kBQOY=";
|
npmDepsHash = "sha256-2cWxVTCOEJOg2eBv+xX/mvr6MUX+UJQ8JlkoObD6+Uc=";
|
||||||
|
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
findutils
|
findutils
|
||||||
|
|
8
apps/update-sources/package-lock.json
generated
8
apps/update-sources/package-lock.json
generated
|
@ -11,7 +11,7 @@
|
||||||
"update-sources": "out/bin/app.cjs"
|
"update-sources": "out/bin/app.cjs"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "22.13.2",
|
"@types/node": "22.13.4",
|
||||||
"esbuild": "0.25.0",
|
"esbuild": "0.25.0",
|
||||||
"eslint": "9.20.1",
|
"eslint": "9.20.1",
|
||||||
"eslint-conf": "file:../config",
|
"eslint-conf": "file:../config",
|
||||||
|
@ -682,9 +682,9 @@
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "22.13.2",
|
"version": "22.13.4",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.2.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
|
||||||
"integrity": "sha512-Z+r8y3XL9ZpI2EY52YYygAFmo2/oWfNSj4BCpAXE2McAexDk8VcnBMGC9Djn9gTKt4d2T/hhXqmPzo4hfIXtTg==",
|
"integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint-conf": "file:../config",
|
"eslint-conf": "file:../config",
|
||||||
"@types/node": "22.13.2",
|
"@types/node": "22.13.4",
|
||||||
"esbuild": "0.25.0",
|
"esbuild": "0.25.0",
|
||||||
"eslint": "9.20.1",
|
"eslint": "9.20.1",
|
||||||
"jiti": "2.4.2",
|
"jiti": "2.4.2",
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
plugins = {
|
plugins = {
|
||||||
cloudflare = {
|
cloudflare = {
|
||||||
url = "github.com/caddy-dns/cloudflare";
|
url = "github.com/caddy-dns/cloudflare";
|
||||||
version = "v0.0.0-20240703190432-89f16b99c18e";
|
version = "v0.0.0-20250214163716-188b4850c0f2";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
hash = "sha256-JVkUkDKdat4aALJHQCq1zorJivVCdyBT+7UhqTvaFLw=";
|
hash = "sha256-izuQXvxIq3ycxcUuMErz7MbP9RwLkj+bhliK9H6Heqc=";
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,42 +9,7 @@ in {
|
||||||
services.searx = {
|
services.searx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
package =
|
package = pkgs.searxng.overrideAttrs (o: {
|
||||||
(pkgs.searxng.override {
|
|
||||||
# FIXME: https://pr-tracker.nelim.org/?pr=381174
|
|
||||||
python3 = pkgs.python3.override {
|
|
||||||
packageOverrides = pyFinal: pyPrev: {
|
|
||||||
httpx = pyPrev.httpx.overridePythonAttrs (o: rec {
|
|
||||||
version = "0.27.2";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "encode";
|
|
||||||
repo = o.pname;
|
|
||||||
tag = version;
|
|
||||||
hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
starlette = pyPrev.starlette.overridePythonAttrs (o: rec {
|
|
||||||
version = "0.41.2";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "encode";
|
|
||||||
repo = "starlette";
|
|
||||||
tag = version;
|
|
||||||
hash = "sha256-ZNB4OxzJHlsOie3URbUnZywJbqOZIvzxS/aq7YImdQ0=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
httpx-socks = pyPrev.httpx-socks.overridePythonAttrs (o: rec {
|
|
||||||
version = "0.9.2";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "romis2012";
|
|
||||||
repo = "httpx-socks";
|
|
||||||
tag = "v${version}";
|
|
||||||
hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
.overrideAttrs (o: {
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
${o.postInstall or ""}
|
${o.postInstall or ""}
|
||||||
# Replace logo
|
# Replace logo
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "postgres";
|
imageName = "postgres";
|
||||||
imageDigest = "sha256:2a453914efff6156786247b2399e6f9f18d7fc37e1ca5574a23aba172cf37d3e";
|
imageDigest = "sha256:5d8330e221083215ffbb3c5feeb2cfe44aadda827bc3f0dad9bbf3e58ed2e895";
|
||||||
hash = "sha256-9B1g88LSeLpyAxMF4C2EMoGPJRRYQk65ICPIOHjwBrA=";
|
hash = "sha256-7dttITmG8h+TWS4xLDDQMxL9NuMLkL2LDn/jhZGogSk=";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "14";
|
finalImageTag = "14";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "postgres";
|
imageName = "postgres";
|
||||||
imageDigest = "sha256:2a453914efff6156786247b2399e6f9f18d7fc37e1ca5574a23aba172cf37d3e";
|
imageDigest = "sha256:5d8330e221083215ffbb3c5feeb2cfe44aadda827bc3f0dad9bbf3e58ed2e895";
|
||||||
hash = "sha256-9B1g88LSeLpyAxMF4C2EMoGPJRRYQk65ICPIOHjwBrA=";
|
hash = "sha256-7dttITmG8h+TWS4xLDDQMxL9NuMLkL2LDn/jhZGogSk=";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "14";
|
finalImageTag = "14";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "rssbridge/rss-bridge";
|
imageName = "rssbridge/rss-bridge";
|
||||||
imageDigest = "sha256:c916ebd227c19c1dbe81f2cd594678c7bf6f07ef2d34b3e2f12816d205261109";
|
imageDigest = "sha256:222e1ad7f207a58bfb49c69925b233405d2eff8a7a61cd5ab094631de02765f8";
|
||||||
hash = "sha256-7kJQ+393WHOJ5x0a7TNvFx12lKTygMLn8MBr8++kKUA=";
|
hash = "sha256-aSFA3DKfk4qViBJUsk9IfUfZwKmIQKon7rdC8gT1H9o=";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "latest";
|
finalImageTag = "latest";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "nextcloud";
|
imageName = "nextcloud";
|
||||||
imageDigest = "sha256:1654f68700a482a13feca52c3235b949d8771624d738c17e9c82e437fe5de5ec";
|
imageDigest = "sha256:35816840281aa2fa2d5630d981ce32c72388f5e885d9ea1be43b38c76ab95d42";
|
||||||
hash = "sha256-xYqfCZAOBERPerr2Nd0c5dyh6q9UdyGGFtHwMIVVGMY=";
|
hash = "sha256-v2IAVcXSDipzLGZAOFEB2zXjbTf5F5EdMQAcdg1tiIM=";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "fpm";
|
finalImageTag = "fpm";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
pkgs:
|
pkgs:
|
||||||
pkgs.dockerTools.pullImage rec {
|
pkgs.dockerTools.pullImage rec {
|
||||||
imageName = "postgres";
|
imageName = "postgres";
|
||||||
imageDigest = "sha256:a58cec2ba7a60b4c08d51f2ca93c1ad65fbf96e75cf0c89b7c0d2684860d3bb3";
|
imageDigest = "sha256:0cb7397b0ef9c951f642398a24141a61e48168fbc88eeb7b3ad47618e1176ffb";
|
||||||
hash = "sha256-U3TASqUWqsaqy+V3/RcwyfwVbefoCegDGkRlBC1jG5Y=";
|
hash = "sha256-afFZ6GOyRw6ElVWDc7XIs8y68+685bImXeyWQH7Ylvc=";
|
||||||
finalImageName = imageName;
|
finalImageName = imageName;
|
||||||
finalImageTag = "15-alpine";
|
finalImageTag = "15-alpine";
|
||||||
}
|
}
|
||||||
|
|
55
flake.lock
generated
55
flake.lock
generated
|
@ -489,11 +489,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739458725,
|
"lastModified": 1739559906,
|
||||||
"narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=",
|
"narHash": "sha256-iK5BXN5uDXVe76ssYTkFHl7oNZe+hhwcO3N7EN9yxqQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "22b418c13fb0be43f4bc5c185f323a3237028594",
|
"rev": "9daae9a67af7b4d341e2c806fa274a9c0925d7cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -602,11 +602,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739446679,
|
"lastModified": 1739547063,
|
||||||
"narHash": "sha256-W4/dpSdDzsqw2diGefNHlhYFhx18oX4k7GLDjvGc96E=",
|
"narHash": "sha256-HOKqsauJjL2hsocuCc+ryMZ+LXkoIOCGOyYvAJ20a40=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "40adb3dfb4b6f8cf0c5093f095954e3ef162a8eb",
|
"rev": "df3fba157279de53c582344b59699a21ac5d62b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -882,11 +882,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739415015,
|
"lastModified": 1739514403,
|
||||||
"narHash": "sha256-WcHoyeu90uTBoCiMc3Gtb/6y/jt/qVl0hPIBmGMoG2g=",
|
"narHash": "sha256-g5+w009KIHfOH8SK2t/54MYzbgTs4Xn5P1QOCGCuUl0=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "27f77b393bb2cf8740d2275cb59254f742469f64",
|
"rev": "740e8e359a21b4d0ab5421f33ba328a43e768652",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -998,11 +998,11 @@
|
||||||
"modernz-src": {
|
"modernz-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739032311,
|
"lastModified": 1739560660,
|
||||||
"narHash": "sha256-r6T5iXICXGagbMbIzA1fkNHDE0dIpuGk/l2cBFwbfUo=",
|
"narHash": "sha256-jqHuEpSWhaxARo0a1IZ9r3uTyW1GVFK8qJPyKpN3FRA=",
|
||||||
"owner": "Samillion",
|
"owner": "Samillion",
|
||||||
"repo": "ModernZ",
|
"repo": "ModernZ",
|
||||||
"rev": "1b8d849242ab293b6e41fc5dffd01a1b0fde5723",
|
"rev": "124b836109453ef06c2ee3ab7711d2118691dd02",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1127,15 +1127,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739426028,
|
"lastModified": 1733815740,
|
||||||
"narHash": "sha256-1dZLPw+nlFQzzswfyTxW+8VF1AJ4ZvoYvLTjlHiz1SA=",
|
"narHash": "sha256-63i7TgirD3FiJM1z8ZuOOcXWj4ZhgK357NHmf90WNig=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-eval-jobs",
|
"repo": "nix-eval-jobs",
|
||||||
"rev": "6d4fd5a93d7bc953ffa4dcd6d53ad7056a71eff7",
|
"rev": "8e82a79fe9329f3be4836ad45d4edf2383e7723a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "v2.25.0",
|
||||||
"repo": "nix-eval-jobs",
|
"repo": "nix-eval-jobs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1202,11 +1203,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739410808,
|
"lastModified": 1739497168,
|
||||||
"narHash": "sha256-hnQFEeTs3G9dCvbBjCUF7WuPyGdUwppOhqJUhepzjjc=",
|
"narHash": "sha256-gKF/ZZRAHYvCXwZRDopPfy/kQrL1W7HqiAjjnDn3WSo=",
|
||||||
"owner": "fufexan",
|
"owner": "fufexan",
|
||||||
"repo": "nix-gaming",
|
"repo": "nix-gaming",
|
||||||
"rev": "78967efda12abfb171fa837c7b9f9d1043277a15",
|
"rev": "78c53283c9c7a4f1ac83ac0354e5f74ef8eacc01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1340,11 +1341,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739214665,
|
"lastModified": 1739446958,
|
||||||
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
|
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
|
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1414,11 +1415,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739412323,
|
"lastModified": 1739498654,
|
||||||
"narHash": "sha256-7zXoXc3HPQFi91hFe5RTiUSHT2L9dXyrD/a+ZkOj+CY=",
|
"narHash": "sha256-Xqf+1krhE71tkxSTZCsE08rfyU6oE5590cgWLVLgkfQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "731a05226213f16fac030f6da40f3d86918dd565",
|
"rev": "97697872a3ae429185f71e08b0832d2a574c7475",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1937,11 +1938,11 @@
|
||||||
"vimplugin-roslyn-nvim-src": {
|
"vimplugin-roslyn-nvim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738924076,
|
"lastModified": 1739555562,
|
||||||
"narHash": "sha256-vmHSa5AGQ8q6kCTgCqcD5yGlifK0ODcQjaxubUjLIx4=",
|
"narHash": "sha256-LFlLUBKbOA5jHrjDmQ4PGY6NACIbZUUpSuTORoigF+E=",
|
||||||
"owner": "seblj",
|
"owner": "seblj",
|
||||||
"repo": "roslyn.nvim",
|
"repo": "roslyn.nvim",
|
||||||
"rev": "fcf98a8ee39f34287cec3cafdef7f95583e412db",
|
"rev": "63b0c30bb6b82b1f5b100cde3a212a5a3a677869",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -283,6 +283,7 @@
|
||||||
treefmt-nix.follows = "treefmt-nix";
|
treefmt-nix.follows = "treefmt-nix";
|
||||||
};
|
};
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
|
ref = "v2.25.0";
|
||||||
repo = "nix-eval-jobs";
|
repo = "nix-eval-jobs";
|
||||||
type = "github";
|
type = "github";
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,6 +23,9 @@ in {
|
||||||
|
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
|
|
||||||
|
# TODO: check if this is right
|
||||||
|
signing.format = "openpgp";
|
||||||
|
|
||||||
includes = [
|
includes = [
|
||||||
{path = toString self.scopedPackages.${pkgs.system}.dracula.git;}
|
{path = toString self.scopedPackages.${pkgs.system}.dracula.git;}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@ let
|
||||||
nix-eval-jobs = mkInput {
|
nix-eval-jobs = mkInput {
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = "nix-eval-jobs";
|
repo = "nix-eval-jobs";
|
||||||
|
ref = "v2.25.0";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-index-db = mkInput {
|
nix-index-db = mkInput {
|
||||||
|
|
41
overlays/xdg-desktop-portal-kde/6-1-3.patch
Normal file
41
overlays/xdg-desktop-portal-kde/6-1-3.patch
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
||||||
|
index 99ce57f..af64eff 100644
|
||||||
|
--- a/src/remotedesktop.cpp
|
||||||
|
+++ b/src/remotedesktop.cpp
|
||||||
|
@@ -19,6 +19,8 @@
|
||||||
|
#include <KNotification>
|
||||||
|
#include <QGuiApplication>
|
||||||
|
#include <QRegion>
|
||||||
|
+#include <KSharedConfig>
|
||||||
|
+#include <KConfigGroup>
|
||||||
|
#include <QScreen>
|
||||||
|
|
||||||
|
RemoteDesktopPortal::RemoteDesktopPortal(QObject *parent)
|
||||||
|
@@ -152,14 +154,19 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
||||||
|
notification->setIconName(QStringLiteral("krfb"));
|
||||||
|
notification->sendEvent();
|
||||||
|
} else {
|
||||||
|
- QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
||||||
|
- new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled()));
|
||||||
|
- Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
||||||
|
- Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
||||||
|
- connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
||||||
|
-
|
||||||
|
- if (!remoteDesktopDialog->exec()) {
|
||||||
|
- return 1;
|
||||||
|
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
||||||
|
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
||||||
|
+ if (!unattendedAccess)
|
||||||
|
+ {
|
||||||
|
+ QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
||||||
|
+ new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled()));
|
||||||
|
+ Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
||||||
|
+ Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
||||||
|
+ connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
||||||
|
+
|
||||||
|
+ if (!remoteDesktopDialog->exec()) {
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
41
overlays/xdg-desktop-portal-kde/6-2.patch
Normal file
41
overlays/xdg-desktop-portal-kde/6-2.patch
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
||||||
|
index 02a32a7..6b9b687 100644
|
||||||
|
--- a/src/remotedesktop.cpp
|
||||||
|
+++ b/src/remotedesktop.cpp
|
||||||
|
@@ -22,6 +22,8 @@
|
||||||
|
#include <QDBusReply>
|
||||||
|
#include <QGuiApplication>
|
||||||
|
#include <QRegion>
|
||||||
|
+#include <KSharedConfig>
|
||||||
|
+#include <KConfigGroup>
|
||||||
|
#include <QScreen>
|
||||||
|
|
||||||
|
using namespace Qt::StringLiterals;
|
||||||
|
@@ -178,14 +180,19 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
||||||
|
notification->setIconName(QStringLiteral("krfb"));
|
||||||
|
notification->sendEvent();
|
||||||
|
} else {
|
||||||
|
- QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
||||||
|
- new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
||||||
|
- Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
||||||
|
- Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
||||||
|
- connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
||||||
|
-
|
||||||
|
- if (!remoteDesktopDialog->exec()) {
|
||||||
|
- return 1;
|
||||||
|
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
||||||
|
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
||||||
|
+ if (!unattendedAccess)
|
||||||
|
+ {
|
||||||
|
+ QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
||||||
|
+ new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
||||||
|
+ Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
||||||
|
+ Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
||||||
|
+ connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
||||||
|
+
|
||||||
|
+ if (!remoteDesktopDialog->exec()) {
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
26
overlays/xdg-desktop-portal-kde/6-3.patch
Normal file
26
overlays/xdg-desktop-portal-kde/6-3.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
||||||
|
index 44ceebcf..8146df20 100644
|
||||||
|
--- a/src/remotedesktop.cpp
|
||||||
|
+++ b/src/remotedesktop.cpp
|
||||||
|
@@ -22,6 +22,8 @@
|
||||||
|
#include <QDBusReply>
|
||||||
|
#include <QGuiApplication>
|
||||||
|
#include <QRegion>
|
||||||
|
+#include <KSharedConfig>
|
||||||
|
+#include <KConfigGroup>
|
||||||
|
#include <QScreen>
|
||||||
|
|
||||||
|
#include "permission_store.h"
|
||||||
|
@@ -224,7 +226,10 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
||||||
|
notification->setIconName(QStringLiteral("krfb"));
|
||||||
|
notification->sendEvent();
|
||||||
|
} else {
|
||||||
|
- if (!isAppMegaAuthorized(app_id)) { // authorize right away
|
||||||
|
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
||||||
|
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
||||||
|
+ if (!unattendedAccess || !isAppMegaAuthorized(app_id)) // authorize right away
|
||||||
|
+ {
|
||||||
|
QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
||||||
|
new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
||||||
|
Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
||||||
|
|
|
@ -1,102 +1,20 @@
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
kdePackages = prev.kdePackages.overrideScope (kfinal: kprev: {
|
kdePackages = prev.kdePackages.overrideScope (kfinal: kprev: {
|
||||||
xdg-desktop-portal-kde = kprev.xdg-desktop-portal-kde.overrideAttrs (o: {
|
xdg-desktop-portal-kde = kprev.xdg-desktop-portal-kde.overrideAttrs (o: {
|
||||||
patches =
|
patches = let
|
||||||
|
rdpPatch =
|
||||||
|
if o.version == "6.1.3"
|
||||||
|
then ./6-1-3.patch
|
||||||
|
else if builtins.compareVersions o.version "6.3.0" == -1
|
||||||
|
then ./6-2.patch
|
||||||
|
# TODO: this patch is not necessary anymore
|
||||||
|
# https://develop.kde.org/docs/administration/portal-permissions/
|
||||||
|
else ./6-3.patch;
|
||||||
|
in
|
||||||
(o.patches or [])
|
(o.patches or [])
|
||||||
++ [
|
++ [
|
||||||
# https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/issues/15#note_906047
|
# https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/issues/15#note_906047
|
||||||
(builtins.toFile
|
rdpPatch
|
||||||
"rdp.patch"
|
|
||||||
(
|
|
||||||
if o.version == "6.1.3"
|
|
||||||
# cpp
|
|
||||||
then ''
|
|
||||||
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
|
||||||
index 99ce57f..af64eff 100644
|
|
||||||
--- a/src/remotedesktop.cpp
|
|
||||||
+++ b/src/remotedesktop.cpp
|
|
||||||
@@ -19,6 +19,8 @@
|
|
||||||
#include <KNotification>
|
|
||||||
#include <QGuiApplication>
|
|
||||||
#include <QRegion>
|
|
||||||
+#include <KSharedConfig>
|
|
||||||
+#include <KConfigGroup>
|
|
||||||
#include <QScreen>
|
|
||||||
|
|
||||||
RemoteDesktopPortal::RemoteDesktopPortal(QObject *parent)
|
|
||||||
@@ -152,14 +154,19 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
|
||||||
notification->setIconName(QStringLiteral("krfb"));
|
|
||||||
notification->sendEvent();
|
|
||||||
} else {
|
|
||||||
- QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
|
||||||
- new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled()));
|
|
||||||
- Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
|
||||||
- Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
|
||||||
- connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
|
||||||
-
|
|
||||||
- if (!remoteDesktopDialog->exec()) {
|
|
||||||
- return 1;
|
|
||||||
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
|
||||||
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
|
||||||
+ if (!unattendedAccess)
|
|
||||||
+ {
|
|
||||||
+ QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
|
||||||
+ new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled()));
|
|
||||||
+ Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
|
||||||
+ Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
|
||||||
+ connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
|
||||||
+
|
|
||||||
+ if (!remoteDesktopDialog->exec()) {
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
''
|
|
||||||
# cpp
|
|
||||||
else ''
|
|
||||||
diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
|
|
||||||
index 02a32a7..6b9b687 100644
|
|
||||||
--- a/src/remotedesktop.cpp
|
|
||||||
+++ b/src/remotedesktop.cpp
|
|
||||||
@@ -22,6 +22,8 @@
|
|
||||||
#include <QDBusReply>
|
|
||||||
#include <QGuiApplication>
|
|
||||||
#include <QRegion>
|
|
||||||
+#include <KSharedConfig>
|
|
||||||
+#include <KConfigGroup>
|
|
||||||
#include <QScreen>
|
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
|
||||||
@@ -178,14 +180,19 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
|
|
||||||
notification->setIconName(QStringLiteral("krfb"));
|
|
||||||
notification->sendEvent();
|
|
||||||
} else {
|
|
||||||
- QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
|
||||||
- new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
|
||||||
- Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
|
||||||
- Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
|
||||||
- connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
|
||||||
-
|
|
||||||
- if (!remoteDesktopDialog->exec()) {
|
|
||||||
- return 1;
|
|
||||||
+ auto cfg = KSharedConfig::openConfig(QStringLiteral("plasmaremotedesktoprc"));
|
|
||||||
+ const auto unattendedAccess = cfg->group("Sharing").readEntry("Unattended", false);
|
|
||||||
+ if (!unattendedAccess)
|
|
||||||
+ {
|
|
||||||
+ QScopedPointer<RemoteDesktopDialog, QScopedPointerDeleteLater> remoteDesktopDialog(
|
|
||||||
+ new RemoteDesktopDialog(app_id, session->deviceTypes(), session->screenSharingEnabled(), session->persistMode()));
|
|
||||||
+ Utils::setParentWindow(remoteDesktopDialog->windowHandle(), parent_window);
|
|
||||||
+ Request::makeClosableDialogRequest(handle, remoteDesktopDialog.get());
|
|
||||||
+ connect(session, &Session::closed, remoteDesktopDialog.data(), &RemoteDesktopDialog::reject);
|
|
||||||
+
|
|
||||||
+ if (!remoteDesktopDialog->exec()) {
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
''
|
|
||||||
))
|
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue