kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framework 12 fixes + emacs update

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-07-26 10:33:22 +02:00
parent 4905239518
commit 6ba3739830
4 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -333,11 +333,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753479356, "lastModified": 1753518720,
"narHash": "sha256-fJZgp57I30SMZKwq2UQfGBkM4R7HqrZLde9YRUBe3dw=", "narHash": "sha256-C5UWpgvNOxGcHiAfNHPrbepydjVXYULiktkPmGOoGl8=",
"owner": "kylekrein", "owner": "kylekrein",
"repo": "emacs-config", "repo": "emacs-config",
"rev": "c256cbb11af63a3f5026ab4a9c427f51ef0d2dae", "rev": "34035d410d01a95f623f3c38a20bbf11ff57ec63",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -267,7 +267,6 @@
modules = [ modules = [
(import ./disko/impermanence-tmpfs-luks.nix {device = "/dev/nvme0n1";}) (import ./disko/impermanence-tmpfs-luks.nix {device = "/dev/nvme0n1";})
./nixos/configuration.nix ./nixos/configuration.nix
inputs.nixos-hardware.nixosModules.framework-12-13th-gen-intel
]; ];
}; };
"kylekrein-mac" = nixpkgs.lib.nixosSystem { "kylekrein-mac" = nixpkgs.lib.nixosSystem {

30
nixos/hardware/framework12/default.nix Normal file
View 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
nixos/hosts/kylekrein-framework12/default.nix
View file

@ -9,7 +9,7 @@
... ...
}: { }: {
imports = [ imports = [
../../hardware/nvidia ../../hardware/framework12
../../modules/niri ../../modules/niri
@ -50,15 +50,13 @@
blender blender
ladybird ladybird
prismlauncher prismlauncher
#inputs.nix-gaming.packages.${pkgs.system}.star-citizen
]; ];
zramSwap = { zramSwap = {
enable = true; # Hopefully? helps with freezing when using swap enable = true; # Hopefully? helps with freezing when using swap
}; };
services.zerotierone = { services.zerotierone = {
enable = true; enable = false;
port = 9994; port = 9994;
joinNetworks = [ joinNetworks = [
"A84AC5C10AD269CA" "A84AC5C10AD269CA"
@ -69,13 +67,12 @@
services.ollama = { services.ollama = {
enable = true; enable = true;
loadModels = ["qwq" "llama3.1" "qwen2.5-coder:7b"]; loadModels = ["qwq" "llama3.1" "qwen2.5-coder:7b"];
acceleration = "cuda";
home = "/persist/ollama"; home = "/persist/ollama";
user = "ollama"; user = "ollama";
group = "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.enable = true;
#services.open-webui.package = unstable-pkgs.open-webui; #services.open-webui.package = unstable-pkgs.open-webui;