christoph/flake-nixinator
1
Fork 0
Code Activity

Home: Fix remaining name qualifications after module update

Browse Source
This commit is contained in:
Christoph Urlacher
2024-10-14 15:25:54 +02:00
parent 050969a892
commit cb0c880431
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/modules/chromium/default.nix
View File

@ -12,7 +12,7 @@ in {
config = lib.mkIf chromium.enable { config = lib.mkIf chromium.enable {
home.packages = with pkgs; home.packages = with pkgs;
builtins.concatLists [ builtins.concatLists [
(optionals cfg.google [ (lib.optionals chromium.google [
google-chrome # Trash, but required for decker pdf export google-chrome # Trash, but required for decker pdf export
# Required for some flatpak compatibility # Required for some flatpak compatibility

4
home/modules/firefox/default.nix
View File

@ -15,14 +15,14 @@ in {
home.packages = with pkgs; home.packages = with pkgs;
builtins.concatLists [ builtins.concatLists [
# TODO: I don't think vaapi works yet # TODO: I don't think vaapi works yet
(optionals cfg.vaapi [ (lib.optionals firefox.vaapi [
# NOTE: I put these into hardware.opengl.extrapackages, don't know if they belong there... # NOTE: I put these into hardware.opengl.extrapackages, don't know if they belong there...
# libva # libva
# libvdpau # libvdpau
]) ])
# TODO: Derivation borked on standalone HM # TODO: Derivation borked on standalone HM
# (optionals cfg.gnomeTheme [firefox-gnome-theme]) # (lib.optionals firefox.gnomeTheme [firefox-gnome-theme])
]; ];
home.sessionVariables = lib.mkMerge [ home.sessionVariables = lib.mkMerge [

2
home/modules/fish/default.nix
View File

@ -114,7 +114,7 @@ in {
# These can be used for my config.modules and for HM config.programs, # These can be used for my config.modules and for HM config.programs,
# as both of these add the package to home.packages # as both of these add the package to home.packages
hasHomePackage = package: (mylib.contains config.home.packages package); hasHomePackage = package: (mylib.modules.contains config.home.packages package);
# Only add fish abbr if package is installed # Only add fish abbr if package is installed
abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr); abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);

2
home/modules/neovim/default.nix
View File

@ -23,7 +23,7 @@ in {
packages = with pkgs; packages = with pkgs;
builtins.concatLists [ builtins.concatLists [
(optionals cfg.neovide [neovide]) (lib.optionals neovim.neovide [neovide])
[ [
(pkgs.ripgrep.override {withPCRE2 = true;}) (pkgs.ripgrep.override {withPCRE2 = true;})