Framework 12 fixes + emacs update
This commit is contained in:
parent
4905239518
commit
6ba3739830
4 changed files with 36 additions and 10 deletions
30
nixos/hardware/framework12/default.nix
Normal file
30
nixos/hardware/framework12/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.framework-12-13th-gen-intel
|
||||
];
|
||||
# Ensure that the `pinctrl_tigerlake` kernel module is loaded before `soc_button_array`.
|
||||
# This is required for correcly switching to tablet mode when the display is folded back.
|
||||
boot.extraModprobeConfig = ''
|
||||
softdep soc_button_array pre: pinctrl_tigerlake
|
||||
'';
|
||||
# Patch the `udev` rules shipping with `iio-sensor-proxy` according to:
|
||||
# https://github.com/FrameworkComputer/linux-docs/blob/main/framework12/Ubuntu-25-04-accel-ubuntu25.04.md
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
iio-sensor-proxy = prev.iio-sensor-proxy.overrideAttrs (old: {
|
||||
postInstall = ''
|
||||
${old.postInstall or ""}
|
||||
sed -i 's/.*iio-buffer-accel/#&/' $out/lib/udev/rules.d/80-iio-sensor-proxy.rules
|
||||
'';
|
||||
});
|
||||
})
|
||||
];
|
||||
environment.systemPackages = [
|
||||
pkgs.frameworkTool
|
||||
];
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../hardware/nvidia
|
||||
../../hardware/framework12
|
||||
|
||||
../../modules/niri
|
||||
|
||||
|
|
@ -50,15 +50,13 @@
|
|||
blender
|
||||
ladybird
|
||||
prismlauncher
|
||||
|
||||
#inputs.nix-gaming.packages.${pkgs.system}.star-citizen
|
||||
];
|
||||
|
||||
zramSwap = {
|
||||
enable = true; # Hopefully? helps with freezing when using swap
|
||||
};
|
||||
services.zerotierone = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
port = 9994;
|
||||
joinNetworks = [
|
||||
"A84AC5C10AD269CA"
|
||||
|
|
@ -69,13 +67,12 @@
|
|||
services.ollama = {
|
||||
enable = true;
|
||||
loadModels = ["qwq" "llama3.1" "qwen2.5-coder:7b"];
|
||||
acceleration = "cuda";
|
||||
home = "/persist/ollama";
|
||||
user = "ollama";
|
||||
group = "ollama";
|
||||
};
|
||||
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"];
|
||||
#boot.binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"];
|
||||
|
||||
services.open-webui.enable = true;
|
||||
#services.open-webui.package = unstable-pkgs.open-webui;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue