From 338fd6e92c7c0bbb85940af476fe5f8504cd39f8 Mon Sep 17 00:00:00 2001 From: Ivan Kirilov Dimitrov Date: Thu, 4 Jul 2024 11:53:22 +0200 Subject: [PATCH] wayland nixos module --- nixos/configs/default.nix | 2 +- nixos/modules/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/configs/default.nix b/nixos/configs/default.nix index 5affa74..0177a7b 100644 --- a/nixos/configs/default.nix +++ b/nixos/configs/default.nix @@ -14,7 +14,7 @@ in ./nova-hardware.nix inputs.hosts.nixosModule inputs.catppuccin.nixosModules.catppuccin - ] ++ (with toplevel.config.flake.nixosModules; [ grub base sound security ivand wireless wireguard style ]); + ] ++ (with toplevel.config.flake.nixosModules; [ grub base sound wayland security ivand wireless wireguard style ]); }); vm = withSystem system (ctx@{ config, inputs', ... }: inputs.nixpkgs.lib.nixosSystem { diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index eb79010..e5a9f61 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -22,7 +22,6 @@ experimental-features = nix-command flakes ''; }; - hardware.graphics.enable = true; i18n.supportedLocales = [ "all" ]; time.timeZone = "Europe/Prague"; fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) noto-fonts noto-fonts-emoji noto-fonts-lgc-plus ]; @@ -71,6 +70,10 @@ }; }; }); + wayland = moduleWithSystem (toplevel@{ ... }: perSystem@{ ... }: { + hardware.graphics.enable = true; + security.pam.services.swaylock = { }; + }); security = moduleWithSystem (toplevel@{ ... }: perSystem@{ ... }: { security = { sudo = { @@ -91,7 +94,6 @@ }; polkit.enable = true; rtkit.enable = true; - pam = { services = { swaylock = { }; }; }; }; }); wireguard = {