From a5e6c1ba7591b3410ebf63f2c993b1cc34f0eadd Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 27 Nov 2024 16:10:37 -0500 Subject: [PATCH] refactor --- configurations/nixos/vixen/default.nix | 1 + modules/nixos/linux/gui/hyprland/default.nix | 9 ++++++--- modules/nixos/linux/gui/hyprland/home/default.nix | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index e98c393..7786b97 100644 --- a/configurations/nixos/vixen/default.nix +++ b/configurations/nixos/vixen/default.nix @@ -22,6 +22,7 @@ in services.syncthing = { enable = true; user = "srid"; dataDir = "/home/srid/Documents"; }; programs.nix-ld.enable = true; # for vscode server + programs.steam.enable = true; environment.systemPackages = with pkgs; [ google-chrome diff --git a/modules/nixos/linux/gui/hyprland/default.nix b/modules/nixos/linux/gui/hyprland/default.nix index 7b9072f..25a18ec 100644 --- a/modules/nixos/linux/gui/hyprland/default.nix +++ b/modules/nixos/linux/gui/hyprland/default.nix @@ -2,22 +2,25 @@ let inherit (flake) inputs; + hyprlandPkgs = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; in { programs.hyprland = { enable = true; # set the flake package - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = hyprlandPkgs.hyprland; # make sure to also set the portal package, so that they are in sync - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + portalPackage = hyprlandPkgs.xdg-desktop-portal-hyprland; }; security.pam.services.hyprlock = { }; home-manager.sharedModules = [ ./home ]; + # hint Electron apps to use Wayland + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.systemPackages = with pkgs; [ - kitty grimblast acpi diff --git a/modules/nixos/linux/gui/hyprland/home/default.nix b/modules/nixos/linux/gui/hyprland/home/default.nix index 9273afe..a55e778 100644 --- a/modules/nixos/linux/gui/hyprland/home/default.nix +++ b/modules/nixos/linux/gui/hyprland/home/default.nix @@ -9,7 +9,6 @@ enable = true; }; services.dunst.enable = true; - home.sessionVariables.NIXOS_OZONE_WL = "1"; programs.hyprlock.enable = true; programs.rofi = {