Compare commits
2 Commits
renovate/l
...
ash/sway-s
| Author | SHA1 | Date | |
|---|---|---|---|
| 93c1c03ce6 | |||
| 62bc13c575 |
@@ -51,7 +51,6 @@ jobs:
|
|||||||
custom-beads
|
custom-beads
|
||||||
custom-gastown
|
custom-gastown
|
||||||
custom-perles
|
custom-perles
|
||||||
custom-nextcloud-talk-desktop
|
|
||||||
qt-pinned-jellyfin-media-player
|
qt-pinned-jellyfin-media-player
|
||||||
qt-pinned-stremio
|
qt-pinned-stremio
|
||||||
nix-deck-kernel
|
nix-deck-kernel
|
||||||
|
|||||||
72
flake.lock
generated
72
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774147838,
|
"lastModified": 1773070962,
|
||||||
"narHash": "sha256-AqpdisbN6sFU2135/+B+FxJUUVknifzT7Gijc3dl2KQ=",
|
"narHash": "sha256-kHZXx+kygpVholOBsuQocCtksHo5ZWYskP64qK2Kjh0=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
"rev": "1402021b8bf36595fabad628317d3d27b4c88aa0",
|
"rev": "9604d30b7c746f9f04f6dea5f82996f71bb66073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -23,11 +23,11 @@
|
|||||||
"doomemacs": {
|
"doomemacs": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774080407,
|
"lastModified": 1772615218,
|
||||||
"narHash": "sha256-FYbalilgDFjIVwK+D6DjDos1IMmMGA20lRf8k6Ykm1Y=",
|
"narHash": "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=",
|
||||||
"owner": "doomemacs",
|
"owner": "doomemacs",
|
||||||
"repo": "doomemacs",
|
"repo": "doomemacs",
|
||||||
"rev": "d8d75443d39d95f3c5256504eb838e0acc62ef44",
|
"rev": "d23bbe87721c61f4d5a605f2914b32780bb89949",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -46,11 +46,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774256052,
|
"lastModified": 1772706147,
|
||||||
"narHash": "sha256-7OLaUBQCOCt4XXbjHq9xqBopOJJpbV6Cl8mWdMLzazc=",
|
"narHash": "sha256-C0UMYQg3KBU6+L8TLfQ/s60O6/Tiu/JpN8C/WiIH9DU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "c4b7915a9467aa611c7346d2322514cdf8c1ba45",
|
"rev": "54af2ae96631311dc4d2686a07e4f472fb36f516",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -88,11 +88,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774219978,
|
"lastModified": 1773088127,
|
||||||
"narHash": "sha256-nP0hblGmLrkEopkd2OuNfmAii06AhiWsfnBtT3qEqxI=",
|
"narHash": "sha256-gJFayiBYrF0Q99AOQH29uq0Mli8KRfwReYeAh5H5evY=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "gastown",
|
"repo": "gastown",
|
||||||
"rev": "fc4feb81b72b284e70060112e7b92c9f04f86dd7",
|
"rev": "8da798be0663af74be7960844b90038e51769203",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -128,11 +128,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774274588,
|
"lastModified": 1772633058,
|
||||||
"narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
|
"narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
|
"rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -149,11 +149,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774292006,
|
"lastModified": 1772633327,
|
||||||
"narHash": "sha256-RI5sjkDEwIiD2eZHd7iM6ZqPoPWZvn3KdBiMumA3IYI=",
|
"narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3cea83bf84abeb72581bdee380fa526d7fcd7e5b",
|
"rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -171,11 +171,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774168156,
|
"lastModified": 1772517207,
|
||||||
"narHash": "sha256-+pwZSARdlM2RQQ6V0q76+WMKW9aNIcxkSOIThcz/f0A=",
|
"narHash": "sha256-qxHfxqbigqBTn//U4leIS5he22Wp1GS0+zmwGV7Pozs=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "939caad56508542d0f19cab963e2bc693f5f2831",
|
"rev": "7ca1501c2d80900b5967baea4d42581f84b388dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -213,11 +213,11 @@
|
|||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774265710,
|
"lastModified": 1772716420,
|
||||||
"narHash": "sha256-ar8pFUSAxXhV7DpVRjNvgviWuqOqWPAImb4MM7lSh5Y=",
|
"narHash": "sha256-T3UEKNTGqBl44AQ0+0OIpiWMXeQ8+4QW/akSc4yeL2A=",
|
||||||
"owner": "marienz",
|
"owner": "marienz",
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
"rev": "f6022b9192e034a817373692ede18a9319cf9730",
|
"rev": "be3ecb81a85be302e27d46ff32a1e251e444327d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -250,11 +250,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774244481,
|
"lastModified": 1772598333,
|
||||||
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
|
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
|
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -266,11 +266,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-qt": {
|
"nixpkgs-qt": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774244481,
|
"lastModified": 1772598333,
|
||||||
"narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
|
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4590696c8693fea477850fe379a01544293ca4e2",
|
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -282,11 +282,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774106199,
|
"lastModified": 1772624091,
|
||||||
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -299,11 +299,11 @@
|
|||||||
"perles": {
|
"perles": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773694696,
|
"lastModified": 1772661365,
|
||||||
"narHash": "sha256-8euoE/QViymgSEEzdMwF72Ui1/Bbikh3K0oC0cRo8tw=",
|
"narHash": "sha256-kMlvIpfGMBkN5D1W0O1fcqUiH3dyobcH0GRRLCX7GGo=",
|
||||||
"owner": "zjrosen",
|
"owner": "zjrosen",
|
||||||
"repo": "perles",
|
"repo": "perles",
|
||||||
"rev": "0871cb7626d7d7b67ad90d6ca1e3bb1cf257f988",
|
"rev": "326ff1938dfe073daab7939762ce2f44c2ee74a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -185,7 +185,6 @@
|
|||||||
./machines/boxy/configuration.nix
|
./machines/boxy/configuration.nix
|
||||||
{
|
{
|
||||||
home-manager.users.johno = import ./home/home-media-center.nix;
|
home-manager.users.johno = import ./home/home-media-center.nix;
|
||||||
# kodi user: AVR volume control + minimal Plasma config for Bigscreen session
|
|
||||||
home-manager.users.kodi = import ./home/home-kodi.nix;
|
home-manager.users.kodi = import ./home/home-kodi.nix;
|
||||||
home-manager.extraSpecialArgs = { inherit system; };
|
home-manager.extraSpecialArgs = { inherit system; };
|
||||||
}
|
}
|
||||||
@@ -285,7 +284,6 @@
|
|||||||
"custom-mcrcon-rbw" = pkgs.custom.mcrcon-rbw;
|
"custom-mcrcon-rbw" = pkgs.custom.mcrcon-rbw;
|
||||||
"custom-tea-rbw" = pkgs.custom.tea-rbw;
|
"custom-tea-rbw" = pkgs.custom.tea-rbw;
|
||||||
"custom-rclone-torbox-setup" = pkgs.custom.rclone-torbox-setup;
|
"custom-rclone-torbox-setup" = pkgs.custom.rclone-torbox-setup;
|
||||||
"custom-nextcloud-talk-desktop" = pkgs.custom.nextcloud-talk-desktop;
|
|
||||||
"qt-pinned-jellyfin-media-player" = pkgsQt.jellyfin-media-player;
|
"qt-pinned-jellyfin-media-player" = pkgsQt.jellyfin-media-player;
|
||||||
"qt-pinned-stremio" = pkgsQt.stremio;
|
"qt-pinned-stremio" = pkgsQt.stremio;
|
||||||
# Flake input packages (beads, gastown) - these get version from input rev
|
# Flake input packages (beads, gastown) - these get version from input rev
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ in
|
|||||||
pkgs.element-desktop
|
pkgs.element-desktop
|
||||||
# Re-enabled in 25.11 after security issues were resolved
|
# Re-enabled in 25.11 after security issues were resolved
|
||||||
pkgs.fluffychat
|
pkgs.fluffychat
|
||||||
pkgs.custom.nextcloud-talk-desktop
|
pkgs.nextcloud-talk-desktop
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,11 +22,12 @@ with lib;
|
|||||||
sddm = true;
|
sddm = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
};
|
};
|
||||||
plasma-bigscreen = {
|
kodi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autologin = true;
|
autologin = true;
|
||||||
jellyfinScaleFactor = 1.0;
|
wayland = true;
|
||||||
appLauncherServer.enable = true;
|
appLauncherServer.enable = true;
|
||||||
|
jellyfinScaleFactor = 1.0;
|
||||||
};
|
};
|
||||||
nfs-mounts.enable = true;
|
nfs-mounts.enable = true;
|
||||||
users.enable = true;
|
users.enable = true;
|
||||||
@@ -71,3 +72,4 @@ with lib;
|
|||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,5 +6,4 @@
|
|||||||
mcrcon-rbw = pkgs.callPackage ./mcrcon-rbw {};
|
mcrcon-rbw = pkgs.callPackage ./mcrcon-rbw {};
|
||||||
rclone-torbox-setup = pkgs.callPackage ./rclone-torbox-setup {};
|
rclone-torbox-setup = pkgs.callPackage ./rclone-torbox-setup {};
|
||||||
pi-coding-agent = pkgs.callPackage ./pi-coding-agent {};
|
pi-coding-agent = pkgs.callPackage ./pi-coding-agent {};
|
||||||
nextcloud-talk-desktop = pkgs.callPackage ./nextcloud-talk-desktop {};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
# Patched Nextcloud Talk Desktop with Wayland screen sharing support
|
|
||||||
# Applies the core change from upstream draft PR #1022:
|
|
||||||
# https://github.com/nextcloud/talk-desktop/pull/1022
|
|
||||||
#
|
|
||||||
# Patches the webpack bundle in app.asar to add setDisplayMediaRequestHandler
|
|
||||||
# with useSystemPicker: true, enabling native PipeWire/portal-based
|
|
||||||
# screen sharing on Wayland (Sway, Hyprland, etc.)
|
|
||||||
{ lib
|
|
||||||
, nextcloud-talk-desktop
|
|
||||||
, nodejs
|
|
||||||
, asar
|
|
||||||
}:
|
|
||||||
|
|
||||||
nextcloud-talk-desktop.overrideAttrs (old: {
|
|
||||||
pname = "nextcloud-talk-desktop-patched";
|
|
||||||
|
|
||||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ asar nodejs ];
|
|
||||||
|
|
||||||
# Patch the asar after the main installPhase creates the output
|
|
||||||
postFixup = (old.postFixup or "") + ''
|
|
||||||
echo "Patching app.asar for Wayland screen sharing..."
|
|
||||||
ASAR_PATH="$out/opt/Nextcloud Talk-linux-x64/resources/app.asar"
|
|
||||||
|
|
||||||
WORK=$(mktemp -d)
|
|
||||||
asar extract "$ASAR_PATH" "$WORK/app"
|
|
||||||
|
|
||||||
# In the webpack bundle:
|
|
||||||
# session = l, desktopCapturer = a, app = n
|
|
||||||
# We inject setDisplayMediaRequestHandler right after n.whenReady().then((async()=>{
|
|
||||||
# useSystemPicker: true makes Electron use the native system picker
|
|
||||||
# (PipeWire/xdg-desktop-portal on Wayland)
|
|
||||||
node -e "
|
|
||||||
const fs = require('fs');
|
|
||||||
const p = '$WORK/app/.webpack/main/index.js';
|
|
||||||
let c = fs.readFileSync(p, 'utf8');
|
|
||||||
|
|
||||||
if (c.includes('setDisplayMediaRequestHandler')) {
|
|
||||||
console.log('Already patched');
|
|
||||||
process.exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
const marker = 'n.whenReady().then((async()=>{';
|
|
||||||
const idx = c.indexOf(marker);
|
|
||||||
if (idx === -1) {
|
|
||||||
console.error('ERROR: Could not find whenReady marker in webpack bundle');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Inject after the marker
|
|
||||||
const injection = 'l.defaultSession.setDisplayMediaRequestHandler(async(e,t)=>{const s=await a.getSources({types:[\"screen\",\"window\"]});s.length>0?t({video:s[0]}):t({})},{useSystemPicker:!0});';
|
|
||||||
|
|
||||||
c = c.slice(0, idx + marker.length) + injection + c.slice(idx + marker.length);
|
|
||||||
fs.writeFileSync(p, c, 'utf8');
|
|
||||||
console.log('Successfully patched main bundle for Wayland screen sharing');
|
|
||||||
"
|
|
||||||
|
|
||||||
asar pack "$WORK/app" "$ASAR_PATH"
|
|
||||||
rm -rf "$WORK"
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
"lockFileMaintenance": {
|
"lockFileMaintenance": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"after 5pm and before 7pm on Saturday"
|
"after 2pm and before 4pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencyDashboard": true,
|
"dependencyDashboard": true,
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"/^nix-darwin$/"
|
"/^nix-darwin$/"
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"after 5pm and before 7pm on Saturday"
|
"after 2pm and before 4pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
"/home-manager-unstable/"
|
"/home-manager-unstable/"
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"after 5pm and before 7pm on Saturday"
|
"after 2pm and before 4pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
"/nixpkgs-qt/"
|
"/nixpkgs-qt/"
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"after 7pm and before 9pm on Saturday"
|
"after 4pm and before 6pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ with lib;
|
|||||||
./k3s-node
|
./k3s-node
|
||||||
./kodi
|
./kodi
|
||||||
./nfs-mounts
|
./nfs-mounts
|
||||||
./plasma-bigscreen
|
|
||||||
./nvidia
|
./nvidia
|
||||||
./printing
|
./printing
|
||||||
./rclone-mount
|
./rclone-mount
|
||||||
|
|||||||
@@ -1,134 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.roles.plasma-bigscreen;
|
|
||||||
|
|
||||||
# Plasma Bigscreen package — not yet in nixpkgs, built from upstream master.
|
|
||||||
# TODO: Replace with pkgs.kdePackages.plasma-bigscreen once available.
|
|
||||||
plasma-bigscreen = pkgs.kdePackages.callPackage ./package.nix {};
|
|
||||||
|
|
||||||
jellyfinMediaPlayerPkg =
|
|
||||||
if cfg.jellyfinScaleFactor != null
|
|
||||||
then pkgs.symlinkJoin {
|
|
||||||
name = "jellyfin-media-player-scaled";
|
|
||||||
paths = [ pkgs.qt-pinned.jellyfin-media-player ];
|
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
|
||||||
postBuild = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
rm -f $out/bin/jellyfin-desktop
|
|
||||||
makeWrapper ${pkgs.qt-pinned.jellyfin-media-player}/bin/jellyfin-desktop $out/bin/jellyfin-desktop \
|
|
||||||
--add-flags "--tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
|
||||||
|
|
||||||
# Update .desktop file to include scale factor and TV mode arguments
|
|
||||||
mkdir -p $out/share/applications
|
|
||||||
rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
|
|
||||||
substitute ${pkgs.qt-pinned.jellyfin-media-player}/share/applications/org.jellyfin.JellyfinDesktop.desktop \
|
|
||||||
$out/share/applications/org.jellyfin.JellyfinDesktop.desktop \
|
|
||||||
--replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
else pkgs.qt-pinned.jellyfin-media-player;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.roles.plasma-bigscreen = {
|
|
||||||
enable = mkEnableOption "Plasma Bigscreen TV interface";
|
|
||||||
|
|
||||||
autologin = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Auto-login to Plasma Bigscreen session";
|
|
||||||
};
|
|
||||||
|
|
||||||
user = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "kodi";
|
|
||||||
description = "User account for the Bigscreen session";
|
|
||||||
};
|
|
||||||
|
|
||||||
jellyfinScaleFactor = mkOption {
|
|
||||||
type = types.nullOr types.float;
|
|
||||||
default = null;
|
|
||||||
description = "Scale factor for Jellyfin Media Player UI (e.g., 1.0 for 100% scaling)";
|
|
||||||
};
|
|
||||||
|
|
||||||
appLauncherServer = {
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable HTTP app launcher server for remote control";
|
|
||||||
};
|
|
||||||
port = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 8081;
|
|
||||||
description = "Port for the app launcher HTTP server";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# Create the bigscreen user
|
|
||||||
users.extraUsers.${cfg.user} = {
|
|
||||||
isNormalUser = true;
|
|
||||||
extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Plasma Bigscreen is a Plasma 6 shell — needs Plasma 6 desktop manager
|
|
||||||
services.desktopManager.plasma6.enable = true;
|
|
||||||
|
|
||||||
# Register the bigscreen session with the display manager
|
|
||||||
services.displayManager = {
|
|
||||||
sessionPackages = [ plasma-bigscreen ];
|
|
||||||
} // optionalAttrs cfg.autologin {
|
|
||||||
autoLogin.enable = true;
|
|
||||||
autoLogin.user = cfg.user;
|
|
||||||
defaultSession = "plasma-bigscreen-wayland";
|
|
||||||
};
|
|
||||||
xdg.portal.configPackages = [ plasma-bigscreen ];
|
|
||||||
|
|
||||||
# Fix homescreen not being focused after quitting app or on boot
|
|
||||||
# xwaylandvideobridge can interfere with focus; exclude if present
|
|
||||||
environment.plasma6.excludePackages =
|
|
||||||
lib.optional (pkgs.kdePackages ? xwaylandvideobridge) pkgs.kdePackages.xwaylandvideobridge;
|
|
||||||
|
|
||||||
# Firewall for remote control
|
|
||||||
networking.firewall = {
|
|
||||||
allowedTCPPorts = optional cfg.appLauncherServer.enable cfg.appLauncherServer.port;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
plasma-bigscreen
|
|
||||||
firefox
|
|
||||||
jellyfinMediaPlayerPkg
|
|
||||||
qt-pinned.stremio
|
|
||||||
wget
|
|
||||||
] ++ optional cfg.appLauncherServer.enable pkgs.custom.app-launcher-server;
|
|
||||||
|
|
||||||
nixpkgs.config.permittedInsecurePackages = lib.warn
|
|
||||||
"Allowing insecure package qtwebengine-5.15.19 as a jellyfin-media-player/stremio dependency."
|
|
||||||
[
|
|
||||||
"qtwebengine-5.15.19"
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.kdeconnect.enable = true;
|
|
||||||
|
|
||||||
systemd.user.services = mkIf cfg.appLauncherServer.enable {
|
|
||||||
app-launcher-server = {
|
|
||||||
description = "HTTP App Launcher Server";
|
|
||||||
wantedBy = [ "graphical-session.target" ];
|
|
||||||
after = [ "graphical-session.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
ExecStart = "${pkgs.custom.app-launcher-server}/bin/app-launcher-server ${toString cfg.appLauncherServer.port}";
|
|
||||||
Restart = "always";
|
|
||||||
RestartSec = "5s";
|
|
||||||
Environment = [
|
|
||||||
"PATH=${pkgs.firefox}/bin:/run/current-system/sw/bin"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
# Plasma Bigscreen — TV interface for Plasma 6
|
|
||||||
# Not yet released or packaged in nixpkgs; built from upstream master.
|
|
||||||
#
|
|
||||||
# TODO: Remove this file once plasma-bigscreen lands in nixpkgs.
|
|
||||||
# Tracking issue: https://github.com/NixOS/nixpkgs/issues/428077
|
|
||||||
# Draft nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/428353
|
|
||||||
# When available, switch to pkgs.kdePackages.plasma-bigscreen.
|
|
||||||
#
|
|
||||||
# Upstream: https://invent.kde.org/plasma/plasma-bigscreen
|
|
||||||
{
|
|
||||||
mkKdeDerivation,
|
|
||||||
lib,
|
|
||||||
fetchFromGitLab,
|
|
||||||
pkg-config,
|
|
||||||
# KDE Frameworks 6
|
|
||||||
ki18n,
|
|
||||||
kdeclarative,
|
|
||||||
kcmutils,
|
|
||||||
knotifications,
|
|
||||||
kio,
|
|
||||||
kwayland,
|
|
||||||
kwindowsystem,
|
|
||||||
ksvg,
|
|
||||||
kiconthemes,
|
|
||||||
kglobalaccel,
|
|
||||||
kdbusaddons,
|
|
||||||
# KDE Plasma 6
|
|
||||||
plasma-workspace,
|
|
||||||
plasma-nano,
|
|
||||||
plasma-nm,
|
|
||||||
plasma-activities,
|
|
||||||
plasma-activities-stats,
|
|
||||||
milou,
|
|
||||||
libkscreen,
|
|
||||||
kdeconnect-kde,
|
|
||||||
# Qt 6
|
|
||||||
qtdeclarative, # needed for Qt6::QmlPrivate — see QCoro workaround in postPatch
|
|
||||||
qtmultimedia,
|
|
||||||
qtwebengine,
|
|
||||||
# Other
|
|
||||||
bluez-qt,
|
|
||||||
qcoro,
|
|
||||||
plasma-wayland-protocols,
|
|
||||||
wayland,
|
|
||||||
sdl3,
|
|
||||||
}:
|
|
||||||
|
|
||||||
mkKdeDerivation {
|
|
||||||
pname = "plasma-bigscreen";
|
|
||||||
version = "unstable-2026-03-07";
|
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
domain = "invent.kde.org";
|
|
||||||
owner = "plasma";
|
|
||||||
repo = "plasma-bigscreen";
|
|
||||||
rev = "bd143fea7e386bac1652b8150a3ed3d5ef7cf93c";
|
|
||||||
hash = "sha256-y439IX7e0+XqxqFj/4+P5le0hA7DiwA+smDsD0UH/fI=";
|
|
||||||
};
|
|
||||||
|
|
||||||
extraNativeBuildInputs = [
|
|
||||||
pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
extraBuildInputs = [
|
|
||||||
# KDE Frameworks
|
|
||||||
ki18n
|
|
||||||
kdeclarative
|
|
||||||
kcmutils
|
|
||||||
knotifications
|
|
||||||
kio
|
|
||||||
kwayland
|
|
||||||
kwindowsystem
|
|
||||||
ksvg
|
|
||||||
kiconthemes
|
|
||||||
kglobalaccel
|
|
||||||
kdbusaddons
|
|
||||||
# Plasma
|
|
||||||
plasma-workspace
|
|
||||||
plasma-nano
|
|
||||||
plasma-nm
|
|
||||||
plasma-activities
|
|
||||||
plasma-activities-stats
|
|
||||||
milou
|
|
||||||
libkscreen
|
|
||||||
kdeconnect-kde
|
|
||||||
# Qt — qtdeclarative is needed for Qt6::QmlPrivate (see postPatch)
|
|
||||||
qtdeclarative
|
|
||||||
qtmultimedia
|
|
||||||
qtwebengine
|
|
||||||
# Other
|
|
||||||
bluez-qt
|
|
||||||
qcoro
|
|
||||||
plasma-wayland-protocols
|
|
||||||
wayland
|
|
||||||
sdl3
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace bin/plasma-bigscreen-wayland.in \
|
|
||||||
--replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
|
|
||||||
|
|
||||||
# WORKAROUND: Plasma version numbers must match; we're building an
|
|
||||||
# unreleased package against a stable Plasma release. Remove once
|
|
||||||
# bigscreen is part of the Plasma release cycle.
|
|
||||||
substituteInPlace CMakeLists.txt \
|
|
||||||
--replace-fail 'set(PROJECT_VERSION "6.5.80")' 'set(PROJECT_VERSION "${plasma-workspace.version}")'
|
|
||||||
|
|
||||||
# WORKAROUND: QCoro6Qml's cmake config links against Qt6::QmlPrivate but
|
|
||||||
# doesn't call find_package to import the target. This is arguably a QCoro
|
|
||||||
# packaging bug in nixpkgs (it should propagate qtdeclarative). Remove
|
|
||||||
# once QCoro or the nixpkgs plasma-bigscreen package is fixed upstream.
|
|
||||||
substituteInPlace CMakeLists.txt \
|
|
||||||
--replace-fail 'find_package(QCoro6' 'find_package(Qt6 ''${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS QmlPrivate)
|
|
||||||
find_package(QCoro6'
|
|
||||||
'';
|
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
wrapQtApp $out/bin/plasma-bigscreen-wayland
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.providedSessions = [
|
|
||||||
"plasma-bigscreen-wayland"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Plasma shell for TVs (Plasma Bigscreen)";
|
|
||||||
homepage = "https://plasma-bigscreen.org";
|
|
||||||
license = lib.licenses.gpl2Plus;
|
|
||||||
platforms = lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user