diff --git a/README.md b/README.md index 986a7b35..d37d0083 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,10 @@ [![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org) ![Static Badge](https://img.shields.io/badge/time_wasted-alot-red) + +## Templates/Resources used + +[Misterio77/nix-starter-configs2](https://github.com/Misterio77/nix-starter-configs) +[pull request for a bug](https://github.com/Misterio77/nix-starter-configs/pull/34/commits/2a5f3ca3dde606b83ea30b5507347bf989819301) +[doom emacs guy -> hlissner/dotfiles](https://github.com/hlissner/dotfiles) +[nixos.wiki (unofficial)](https://nixos.wiki/) diff --git a/flake.nix b/flake.nix index c145c2c6..65c44107 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager, ...}@attrs: + outputs = { self, nixpkgs, home-manager, ...}@inputs: let inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ @@ -17,11 +17,10 @@ ]; in rec { - # custom packages packages = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; - in import ./packages {inherit pkgs; } + in import ./packages { inherit pkgs; } ); # dev shell for bootstrap devShells = forAllSystems (system: diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index 786174c6..3f8ac078 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -1,12 +1,12 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page and in the NixOS manual (accessible by running `nixos-help`). -{ config, pkgs, lib, home-manager, ... }: +{ config, pkgs, lib, inputs, outputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - home-manager.nixosModules.default + inputs.home-manager.nixosModules.home-manager # TODO(sako):: make this better ../../modules ];