From bc6e5be1af589af1516ec13e4fee99b5ba49ae14 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 12 Jan 2025 11:25:13 +0000 Subject: [PATCH] Switch from lightdm to ly --- nix/hosts/t490/programs.nix | 2 -- nix/modules/nixos/i3.nix | 24 ++++++++---------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/nix/hosts/t490/programs.nix b/nix/hosts/t490/programs.nix index 83fd67a..dcfb912 100644 --- a/nix/hosts/t490/programs.nix +++ b/nix/hosts/t490/programs.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - programs.dconf.enable = true; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/nix/modules/nixos/i3.nix b/nix/modules/nixos/i3.nix index 94e9373..2f12177 100644 --- a/nix/modules/nixos/i3.nix +++ b/nix/modules/nixos/i3.nix @@ -20,27 +20,19 @@ in config = mkIf config.features.desktop.i3.enable { services = { - displayManager.defaultSession = "none+i3"; + displayManager.ly.enable = true; - xserver = { - displayManager.lightdm.enable = true; + xserver.windowManager.i3 = { + enable = true; - windowManager.i3 = { - enable = true; - extraPackages = with pkgs; [ - i3status - i3lock - i3blocks - ]; - }; + extraPackages = with pkgs; [ + i3status + i3lock + i3blocks + ]; }; }; - environment.systemPackages = with pkgs; [ - acpi - libnotify - ]; - home-manager.users.${username} = { xsession.windowManager.i3 = { enable = true;