diff --git a/configs/laptop.nix b/configs/laptop.nix index 8481bad..42aec9d 100644 --- a/configs/laptop.nix +++ b/configs/laptop.nix @@ -6,21 +6,7 @@ }: { imports = [./desktop.nix]; - 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]; - }; - }; + hardware.bluetooth.enable = true; services = { libinput.enable = true; diff --git a/flake.lock b/flake.lock index bfe673e..0fad3a4 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1734383070, - "narHash": "sha256-4wvPqNd5j4ZeHCN8KwpJWsLh0SpWgZ8YI8BVT6QS+50=", + "lastModified": 1734193015, + "narHash": "sha256-Rz1PTmKDdnC0+qOloHLorQuVRr/cZeLKR05sqBdfBUM=", "owner": "uku3lig", "repo": "api-rs", - "rev": "3e15ae920e6b2cafd4f0a3189d6ec82bdf923cdc", + "rev": "3be5ad799e933e829a516295b744da63d97b80a7", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1734307297, - "narHash": "sha256-F1WqUnK9cYn+WJUuVyW8YLfYRalJHWQdEd084+BYC4c=", + "lastModified": 1733960566, + "narHash": "sha256-P2l4eyDl8DawIM7LYm2CTiaoXE6GAid05nhj5teSs44=", "ref": "refs/heads/main", - "rev": "2a8dfd7809e5d0abf95ff3e11489685e9434cd3e", - "revCount": 33, + "rev": "ac25fc8620c6487980468def5ac281016c7e9480", + "revCount": 32, "type": "git", "url": "https://git.uku3lig.net/uku/camasca" }, @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1734397929, - "narHash": "sha256-VCTVpU/RlrI9StxzDnqc1R3ZTQloLVALSkiN/Fgiad4=", + "lastModified": 1734057772, + "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "21310cde33d3ee8023679dec01a9724a346c63ff", + "rev": "20b6328df20ae45752c81311d225fd47cba32483", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1734473861, - "narHash": "sha256-NP9E/8lMsHevtV3K3inojYGnLnumAkAROCeQoh9G6hc=", + "lastModified": 1734327066, + "narHash": "sha256-RCMc9HVd34I4FW9eDgAQC4hShztMgrNdSRjzbpcEvIM=", "ref": "refs/heads/main", - "rev": "34dca8149b6d096e02ab2767aca1b106a4ba87e1", - "revCount": 8319, + "rev": "50cee999887c1c1f9ad32caf7e705c05db3efc18", + "revCount": 8294, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1734338780, - "narHash": "sha256-zKzjfmKvwnLfc5aPHfqQV5Fus4oPXC3IZUWq6Q72xtw=", + "lastModified": 1734193036, + "narHash": "sha256-W7bUxH/LZIczDLrt+m6j/cxRrUc+YlQkhZw/CQb0BzI=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "0b6c07ecb0db1acf4659091ea4ad7c29f273a263", + "rev": "dfffaf47f215d3289a8430bdef064da06c7d1163", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "vencord": { "flake": false, "locked": { - "lastModified": 1734388575, - "narHash": "sha256-UF1DBqiinE7NeoEYWd0cXTinTAIsRvflflQwKZkWLSA=", + "lastModified": 1734154635, + "narHash": "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ=", "owner": "Vendicated", "repo": "Vencord", - "rev": "48a9aef2ebafbc72a0245a3725bf3c84bc9d76c6", + "rev": "fc731bc6c8ed7784540edbe2c4ad7dfb28bbd188", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1734486856, - "narHash": "sha256-+DI4DiwcS3Zp1OUuEi38Tb5gpVt+c8eDpQHy6MAHPzo=", + "lastModified": 1734314392, + "narHash": "sha256-EydUadS7omV3SO/4TLeMkLT2JUugvPEtvBoAF43ggWU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "94a50a7dc9b4be928f36544d1538c6bae93f6f94", + "rev": "4ef033412f0732794077fcc25af4f79f097ad1e1", "type": "github" }, "original": { diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix index ffdce13..91a7ae3 100644 --- a/systems/kilimandjaro/default.nix +++ b/systems/kilimandjaro/default.nix @@ -1,4 +1,8 @@ -{camasca, ...}: { +{ + pkgs, + camasca, + ... +}: { imports = [ camasca.nixosModules.asus-numpad ../../programs/games.nix @@ -10,4 +14,11 @@ 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]; }