From e0bc8eefa8e493ea599167f637afcb63975c3864 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 22 Jan 2025 13:37:11 +0100 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 'api-rs': 'github:uku3lig/api-rs/a1329a27cee518f61090b6b74c20d7176ce97225?narHash=sha256-qn4stOJgP52QLzgSgjXT5jojcLZ1fXLH7SrUWNYyvCc%3D' (2025-01-13) → 'github:uku3lig/api-rs/8610214c1b25d8e906a5c7f72fbe7f9e7ad9f254?narHash=sha256-GJAyFfTeMdw4DuaTghTvmnj%2BbPpiNoz4y74nC52fu7E%3D' (2025-01-20) • Updated input 'camasca': 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=4225fb1ad43a8ca42ab0b3c4d804ef48cabf8b57' (2025-01-13) → 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=df8bf54a0a71c2383a48ef4d23aa2ecafb0841c3' (2025-01-20) • Updated input 'home-manager': 'github:nix-community/home-manager/f8ef4541bb8a54a8b52f19b52912119e689529b3?narHash=sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw%3D' (2025-01-19) → 'github:nix-community/home-manager/4481a16d1ac5bff4a77c608cefe08c9b9efe840d?narHash=sha256-rk/cmrvq3In0TegW9qaAxw%2B5YpJhRWt2p74/6JStrw0%3D' (2025-01-21) • Updated input 'mystia': 'github:soopyc/mystia/b2103e6255abfd819ccb474c768e9223b777ce03?narHash=sha256-LLaaTAzfB8rwGxCCfJisoebeuqi0IMnTiwX5QR3PiOk%3D' (2025-01-17) → 'github:soopyc/mystia/f725d2ad9fdb98315c240afcbddee6523051d9c4?narHash=sha256-GF4c%2BLW/3Ywkax6hdny2vyftXHIA/loZt8Q1poQcjTs%3D' (2025-01-22) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16) → 'github:NixOS/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899?narHash=sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc%3D' (2025-01-17) → 'github:numtide/treefmt-nix/f2cc121df15418d028a59c9737d38e3a90fbaf8f?narHash=sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo%3D' (2025-01-21) • Updated input 'ukubot-rs': 'github:uku3lig/ukubot-rs/95742c0cd0573908c2a25c54dedcea8ec6162855?narHash=sha256-YO%2BeNLMWvZJkg0BK30J/aruyuwAIYWXmmeWjQk2vlUA%3D' (2025-01-13) → 'github:uku3lig/ukubot-rs/02c3f6edf457a46a91bbc0b2c523175bd0f5709e?narHash=sha256-cIq3uhAcn9hp1PjTMGJmyxhZ%2BDxeSV5gbuiVX4lhC3I%3D' (2025-01-20) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/83e447a2ae38dc584ce572d0d80847e3d53fac90?narHash=sha256-1j7wMhzpTUIkfXnsgTDr4c6dIKAHAAXDr3ojgs0n3HE%3D' (2025-01-20) → 'github:nix-community/nix-vscode-extensions/5af3e00a29d0eb68fc7478548d732f355ac0c381?narHash=sha256-8dHvINAotk7qQ8BfQ6ZAewyuhs0tUx2MwqgvMK9zkBk%3D' (2025-01-22) --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index c9e0809..04719cb 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1736806100, - "narHash": "sha256-qn4stOJgP52QLzgSgjXT5jojcLZ1fXLH7SrUWNYyvCc=", + "lastModified": 1737408151, + "narHash": "sha256-GJAyFfTeMdw4DuaTghTvmnj+bPpiNoz4y74nC52fu7E=", "owner": "uku3lig", "repo": "api-rs", - "rev": "a1329a27cee518f61090b6b74c20d7176ce97225", + "rev": "8610214c1b25d8e906a5c7f72fbe7f9e7ad9f254", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1736726491, - "narHash": "sha256-zxJ5a2CSUWO6eA1k73Grqmz+bNpubZUVIHfXo2sWXCw=", + "lastModified": 1737331307, + "narHash": "sha256-6WVG4ateSby9v+JmkkU7AfnMYKabjb+7IHCvAVCkvyo=", "ref": "refs/heads/main", - "rev": "4225fb1ad43a8ca42ab0b3c4d804ef48cabf8b57", - "revCount": 41, + "rev": "df8bf54a0a71c2383a48ef4d23aa2ecafb0841c3", + "revCount": 42, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1737299337, - "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1737100924, - "narHash": "sha256-LLaaTAzfB8rwGxCCfJisoebeuqi0IMnTiwX5QR3PiOk=", + "lastModified": 1737532932, + "narHash": "sha256-GF4c+LW/3Ywkax6hdny2vyftXHIA/loZt8Q1poQcjTs=", "owner": "soopyc", "repo": "mystia", - "rev": "b2103e6255abfd819ccb474c768e9223b777ce03", + "rev": "f725d2ad9fdb98315c240afcbddee6523051d9c4", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1737103437, - "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { @@ -318,11 +318,11 @@ ] }, "locked": { - "lastModified": 1736806268, - "narHash": "sha256-YO+eNLMWvZJkg0BK30J/aruyuwAIYWXmmeWjQk2vlUA=", + "lastModified": 1737382446, + "narHash": "sha256-cIq3uhAcn9hp1PjTMGJmyxhZ+DxeSV5gbuiVX4lhC3I=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "95742c0cd0573908c2a25c54dedcea8ec6162855", + "rev": "02c3f6edf457a46a91bbc0b2c523175bd0f5709e", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1737337847, - "narHash": "sha256-1j7wMhzpTUIkfXnsgTDr4c6dIKAHAAXDr3ojgs0n3HE=", + "lastModified": 1737510513, + "narHash": "sha256-8dHvINAotk7qQ8BfQ6ZAewyuhs0tUx2MwqgvMK9zkBk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "83e447a2ae38dc584ce572d0d80847e3d53fac90", + "rev": "5af3e00a29d0eb68fc7478548d732f355ac0c381", "type": "github" }, "original": { From 2049827fc308eb8088cce039332c4f4c5dfeb50c Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 22 Jan 2025 13:47:54 +0100 Subject: [PATCH 2/2] feat: set linux kernel versions appropriately --- configs/client.nix | 2 ++ configs/common.nix | 2 +- configs/desktop.nix | 2 -- configs/server.nix | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/client.nix b/configs/client.nix index 77a7939..817daa5 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -7,6 +7,8 @@ ../programs/rust.nix ]; + boot.kernelPackages = pkgs.linuxPackages; # lts + environment = { systemPackages = with pkgs; [ ffmpeg-full diff --git a/configs/common.nix b/configs/common.nix index 2475a9e..fca70e9 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -42,7 +42,7 @@ in }; boot = { - kernelPackages = lib.mkDefault pkgs.linuxPackages; # use lts + # see ./server.nix and ./client.nix for kernel versions kernelParams = [ "quiet" "loglevel=3" diff --git a/configs/desktop.nix b/configs/desktop.nix index fa23ee2..027c807 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -16,8 +16,6 @@ ]; boot = { - kernelPackages = pkgs.linuxPackages_latest; - extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; kernelModules = [ "v4l2loopback" ]; diff --git a/configs/server.nix b/configs/server.nix index fcac1d7..d63df0f 100644 --- a/configs/server.nix +++ b/configs/server.nix @@ -15,6 +15,8 @@ in secrets.generate ]; + boot.kernelPackages = pkgs.linuxPackages_6_6; + environment.systemPackages = with pkgs; [ ghostty.terminfo ];