From fe55b38bf93bbd7c2b4892e4c31e1f3a52f9d1ce Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 17 Mar 2024 10:25:09 +0100 Subject: [PATCH] Change usage of mkForce --- configurations/host/materusPC/gnome.nix | 2 +- configurations/host/materusPC/kde.nix | 2 +- configurations/profile/home/shell/zsh.nix | 2 +- configurations/profile/os/fonts.nix | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configurations/host/materusPC/gnome.nix b/configurations/host/materusPC/gnome.nix index ffa9950..ba6a6f3 100644 --- a/configurations/host/materusPC/gnome.nix +++ b/configurations/host/materusPC/gnome.nix @@ -17,7 +17,7 @@ services.gnome.core-shell.enable = true; services.gnome.core-os-services.enable = true; - #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3; + programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; programs.gnome-terminal.enable = true; diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix index 2fcbbf8..fada151 100644 --- a/configurations/host/materusPC/kde.nix +++ b/configurations/host/materusPC/kde.nix @@ -42,7 +42,7 @@ in }; services.xserver.desktopManager.plasma6.enable = true; services.xserver.desktopManager.plasma6.enableQt5Integration = true; - #programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3; + programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ]; environment.variables = { diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index 5e4bf36..bf5f7a6 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -118,7 +118,7 @@ in }; - programs.starship.enableZshIntegration = lib.mkForce false; + programs.starship.enableZshIntegration = lib.mkDefault false; }; diff --git a/configurations/profile/os/fonts.nix b/configurations/profile/os/fonts.nix index f0ffc47..4aab698 100644 --- a/configurations/profile/os/fonts.nix +++ b/configurations/profile/os/fonts.nix @@ -9,16 +9,16 @@ in config = lib.mkIf cfg.enable { fonts.fonts = packages.list.fonts ++ packages.list.moreFonts; - fonts.enableDefaultFonts = lib.mkForce true; + fonts.enableDefaultFonts = lib.mkDefault true; - fonts.fontconfig.enable = lib.mkForce true; - fonts.fontconfig.cache32Bit = lib.mkForce true; + fonts.fontconfig.enable = lib.mkDefault true; + fonts.fontconfig.cache32Bit = lib.mkDefault true; fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ]; fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ]; - fonts.fontDir.enable = lib.mkForce true; + fonts.fontDir.enable = lib.mkDefault true; }; }