Compare commits
16 Commits
polecat/ru
...
f5ea3e6236
| Author | SHA1 | Date | |
|---|---|---|---|
| f5ea3e6236 | |||
|
|
ff57d3c043 | ||
| 3a36594dc9 | |||
| 5a7064d07b | |||
| 8afdf287ee | |||
| bb3cdd8046 | |||
| 1380fb307a | |||
| 6ccfb5097c | |||
| 1b585847ab | |||
| e7906331dc | |||
| dc722843a9 | |||
| 03f169284d | |||
| 8908500073 | |||
| 87f6d5c759 | |||
| a851c2551c | |||
|
|
6cf63e86c1 |
@@ -18,3 +18,50 @@ jobs:
|
|||||||
run: nix flake check
|
run: nix flake check
|
||||||
env:
|
env:
|
||||||
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|
||||||
|
build-and-cache:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: check
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
machine:
|
||||||
|
- nix-book
|
||||||
|
- boxy
|
||||||
|
- zix790prors
|
||||||
|
- nix-deck
|
||||||
|
- john-endesktop
|
||||||
|
- live-usb
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- uses: https://git.johnogle.info/johno/gitea-actions/nix-setup@v1
|
||||||
|
|
||||||
|
- name: Build ${{ matrix.machine }}
|
||||||
|
id: build
|
||||||
|
run: |
|
||||||
|
OUT_PATH=$(nix build .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel --no-link --print-out-paths)
|
||||||
|
echo "out_path=$OUT_PATH" >> "$GITHUB_OUTPUT"
|
||||||
|
env:
|
||||||
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|
||||||
|
- name: Sign and push to cache
|
||||||
|
run: |
|
||||||
|
# Write signing key
|
||||||
|
echo "${{ secrets.NIX_SIGNING_KEY }}" > /tmp/signing-key
|
||||||
|
chmod 600 /tmp/signing-key
|
||||||
|
|
||||||
|
# Sign the closure
|
||||||
|
nix store sign --key-file /tmp/signing-key -r "${{ steps.build.outputs.out_path }}"
|
||||||
|
|
||||||
|
# Setup SSH key for cache push
|
||||||
|
mkdir -p ~/.ssh
|
||||||
|
echo "${{ secrets.CACHE_SSH_KEY }}" > ~/.ssh/cache_key
|
||||||
|
chmod 600 ~/.ssh/cache_key
|
||||||
|
ssh-keyscan -H ${{ secrets.CACHE_HOST }} >> ~/.ssh/known_hosts 2>/dev/null || true
|
||||||
|
|
||||||
|
# Push to cache
|
||||||
|
nix copy --to "ssh-ng://${{ secrets.CACHE_USER }}@${{ secrets.CACHE_HOST }}?ssh-key=$HOME/.ssh/cache_key" "${{ steps.build.outputs.out_path }}"
|
||||||
|
env:
|
||||||
|
NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
|
||||||
|
|||||||
30
flake.lock
generated
30
flake.lock
generated
@@ -8,16 +8,17 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769405733,
|
"lastModified": 1770604276,
|
||||||
"narHash": "sha256-WpROnW0dRi5ub0SlpKrMBs3pYlSBY4xw22hnTNvBMgI=",
|
"narHash": "sha256-U5u6LI8KyKf4J5fl3BfOT7woLa2tJ4JVR3y33Fa6UAs=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
"rev": "6e82d1e2eea121ce5dc0964d554879f8b0c08563",
|
"rev": "bcfaed92f67238b9f4844445dca8b9fcb7abeaf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
|
"rev": "bcfaed92f67238b9f4844445dca8b9fcb7abeaf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -81,11 +82,11 @@
|
|||||||
"gastown": {
|
"gastown": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769538736,
|
"lastModified": 1770098007,
|
||||||
"narHash": "sha256-A33gyS/ERUCFcaFG9PJdIHfIOafguqkRe+DuIZteH5s=",
|
"narHash": "sha256-CFlN57BXlR5FobTChdE2GgdIGx4xJcFFCk1E5Q98cSQ=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "gastown",
|
"repo": "gastown",
|
||||||
"rev": "177094a2335786d1d450fd9e14b935877291c004",
|
"rev": "13461161063bf7b2365fe5fd4df88e32c3ba2a28",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -257,6 +258,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-qt": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1770464364,
|
||||||
|
"narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-25.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769170682,
|
"lastModified": 1769170682,
|
||||||
@@ -346,6 +363,7 @@
|
|||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
|
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-qt": "nixpkgs-qt",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"perles": "perles",
|
"perles": "perles",
|
||||||
"plasma-manager": "plasma-manager",
|
"plasma-manager": "plasma-manager",
|
||||||
|
|||||||
12
flake.nix
12
flake.nix
@@ -4,6 +4,9 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
# Separate nixpkgs for qt5webengine-dependent packages (jellyfin-media-player, etc.)
|
||||||
|
# Updates on separate Renovate schedule to avoid massive qt rebuilds
|
||||||
|
nixpkgs-qt.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
|
|
||||||
nix-darwin = {
|
nix-darwin = {
|
||||||
url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
|
url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
|
||||||
@@ -43,7 +46,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beads = {
|
beads = {
|
||||||
url = "github:steveyegge/beads";
|
# v0.49.1 has dolt server mode support (gt-1mf.3)
|
||||||
|
# Pinned to 259ddd92 - uses Go 1.24 compatible with nixpkgs
|
||||||
|
url = "github:steveyegge/beads/bcfaed92f67238b9f4844445dca8b9fcb7abeaf3";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -74,6 +79,11 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = unstableOverlays;
|
overlays = unstableOverlays;
|
||||||
};
|
};
|
||||||
|
# Separate nixpkgs for qt5webengine-heavy packages to avoid rebuild churn
|
||||||
|
qt-pinned = import inputs.nixpkgs-qt {
|
||||||
|
system = prev.stdenv.hostPlatform.system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
custom = prev.callPackage ./packages {};
|
custom = prev.callPackage ./packages {};
|
||||||
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
# Compatibility: bitwarden renamed to bitwarden-desktop in unstable
|
||||||
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
home.roles = {
|
home.roles = {
|
||||||
base.enable = true;
|
base.enable = true;
|
||||||
plasma-manager-kodi.enable = true;
|
plasma-manager-kodi.enable = true;
|
||||||
|
kdeconnect.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|||||||
@@ -5,20 +5,25 @@ with lib;
|
|||||||
let
|
let
|
||||||
cfg = config.home.roles.development;
|
cfg = config.home.roles.development;
|
||||||
|
|
||||||
# FIXME: Temporary override for upstream beads vendorHash mismatch
|
# Build beads from flake input with corrected vendorHash
|
||||||
# Remove after upstream fix: https://github.com/steveyegge/beads/issues/XXX
|
# The upstream default.nix has stale vendorHash for commits with server mode
|
||||||
beadsPackage = globalInputs.beads.packages.${system}.default.overrideAttrs (old: {
|
beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown");
|
||||||
vendorHash = "sha256-YU+bRLVlWtHzJ1QPzcKJ70f+ynp8lMoIeFlm+29BNPE=";
|
beadsPackage = pkgs.buildGoModule {
|
||||||
|
pname = "beads";
|
||||||
# Performance fix: avoid WHERE IN (8000+ IDs) query pattern that hammers Dolt CPU
|
version = "0.49.1-${beadsRev}";
|
||||||
# See: hq-ihwsj - bd list uses inefficient WHERE IN (all_ids) query pattern
|
src = globalInputs.beads;
|
||||||
# The fix changes SearchIssues to SELECT all columns directly instead of:
|
subPackages = [ "cmd/bd" ];
|
||||||
# 1. SELECT id FROM issues WHERE ... -> collect IDs
|
doCheck = false;
|
||||||
# 2. SELECT * FROM issues WHERE id IN (all_ids) -> 8000+ placeholder IN clause
|
# Regenerated vendorHash for commit 93965b4a (has dolt server mode, Go 1.24)
|
||||||
patches = (old.patches or []) ++ [
|
vendorHash = "sha256-gwxGv8y4+1+k0741CnOYcyJPTJ5vTrynqPoO8YS9fbQ=";
|
||||||
./beads-search-query-optimization.patch
|
nativeBuildInputs = [ pkgs.git ];
|
||||||
];
|
meta = with lib; {
|
||||||
});
|
description = "beads (bd) - An issue tracker designed for AI-supervised coding workflows";
|
||||||
|
homepage = "https://github.com/steveyegge/beads";
|
||||||
|
license = licenses.mit;
|
||||||
|
mainProgram = "bd";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Gastown - multi-agent workspace manager (no upstream flake.nix yet)
|
# Gastown - multi-agent workspace manager (no upstream flake.nix yet)
|
||||||
# Source is tracked via flake input for renovate updates
|
# Source is tracked via flake input for renovate updates
|
||||||
@@ -47,14 +52,10 @@ let
|
|||||||
./gastown-fix-validate-recipient.patch
|
./gastown-fix-validate-recipient.patch
|
||||||
# Fix agentBeadToAddress to use title field for hq- prefixed beads
|
# Fix agentBeadToAddress to use title field for hq- prefixed beads
|
||||||
./gastown-fix-agent-bead-address-title.patch
|
./gastown-fix-agent-bead-address-title.patch
|
||||||
# Fix agentBeadToAddress to handle rig-specific prefixes (j-, sc-, etc.)
|
|
||||||
./gastown-fix-agent-bead-rig-prefix.patch
|
|
||||||
# Fix crew/polecat home paths: remove incorrect /rig suffix
|
# Fix crew/polecat home paths: remove incorrect /rig suffix
|
||||||
./gastown-fix-role-home-paths.patch
|
./gastown-fix-role-home-paths.patch
|
||||||
# Fix town root detection: don't map to Mayor (causes spurious mismatch warnings)
|
# Fix town root detection: don't map to Mayor (causes spurious mismatch warnings)
|
||||||
./gastown-fix-town-root-detection.patch
|
./gastown-fix-town-root-detection.patch
|
||||||
# Fix copyDir to handle symlinks (broken symlinks cause "no such file" errors)
|
|
||||||
./gastown-fix-copydir-symlinks.patch
|
|
||||||
# Statusline optimization: skip expensive beads queries for detached sessions
|
# Statusline optimization: skip expensive beads queries for detached sessions
|
||||||
# Reduces Dolt CPU from ~70% to ~20% by caching and early-exit
|
# Reduces Dolt CPU from ~70% to ~20% by caching and early-exit
|
||||||
./gastown-statusline-optimization.patch
|
./gastown-statusline-optimization.patch
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
diff --git a/internal/mail/router.go b/internal/mail/router.go
|
diff --git a/internal/mail/router.go b/internal/mail/router.go
|
||||||
--- a/internal/mail/router.go
|
--- a/internal/mail/router.go
|
||||||
+++ b/internal/mail/router.go
|
+++ b/internal/mail/router.go
|
||||||
@@ -326,7 +326,10 @@ func agentBeadToAddress(bead *agentBead) string {
|
@@ -315,7 +315,10 @@ func agentBeadToAddress(bead *agentBead) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall back to parsing description for role_type and rig
|
// For other hq- agents, fall back to description parsing
|
||||||
- return parseAgentAddressFromDescription(bead.Description)
|
- return parseAgentAddressFromDescription(bead.Description)
|
||||||
+ if bead.Title != "" && strings.Contains(bead.Title, "/") {
|
+ if bead.Title != "" && strings.Contains(bead.Title, "/") {
|
||||||
+ return bead.Title
|
+ return bead.Title
|
||||||
+ }
|
+ }
|
||||||
+ return parseAgentAddressFromDescription(bead.Description)
|
+ return parseAgentAddressFromDescription(bead.Description)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle gt- prefixed IDs (legacy format)
|
// Handle gt- prefixed IDs (legacy format)
|
||||||
|
|||||||
@@ -6,24 +6,24 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.1.19";
|
version = "2.1.30";
|
||||||
|
|
||||||
srcs = {
|
srcs = {
|
||||||
aarch64-darwin = {
|
aarch64-darwin = {
|
||||||
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-arm64/claude";
|
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-arm64/claude";
|
||||||
sha256 = "d386ac8f6d1479f85d31f369421c824135c10249c32087017d05a5f428852c41";
|
sha256 = "3ccc14f322b1e8da0cd58afc254fd5100eee066fa14729f30745e67a3f7979f7";
|
||||||
};
|
};
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-x64/claude";
|
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-x64/claude";
|
||||||
sha256 = "be266b3a952f483d8358ad141e2afe661170386506f479ead992319e4fdc38ac";
|
sha256 = "8a083696006483b8382ec0e47cd8f2e3223f3d2cab1a21c524fa08c082b5600e";
|
||||||
};
|
};
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-x64/claude";
|
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-x64/claude";
|
||||||
sha256 = "4e2a1c73871ecf3b133376b57ded03333a7a6387f2d2a3a6279bb90a07f7a944";
|
sha256 = "ada8f1cf9272965d38b10f1adb6cea885e621c83f7e7bb233008c721f43fad54";
|
||||||
};
|
};
|
||||||
aarch64-linux = {
|
aarch64-linux = {
|
||||||
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-arm64/claude";
|
url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-arm64/claude";
|
||||||
sha256 = "8c4b61b24ca760d6f7aa2f19727163d122e9fd0c3ce91f106a21b6918a7b1bbb";
|
sha256 = "45fbf35a1011b06f86170b20beb64c599db0658aac70e2de2410c45d15775596";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
"lockFileMaintenance": {
|
"lockFileMaintenance": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"before 5am on monday"
|
"after 2pm and before 4pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencyDashboard": true,
|
"dependencyDashboard": true,
|
||||||
@@ -37,6 +37,9 @@
|
|||||||
"/^nixpkgs$/",
|
"/^nixpkgs$/",
|
||||||
"/^home-manager$/",
|
"/^home-manager$/",
|
||||||
"/^nix-darwin$/"
|
"/^nix-darwin$/"
|
||||||
|
],
|
||||||
|
"schedule": [
|
||||||
|
"after 2pm and before 4pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -48,6 +51,21 @@
|
|||||||
"matchPackageNames": [
|
"matchPackageNames": [
|
||||||
"/nixpkgs-unstable/",
|
"/nixpkgs-unstable/",
|
||||||
"/home-manager-unstable/"
|
"/home-manager-unstable/"
|
||||||
|
],
|
||||||
|
"schedule": [
|
||||||
|
"after 2pm and before 4pm on Saturday"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "nixpkgs-qt updates on Saturday (staggered from main ecosystem)",
|
||||||
|
"matchManagers": [
|
||||||
|
"nix"
|
||||||
|
],
|
||||||
|
"matchPackageNames": [
|
||||||
|
"/nixpkgs-qt/"
|
||||||
|
],
|
||||||
|
"schedule": [
|
||||||
|
"after 4pm and before 6pm on Saturday"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,13 @@
|
|||||||
max-jobs = "auto";
|
max-jobs = "auto";
|
||||||
trusted-users = [ "johno" ];
|
trusted-users = [ "johno" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
|
"https://nix-cache.johnogle.info"
|
||||||
];
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"nix-cache.johnogle.info-1:G0ZGQwcSC4+4SDDFHZI/ZX3a6uFrs/5cjA5Jvaypj0I="
|
||||||
|
];
|
||||||
|
fallback = true;
|
||||||
|
connect-timeout = 5;
|
||||||
};
|
};
|
||||||
|
|
||||||
gc = {
|
gc = {
|
||||||
|
|||||||
@@ -47,23 +47,23 @@ in
|
|||||||
if cfg.jellyfinScaleFactor != null
|
if cfg.jellyfinScaleFactor != null
|
||||||
then pkgs.symlinkJoin {
|
then pkgs.symlinkJoin {
|
||||||
name = "jellyfin-media-player-scaled";
|
name = "jellyfin-media-player-scaled";
|
||||||
paths = [ pkgs.jellyfin-media-player ];
|
paths = [ pkgs.qt-pinned.jellyfin-media-player ];
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
rm -f $out/bin/jellyfin-desktop
|
rm -f $out/bin/jellyfin-desktop
|
||||||
makeWrapper ${pkgs.jellyfin-media-player}/bin/jellyfin-desktop $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}"
|
--add-flags "--tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
||||||
|
|
||||||
# Update .desktop file to include scale factor and TV mode arguments
|
# Update .desktop file to include scale factor and TV mode arguments
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
|
rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
|
||||||
substitute ${pkgs.jellyfin-media-player}/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 \
|
$out/share/applications/org.jellyfin.JellyfinDesktop.desktop \
|
||||||
--replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
--replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
else pkgs.jellyfin-media-player;
|
else pkgs.qt-pinned.jellyfin-media-player;
|
||||||
in mkIf cfg.enable
|
in mkIf cfg.enable
|
||||||
{
|
{
|
||||||
users.extraUsers.kodi = {
|
users.extraUsers.kodi = {
|
||||||
|
|||||||
Reference in New Issue
Block a user