From 5dba39231cc47a18126dc7358255f540a5deb120 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 10 Mar 2023 18:58:08 -0800 Subject: home/gnome: no more keyring I used the keyring only to start the GPG agent and unlock the ssh keys. But since I'm storing the ssh keys on yubikeys and I don't use GPG, I can remove it. --- home/default.nix | 1 - home/seahorse/default.nix | 10 ---------- home/wm/default.nix | 2 +- home/wm/gnome/default.nix | 17 ----------------- 4 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 home/seahorse/default.nix delete mode 100644 home/wm/gnome/default.nix (limited to 'home') diff --git a/home/default.nix b/home/default.nix index c778c6c..f9929d1 100644 --- a/home/default.nix +++ b/home/default.nix @@ -28,7 +28,6 @@ ./python ./rust ./scanner - ./seahorse ./shell ./ssh ./sublime-music diff --git a/home/seahorse/default.nix b/home/seahorse/default.nix deleted file mode 100644 index d37395e..0000000 --- a/home/seahorse/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, config, pkgs, ... }: -let cfg = config.my.home.seahorse; -in -{ - options.my.home.seahorse = with lib; { - enable = mkEnableOption "seahorse configuration"; - }; - - config.home.packages = with pkgs; lib.mkIf cfg.enable ([ gnome.seahorse ]); -} diff --git a/home/wm/default.nix b/home/wm/default.nix index 92d450a..ecf8bf3 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -1,6 +1,6 @@ { lib, ... }: { - imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ./gnome ]; + imports = [ ./sway ./waybar ./mako ./swaylock ./wofi ./gammastep ]; options.my.home.wm = with lib; { windowManager = mkOption { type = with types; nullOr (enum [ "sway" ]); diff --git a/home/wm/gnome/default.nix b/home/wm/gnome/default.nix deleted file mode 100644 index 0b14a0b..0000000 --- a/home/wm/gnome/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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