diff --git a/configuration.nix b/configuration.nix index f4d04a1..fb9fb6a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,12 +2,14 @@ config, lib, pkgs, + inputs, ... }: { imports = [ ./stylix.nix ./nixvim/nixvim.nix + ]; boot.loader.systemd-boot.enable = true; @@ -39,16 +41,21 @@ LC_TELEPHONE = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8"; }; - services.xserver.enable = true; + services.upower.enable = true; + services.xserver.enable = false; services.xserver.xkb = { layout = "eu"; variant = ""; }; services = { - desktopManager.plasma6.enable = true; displayManager.ly.enable = true; }; - + programs.hyprland = { + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + enable = true; + withUWSM = true; # recommended for most users + xwayland.enable = true; # Xwayland can be disabled. + }; security.doas.enable = true; security.sudo.enable = false; security.doas.extraRules = [ diff --git a/flake.nix b/flake.nix index 8669fef..dc97b5f 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ }: { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; modules = [ ./easyroam.nix ./configuration.nix diff --git a/home/hyprland.nix b/home/hyprland.nix index a373d63..4f42e3e 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,7 +1,7 @@ { inputs, pkgs, ... }: { wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = null; systemd.enable = false; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;