turned nixgl into flake input

This commit is contained in:
John Lancaster
2025-07-06 15:37:04 -05:00
parent 3091004882
commit ee68509b10
2 changed files with 10 additions and 9 deletions

View File

@@ -8,6 +8,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
_1password-shell-plugins.url = "github:1Password/shell-plugins"; _1password-shell-plugins.url = "github:1Password/shell-plugins";
nixgl = {
url = "github:nix-community/nixGL";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, ... }@inputs: outputs = { self, nixpkgs, ... }@inputs:
@@ -77,7 +81,10 @@
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = {
inherit inputs;
nixgl-pkgs = inputs.nixgl.packages.${system};
};
users = { users = {
${config.user} = { ${config.user} = {
imports = mkhomeManagerModules config; imports = mkhomeManagerModules config;

View File

@@ -1,19 +1,13 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, nixgl-pkgs, ... }:
{ {
home.sessionVariables = lib.mkIf (config.enableShell && config.graphical) { home.sessionVariables = lib.mkIf (config.enableShell && config.graphical) {
TERMINAL = "ghostty"; TERMINAL = "ghostty";
}; };
# https://github.com/nix-community/nixGL?tab=readme-ov-file#nix-channel-recommended
# nix-channel --add https://github.com/nix-community/nixGL/archive/main.tar.gz nixgl && nix-channel --update
nixGL.packages = import <nixgl> { inherit pkgs; };
nixGL.defaultWrapper = "mesa";
nixGL.installScripts = [ "mesa" ];
programs.ghostty = lib.mkIf (config.enableShell && config.graphical) { programs.ghostty = lib.mkIf (config.enableShell && config.graphical) {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
package = config.lib.nixGL.wrap pkgs.ghostty; package = nixgl-pkgs.nixGLMesa pkgs.ghostty;
settings = { settings = {
# command = "TERM=xterm-256color /usr/bin/bash"; # command = "TERM=xterm-256color /usr/bin/bash";
font-size = 12; font-size = 12;