Compare commits
17 Commits
fix/ci-ski
...
ash/plasma
| Author | SHA1 | Date | |
|---|---|---|---|
| 91cc6cbed8 | |||
| bf63c8dff3 | |||
| 44786b2a25 | |||
| 77f792b9bf | |||
| eacfa28321 | |||
| a3d039613f | |||
| 0a85616d58 | |||
| c85f047ee2 | |||
| f4c1de5fb3 | |||
| e2770617c7 | |||
| 8fd702cad0 | |||
| eb4700226f | |||
| d4d7769e51 | |||
| c39f711662 | |||
| 4dd53a0dd0 | |||
| 4945a9e339 | |||
| c50c90ab13 |
101
flake.lock
generated
101
flake.lock
generated
@@ -2,17 +2,16 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"beads": {
|
"beads": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770711800,
|
"lastModified": 1772587450,
|
||||||
"narHash": "sha256-A7S9C5NBhrmf60wxEZiWTOn07eUPEk1d75LixLDedc0=",
|
"narHash": "sha256-yJ38xi6nRnEZIV5CEgV8xZK1dky0dVMavfFg4J7gkqw=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "beads",
|
"repo": "beads",
|
||||||
"rev": "6a51223b6fb59f97e699d5ac2f9a93967ca66f28",
|
"rev": "7f41edd9c4350e5c68ebec6f9571e27833f27133",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -24,11 +23,11 @@
|
|||||||
"doomemacs": {
|
"doomemacs": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770765473,
|
"lastModified": 1772615218,
|
||||||
"narHash": "sha256-tEuhgaenYbeScYGV2gDivn468kHk+k6lndlxSPNYTes=",
|
"narHash": "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=",
|
||||||
"owner": "doomemacs",
|
"owner": "doomemacs",
|
||||||
"repo": "doomemacs",
|
"repo": "doomemacs",
|
||||||
"rev": "a0d6aac43fc94def29c98826e2f0088bcb703d13",
|
"rev": "d23bbe87721c61f4d5a605f2914b32780bb89949",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -47,11 +46,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770602774,
|
"lastModified": 1772706147,
|
||||||
"narHash": "sha256-eRcZ279Oaf8ViHtvdWVTpcD9x7bvJ3ipQ1Xq9bd+qlk=",
|
"narHash": "sha256-C0UMYQg3KBU6+L8TLfQ/s60O6/Tiu/JpN8C/WiIH9DU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "a3d87c21d1464f1069d8125cafe6adb84d200185",
|
"rev": "54af2ae96631311dc4d2686a07e4f472fb36f516",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -79,13 +78,21 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gastown": {
|
"gastown": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"beads": [
|
||||||
|
"beads"
|
||||||
|
],
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-unstable"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770789619,
|
"lastModified": 1772724442,
|
||||||
"narHash": "sha256-BDtohweSxBBLM+bAouzsK6tvAo5bZPUviK/ITMIyUag=",
|
"narHash": "sha256-+H/T745sVDJAztpf3k6zz89YNrpCYsGghbO7O3O/IHw=",
|
||||||
"owner": "steveyegge",
|
"owner": "steveyegge",
|
||||||
"repo": "gastown",
|
"repo": "gastown",
|
||||||
"rev": "2779e30fd35c3482912b22e4be89258fe5510167",
|
"rev": "112ff2c4bd145de796d20f35d35e583832a72ce1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -121,11 +128,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768949235,
|
"lastModified": 1772633058,
|
||||||
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
|
"narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
|
"rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -142,11 +149,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769397130,
|
"lastModified": 1772633327,
|
||||||
"narHash": "sha256-TTM4KV9IHwa181X7afBRbhLJIrgynpDjAXJFMUOWfyU=",
|
"narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c37679d37bdbecf11bbe3c5eb238d89ca4f60641",
|
"rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -164,11 +171,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769273817,
|
"lastModified": 1772517207,
|
||||||
"narHash": "sha256-+iyLihi/ynJokMgJZMRXuMuI6DPGUQRajz5ztNCHgnI=",
|
"narHash": "sha256-qxHfxqbigqBTn//U4leIS5he22Wp1GS0+zmwGV7Pozs=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "98f988ad46e31f9956c5f6874dfb3580a7ff3969",
|
"rev": "7ca1501c2d80900b5967baea4d42581f84b388dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -184,11 +191,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767634391,
|
"lastModified": 1772129556,
|
||||||
"narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
|
"narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
|
||||||
"owner": "nix-darwin",
|
"owner": "nix-darwin",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
|
"rev": "ebec37af18215214173c98cf6356d0aca24a2585",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -206,11 +213,11 @@
|
|||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770887282,
|
"lastModified": 1772716420,
|
||||||
"narHash": "sha256-8vmh9ZSLEuXanLMeiuvAlJCKprBiEBW7N0SbUnMgpfM=",
|
"narHash": "sha256-T3UEKNTGqBl44AQ0+0OIpiWMXeQ8+4QW/akSc4yeL2A=",
|
||||||
"owner": "marienz",
|
"owner": "marienz",
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
"rev": "a9cdd935c314894dd03287b287cc21c6f8004c7f",
|
"rev": "be3ecb81a85be302e27d46ff32a1e251e444327d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -243,11 +250,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769089682,
|
"lastModified": 1772598333,
|
||||||
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
|
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
|
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -259,11 +266,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-qt": {
|
"nixpkgs-qt": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770464364,
|
"lastModified": 1772598333,
|
||||||
"narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
|
"narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
|
"rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -275,11 +282,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769170682,
|
"lastModified": 1772624091,
|
||||||
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
|
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
|
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -292,11 +299,11 @@
|
|||||||
"perles": {
|
"perles": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769460725,
|
"lastModified": 1772661365,
|
||||||
"narHash": "sha256-zM2jw+emxe8+mNyR1ebMWkQiEx8uSmhoqqI0IxXLDgs=",
|
"narHash": "sha256-kMlvIpfGMBkN5D1W0O1fcqUiH3dyobcH0GRRLCX7GGo=",
|
||||||
"owner": "zjrosen",
|
"owner": "zjrosen",
|
||||||
"repo": "perles",
|
"repo": "perles",
|
||||||
"rev": "57b20413eea461452b59e13f5a4a367953b1f768",
|
"rev": "326ff1938dfe073daab7939762ce2f44c2ee74a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -315,11 +322,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767662275,
|
"lastModified": 1772361940,
|
||||||
"narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
|
"narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
|
"rev": "a4b33606111c9c5dcd10009042bb710307174f51",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -338,11 +345,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767662275,
|
"lastModified": 1772361940,
|
||||||
"narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
|
"narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
|
"rev": "a4b33606111c9c5dcd10009042bb710307174f51",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
18
flake.nix
18
flake.nix
@@ -52,7 +52,8 @@
|
|||||||
|
|
||||||
gastown = {
|
gastown = {
|
||||||
url = "github:steveyegge/gastown";
|
url = "github:steveyegge/gastown";
|
||||||
flake = false; # No flake.nix upstream yet
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
inputs.beads.follows = "beads";
|
||||||
};
|
};
|
||||||
|
|
||||||
perles = {
|
perles = {
|
||||||
@@ -171,6 +172,7 @@
|
|||||||
./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; };
|
||||||
}
|
}
|
||||||
@@ -182,7 +184,16 @@
|
|||||||
modules = nixosModules ++ [
|
modules = nixosModules ++ [
|
||||||
./machines/zix790prors/configuration.nix
|
./machines/zix790prors/configuration.nix
|
||||||
{
|
{
|
||||||
home-manager.users.johno = import ./home/home-desktop.nix;
|
home-manager.users.johno = {
|
||||||
|
imports = [ ./home/home-desktop.nix ];
|
||||||
|
home.roles.i3_sway.extraSwayConfig = {
|
||||||
|
output = {
|
||||||
|
"DP-1" = {
|
||||||
|
mode = "3440x1440@164.900Hz";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
home-manager.extraSpecialArgs = { inherit system; };
|
home-manager.extraSpecialArgs = { inherit system; };
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -265,8 +276,9 @@
|
|||||||
"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
|
||||||
"custom-beads" = pkgs.callPackage ./packages/beads {
|
"custom-beads" = pkgs.callPackage ./packages/beads {
|
||||||
|
inherit (pkgs.unstable) buildGoModule;
|
||||||
src = inputs.beads;
|
src = inputs.beads;
|
||||||
version = "0.49.6-${beadsRev}";
|
version = "0.52.0-${beadsRev}";
|
||||||
};
|
};
|
||||||
"custom-gastown" = pkgs.callPackage ./packages/gastown {
|
"custom-gastown" = pkgs.callPackage ./packages/gastown {
|
||||||
src = inputs.gastown;
|
src = inputs.gastown;
|
||||||
|
|||||||
@@ -5,28 +5,16 @@ with lib;
|
|||||||
let
|
let
|
||||||
cfg = config.home.roles.development;
|
cfg = config.home.roles.development;
|
||||||
|
|
||||||
# Build beads from flake input with corrected vendorHash
|
# Build beads from flake input
|
||||||
# The upstream default.nix has stale vendorHash for commits with server mode
|
|
||||||
beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown");
|
beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown");
|
||||||
|
|
||||||
# nixpkgs ships Go 1.25.5, but beads' dolt deps require Go >= 1.25.6
|
beadsPackage = pkgs.unstable.buildGoModule {
|
||||||
go_1_25_6 = pkgs.go_1_25.overrideAttrs (old: rec {
|
|
||||||
version = "1.25.6";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
|
||||||
hash = "sha256-WMv3ceRNdt5vVtGeM7d9dFoeSJNAkih15GWFuXXCsFk=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
buildGoModule_1_25_6 = pkgs.buildGoModule.override { go = go_1_25_6; };
|
|
||||||
|
|
||||||
beadsPackage = buildGoModule_1_25_6 {
|
|
||||||
pname = "beads";
|
pname = "beads";
|
||||||
version = "0.49.6-${beadsRev}";
|
version = "0.52.0-${beadsRev}";
|
||||||
src = globalInputs.beads;
|
src = globalInputs.beads;
|
||||||
subPackages = [ "cmd/bd" ];
|
subPackages = [ "cmd/bd" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
# Regenerated vendorHash for commit 6a51223b (dolt server mode, Go 1.25.6)
|
vendorHash = "sha256-OL6QGf4xSMpEbmU+41pFdO0Rrs3H162T3pdiW9UfWR0=";
|
||||||
vendorHash = "sha256-9RMy0+ZBFg1BAl8Z0EuZK4XVm9QYVekS9i/1ErOIB/c=";
|
|
||||||
nativeBuildInputs = [ pkgs.git pkgs.pkg-config ];
|
nativeBuildInputs = [ pkgs.git pkgs.pkg-config ];
|
||||||
buildInputs = [ pkgs.icu ];
|
buildInputs = [ pkgs.icu ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
@@ -37,14 +25,14 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Gastown - multi-agent workspace manager (no upstream flake.nix yet)
|
# Gastown - multi-agent workspace manager
|
||||||
# Source is tracked via flake input for renovate updates
|
# Source is tracked via flake input for renovate updates
|
||||||
gastownRev = builtins.substring 0 8 (globalInputs.gastown.rev or "unknown");
|
gastownRev = builtins.substring 0 8 (globalInputs.gastown.rev or "unknown");
|
||||||
gastownPackage = pkgs.buildGoModule {
|
gastownPackage = pkgs.buildGoModule {
|
||||||
pname = "gastown";
|
pname = "gastown";
|
||||||
version = "unstable-${gastownRev}";
|
version = "unstable-${gastownRev}";
|
||||||
src = globalInputs.gastown;
|
src = globalInputs.gastown;
|
||||||
vendorHash = "sha256-ripY9vrYgVW8bngAyMLh0LkU/Xx1UUaLgmAA7/EmWQU=";
|
vendorHash = "sha256-/+ODyndArUF0nJY9r8G5JKhzQckBHFb48A7EBZmoIr0=";
|
||||||
subPackages = [ "cmd/gt" ];
|
subPackages = [ "cmd/gt" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
@@ -81,11 +69,11 @@ let
|
|||||||
# Perles - TUI for beads issue tracking (no upstream flake.nix yet)
|
# Perles - TUI for beads issue tracking (no upstream flake.nix yet)
|
||||||
# Source is tracked via flake input for renovate updates
|
# Source is tracked via flake input for renovate updates
|
||||||
perlesRev = builtins.substring 0 8 (globalInputs.perles.rev or "unknown");
|
perlesRev = builtins.substring 0 8 (globalInputs.perles.rev or "unknown");
|
||||||
perlesPackage = pkgs.buildGoModule {
|
perlesPackage = pkgs.unstable.buildGoModule {
|
||||||
pname = "perles";
|
pname = "perles";
|
||||||
version = "unstable-${perlesRev}";
|
version = "unstable-${perlesRev}";
|
||||||
src = globalInputs.perles;
|
src = globalInputs.perles;
|
||||||
vendorHash = "sha256-JHERJDzbiqgjWXwRhXVjgDEiDQ3AUXRIONotfPF21B0=";
|
vendorHash = "sha256-A5LE9Cor/DRcJtVpiScSoqDYhJIKyaq0cbK+OGmr4XU=";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
@@ -110,6 +98,12 @@ let
|
|||||||
ref = "main";
|
ref = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Claude Code statusline: shows model, cwd, git branch, and context usage %
|
||||||
|
claudeCodeStatusLineConfig = pkgs.writeText "claude-statusline.json" (builtins.toJSON {
|
||||||
|
type = "command";
|
||||||
|
command = ''input=$(cat); model=$(echo "$input" | jq -r '.model.display_name'); cwd=$(echo "$input" | jq -r '.workspace.current_dir'); if git -C "$cwd" rev-parse --git-dir > /dev/null 2>&1; then branch=$(git -C "$cwd" --no-optional-locks rev-parse --abbrev-ref HEAD 2>/dev/null || echo ""); if [ -n "$branch" ]; then git_info=" on $branch"; else git_info=""; fi; else git_info=""; fi; usage=$(echo "$input" | jq '.context_window.current_usage'); if [ "$usage" != "null" ]; then current=$(echo "$usage" | jq '.input_tokens + .cache_creation_input_tokens + .cache_read_input_tokens'); size=$(echo "$input" | jq '.context_window.context_window_size'); pct=$((current * 100 / size)); context_info=" | ''${pct}% context"; else context_info=""; fi; printf "%s in %s%s%s" "$model" "$cwd" "$git_info" "$context_info"'';
|
||||||
|
});
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.development = {
|
options.home.roles.development = {
|
||||||
@@ -143,6 +137,7 @@ in
|
|||||||
|
|
||||||
# Custom packages
|
# Custom packages
|
||||||
pkgs.custom.tea-rbw
|
pkgs.custom.tea-rbw
|
||||||
|
pkgs.custom.pi-coding-agent
|
||||||
];
|
];
|
||||||
|
|
||||||
# Install Claude Code humanlayer command and agent plugins
|
# Install Claude Code humanlayer command and agent plugins
|
||||||
@@ -251,6 +246,18 @@ in
|
|||||||
$DRY_RUN_CMD echo "Claude Code beads integration configured (hooks installed)"
|
$DRY_RUN_CMD echo "Claude Code beads integration configured (hooks installed)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Configure Claude Code statusline (merge into existing settings.json)
|
||||||
|
home.activation.claudeCodeStatusLine = lib.hm.dag.entryAfter ["writeBoundary" "claudeCodeBeadsSetup"] ''
|
||||||
|
SETTINGS="$HOME/.claude/settings.json"
|
||||||
|
mkdir -p "$HOME/.claude"
|
||||||
|
if [ -f "$SETTINGS" ]; then
|
||||||
|
${pkgs.jq}/bin/jq --slurpfile sl ${claudeCodeStatusLineConfig} '.statusLine = $sl[0]' "$SETTINGS" > "''${SETTINGS}.tmp" && mv "''${SETTINGS}.tmp" "$SETTINGS"
|
||||||
|
else
|
||||||
|
${pkgs.jq}/bin/jq -n --slurpfile sl ${claudeCodeStatusLineConfig} '{statusLine: $sl[0]}' > "$SETTINGS"
|
||||||
|
fi
|
||||||
|
$DRY_RUN_CMD echo "Claude Code statusline configured"
|
||||||
|
'';
|
||||||
|
|
||||||
# Beads timer gate checker (Linux only - uses systemd)
|
# Beads timer gate checker (Linux only - uses systemd)
|
||||||
# Runs every 5 minutes to auto-resolve expired timer gates across all beads projects
|
# Runs every 5 minutes to auto-resolve expired timer gates across all beads projects
|
||||||
# This enables self-scheduling molecules (watchers, patrols, etc.)
|
# This enables self-scheduling molecules (watchers, patrols, etc.)
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ let
|
|||||||
doomEmacs = pkgs.fetchFromGitHub {
|
doomEmacs = pkgs.fetchFromGitHub {
|
||||||
owner = "doomemacs";
|
owner = "doomemacs";
|
||||||
repo = "doomemacs";
|
repo = "doomemacs";
|
||||||
rev = "38d94da67dc84897a4318714dcc48494c016d8c4";
|
rev = "d23bbe87721c61f4d5a605f2914b32780bb89949";
|
||||||
sha256 = "sha256-Uc6qONH3jjUVDgW+pPBCGC7mh88ZY05u1y37fQrsxq0=";
|
sha256 = "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Shared emacs packages
|
# Shared emacs packages
|
||||||
|
|||||||
@@ -274,6 +274,18 @@ rbw is unavailable or the entry is not found."
|
|||||||
(error (format "Error listing directory %s: %s" dirpath (error-message-string err)))))
|
(error (format "Error listing directory %s: %s" dirpath (error-message-string err)))))
|
||||||
:args (list '(:name "dirpath" :type "string" :description "Directory path to list"))))
|
:args (list '(:name "dirpath" :type "string" :description "Directory path to list"))))
|
||||||
|
|
||||||
|
(use-package! pi-coding-agent
|
||||||
|
:commands (pi-coding-agent pi-coding-agent-toggle)
|
||||||
|
:init
|
||||||
|
(defalias 'pi 'pi-coding-agent)
|
||||||
|
(map! :leader
|
||||||
|
(:prefix ("o" . "open")
|
||||||
|
:desc "Pi Coding Agent" "p" #'pi-coding-agent))
|
||||||
|
:config
|
||||||
|
;; Tree-sitter grammars are managed by Nix (treesit-grammars.with-all-grammars),
|
||||||
|
;; so suppress the auto-install prompt
|
||||||
|
(setq pi-coding-agent-essential-grammar-action 'warn))
|
||||||
|
|
||||||
(use-package! claude-code-ide
|
(use-package! claude-code-ide
|
||||||
:commands (claude-code-ide-menu claude-code-ide-open-here)
|
:commands (claude-code-ide-menu claude-code-ide-open-here)
|
||||||
:init
|
:init
|
||||||
|
|||||||
@@ -72,3 +72,8 @@
|
|||||||
:recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
|
:recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
|
||||||
:files ("lisp/*.el"))
|
:files ("lisp/*.el"))
|
||||||
:pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
|
:pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
|
||||||
|
|
||||||
|
(package! pi-coding-agent
|
||||||
|
:recipe (:host github :repo "dnouri/pi-coding-agent"
|
||||||
|
:files ("*.el"))
|
||||||
|
:pin "8d8158b0a6150ce13d91e561a1223790670acaa7")
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# The currentIndex is incremented by `nix run .#rotate-wallpaper`
|
# The currentIndex is incremented by `nix run .#rotate-wallpaper`
|
||||||
# and gets committed as part of `nix run .#upgrade`
|
# and gets committed as part of `nix run .#upgrade`
|
||||||
{
|
{
|
||||||
currentIndex = 1; # Index into wallpapers list
|
currentIndex = 2; # Index into wallpapers list
|
||||||
|
|
||||||
wallpapers = [
|
wallpapers = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,12 +22,11 @@ with lib;
|
|||||||
sddm = true;
|
sddm = true;
|
||||||
wayland = true;
|
wayland = true;
|
||||||
};
|
};
|
||||||
kodi = {
|
plasma-bigscreen = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autologin = true;
|
autologin = true;
|
||||||
wayland = true;
|
|
||||||
appLauncherServer.enable = true;
|
|
||||||
jellyfinScaleFactor = 1.0;
|
jellyfinScaleFactor = 1.0;
|
||||||
|
appLauncherServer.enable = true;
|
||||||
};
|
};
|
||||||
nfs-mounts.enable = true;
|
nfs-mounts.enable = true;
|
||||||
users.enable = true;
|
users.enable = true;
|
||||||
@@ -72,4 +71,3 @@ with lib;
|
|||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
system.stateVersion = "24.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,10 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
extraGroups = [ "video" ];
|
extraGroups = [ "video" ];
|
||||||
};
|
};
|
||||||
virtualisation.enable = true;
|
virtualisation = {
|
||||||
|
enable = true;
|
||||||
|
waydroid = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
# Beads package - issue tracker for AI-supervised coding workflows
|
# Beads package - issue tracker for AI-supervised coding workflows
|
||||||
# Takes src as argument so it can be called from both overlay and flake packages
|
# Takes src as argument so it can be called from both overlay and flake packages
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, fetchurl
|
|
||||||
, go_1_25
|
|
||||||
, git
|
, git
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, icu
|
, icu
|
||||||
@@ -12,24 +9,12 @@
|
|||||||
, version ? "unknown"
|
, version ? "unknown"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
buildGoModule {
|
||||||
# nixpkgs ships Go 1.25.5, but beads' dolt deps require Go >= 1.25.6
|
|
||||||
go_1_25_6 = go_1_25.overrideAttrs (old: rec {
|
|
||||||
version = "1.25.6";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
|
||||||
hash = "sha256-WMv3ceRNdt5vVtGeM7d9dFoeSJNAkih15GWFuXXCsFk=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
buildGoModule_1_25_6 = buildGoModule.override { go = go_1_25_6; };
|
|
||||||
in
|
|
||||||
buildGoModule_1_25_6 {
|
|
||||||
pname = "beads";
|
pname = "beads";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
subPackages = [ "cmd/bd" ];
|
subPackages = [ "cmd/bd" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
# Regenerated vendorHash for commit 6a51223b (dolt server mode, Go 1.25.6)
|
vendorHash = "sha256-OL6QGf4xSMpEbmU+41pFdO0Rrs3H162T3pdiW9UfWR0=";
|
||||||
vendorHash = "sha256-9RMy0+ZBFg1BAl8Z0EuZK4XVm9QYVekS9i/1ErOIB/c=";
|
|
||||||
nativeBuildInputs = [ git pkg-config ];
|
nativeBuildInputs = [ git pkg-config ];
|
||||||
buildInputs = [ icu ];
|
buildInputs = [ icu ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@@ -6,24 +6,24 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.1.32";
|
version = "2.1.69";
|
||||||
|
|
||||||
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 = "841ac3051c04480a5651bc9f4ae27ab9d3963477250e71892e4d6e05778dd9d3";
|
sha256 = "a86e14f44b167c1e8dbf764f76755b92ecf52c097d732a3461fe65b5fb60be05";
|
||||||
};
|
};
|
||||||
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 = "2b8a57be5640076e17d23e47e9288f2d1faee6564f4e311b5f7132bfde73fded";
|
sha256 = "e5987b4dd502a6542bf86c3c0bcd1d533b774616fc7d49566ce0b2040e6c1374";
|
||||||
};
|
};
|
||||||
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 = "96cd1ba796772481bd49bd67e3b8484565d1f3a99662565516c3bfe16d9afd4a";
|
sha256 = "b3bdbd5a3cbf8caafe353022170df77fefa80b00003074d4d27e7da8c59e629a";
|
||||||
};
|
};
|
||||||
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 = "6f8390c0fde5b802ff777ab54225233f6159d76913adc3b8aea7c8774fa8fe70";
|
sha256 = "ecc7bbf10513ff122327866eb97212945b73afd7f81e30700375cdf10f50b2a3";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,4 +5,5 @@
|
|||||||
claude-code = pkgs.callPackage ./claude-code {};
|
claude-code = pkgs.callPackage ./claude-code {};
|
||||||
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 {};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "gastown";
|
pname = "gastown";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
vendorHash = "sha256-ripY9vrYgVW8bngAyMLh0LkU/Xx1UUaLgmAA7/EmWQU=";
|
vendorHash = "sha256-/+ODyndArUF0nJY9r8G5JKhzQckBHFb48A7EBZmoIr0=";
|
||||||
subPackages = [ "cmd/gt" ];
|
subPackages = [ "cmd/gt" ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|||||||
79
packages/pi-coding-agent/default.nix
Normal file
79
packages/pi-coding-agent/default.nix
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, patchelf
|
||||||
|
, glibc
|
||||||
|
, makeWrapper
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
version = "0.55.4";
|
||||||
|
|
||||||
|
srcs = {
|
||||||
|
aarch64-darwin = {
|
||||||
|
url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-darwin-arm64.tar.gz";
|
||||||
|
sha256 = "0vsav9frvnzskk6p6j60i7klrs3m8lphhyi4c39mv2mvhpm8fkl5";
|
||||||
|
};
|
||||||
|
x86_64-darwin = {
|
||||||
|
url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-darwin-x64.tar.gz";
|
||||||
|
sha256 = "1377rvhsiiww1bbpgv2v46fjm7iz2smmh8g2yhm28kbsq3gwvvr0";
|
||||||
|
};
|
||||||
|
x86_64-linux = {
|
||||||
|
url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-linux-x64.tar.gz";
|
||||||
|
sha256 = "1wnfwnkfq5ffz6wyqyhciv4lz06bpxims0hv0dlhz0f9vliyc1md";
|
||||||
|
};
|
||||||
|
aarch64-linux = {
|
||||||
|
url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-linux-arm64.tar.gz";
|
||||||
|
sha256 = "00fp37hgjl40kc59jfpv189i7np53ymm037hvds6k9y2sz818wjy";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
pname = "pi-coding-agent";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
inherit (src) url sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
sourceRoot = "pi";
|
||||||
|
|
||||||
|
# Bun standalone binaries have JS code appended after the ELF sections
|
||||||
|
dontStrip = true;
|
||||||
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ]
|
||||||
|
++ lib.optionals stdenv.isLinux [ patchelf ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
# Install the full pi directory structure (binary + supporting files)
|
||||||
|
mkdir -p $out/lib/pi-coding-agent
|
||||||
|
cp -r . $out/lib/pi-coding-agent/
|
||||||
|
|
||||||
|
# Create bin wrapper that runs the binary from its lib directory
|
||||||
|
# (pi expects supporting files like themes and wasm relative to itself)
|
||||||
|
mkdir -p $out/bin
|
||||||
|
makeWrapper $out/lib/pi-coding-agent/pi $out/bin/pi
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Manually patch the interpreter for bun standalone binaries on Linux
|
||||||
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
|
interpreter="${glibc}/lib/${if stdenv.hostPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else "ld-linux-x86-64.so.2"}"
|
||||||
|
patchelf --set-interpreter "$interpreter" $out/lib/pi-coding-agent/pi
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Minimal terminal coding agent with extensible tools and session management";
|
||||||
|
homepage = "https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ ];
|
||||||
|
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
|
||||||
|
mainProgram = "pi";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
"/gastown/"
|
"/gastown/"
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"before 6am every day"
|
"before 6am"
|
||||||
],
|
],
|
||||||
"automerge": false
|
"automerge": false
|
||||||
},
|
},
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
"/beads/"
|
"/beads/"
|
||||||
],
|
],
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"before 6am every day"
|
"before 6am"
|
||||||
],
|
],
|
||||||
"automerge": false
|
"automerge": false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ with lib;
|
|||||||
./k3s-node
|
./k3s-node
|
||||||
./kodi
|
./kodi
|
||||||
./nfs-mounts
|
./nfs-mounts
|
||||||
|
./plasma-bigscreen
|
||||||
./nvidia
|
./nvidia
|
||||||
./printing
|
./printing
|
||||||
./rclone-mount
|
./rclone-mount
|
||||||
|
|||||||
@@ -11,9 +11,8 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
wrapperFeatures.gtk = true;
|
wrapperFeatures.gtk = true;
|
||||||
};
|
};
|
||||||
programs.light.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
brightnessctl
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
|
|||||||
134
roles/plasma-bigscreen/default.nix
Normal file
134
roles/plasma-bigscreen/default.nix
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
{ 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"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
131
roles/plasma-bigscreen/package.nix
Normal file
131
roles/plasma-bigscreen/package.nix
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
# 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;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -13,6 +13,11 @@ in
|
|||||||
default = [ "johno" ];
|
default = [ "johno" ];
|
||||||
description = "List of users to add to the docker group";
|
description = "List of users to add to the docker group";
|
||||||
};
|
};
|
||||||
|
waydroid = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable waydroid support";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable
|
config = mkIf cfg.enable
|
||||||
@@ -21,5 +26,6 @@ in
|
|||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
users.extraGroups.docker.members = cfg.dockerUsers;
|
users.extraGroups.docker.members = cfg.dockerUsers;
|
||||||
|
virtualisation.waydroid.enable = cfg.waydroid;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
0
scripts/rotate-wallpaper.sh
Normal file → Executable file
0
scripts/rotate-wallpaper.sh
Normal file → Executable file
Reference in New Issue
Block a user