+3 -3

lib/shared/default.nix

reviewed

··· 23 23 builders-use-substitutes = true; 24 24 auto-optimise-store = true; 25 25 extra-experimental-features = "flakes nix-command"; 26 26 - extra-trusted-substituters = [ 26 26 + extra-substituters = [ 27 27 + "https://nix-community.cachix.org" 28 28 + "https://nyx.chaotic.cx" 27 29 "https://hyprland.cachix.org" 28 30 "https://lpchaim.cachix.org" 29 29 - "https://nix-community.cachix.org" 30 31 "https://nix-gaming.cachix.org" 31 31 - "https://nyx.chaotic.cx" 32 32 "https://snowflakeos.cachix.org" 33 33 ]; 34 34 extra-trusted-public-keys = [

+5 -4

modules/home/base/default.nix

reviewed

··· 1 1 { 2 2 config, 3 3 lib, 4 4 + osConfig ? null, 4 5 ... 5 5 - } @ args: let 6 6 + }: let 6 7 inherit (lib) mkDefault; 7 8 inherit (lib.lpchaim) shared; 8 9 inherit (lib.snowfall) fs; ··· 25 26 nix = 26 27 { 27 28 gc = { 28 28 - automatic = true; 29 29 + automatic = osConfig == null; 29 30 frequency = "daily"; 30 31 options = "--delete-older-than=7d"; 31 32 }; 32 33 settings = shared.nix.settings; 33 34 } 34 34 - // (lib.optionalAttrs (args ? osConfig) { 35 35 - inherit (args.osConfig.nix) extraOptions; 35 35 + // (lib.optionalAttrs (osConfig != null) { 36 36 + inherit (osConfig.nix) extraOptions; 36 37 }); 37 38 systemd.user.startServices = "sd-switch"; 38 39 };

+2 -1

modules/home/cli/atuin/default.nix

reviewed

··· 1 1 { 2 2 config, 3 3 lib, 4 4 + osConfig ? null, 4 5 pkgs, 5 6 ... 6 6 - } @ args: 7 7 + }: 7 8 lib.lpchaim.mkModule { 8 9 inherit config; 9 10 namespace = "my.modules.cli.atuin";

+1 -1

modules/home/de/hyprland/bars/ags/default.nix

reviewed

··· 29 29 cp ${optionsFile} ~/.cache/ags/options.json 30 30 chmod +w ~/.cache/ags/options.json 31 31 ''; 32 32 - ExecStart = "${ags}/bin/ags"; 32 32 + ExecStart = "${lib.getExe ags}"; 33 33 Restart = "always"; 34 34 RestartSec = "5"; 35 35 };

+1 -1

modules/home/de/hyprland/bars/ags/dotfiles/aylur/ags.nix

reviewed

··· 26 26 }: let 27 27 name = "ags"; 28 28 29 29 - ags = inputs.ags.packages.${system}.default.override { 29 29 + ags = inputs.ags18.packages.${system}.default.override { 30 30 extraPackages = [accountsservice]; 31 31 }; 32 32

+3 -2

modules/home/de/hyprland/hyprlock/default.nix

reviewed

··· 1 1 { 2 2 config, 3 3 lib, 4 4 + osConfig ? null, 4 5 ... 5 5 - } @ args: let 6 6 + }: let 6 7 inherit (lib) getAttrFromPath mkIf; 7 8 namespace = ["my" "modules" "de" "hyprland"]; 8 9 cfg = getAttrFromPath namespace config; ··· 16 17 in { 17 18 background = { 18 19 path = 19 19 - if (args ? osConfig && (lib.elem "nvidia" args.osConfig.services.xserver.videoDrivers)) 20 20 + if (osConfig != null && (lib.elem "nvidia" osConfig.services.xserver.videoDrivers)) 20 21 then "${config.stylix.image}" 21 22 else "screenshot"; 22 23 blur_size = 3;

+3 -2

modules/home/gaming/default.nix

reviewed

··· 1 1 { 2 2 config, 3 3 lib, 4 4 + osConfig ? null, 4 5 pkgs, 5 6 ... 6 6 - } @ args: let 7 7 + }: let 7 8 inherit (lib) mkIf mkMerge; 8 9 in 9 10 lib.lpchaim.mkModule { ··· 12 13 namespace = "my.modules.gaming"; 13 14 configBuilder = cfg: 14 15 mkMerge [ 15 15 - (mkIf (args ? osConfig && args.osConfig.programs.steam.enable) { 16 16 + (mkIf (osConfig.programs.steam.enable or false) { 16 17 home.file = 17 18 lib.concatMapAttrs 18 19 (_: package: {

+3 -2

modules/home/gui/chromium.nix

reviewed

··· 2 2 config, 3 3 inputs, 4 4 lib, 5 5 + osConfig ? null, 5 6 pkgs, 6 7 ... 7 7 - } @ args: let 8 8 + }: let 8 9 inherit (inputs.home-manager.lib) hm; 9 10 in 10 11 lib.mkIf (config.my.modules.gui.enable) { ··· 14 15 [ 15 16 "--password-store=gnome" 16 17 ] 17 17 - ++ (lib.optionals (args ? osConfig && (lib.elem "nvidia" args.osConfig.services.xserver.videoDrivers)) [ 18 18 + ++ (lib.optionals (osConfig != null && (lib.elem "nvidia" osConfig.services.xserver.videoDrivers)) [ 18 19 "--disable-gpu-compositing" # @TODO Remove after NVIDIA figures this out 19 20 ]); 20 21 package = pkgs.brave;

+4 -3

modules/home/gui/default.nix

reviewed

··· 2 2 config, 3 3 pkgs, 4 4 lib, 5 5 + osConfig ? null, 5 6 ... 6 6 - } @ args: 7 7 + }: 7 8 with lib; let 8 9 namespace = ["my" "modules" "gui"]; 9 10 cfg = getAttrFromPath namespace config; ··· 40 41 }; 41 42 42 43 services = { 43 43 - kdeconnect = mkIf (args ? osConfig) { 44 44 - inherit (args.osConfig.programs.kdeconnect) package; 44 44 + kdeconnect = mkIf (osConfig != null) { 45 45 + inherit (osConfig.programs.kdeconnect) package; 45 46 enable = true; 46 47 indicator = true; 47 48 };

+4 -3

modules/home/syncthing/default.nix

reviewed

··· 1 1 { 2 2 lib, 3 3 pkgs, 4 4 + osConfig ? null, 4 5 ... 5 5 - } @ args: let 6 6 + }: let 6 7 # inherit (inputs.home-manager.lib) hm; 7 8 inherit (pkgs) syncthingtray; 8 8 - syncthing = args.osConfig.services.syncthing.package; 9 9 + syncthing = osConfig.services.syncthing.package; 9 10 in 10 10 - lib.mkIf (args ? osConfig && args.osConfig.services.syncthing.enable) { 11 11 + lib.mkIf (osConfig.services.syncthing.enable or false) { 11 12 home.packages = [pkgs.syncthingtray]; 12 13 services.syncthing.tray.enable = true; 13 14 systemd.user.services.syncthingtray = {

-1

modules/nixos/traits/de/hyprland.nix

reviewed

··· 1 1 { 2 2 - lib, 3 2 inputs, 4 3 pkgs, 5 4 ...

+1 -1

modules/shared/theming/default.nix

reviewed

··· 19 19 }; 20 20 fonts.monospace = { 21 21 name = lib.mkDefault "JetBrainsMono Nerd Font"; 22 22 - package = lib.mkDefault (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}); 22 22 + package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono; 23 23 }; 24 24 }; 25 25 }