From ce64bc072eb2addfeeb4e79fb32ce359d7f387a4 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Wed, 26 Jun 2024 20:55:57 +0200 Subject: [PATCH] replace `outputs` with `inputs.self` --- README.md | 4 ++-- minimal/flake.nix | 5 ++--- standard/flake.nix | 5 ++--- standard/home-manager/home.nix | 9 ++++----- standard/nixos/configuration.nix | 9 ++++----- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 491c4d3..b8154c1 100644 --- a/README.md +++ b/README.md @@ -120,14 +120,14 @@ add this to your NixOS configuration (either directly on `nixos/configuration.nix` or on a separate file and import it): ```nix -{ inputs, outputs, ... }: { +{ inputs, ... }: { imports = [ # Import home-manager's NixOS module inputs.home-manager.nixosModules.home-manager ]; home-manager = { - extraSpecialArgs = { inherit inputs outputs; }; + extraSpecialArgs = { inherit inputs; }; users = { # Import your home-manager configuration your-username = import ../home-manager/home.nix; diff --git a/minimal/flake.nix b/minimal/flake.nix index e1f978d..0550e15 100644 --- a/minimal/flake.nix +++ b/minimal/flake.nix @@ -16,14 +16,13 @@ home-manager, ... } @ inputs: let - inherit (self) outputs; in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { # FIXME replace with your hostname your-hostname = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs;}; # > Our main nixos configuration file < modules = [./nixos/configuration.nix]; }; @@ -35,7 +34,7 @@ # FIXME replace with your username@hostname "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; + extraSpecialArgs = {inherit inputs;}; # > Our main home-manager configuration file < modules = [./home-manager/home.nix]; }; diff --git a/standard/flake.nix b/standard/flake.nix index 0b8a8e0..530470f 100644 --- a/standard/flake.nix +++ b/standard/flake.nix @@ -20,7 +20,6 @@ home-manager, ... } @ inputs: let - inherit (self) outputs; # Supported systems for your flake packages, shell, etc. systems = [ "aarch64-linux" @@ -54,7 +53,7 @@ nixosConfigurations = { # FIXME replace with your hostname your-hostname = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = {inherit inputs;}; modules = [ # > Our main nixos configuration file < ./nixos/configuration.nix @@ -68,7 +67,7 @@ # FIXME replace with your username@hostname "your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; + extraSpecialArgs = {inherit inputs;}; modules = [ # > Our main home-manager configuration file < ./home-manager/home.nix diff --git a/standard/home-manager/home.nix b/standard/home-manager/home.nix index 7aa567f..9030601 100644 --- a/standard/home-manager/home.nix +++ b/standard/home-manager/home.nix @@ -2,7 +2,6 @@ # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) { inputs, - outputs, lib, config, pkgs, @@ -11,7 +10,7 @@ # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): - # outputs.homeManagerModules.example + # inputs.self.homeManagerModules.example # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default @@ -24,9 +23,9 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages + inputs.self.overlays.additions + inputs.self.overlays.modifications + inputs.self.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/standard/nixos/configuration.nix b/standard/nixos/configuration.nix index 3b4ca08..9e361a8 100644 --- a/standard/nixos/configuration.nix +++ b/standard/nixos/configuration.nix @@ -2,7 +2,6 @@ # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { inputs, - outputs, lib, config, pkgs, @@ -11,7 +10,7 @@ # You can import other NixOS modules here imports = [ # If you want to use modules your own flake exports (from modules/nixos): - # outputs.nixosModules.example + # inputs.self.nixosModules.example # Or modules from other flakes (such as nixos-hardware): # inputs.hardware.nixosModules.common-cpu-amd @@ -28,9 +27,9 @@ # You can add overlays here overlays = [ # Add overlays your own flake exports (from overlays and pkgs dir): - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages + inputs.self.overlays.additions + inputs.self.overlays.modifications + inputs.self.overlays.unstable-packages # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default