nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Rid of gnome-keyring

Browse source
This commit is contained in:
Natsu Kagami 2024-06-03 23:20:43 +02:00
parent aa3524840c
commit 1f14b6b02a
Signed by: nki
GPG key ID: 55A032EB38B49ADB
4 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
home/common-linux.nix
View file

@ -8,6 +8,16 @@ let
SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
SSH_ASKPASS_REQUIRE = "prefer";
};
# Enable this for sway
wayland.windowManager.sway.config.startup = [
{ command = "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"; }
];
# Automatic dbus activation
xdg.dataFile."dbus-1/services/org.freedesktop.secrets.service".text = ''
[D-BUS Service]
Name=org.freedesktop.secrets
Exec=${pkgs.kdePackages.kwallet}/bin/kwalletd6
'';
};
in
{
@ -16,6 +26,7 @@ in
./modules/linux/graphical
./modules/X11/xfce4-notifyd.nix
./modules/programs/discord.nix
kwallet
];
config = (mkIf pkgs.stdenv.isLinux {
home.packages = with pkgs; [

9
modules/common/linux/default.nix
View file

@ -290,15 +290,11 @@ in
hardware.opengl.driSupport32Bit = !pkgs.stdenv.isAarch64; # For 32 bit applications
## Services
# gnome-keyring for storing keys
services.gnome.gnome-keyring.enable = true;
# OpenSSH so you can SSH to me
services.openssh.enable = true;
# PAM
security.pam.services.login.enableKwallet = true;
security.pam.services.login.enableGnomeKeyring = true;
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.lightdm.enableGnomeKeyring = true;
security.pam.services.swaylock = { };
# Printers
services.printing.enable = true;
@ -308,10 +304,9 @@ in
wlr.enable = true;
xdgOpenUsePortal = true;
# gtk portal needed to make gtk apps happy
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
config.sway."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
config.sway.default = [ "wlr" "gtk" ];
config.sway.default = [ "wlr" "kde" ];
};
# D-Bus
services.dbus.packages = with pkgs; [ gcr ];

12
modules/services/pam/gnome-keyring.nix
View file

@ -1,12 +0,0 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.nki.services.pam;
in
{
options.nki.services.pam.enableGnomeKeyring = mkEnableOption "Enable gnome-keyring on login";
config = mkIf cfg.enableGnomeKeyring {
security.pam.services.login.enableGnomeKeyring = true;
# security.pam.services.login.gnupg.enable = true;
};
}

5
nki-x1c1/configuration.nix
View file

@ -12,7 +12,6 @@
# Fonts
../modules/personal/fonts
# Some PAM stuff
../modules/services/pam/gnome-keyring.nix
../modules/services/swaylock.nix
];
# Use the latest kernel
@ -116,9 +115,6 @@
pciutils
];
# Gnome-keyring is useful
services.gnome.gnome-keyring.enable = true;
## Environment variables
environment.variables = {
# Input method overrides
@ -145,7 +141,6 @@
# };
# List services that you want to enable:
nki.services.pam.enableGnomeKeyring = true;
services.input-remapper.enable = true;
services.swaylock.enable = true;