diff --git a/minimal/home-manager/home.nix b/minimal/home-manager/home.nix index dae9415..814f6e6 100644 --- a/minimal/home-manager/home.nix +++ b/minimal/home-manager/home.nix @@ -33,8 +33,6 @@ config = { # Disable if you don't want unfree packages allowUnfree = true; - # Workaround for https://github.com/nix-community/home-manager/issues/2942 - allowUnfreePredicate = _: true; }; }; @@ -52,9 +50,6 @@ programs.home-manager.enable = true; programs.git.enable = true; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "25.11"; } diff --git a/minimal/nixos/configuration.nix b/minimal/nixos/configuration.nix index 18fefdf..47bc7fe 100644 --- a/minimal/nixos/configuration.nix +++ b/minimal/nixos/configuration.nix @@ -40,23 +40,15 @@ }; }; - nix = let - flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; - in { + nix = { settings = { # Enable flakes and new 'nix' command experimental-features = "nix-command flakes"; # Opinionated: disable global registry flake-registry = ""; - # Workaround for https://github.com/NixOS/nix/issues/9574 - nix-path = config.nix.nixPath; }; # Opinionated: disable channels channel.enable = false; - - # Opinionated: make flake registry and nix path match flake inputs - registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs; - nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; }; # FIXME: Add the rest of your current configuration diff --git a/standard/home-manager/home.nix b/standard/home-manager/home.nix index 3ae2d86..185137b 100644 --- a/standard/home-manager/home.nix +++ b/standard/home-manager/home.nix @@ -58,9 +58,6 @@ programs.home-manager.enable = true; programs.git.enable = true; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion home.stateVersion = "25.11"; } diff --git a/standard/nixos/configuration.nix b/standard/nixos/configuration.nix index c8ab9bb..8e9a6ad 100644 --- a/standard/nixos/configuration.nix +++ b/standard/nixos/configuration.nix @@ -48,23 +48,15 @@ }; }; - nix = let - flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; - in { + nix = { settings = { # Enable flakes and new 'nix' command experimental-features = "nix-command flakes"; # Opinionated: disable global registry flake-registry = ""; - # Workaround for https://github.com/NixOS/nix/issues/9574 - nix-path = config.nix.nixPath; }; # Opinionated: disable channels channel.enable = false; - - # Opinionated: make flake registry and nix path match flake inputs - registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs; - nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; }; # FIXME: Add the rest of your current configuration