Compare commits
12 commits
ab020ae8eb
...
ff34c17400
| Author | SHA1 | Date | |
|---|---|---|---|
| ff34c17400 | |||
| 3def5d58dd | |||
| b565cba77d | |||
| 39cf975863 | |||
| ca7aa45c18 | |||
| 9b07038b52 | |||
| b44e6b5c21 | |||
| cb2ca003a7 | |||
| dbd76da8a8 | |||
| d09c7c2f7e | |||
| ea8258e4d9 | |||
| dc4a9e6a27 |
8 changed files with 62 additions and 106 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -7,3 +7,5 @@
|
|||
|
||||
# nixago: ignore-linked-files
|
||||
/treefmt.toml
|
||||
|
||||
/debug-logs
|
||||
|
|
|
|||
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -17,22 +17,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ath11k-firmware": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733258345,
|
||||
"narHash": "sha256-th2svNLc74sVI/P+y1/Yck1IW+RIUnxL+NF2HLrsSxI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "ff9dd08208c5705a3867fc132dcedb5d31c901e2",
|
||||
"revCount": 163,
|
||||
"type": "git",
|
||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||
}
|
||||
},
|
||||
"colmena": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
|
@ -1249,7 +1233,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"aphorme_launcher": "aphorme_launcher",
|
||||
"ath11k-firmware": "ath11k-firmware",
|
||||
"colmena": "colmena",
|
||||
"crane": "crane",
|
||||
"disko": [
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -88,11 +88,6 @@
|
|||
url = "github:espanso/espanso/db97658d1d80697a635b57801696c594eacf057b";
|
||||
};
|
||||
|
||||
ath11k-firmware = {
|
||||
url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
nixpkgs-kanidm.url = "github:steveej-forks/nixpkgs/kanidm";
|
||||
nix4vscode = {
|
||||
url = "github:nix-community/nix4vscode";
|
||||
|
|
@ -325,12 +320,6 @@
|
|||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
buildInputs = [ ];
|
||||
};
|
||||
|
||||
x13s-ath11k-firmware = pkgs.runCommand "x13s-ath11k-firmware-before" { } ''
|
||||
mkdir -p $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
cp -v ${inputs.ath11k-firmware}/WCN6855/hw2.1/{board-2,regdb}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
cp -v ${inputs.ath11k-firmware}/WCN6855/hw2.1/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41/{amss,m3}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
'';
|
||||
};
|
||||
|
||||
formatter =
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@
|
|||
# hedgedoc-cli
|
||||
|
||||
xwayland
|
||||
pulsemixer
|
||||
|
||||
(pkgs.writeShellScriptBin "rflk" ''
|
||||
exec nix run nixpkgs#$@
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ let
|
|||
# Vimium C
|
||||
{ id = "hfjbmagddngcpeloejdejnfgbamkjaeg"; }
|
||||
|
||||
# TODO: this causes scrolling the tab bar all the way to the end. look for a different one or report
|
||||
# always right
|
||||
{ id = "npjpaghfnndnnmjiliibnkmdfgbojokj"; }
|
||||
|
||||
|
|
|
|||
|
|
@ -84,6 +84,8 @@
|
|||
../../snippets/nix-settings-holo-chain.nix
|
||||
../../snippets/mycelium.nix
|
||||
|
||||
# TODO: broken with: v4l2loopback-0.13.2-6.13.0-rc3.drv
|
||||
# make: *** [Makefile:53: v4l2loopback.ko] Error 2
|
||||
# ../../snippets/obs-studio.nix
|
||||
|
||||
{
|
||||
|
|
@ -231,8 +233,13 @@
|
|||
];
|
||||
};
|
||||
|
||||
# TODO: debug this collision: collision between `/nix/store/cb32qlzc4pm6h4arw59kxqyzbvgnmx7g-b43-firmware-6.30.163.46-zstd/lib/firmware/b43/a0g0bsinitvals5.fw.zst' and `/nix/store/niffz3cf0v91y5knz0an29fwvm8amigm-b43-firmware-5.100.138-zstd/lib/firmware/b43/a0g0bsinitvals5.fw.zst'
|
||||
hardware.firmware = lib.mkBefore [
|
||||
packages'.x13s-ath11k-firmware
|
||||
(pkgs.runCommand "x13s-ath11k-firmware-before" { } ''
|
||||
mkdir -p $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
cp -v ${nodeFlake.inputs.ath11k-firmware}/WCN6855/hw2.1/{board-2,regdb}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
cp -v ${nodeFlake.inputs.ath11k-firmware}/WCN6855/hw2.1/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41/{amss,m3}.bin $out/lib/firmware/ath11k/WCN6855/hw2.1/
|
||||
'')
|
||||
];
|
||||
|
||||
# see https://linrunner.de/tlp/
|
||||
|
|
|
|||
63
nix/os/devices/steveej-x13s/flake.lock
generated
63
nix/os/devices/steveej-x13s/flake.lock
generated
|
|
@ -1,5 +1,21 @@
|
|||
{
|
||||
"nodes": {
|
||||
"ath11k-firmware": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733258345,
|
||||
"narHash": "sha256-th2svNLc74sVI/P+y1/Yck1IW+RIUnxL+NF2HLrsSxI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "ff9dd08208c5705a3867fc132dcedb5d31c901e2",
|
||||
"revCount": 163,
|
||||
"type": "git",
|
||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -28,11 +44,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733168902,
|
||||
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
|
||||
"lastModified": 1734701201,
|
||||
"narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
|
||||
"rev": "2ee76c861af3b895b3b104bae04777b61397485b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -148,11 +164,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733389730,
|
||||
"narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=",
|
||||
"lastModified": 1734944412,
|
||||
"narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f",
|
||||
"rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -165,16 +181,16 @@
|
|||
"linux-jhovold": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733214488,
|
||||
"narHash": "sha256-nhS3FgdJm1KBjAuTePgcQ4oXzigyDufQfz2TUUahHtM=",
|
||||
"lastModified": 1734331387,
|
||||
"narHash": "sha256-q49Gk6MNWX5cZZlls3mcZ1UloDtOjJGEVTFNQD/UtWM=",
|
||||
"owner": "jhovold",
|
||||
"repo": "linux",
|
||||
"rev": "ccd13b9fd1a31c869789e2320e777bfdc150face",
|
||||
"rev": "e6114ad3a4a32e01978f87af5844e03d50b7732b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jhovold",
|
||||
"ref": "wip/sc8280xp-6.13-rc1",
|
||||
"ref": "wip/sc8280xp-6.13-rc3",
|
||||
"repo": "linux",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -190,11 +206,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732269459,
|
||||
"narHash": "sha256-KIn7TfNknBiCoM/RedPqW3Im9X0Iiwig3hHAAhkTDLg=",
|
||||
"lastModified": 1734517344,
|
||||
"narHash": "sha256-TlYqTCs3CxHsq7JTIeQwWpz86MYqYjXdGzNavt4hPm8=",
|
||||
"owner": "threefoldtech",
|
||||
"repo": "mycelium",
|
||||
"rev": "430ec6b272a4654d0ccbf053bfad8a594eff4016",
|
||||
"rev": "74719ba7cacb96e2d9251ce57760474e6973a14e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -248,11 +264,11 @@
|
|||
"x13s-bt-linux-firmware": "x13s-bt-linux-firmware"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733393262,
|
||||
"narHash": "sha256-cbpUix+ggnZtTT7Rtr1+A+iX+fI+KpduaGOOTXhaQWU=",
|
||||
"lastModified": 1734814904,
|
||||
"narHash": "sha256-+bjvOEXRmy1j3tbwYFBCy5Ego8YrYQah7osIDigF/Uc=",
|
||||
"ref": "bump",
|
||||
"rev": "b116d698f4b531a7577ccb875ca6a8106b9d63ee",
|
||||
"revCount": 127,
|
||||
"rev": "3c79ed01fb15d9e1f2c6226dae1a2ee883c77c8e",
|
||||
"revCount": 130,
|
||||
"type": "git",
|
||||
"url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
|
||||
},
|
||||
|
|
@ -292,11 +308,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1733261153,
|
||||
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||
"lastModified": 1734875076,
|
||||
"narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||
"rev": "1807c2b91223227ad5599d7067a61665c52d1295",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -308,11 +324,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1733393026,
|
||||
"narHash": "sha256-hpUyV0NHnIZpFzN6p7udW6Jh+m9tlLvCcNf1/wG5pQY=",
|
||||
"lastModified": 1733759999,
|
||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
||||
"owner": "steveej-forks",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b1714b7f9e5761ad965a4df7602105f1e159b89e",
|
||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -324,6 +340,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"ath11k-firmware": "ath11k-firmware",
|
||||
"disko": "disko",
|
||||
"get-flake": "get-flake",
|
||||
"home-manager": "home-manager",
|
||||
|
|
|
|||
|
|
@ -14,7 +14,10 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixos-x13s.url = "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
|
||||
nixos-x13s.url =
|
||||
"git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
|
||||
# 6.13-rc2
|
||||
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump&rev=c95058f8aa1b361df3874429c5dc0f694f9cba78"
|
||||
# 6.11.0
|
||||
# "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=6b9efe77ca80653354981c720af3c4241ac71490"
|
||||
# 6.12.0-rc6
|
||||
|
|
@ -26,6 +29,11 @@
|
|||
# nixos-x13s.url = "path:/home/steveej/src/others/nixos-x13s";
|
||||
# nixos-x13s.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
ath11k-firmware = {
|
||||
url = "git+https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
mycelium.url = "github:threefoldtech/mycelium";
|
||||
mycelium.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
|
|
@ -80,59 +88,7 @@
|
|||
inherit mkNixosConfiguration;
|
||||
};
|
||||
|
||||
overlays.libcamera =
|
||||
_final: previous:
|
||||
let
|
||||
webkitgtkPreConfigure = ''
|
||||
export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 2 ? 2 : NIX_BUILD_CORES))"
|
||||
export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
|
||||
'';
|
||||
in
|
||||
{
|
||||
wireplumber = previous.wireplumber.overrideAttrs (_: {
|
||||
version = "git";
|
||||
src = previous.fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "pipewire";
|
||||
repo = "wireplumber";
|
||||
rev = "71f868233792f10848644319dbdc97a4f147d554";
|
||||
hash = "sha256-VX3OFsBK9AbISm/XTx8p05ak+z/VcKXfUXhB9aI9ev8=";
|
||||
};
|
||||
});
|
||||
|
||||
libcamera = previous.libcamera.overrideAttrs (_: {
|
||||
postFixup = ''
|
||||
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
|
||||
'';
|
||||
});
|
||||
|
||||
libcamera-qcam = previous.libcamera-qcam.overrideAttrs (_: {
|
||||
postFixup = ''
|
||||
../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
|
||||
'';
|
||||
});
|
||||
|
||||
webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
|
||||
preConfigure = attrs.preConfigure + webkitgtkPreConfigure;
|
||||
});
|
||||
|
||||
webkitgtk_4_1 = previous.webkitgtk_4_1.overrideAttrs (attrs: {
|
||||
preConfigure = attrs.preConfigure + webkitgtkPreConfigure;
|
||||
});
|
||||
|
||||
webkitgtk_6_0 = previous.webkitgtk_6_0.overrideAttrs (attrs: {
|
||||
preConfigure = attrs.preConfigure + webkitgtkPreConfigure;
|
||||
});
|
||||
};
|
||||
|
||||
overlays.default = _final: _previous: {
|
||||
# inherit pkgsUnstable;
|
||||
# inherit (pkgsUnstable)
|
||||
# libcamera
|
||||
# webkitgtk
|
||||
# webkitgtk_4_1
|
||||
# webkitgtk_6_0
|
||||
# ;
|
||||
};
|
||||
|
||||
nixosConfigurations = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue