diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 94849aa..12717f5 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -16,6 +16,7 @@ modules.kitty modules.nikpkgs modules.fonts + modules.unity (modules.obs { audio = true; diff --git a/config/modules/hyprland/hyprland.nix b/config/modules/hyprland/hyprland.nix index c45213a..b28e8e9 100644 --- a/config/modules/hyprland/hyprland.nix +++ b/config/modules/hyprland/hyprland.nix @@ -3,59 +3,56 @@ inputs, lib, ... -}: -{ +}: { flake-file.inputs = { hyprland.url = "github:hyprwm/Hyprland"; }; modules.hyprland = { - nixos = - { pkgs, ... }: - { - imports = [ inputs.hyprland.nixosModules.default ]; - environment.systemPackages = with pkgs; [ - wayfreeze - grim - slurp - wlogout - ranger + nixos = {pkgs, ...}: { + imports = [inputs.hyprland.nixosModules.default]; + environment.systemPackages = with pkgs; [ + wayfreeze + grim + slurp + wlogout + ranger + ]; + programs.xwayland.enable = true; + programs.hyprland = { + enable = true; + # withUWSM = true; + # set the flake package + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.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; + }; + # gtk.enable = lib.mkForce false; + xdg.portal = { + enable = true; + extraPortals = [ + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland ]; - programs.xwayland.enable = true; - programs.hyprland = { - enable = true; - # withUWSM = true; - # set the flake package - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.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; - }; - # gtk.enable = lib.mkForce false; - xdg.portal = { - enable = true; - extraPortals = [ - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland - ]; - }; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - hardware.graphics = { - # package = pkgs-unstable.mesa; + }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + hardware.graphics = { + # package = pkgs-unstable.mesa; - # if you also want 32-bit support (e.g for Steam) - # enable32Bit = true; - # package32 = pkgs-unstable.pkgsi686Linux.mesa; - }; + # if you also want 32-bit support (e.g for Steam) + # enable32Bit = true; + # package32 = pkgs-unstable.pkgsi686Linux.mesa; }; - homeManager = - { pkgs, ... }: - { - gtk = { - enable = true; - }; - wayland.windowManager.hyprland = { - enable = true; - systemd.variables = [ "--all" ]; - }; + }; + homeManager = {pkgs, ...}: { + gtk = { + enable = true; }; + # backupFileExtension = "backupHM"; + wayland.windowManager.hyprland = { + enable = true; + systemd.variables = ["--all"]; + # configType = "lua"; + }; + }; }; } diff --git a/config/modules/unity.nix b/config/modules/unity.nix new file mode 100644 index 0000000..10db2cd --- /dev/null +++ b/config/modules/unity.nix @@ -0,0 +1,11 @@ +{modules, ...}: { + modules.unity = { + homeManager = {pkgs, ...}: { + home.packages = [pkgs.unityhub pkgs.alcom]; + home.file."unityExec" = { + source = "${pkgs.unityhub}/bin/unityhub"; + recursive = true; + }; + }; + }; +}