From 3e3af69560c82c6d42670479696377e9f143d9e6 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 16 Oct 2024 10:37:10 +0200 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=7673ce31a9d048865a25ea68bcf0fb9ec9eac310' (2024-10-15) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=9d341a9fcaa176a53876bc3b451f64e46ae256b9' (2024-10-15) • Updated input 'home-manager': 'github:nix-community/home-manager/e1aec543f5caf643ca0d94b6a633101942fd065f' (2024-10-14) → 'github:nix-community/home-manager/2a4fd1cfd8ed5648583dadef86966a8231024221' (2024-10-15) • Updated input 'lanzaboote': 'github:nix-community/lanzaboote/a71d589ce0bce98ac8f7cbaf7d88b0badfbb6dd0' (2024-10-14) → 'github:nix-community/lanzaboote/2fa1368f938b50e35ca87334b5aeba38a3402165' (2024-10-16) • Updated input 'lanzaboote/rust-overlay': 'github:oxalica/rust-overlay/a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4' (2024-07-29) → 'github:oxalica/rust-overlay/4c6e317300f05b8871f585b826b6f583e7dc4a9b' (2024-10-15) • Updated input 'mystia': 'github:soopyc/mystia/687bb9bb56549ca4ab9092828be5d1738e26f812' (2024-10-11) → 'github:soopyc/mystia/cf51a02eef5f696f284fed8d2768ac6c29239979' (2024-10-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) → 'github:NixOS/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/afbdf987e8613d980e3ae20c552b76fa2d7f6df4' (2024-10-15) → 'github:nix-community/nix-vscode-extensions/81a5fdadd8b5b473d8a51a6ec751c94ed180707e' (2024-10-16) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index f9600a1..ab2b443 100644 --- a/flake.lock +++ b/flake.lock @@ -172,11 +172,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1728957903, - "narHash": "sha256-QeKA2SCNAAaF28I6vdlrzN8Ro/wnpYFaC5bHAKzRSic=", + "lastModified": 1729036568, + "narHash": "sha256-ln80LKy2F42jiz5NOR7HSx5Otw+ckK9AQg/QbMATSqM=", "ref": "refs/heads/main", - "rev": "7673ce31a9d048865a25ea68bcf0fb9ec9eac310", - "revCount": 7699, + "rev": "9d341a9fcaa176a53876bc3b451f64e46ae256b9", + "revCount": 7721, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728931061, - "narHash": "sha256-VTb2wsZ19j4RLdxSifQTMxojchaqLXe7wuBXRIPRpnw=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a71d589ce0bce98ac8f7cbaf7d88b0badfbb6dd0", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1728633721, - "narHash": "sha256-/k62dGfhCzU96BbxaKW7Zc9tCanIc8kDj5E01puw1iE=", + "lastModified": 1729065719, + "narHash": "sha256-ab/BjtWW8pBa7OB9HdUe+kcYe7UUIZIqomjJH4E9DMo=", "owner": "soopyc", "repo": "mystia", - "rev": "687bb9bb56549ca4ab9092828be5d1738e26f812", + "rev": "cf51a02eef5f696f284fed8d2768ac6c29239979", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1728956731, - "narHash": "sha256-qjG5iUECeoyYEXX1E8RKq6nGqrHINXlh4eyXYNYFdPI=", + "lastModified": 1729043231, + "narHash": "sha256-Dhn3CI3e8cexWhwDVuKGQu7DjCXKLut5aT928x5WIDw=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "afbdf987e8613d980e3ae20c552b76fa2d7f6df4", + "rev": "81a5fdadd8b5b473d8a51a6ec751c94ed180707e", "type": "github" }, "original": { From 5331f9b8a443741a8e2e2a4151413ce4d85cc58e Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 16 Oct 2024 11:23:06 +0200 Subject: [PATCH 2/2] feat(desktop): use recent kernel --- configs/common.nix | 2 +- configs/desktop.nix | 2 ++ systems/etna/default.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/common.nix b/configs/common.nix index 74f0ba0..a15f964 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -38,7 +38,7 @@ in { }; boot = { - kernelPackages = pkgs.linuxPackages; # use lts + kernelPackages = lib.mkDefault pkgs.linuxPackages; # use lts kernelParams = ["quiet" "loglevel=3"]; # faster tcp !!! diff --git a/configs/desktop.nix b/configs/desktop.nix index 9569353..719d54e 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -22,6 +22,8 @@ ]; boot = { + kernelPackages = pkgs.linuxPackages_latest; + extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; kernelModules = ["v4l2loopback"]; diff --git a/systems/etna/default.nix b/systems/etna/default.nix index 6d009dc..05f1cfa 100644 --- a/systems/etna/default.nix +++ b/systems/etna/default.nix @@ -33,7 +33,7 @@ in { ]; boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages_6_1; + kernelPackages = pkgs.linuxPackages_6_1; loader.systemd-boot.enable = true; };