diff options
Diffstat (limited to '')
-rw-r--r-- | home/default.nix | 1 | ||||
-rw-r--r-- | home/seahorse/default.nix | 10 | ||||
-rw-r--r-- | home/wm/default.nix | 2 | ||||
-rw-r--r-- | home/wm/gnome/default.nix | 17 | ||||
-rw-r--r-- | hosts/aptos/home.nix | 1 | ||||
-rw-r--r-- | modules/services/gnome/default.nix | 2 |
6 files changed, 2 insertions, 31 deletions
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" - ]; - }; - }; -} diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix index 79a9912..05d4f5e 100644 --- a/hosts/aptos/home.nix +++ b/hosts/aptos/home.nix @@ -52,7 +52,6 @@ defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1"; }; pass.enable = true; - seahorse.enable = true; yubikey.enable = true; }; } diff --git a/modules/services/gnome/default.nix b/modules/services/gnome/default.nix index 392496a..46619eb 100644 --- a/modules/services/gnome/default.nix +++ b/modules/services/gnome/default.nix @@ -8,7 +8,7 @@ in services = { dbus = { enable = true; - packages = with pkgs; [ gcr dconf gnome3.gnome-keyring ]; + packages = with pkgs; [ gcr dconf ]; }; udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; |