diff --git a/flake.nix b/flake.nix index b756e61..57c26a6 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ }; }; - outputs = { self, nixpkgs, home-manager, nixgl, nixvim, ... }@inputs: + outputs = { self, nixpkgs, home-manager, ... }@inputs: let inherit (self) outputs; lib = nixpkgs.lib // home-manager.lib; diff --git a/home/lib/chromeos.nix b/home/lib/chromeos.nix index 29de9a1..fac612a 100644 --- a/home/lib/chromeos.nix +++ b/home/lib/chromeos.nix @@ -1,15 +1,15 @@ -{ pkgs, ... }: -let path = "config/systemd/user/cros-garcon.service.d/override.conf"; -in { +{ inputs, ... }: { + xdg.enable = true; xdg.mime.enable = true; - xdg.configFile.${path} = { - text = '' - [Service] - Environment="PATH=%h/.nix-profile/bin:/usr/local/sbin:/usr/local/bin:/usr/local/games:/usr/sbin:/usr/bin:/usr/games:/sbin:/bin" - Environment="XDG_DATA_DIRS=/nix/var/nix/profiles/default/share:%h/.nix-profile/share:%h/.local/share:/usr/local/share:/usr/share:/var/lib/snapd/desktop:%h/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share" - ''; - }; - home.packages = with pkgs; [ nixgl.nixGLMesa ]; + xdg.configFile."systemd/user/cros-garcon.service.d/override.conf".text = '' + [Service] + Environment="PATH=%h/.nix-profile/bin:/usr/local/sbin:/usr/local/bin:/usr/local/games:/usr/sbin:/usr/bin:/usr/games:/sbin:/bin" + Environment="XDG_DATA_DIRS=/nix/var/nix/profiles/default/share:%h/.nix-profile/share:%h/.local/share:/usr/local/share:/usr/share:/var/lib/snapd/desktop:%h/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share" + ''; + + # activate NixGL wrapper for Crostini + nixGL.packages = inputs.nixgl.packages; + nixGL.defaultWrapper = "mesa"; } diff --git a/home/modules/gui/alacritty.nix b/home/modules/gui/alacritty.nix new file mode 100644 index 0000000..dc3c2e2 --- /dev/null +++ b/home/modules/gui/alacritty.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: { + programs.alacritty = { + enable = true; + package = (config.lib.nixGL.wrap pkgs.alacritty); + settings = { window = { startup_mode = "Maximized"; }; }; + }; +} + diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index f83836d..7e35d25 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { # Common GUI apps - imports = [ ./firefox.nix ./vscode.nix ]; + imports = [ ./alacritty.nix ./firefox.nix ./vscode.nix ]; - home.packages = with pkgs; [ gimp-with-plugins lagrange qFlipper remmina ]; + home.packages = with pkgs; [ gimp-with-plugins qFlipper remmina ]; } diff --git a/overlays/default.nix b/overlays/default.nix index a297485..d4fff63 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -21,5 +21,4 @@ config.allowUnfree = true; }; }; - nixgl = inputs.nixgl.overlay; }