diff --git a/modules/dbus.nix b/modules/dbus.nix index e72e170..4efb5ff 100644 --- a/modules/dbus.nix +++ b/modules/dbus.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { services.dbus = { enable = true; - packages = [ pkgs.gcr ]; # needed for gnome pinentry + packages = with pkgs; [ gcr dconf ]; }; } diff --git a/modules/default.nix b/modules/default.nix index 5c7b3f8..d0e6161 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -52,9 +52,9 @@ imports = [ ./audio.nix ./bluetooth.nix - ./boot.nix ./dbus.nix ./fonts.nix + ./greetd.nix ./i18n.nix ./kdeconnect.nix ./keyd.nix @@ -68,7 +68,6 @@ ./power.nix ./packages.nix ./printing.nix - ./sddm.nix ./security.nix ./shell.nix ./steam.nix @@ -76,6 +75,5 @@ ./unfree.nix ./virtualisation.nix ./xdg-portal.nix - ./xorg.nix ]; } diff --git a/modules/greetd.nix b/modules/greetd.nix new file mode 100644 index 0000000..17a6768 --- /dev/null +++ b/modules/greetd.nix @@ -0,0 +1,56 @@ +{ lib, pkgs, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && gui.flavour != [ ]) { + + environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw + + programs.sway.enable = builtins.elem "sway" gui.flavour; + services.xserver.windowManager.i3.enable = builtins.elem "i3" gui.flavour; + + services.xserver = { + libinput.enable = true; + displayManager = { + startx.enable = builtins.elem "i3" gui.flavour; + }; + }; + + environment = { + etc = { + "greetd/environments".text = '' + sway + ''; + "greetd/kanshi-config".text = '' + profile nomad { + output "LVDS-1" enable + } + + profile station { + output "LVDS-1" disable + output "Dell Inc. DELL U2515H 9X2VY5490XUL" enable mode 1920x1080 position 0,0 + output "Dell Inc. DELL U2515H 9X2VY5C7138L" enable mode 1920x1080 position 1920,0 + output "HJW VGA TO HDMI 0x00000100" enable mode 1920x1080 position 3840,0 + } + ''; + "greetd/sway-config".text = '' + exec "${pkgs.kanshi}/bin/kanshi --config /etc/greetd/kanshi-config" + exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" + + bindsym Mod4+shift+e exec swaynag \ + -t warning \ + -m 'What do you want to do?' \ + -b 'Poweroff' 'systemctl poweroff' \ + -b 'Reboot' 'systemctl reboot' + + include /etc/sway/config.d/* + ''; + }; + }; + + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.sway}/bin/sway --config /etc/greetd/sway-config"; + }; + }; + }; + +}