diff --git a/flake.nix b/flake.nix index 23cff5b..9da4184 100644 --- a/flake.nix +++ b/flake.nix @@ -23,18 +23,20 @@ inputs.neovim-nightly-overlay.overlays.default inputs.neovim.overlays.default ]; + unstableOverlay = final: _prev: { + unstable = import inputs.nixpkgs-unstable { + inherit (final) system; + config.allowUnfree = true; + overlays = inputOverlays; + }; + }; overlays = [ - (final: _prev: { - unstable = import inputs.nixpkgs-unstable { - inherit (final) system; - config.allowUnfree = true; - overlays = inputOverlays; - }; - }) + unstableOverlay ] ++ inputOverlays; mkPkgs = system: import nixpkgs { inherit system overlays; + config.allowUnfree = true; }; in rec { @@ -42,21 +44,12 @@ (import ./modules) ]; homeConfigurations = { - "odie@asgard" = home-manager.lib.homeManagerConfiguration { + "odie-full" = home-manager.lib.homeManagerConfiguration { pkgs = (mkPkgs "x86_64-linux").unstable; extraSpecialArgs = { inherit inputs outputs; }; modules = homeManagerModules; }; }; - packages = flake-utils.lib.eachDefaultSystem - (system: - let - pkgs = mkPkgs system; - in - with pkgs; { - inherit (unstable) hello; - } - ); } // flake-utils.lib.eachDefaultSystem (system: let pkgs = mkPkgs system; diff --git a/modules/default.nix b/modules/default.nix index 4e09c0b..797d531 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, lib, ... }: with lib; { home = { username = "odie"; homeDirectory = "/home/odie"; @@ -14,11 +14,11 @@ ]; programs = { - neovim-ide.enable = true; + neovim-ide.enable = mkDefault true; }; services = { - ssh-agent.enable = true; + ssh-agent.enable = mkDefault true; }; home.stateVersion = "23.05";