From c13c45736baefa84411acb123409bef0760a2b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 14 Dec 2023 10:10:00 +0200 Subject: [PATCH] nixGL and firefox --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 10 ++++++++++ shared/home/default.nix | 10 ++++++++++ 3 files changed, 44 insertions(+) diff --git a/flake.lock b/flake.lock index d4f3b65..549d7b8 100644 --- a/flake.lock +++ b/flake.lock @@ -144,6 +144,29 @@ "type": "github" } }, + "nixgl": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685908677, + "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "owner": "guibou", + "repo": "nixGL", + "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1702453208, @@ -232,6 +255,7 @@ "gitignore": "gitignore", "home-manager": "home-manager", "nix-index-database": "nix-index-database", + "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nur": "nur", diff --git a/flake.nix b/flake.nix index d01ab74..599f6e5 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,14 @@ }; }; + nixgl = { + url = "github:guibou/nixGL"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -74,6 +82,7 @@ pre-commit-hooks, zigpkgs, nur, + nixgl, ... } @ inputs: let myData = import ./data.nix; @@ -296,6 +305,7 @@ inherit system; overlays = [ nur.overlay + nixgl.overlay (_final: prev: { zigpkgs = import zigpkgs { inherit (prev) pkgs; diff --git a/shared/home/default.nix b/shared/home/default.nix index c3a4ee3..cf24a3a 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -21,12 +21,22 @@ zigpkgs."0.11.0" ]) (lib.mkIf hmOnly [ + pkgs.nixgl.nixGLIntel ncdu tokei scrcpy yt-dlp vimv-rs + bandwhich hyperfine + (runCommand "ff" {} '' + mkdir -p $out/bin + { + echo '#!/bin/sh' + echo 'exec ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel ${firefox}/bin/firefox "$@"' + } > $out/bin/ff + chmod a+x $out/bin/ff + '') ]) ];