From 7eee9cd4d15e09803147cdc1e30aa6705143be1e Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 12 Nov 2023 20:54:48 +0100 Subject: [PATCH] Working on thor --- flake.nix | 2 ++ instances/thor/configuration.nix | 12 ++++++------ modules/nixos/hyprland.nix | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 modules/nixos/hyprland.nix diff --git a/flake.nix b/flake.nix index fb29d65..0af414d 100644 --- a/flake.nix +++ b/flake.nix @@ -133,6 +133,8 @@ ./modules/nixos/pro_audio.nix ./modules/nixos/kdeconnect.nix + + ./modules/nixos/hyprland.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/thor/hm.nix; } ]; diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 76df938..18b9a3d 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -194,12 +194,12 @@ with lib; { # plasma5 = { enable = true; runUsingSystemd = true; useQtScaling = true; }; }; windowManager.bspwm = { enable = true; }; - # displayManager.gdm = { enable = true; }; - displayManager.sddm = { - enable = true; - theme = - "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; - }; + displayManager.gdm = { enable = true; }; + # displayManager.sddm = { + # enable = true; + # theme = + # "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; + # }; videoDrivers = [ "nvidia" ]; layout = "us,it"; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix new file mode 100644 index 0000000..29c3684 --- /dev/null +++ b/modules/nixos/hyprland.nix @@ -0,0 +1,17 @@ +{ config, ... }: { + programs.hyprland = { + enable = true; + nvidiaPatches = builtins.elem "nvidia" config.services.xserver.videoDrivers; + xwayland.enable = true; + }; + + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; + + hardware = { + opengl.enable = true; + nvidia.modesetting.enable = builtins.elem "nvidia" config.services.xserver.videoDrivers; + }; +}