Compare commits

...

4 commits

6 changed files with 24 additions and 32 deletions

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; [
@ -23,7 +34,7 @@ in
file # Query file type
nix-output-monitor
pinentry-qt
pinentry-gnome3 # until pinentry-qt introduces caching
# Java stuff
jdk21

View file

@ -20,10 +20,11 @@ let
switch (gum choose $CHOICES)
case "sway"
systemctl --user unset-environment NIXOS_OZONE_WL
exec sway
case "KDE Plasma"
export NIXOS_OZONE_WL=1
exec dbus-run-session startplasma-wayland
systemctl --user set-environment NIXOS_OZONE_WL=1
exec ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed startplasma-wayland
case '*'
exec fish -i
end

View file

@ -175,12 +175,12 @@ in
gtk.font.name = "IBM Plex Sans JP";
gtk.font.size = 10;
gtk.iconTheme = {
package = pkgs.numix-icon-theme;
name = "Numix";
package = pkgs.kdePackages.breeze-icons;
name = "Breeze";
};
gtk.theme = {
package = pkgs.numix-gtk-theme;
name = "Numix";
package = pkgs.kdePackages.breeze-gtk;
name = "Breeze";
};
gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk.gtk2.extraConfig = ''
@ -199,7 +199,9 @@ in
## Qt
qt.enable = true;
qt.platformTheme.name = "kde";
qt.style.name = "breeze";
qt.platformTheme.package = with pkgs.kdePackages; [ plasma-integration systemsettings ];
qt.style.package = [ pkgs.kdePackages.breeze ];
qt.style.name = "Breeze";
xdg.configFile =

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 ];

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;
};
}

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;