materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change usage of mkForce

This commit is contained in:
Mateusz Słodkowicz 2024-03-17 10:25:09 +01:00
parent 14349441ac
commit fe55b38bf9
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configurations/host/materusPC/gnome.nix
View File

@ -17,7 +17,7 @@
services.gnome.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome.core-os-services.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; programs.gnome-terminal.enable = true;

2
configurations/host/materusPC/kde.nix
View File

@ -42,7 +42,7 @@ in
}; };
services.xserver.desktopManager.plasma6.enable = true; services.xserver.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.plasma6.enableQt5Integration = 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.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
environment.variables = { environment.variables = {

2
configurations/profile/home/shell/zsh.nix
View File

@ -118,7 +118,7 @@ in
}; };
programs.starship.enableZshIntegration = lib.mkForce false; programs.starship.enableZshIntegration = lib.mkDefault false;
}; };

8
configurations/profile/os/fonts.nix
View File

@ -9,16 +9,16 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
fonts.fonts = packages.list.fonts ++ packages.list.moreFonts; 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.enable = lib.mkDefault true;
fonts.fontconfig.cache32Bit = lib.mkForce true; fonts.fontconfig.cache32Bit = lib.mkDefault true;
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; 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.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ]; 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.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;
}; };
} }