From 6e325908201885473a6854304694096353b37f9d Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 18 Dec 2024 14:31:53 +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/3be5ad799e933e829a516295b744da63d97b80a7?narHash=sha256-Rz1PTmKDdnC0%2BqOloHLorQuVRr/cZeLKR05sqBdfBUM%3D' (2024-12-14) → 'github:uku3lig/api-rs/3e15ae920e6b2cafd4f0a3189d6ec82bdf923cdc?narHash=sha256-4wvPqNd5j4ZeHCN8KwpJWsLh0SpWgZ8YI8BVT6QS%2B50%3D' (2024-12-16) • Updated input 'camasca': 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=ac25fc8620c6487980468def5ac281016c7e9480' (2024-12-11) → 'git+https://git.uku3lig.net/uku/camasca?ref=refs/heads/main&rev=2a8dfd7809e5d0abf95ff3e11489685e9434cd3e' (2024-12-16) • Updated input 'catppuccin': 'github:Stonks3141/ctp-nix/20b6328df20ae45752c81311d225fd47cba32483?narHash=sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs%3D' (2024-12-13) → 'github:Stonks3141/ctp-nix/21310cde33d3ee8023679dec01a9724a346c63ff?narHash=sha256-VCTVpU/RlrI9StxzDnqc1R3ZTQloLVALSkiN/Fgiad4%3D' (2024-12-17) • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=50cee999887c1c1f9ad32caf7e705c05db3efc18' (2024-12-16) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=34dca8149b6d096e02ab2767aca1b106a4ba87e1' (2024-12-17) • Updated input 'home-manager': 'github:nix-community/home-manager/66c5d8b62818ec4c1edb3e941f55ef78df8141a8?narHash=sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4%3D' (2024-12-13) → 'github:nix-community/home-manager/83ecd50915a09dca928971139d3a102377a8d242?narHash=sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA%3D' (2024-12-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5?narHash=sha256-AKU6qqskl0yf2%2BJdRdD0cfxX4b9x3KKV5RqA6wijmPM%3D' (2024-12-13) → 'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33?narHash=sha256-cHar1vqHOOyC7f1%2BtVycPoWTfKIaqkoe1Q6TnKzuti4%3D' (2024-12-17) • Updated input 'ukubot-rs': 'github:uku3lig/ukubot-rs/dfffaf47f215d3289a8430bdef064da06c7d1163?narHash=sha256-W7bUxH/LZIczDLrt%2Bm6j/cxRrUc%2BYlQkhZw/CQb0BzI%3D' (2024-12-14) → 'github:uku3lig/ukubot-rs/0b6c07ecb0db1acf4659091ea4ad7c29f273a263?narHash=sha256-zKzjfmKvwnLfc5aPHfqQV5Fus4oPXC3IZUWq6Q72xtw%3D' (2024-12-16) • Updated input 'vencord': 'github:Vendicated/Vencord/fc731bc6c8ed7784540edbe2c4ad7dfb28bbd188?narHash=sha256-sU2eJUUw7crvzMGGBQP6rbxISkL%2BS5nmT3QspyYXlRQ%3D' (2024-12-14) → 'github:Vendicated/Vencord/48a9aef2ebafbc72a0245a3725bf3c84bc9d76c6?narHash=sha256-UF1DBqiinE7NeoEYWd0cXTinTAIsRvflflQwKZkWLSA%3D' (2024-12-16) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/4ef033412f0732794077fcc25af4f79f097ad1e1?narHash=sha256-EydUadS7omV3SO/4TLeMkLT2JUugvPEtvBoAF43ggWU%3D' (2024-12-16) → 'github:nix-community/nix-vscode-extensions/94a50a7dc9b4be928f36544d1538c6bae93f6f94?narHash=sha256-%2BDI4DiwcS3Zp1OUuEi38Tb5gpVt%2Bc8eDpQHy6MAHPzo%3D' (2024-12-18) --- flake.lock | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 0fad3a4..bfe673e 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1734193015, - "narHash": "sha256-Rz1PTmKDdnC0+qOloHLorQuVRr/cZeLKR05sqBdfBUM=", + "lastModified": 1734383070, + "narHash": "sha256-4wvPqNd5j4ZeHCN8KwpJWsLh0SpWgZ8YI8BVT6QS+50=", "owner": "uku3lig", "repo": "api-rs", - "rev": "3be5ad799e933e829a516295b744da63d97b80a7", + "rev": "3e15ae920e6b2cafd4f0a3189d6ec82bdf923cdc", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1733960566, - "narHash": "sha256-P2l4eyDl8DawIM7LYm2CTiaoXE6GAid05nhj5teSs44=", + "lastModified": 1734307297, + "narHash": "sha256-F1WqUnK9cYn+WJUuVyW8YLfYRalJHWQdEd084+BYC4c=", "ref": "refs/heads/main", - "rev": "ac25fc8620c6487980468def5ac281016c7e9480", - "revCount": 32, + "rev": "2a8dfd7809e5d0abf95ff3e11489685e9434cd3e", + "revCount": 33, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1734057772, - "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", + "lastModified": 1734397929, + "narHash": "sha256-VCTVpU/RlrI9StxzDnqc1R3ZTQloLVALSkiN/Fgiad4=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "20b6328df20ae45752c81311d225fd47cba32483", + "rev": "21310cde33d3ee8023679dec01a9724a346c63ff", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1734327066, - "narHash": "sha256-RCMc9HVd34I4FW9eDgAQC4hShztMgrNdSRjzbpcEvIM=", + "lastModified": 1734473861, + "narHash": "sha256-NP9E/8lMsHevtV3K3inojYGnLnumAkAROCeQoh9G6hc=", "ref": "refs/heads/main", - "rev": "50cee999887c1c1f9ad32caf7e705c05db3efc18", - "revCount": 8294, + "rev": "34dca8149b6d096e02ab2767aca1b106a4ba87e1", + "revCount": 8319, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1734193036, - "narHash": "sha256-W7bUxH/LZIczDLrt+m6j/cxRrUc+YlQkhZw/CQb0BzI=", + "lastModified": 1734338780, + "narHash": "sha256-zKzjfmKvwnLfc5aPHfqQV5Fus4oPXC3IZUWq6Q72xtw=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "dfffaf47f215d3289a8430bdef064da06c7d1163", + "rev": "0b6c07ecb0db1acf4659091ea4ad7c29f273a263", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "vencord": { "flake": false, "locked": { - "lastModified": 1734154635, - "narHash": "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ=", + "lastModified": 1734388575, + "narHash": "sha256-UF1DBqiinE7NeoEYWd0cXTinTAIsRvflflQwKZkWLSA=", "owner": "Vendicated", "repo": "Vencord", - "rev": "fc731bc6c8ed7784540edbe2c4ad7dfb28bbd188", + "rev": "48a9aef2ebafbc72a0245a3725bf3c84bc9d76c6", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1734314392, - "narHash": "sha256-EydUadS7omV3SO/4TLeMkLT2JUugvPEtvBoAF43ggWU=", + "lastModified": 1734486856, + "narHash": "sha256-+DI4DiwcS3Zp1OUuEi38Tb5gpVt+c8eDpQHy6MAHPzo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4ef033412f0732794077fcc25af4f79f097ad1e1", + "rev": "94a50a7dc9b4be928f36544d1538c6bae93f6f94", "type": "github" }, "original": { From 0ff6938411db6141e9f9f28232b716035e1b99de Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 18 Dec 2024 16:03:46 +0100 Subject: [PATCH 2/2] feat(laptop): add intel gpu drivers --- configs/laptop.nix | 16 +++++++++++++++- systems/kilimandjaro/default.nix | 13 +------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/configs/laptop.nix b/configs/laptop.nix index 42aec9d..8481bad 100644 --- a/configs/laptop.nix +++ b/configs/laptop.nix @@ -6,7 +6,21 @@ }: { imports = [./desktop.nix]; - hardware.bluetooth.enable = true; + boot.initrd.kernelModules = ["xe"]; + + hardware = { + bluetooth.enable = true; + + graphics = { + extraPackages = with pkgs; [ + intel-media-driver + intel-compute-runtime + vpl-gpu-rt + ]; + + extraPackages32 = [pkgs.driversi686Linux.intel-media-driver]; + }; + }; services = { libinput.enable = true; diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index 91a7ae3..ffdce13 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - camasca, - ... -}: { +{camasca, ...}: { imports = [ camasca.nixosModules.asus-numpad ../../programs/games.nix @@ -14,11 +10,4 @@ enable = true; settings.layout = "M433IA"; }; - - boot = { - initrd.kernelModules = ["i915"]; - kernelParams = ["i915.force_probe=9a49"]; - }; - - hardware.graphics.extraPackages = with pkgs; [vaapiIntel libvdpau-va-gl intel-media-driver]; }