Use regular sway package in settings, so stuff are overloaded properly
This commit is contained in:
parent
c98f15feda
commit
b100b22e28
|
@ -114,7 +114,6 @@ in
|
||||||
|
|
||||||
config.wayland.windowManager.sway = mkIf cfg.enable {
|
config.wayland.windowManager.sway = mkIf cfg.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.swayfx-unwrapped;
|
|
||||||
systemdIntegration = true;
|
systemdIntegration = true;
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
@ -320,7 +319,7 @@ in
|
||||||
|
|
||||||
'' + (if config.services.gnome-keyring.enable then ''
|
'' + (if config.services.gnome-keyring.enable then ''
|
||||||
# gnome-keyring
|
# gnome-keyring
|
||||||
eval `${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon -r -d -c secrets,ssh,pkcs11`
|
eval `gnome-keyring-daemon -r -d -c secrets,ssh,pkcs11`
|
||||||
export SSH_AUTH_SOCK
|
export SSH_AUTH_SOCK
|
||||||
'' else "");
|
'' else "");
|
||||||
# Extra
|
# Extra
|
||||||
|
|
|
@ -10,7 +10,7 @@ let
|
||||||
};
|
};
|
||||||
overlay-imported = final: prev: {
|
overlay-imported = final: prev: {
|
||||||
rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}";
|
rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}";
|
||||||
swayfx = final.swayfx-unwrapped;
|
sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
|
||||||
deploy-rs = inputs.deploy-rs.packages.default;
|
deploy-rs = inputs.deploy-rs.packages.default;
|
||||||
|
|
||||||
# A list of source-style inputs.
|
# A list of source-style inputs.
|
||||||
|
|
Loading…
Reference in a new issue