From 80c3158d16321ee22a50d4b62e7ac8f3e3d735d3 Mon Sep 17 00:00:00 2001 From: Gustav Bruhn Date: Sat, 22 Mar 2025 12:28:50 +0100 Subject: [PATCH] 71 current 2025-03-22 12:28:46 25.05.20250315.c80f6a7 6.12.19 * --- hosts/framework/configuration.nix | 4 ++-- modules/nixos/greeter.nix | 22 +++++++++++----------- modules/nixos/niri.nix | 5 ++++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix index a45d5da..fafc811 100644 --- a/hosts/framework/configuration.nix +++ b/hosts/framework/configuration.nix @@ -8,8 +8,8 @@ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.default - # ../../modules/nixos/cosmic.nix - ../../modules/nixos/niri.nix + ../../modules/nixos/cosmic.nix + # ../../modules/nixos/niri.nix ]; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/modules/nixos/greeter.nix b/modules/nixos/greeter.nix index af9eb93..8baa3f5 100644 --- a/modules/nixos/greeter.nix +++ b/modules/nixos/greeter.nix @@ -19,20 +19,20 @@ in { enable = true; settings = { default_session = { - command = "${tuigreet} --time --rememeber --remember-session --sessions ${config.greeter.session}"; + command = "${tuigreet} --time --remember --remember-session --sessions ${config.greeter.session}/bin/niri-session"; user = "greeter"; }; }; }; - }; - # systemd.services.greetd.serviceConfig = { - # Type = "idle"; - # StandardInput = "tty"; - # StandardOutput = "tty"; - # StandardError = "journal"; + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; - # TTYReset = true; - # TTYVHangup = true; - # TTYVDisallocate = true; - # }; + TTYReset = true; + TTYVHangup = true; + TTYVDisallocate = true; + }; + }; } diff --git a/modules/nixos/niri.nix b/modules/nixos/niri.nix index 724d104..48021b2 100644 --- a/modules/nixos/niri.nix +++ b/modules/nixos/niri.nix @@ -2,6 +2,9 @@ imports = [ ./greeter.nix ]; - greeter.session = "${pkgs.niri}/bin/niri-session"; programs.niri.enable = true; + greeter.session = "${pkgs.niri}"; + environment.systemPackages = with pkgs; [ + alacritty + ]; }