diff --git a/framework/configuration.nix b/framework/configuration.nix index 1d97aee..779dc0b 100644 --- a/framework/configuration.nix +++ b/framework/configuration.nix @@ -1,6 +1,9 @@ # Config for framework16 { config, pkgs, lib, nixos-hardware, impermanence, talon-nix, plover-flake, beads-flake, ... }: { + nix.settings = { + download-buffer-size = 524288000; # 500 MiB + }; imports = [ nixos-hardware.nixosModules.framework-16-7040-amd @@ -11,16 +14,18 @@ boot = { loader.systemd-boot.enable = true; - loader.systemd-boot.configurationLimit = 100; + loader.systemd-boot.configurationLimit = 20; loader.efi.canTouchEfiVariables = true; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot"; initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap"; - resumeDevice = "/dev/nvme0n1p2"; + resumeDevice = "/dev/mapper/cryptswap"; kernelParams = [ - "resume_offset=0" "mem_sleep_default=deep" ]; + extraModprobeConfig = '' + options amdgpu cwsr_enable=0 # For ROCm to not crash + ''; }; swapDevices = [ { device = "/dev/mapper/cryptswap"; @@ -41,15 +46,14 @@ hardware.amdgpu = { opencl.enable = true; - amdvlk.enable = true; }; hardware.graphics.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; services.ollama = { - enable = false; + enable = true; loadModels = [ "gemma3" ]; acceleration = "rocm"; - rocmOverrideGfx = "11.0.3"; + rocmOverrideGfx = "11.0.2"; }; networking.hostId = "3294c9a2"; # Required for ZFS @@ -131,10 +135,10 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.displayManager.gdm.wayland = true; - services.xserver.displayManager.gdm.autoSuspend = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.displayManager.gdm.wayland = true; + services.displayManager.gdm.autoSuspend = true; + services.desktopManager.gnome.enable = true; services.xserver.windowManager.xmonad = { enable = true; @@ -164,9 +168,9 @@ hardware.bluetooth.enable = true; services.blueman.enable = true; - services.logind = { - extraConfig = "HandlePowerKey=suspend"; - lidSwitch = "suspend"; + services.logind.settings.Login = { + HandlePowerKey = "suspend"; + HandleLidSwitch = "suspend"; }; services.upower = { @@ -231,7 +235,7 @@ #ruff # for zed goose-cli claude-code - codex + pkgs.unstable.codex neofetch eww hyprpaper # for hyprland @@ -249,14 +253,14 @@ gromit-mpx urbanterror ghostty - talon-nix.packages.${pkgs.system}.default + talon-nix.packages.${pkgs.stdenv.hostPlatform.system}.default pyright just yt-dlp socat - plover-flake.packages.${pkgs.system}.plover-full + plover-flake.packages.${pkgs.stdenv.hostPlatform.system}.plover-full pkgs.unstable.zoom-us - beads-flake.packages.${pkgs.system}.default + beads-flake.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; systemd.user.services = { diff --git a/framework/flake.lock b/framework/flake.lock index 1176b88..b7f26f8 100644 --- a/framework/flake.lock +++ b/framework/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763149136, - "narHash": "sha256-5IeEBR/CqKCNPhhoYMaGm62VQw2e4cAwi4+wGW78dck=", + "lastModified": 1764830699, + "narHash": "sha256-GmK2+kcaorEsQ/O9lweJIVBv21Np6VfW6sE/3F/GBjY=", "owner": "steveyegge", "repo": "beads", - "rev": "2f83815ddddb96bfbf5ed9c7aa27cb924a73b85c", + "rev": "f4b8a7ad4f7eb3bd47b24357f69f22bc1a75d4b7", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -122,27 +122,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1764677808, + "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "plover": { "flake": false, "locked": { - "lastModified": 1762793584, - "narHash": "sha256-1ZOeaSkrc9UftbQeMMOnimq3mfY0O3zL2K4jurnTGyM=", + "lastModified": 1764131295, + "narHash": "sha256-Q6vrDmn3a0m7oz8EeyuIhkq1V4nXNGHIdJhyQl9CAuE=", "owner": "openstenoproject", "repo": "plover", - "rev": "686974243bcd5c5fdd6fab0842137219b246eee2", + "rev": "bf2eaa51491d719e65f2afc4b9f999d42230dbdb", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "rtf-tokenize": "rtf-tokenize" }, "locked": { - "lastModified": 1763092544, - "narHash": "sha256-nUuAos+VMhyJW2f/rm5wwfB49mYYhmmOTjl+q+dm6no=", + "lastModified": 1764820984, + "narHash": "sha256-DyBpG7Mh2mPk6HUpC+g2a4vwvBhTHArX3RNJSmIbf6g=", "owner": "openstenoproject", "repo": "plover-flake", - "rev": "82247004803afe344e0eb4e899a9db45d0969a3e", + "rev": "15dd9b231fd74e7c80416adf94daeb47ba74b8a6", "type": "github" }, "original": { diff --git a/framework/flake.nix b/framework/flake.nix index 8bcc7cf..344480e 100644 --- a/framework/flake.nix +++ b/framework/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration for liminal (Framework 16)"; 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"; nixos-hardware.url = "github:NixOS/nixos-hardware";