diff options
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | home/default.nix | 6 | ||||
| -rw-r--r-- | hosts/common.nix | 4 | ||||
| -rw-r--r-- | hosts/muhammed/configuration.nix | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -24,7 +24,6 @@ outputs = { self, nixpkgs, home-manager, nix-darwin, agenix, ... }@inputs: let args = { - inherit self; flakeInputs = inputs; metadata = nixpkgs.lib.importTOML ./metadata.toml; }; diff --git a/home/default.nix b/home/default.nix index b9e0b72..6e87b53 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,4 +1,4 @@ -{ self, flakeInputs, metadata, ... }: +{ flakeInputs, metadata, ... }: { # Use the flake input pkgs so Home Manager configuration can share overlays @@ -7,12 +7,12 @@ # Pass special arguments from flake.nix further down the chain. I really hate # this split module system. - home-manager.extraSpecialArgs = { inherit self flakeInputs metadata; }; + home-manager.extraSpecialArgs = { inherit flakeInputs metadata; }; # OKAY FUCK THIS SHIT. THERE IS ONE USER. IT IS ME. LINUS. I WILL ADD # MULTIUSER SUPPORT IF IT EVER BECOMES A REQUIREMENT. home-manager.users.linus = { - imports = + imports = [ ./neovim ./zsh diff --git a/hosts/common.nix b/hosts/common.nix index 32baeb5..5a9bc52 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,6 +1,6 @@ # Shared configuraion regardless of hosts. -{ pkgs, options, self, flakeInputs, ... }: +{ pkgs, options, flakeInputs, ... }: { # Enable de facto stable features. @@ -11,7 +11,7 @@ # # See: https://nixos.wiki/wiki/Overlays#Using_nixpkgs.overlays_from_configuration.nix_as_.3Cnixpkgs-overlays.3E_in_your_NIX_PATH nixpkgs.overlays = (import ../pkgs/overlays.nix); - nix.nixPath = options.nix.nixPath.default ++ [ "nixpkgs-overlays=${self}/pkgs/overlays.nix" ]; + nix.nixPath = options.nix.nixPath.default ++ [ "nixpkgs-overlays=${flakeInputs.self}/pkgs/overlays.nix" ]; # Set ZSH as the shell. # https://nixos.wiki/wiki/Command_Shell#Changing_default_shelltrue diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix index f338cdd..db54aff 100644 --- a/hosts/muhammed/configuration.nix +++ b/hosts/muhammed/configuration.nix @@ -1,6 +1,6 @@ # This file contains the configuration for my Macbook Pro. -{ pkgs, flakeInputs, lib, ... }: +{ flakeInputs, ... }: { # Specify the location of this configuration file. Very meta. |