From 5bd70ea1457dee66fc862d578ba5f1bf3777d3eb Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 24 Sep 2022 13:16:25 -0700 Subject: fix(home/wm): unlock gnome-keyring when logging --- home/wm/default.nix | 13 ++----------- home/wm/gnome/default.nix | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 home/wm/gnome/default.nix (limited to 'home') diff --git a/home/wm/default.nix b/home/wm/default.nix index 0125dd1..92d450a 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -1,14 +1,6 @@ -{ config, lib, pkgs, ... }: -let - mkRelatedOption = description: relatedWMs: - let isActivatedWm = wm: config.my.home.wm.windowManager == wm; - in - (lib.mkEnableOption description) // { - default = builtins.any isActivatedWm relatedWMs; - }; -in +{ lib, ... }: { - imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ]; + imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ./gnome ]; options.my.home.wm = with lib; { windowManager = mkOption { type = with types; nullOr (enum [ "sway" ]); @@ -16,6 +8,5 @@ in example = "sway"; description = "Which window manager to use for home session"; }; - waybar = { enable = mkRelatedOption "waybar configuration" [ "sway" ]; }; }; } diff --git a/home/wm/gnome/default.nix b/home/wm/gnome/default.nix new file mode 100644 index 0000000..0b14a0b --- /dev/null +++ b/home/wm/gnome/default.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: +let + isEnabled = config.my.home.wm.windowManager == "sway"; +in +{ + config = lib.mkIf isEnabled { + home.packages = with pkgs; [ gnome.gnome-keyring ]; + services.gnome-keyring = { + enable = true; + components = [ + "pkcs11" + "secrets" + "ssh" + ]; + }; + }; +} -- cgit 1.4.1