hunner/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 25.11

Browse source
This commit is contained in:
Hunter Haugen 2025-12-04 10:19:27 -08:00
parent 5846b10046
commit 6b30d11d42
Signed by: hunner
GPG key ID: EF99694AA599DDAD
3 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
framework/configuration.nix
View file

@ -1,6 +1,9 @@
# Config for framework16 # Config for framework16
{ config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }: { config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }:
{ {
nix.settings = {
download-buffer-size = 524288000; # 500 MiB
};
imports = imports =
[ [
nixos-hardware.nixosModules.framework-16-7040-amd nixos-hardware.nixosModules.framework-16-7040-amd
@ -11,16 +14,18 @@
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.systemd-boot.configurationLimit = 100; loader.systemd-boot.configurationLimit = 20;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
#initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot"; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot";
initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap"; initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap";
resumeDevice = "/dev/nvme0n1p2"; resumeDevice = "/dev/mapper/cryptswap";
kernelParams = [ kernelParams = [
"resume_offset=0"
"mem_sleep_default=deep" "mem_sleep_default=deep"
]; ];
extraModprobeConfig = ''
options amdgpu cwsr_enable=0 # For ROCm to not crash
'';
}; };
swapDevices = [ { swapDevices = [ {
device = "/dev/mapper/cryptswap"; device = "/dev/mapper/cryptswap";
@ -41,15 +46,14 @@
hardware.amdgpu = { hardware.amdgpu = {
opencl.enable = true; opencl.enable = true;
amdvlk.enable = true;
}; };
hardware.graphics.enable = true; hardware.graphics.enable = true;
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
services.ollama = { services.ollama = {
enable = false; enable = true;
loadModels = [ "gemma3" ]; loadModels = [ "gemma3" ];
acceleration = "rocm"; acceleration = "rocm";
rocmOverrideGfx = "11.0.3"; rocmOverrideGfx = "11.0.2";
}; };
networking.hostId = "3294c9a2"; # Required for ZFS networking.hostId = "3294c9a2"; # Required for ZFS
@ -131,10 +135,10 @@
services.xserver.enable = true; services.xserver.enable = true;
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.xserver.displayManager.gdm.autoSuspend = true; services.displayManager.gdm.autoSuspend = true;
services.xserver.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = true;
services.xserver.windowManager.xmonad = { services.xserver.windowManager.xmonad = {
enable = true; enable = true;
@ -164,9 +168,9 @@
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.logind = { services.logind.settings.Login = {
extraConfig = "HandlePowerKey=suspend"; HandlePowerKey = "suspend";
lidSwitch = "suspend"; HandleLidSwitch = "suspend";
}; };
services.upower = { services.upower = {
@ -231,7 +235,7 @@
#ruff # for zed #ruff # for zed
goose-cli goose-cli
claude-code claude-code
codex pkgs.unstable.codex
neofetch neofetch
eww eww
hyprpaper # for hyprland hyprpaper # for hyprland
@ -249,14 +253,14 @@
gromit-mpx gromit-mpx
urbanterror urbanterror
ghostty ghostty
talon-nix.packages.${pkgs.system}.default talon-nix.packages.${pkgs.stdenv.hostPlatform.system}.default
pyright pyright
just just
yt-dlp yt-dlp
socat socat
plover-flake.packages.${pkgs.system}.plover-full plover-flake.packages.${pkgs.stdenv.hostPlatform.system}.plover-full
pkgs.unstable.zoom-us pkgs.unstable.zoom-us
beads-flake.packages.${pkgs.system}.default beads-flake.packages.${pkgs.stdenv.hostPlatform.system}.default
]; ];
}; };
systemd.user.services = { systemd.user.services = {

44
framework/flake.lock generated
View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1763149136, "lastModified": 1764830699,
"narHash": "sha256-5IeEBR/CqKCNPhhoYMaGm62VQw2e4cAwi4+wGW78dck=", "narHash": "sha256-GmK2+kcaorEsQ/O9lweJIVBv21Np6VfW6sE/3F/GBjY=",
"owner": "steveyegge", "owner": "steveyegge",
"repo": "beads", "repo": "beads",
"rev": "2f83815ddddb96bfbf5ed9c7aa27cb924a73b85c", "rev": "f4b8a7ad4f7eb3bd47b24357f69f22bc1a75d4b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1762847253, "lastModified": 1764440730,
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1762977756, "lastModified": 1764667669,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,27 +122,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1763049705, "lastModified": 1764677808,
"narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1762977756, "lastModified": 1764667669,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,11 +171,11 @@
"plover": { "plover": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762793584, "lastModified": 1764131295,
"narHash": "sha256-1ZOeaSkrc9UftbQeMMOnimq3mfY0O3zL2K4jurnTGyM=", "narHash": "sha256-Q6vrDmn3a0m7oz8EeyuIhkq1V4nXNGHIdJhyQl9CAuE=",
"owner": "openstenoproject", "owner": "openstenoproject",
"repo": "plover", "repo": "plover",
"rev": "686974243bcd5c5fdd6fab0842137219b246eee2", "rev": "bf2eaa51491d719e65f2afc4b9f999d42230dbdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
"rtf-tokenize": "rtf-tokenize" "rtf-tokenize": "rtf-tokenize"
}, },
"locked": { "locked": {
"lastModified": 1763092544, "lastModified": 1764820984,
"narHash": "sha256-nUuAos+VMhyJW2f/rm5wwfB49mYYhmmOTjl+q+dm6no=", "narHash": "sha256-DyBpG7Mh2mPk6HUpC+g2a4vwvBhTHArX3RNJSmIbf6g=",
"owner": "openstenoproject", "owner": "openstenoproject",
"repo": "plover-flake", "repo": "plover-flake",
"rev": "82247004803afe344e0eb4e899a9db45d0969a3e", "rev": "15dd9b231fd74e7c80416adf94daeb47ba74b8a6",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
framework/flake.nix
View file

@ -2,7 +2,7 @@
description = "NixOS configuration for liminal (Framework 16)"; description = "NixOS configuration for liminal (Framework 16)";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";