diff --git a/core/modules/display.nix b/core/modules/display.nix index 1bc5bcf..c37793f 100755 --- a/core/modules/display.nix +++ b/core/modules/display.nix @@ -12,17 +12,6 @@ ## xserver still needed for xwayland stuff xserver.enable = true; - ## Current login greeter/display manager, - ## set to run wayland. - #displayManager = { - #enable = true; - #defaultSession = "sway"; - #sddm = { - #enable = true; - #wayland.enable = true; - #}; - #}; - }; programs = { @@ -31,14 +20,14 @@ xwayland = { enable = true; #package = [ ]; - #defaultFontPath = "/run/current-system/sw/share/X11/fonts"; + defaultFontPath = "/run/current-system/sw/share/X11/fonts"; }; ## enable sway window manager sway = { enable = true; ## Sways implementation of xwayland - #xwayland.enable = true; + #xwayland.enable = true; package = pkgs.swayfx; extraPackages = [ ]; wrapperFeatures = { @@ -58,16 +47,39 @@ ## To start sway related services systemd.user.targets.sway = { description = "to start sway related services"; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; }; + xdg = { + portal = { + #enable = true; + #xdgOpenUsePortal = true; + #config = { + #common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; + #common.default = [ "gtk" "gnome" ]; + #sway.default = [ "gtk" "gnome" ]; + #}; + #configPackages = with pkgs; [ + #xdg-desktop-portal-gtk + #xdg-desktop-portal-wlr + #xdg-desktop-portal-gnome + #]; + #extraPortals = with pkgs; [ + #xdg-desktop-portal-gtk + #xdg-desktop-portal-wlr + #xdg-desktop-portal-gnome + #]; + }; + }; environment = { + variables = { XDG_SESSION_TYPE = "wayland"; XDG_CURRENT_DESKTOP = "sway"; }; + systemPackages = with pkgs; [ xorg.xhost #qt5.wayland @@ -77,6 +89,7 @@ #xdg-desktop-portal-wlr #xdg-desktop-portal-gnome ]; + }; ## I put fonts here because i didn't know where tf else to put them lol @@ -98,24 +111,6 @@ }; }; - #xdg.portal = { - #enable = true; - #xdgOpenUsePortal = true; - #config = { - #common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; - #common.default = [ "gtk" "gnome" ]; - #sway.default = [ "gtk" "gnome" ]; - #}; - #configPackages = with pkgs; [ - #xdg-desktop-portal-gtk - #xdg-desktop-portal-wlr - #xdg-desktop-portal-gnome - #]; - #extraPortals = with pkgs; [ - #xdg-desktop-portal-gtk - #xdg-desktop-portal-wlr - #xdg-desktop-portal-gnome - #]; - #}; + } diff --git a/core/modules/regreet.nix b/core/modules/regreet.nix index 7c39f13..0688992 100755 --- a/core/modules/regreet.nix +++ b/core/modules/regreet.nix @@ -40,7 +40,6 @@ in etc."greetd/environments".text = '' sway fish - bash ''; };