From 32d20ed2a333161c898acabcd6257f86efc6eae3 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 23 Dec 2023 20:30:14 +0800 Subject: [PATCH] config: cut down default host config --- flake.nix | 14 +------------- setups/nixos.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 23f3f663..0e4323a6 100644 --- a/flake.nix +++ b/flake.nix @@ -101,15 +101,6 @@ inherit (final.nur.repos.rycee.firefox-addons) buildFirefoxXpiAddon; firefox-addons = final.callPackage ./pkgs/firefox-addons { }; }) - - # Neovim nightly! - inputs.neovim-nightly-overlay.overlays.default - - # Emacs unstable version! - inputs.emacs-overlay.overlays.default - - # Access to NUR. - inputs.nur.overlay ] ++ (lib'.attrValues self.overlays); defaultSystem = "x86_64-linux"; @@ -159,13 +150,10 @@ # Then, make the most with the modules from the flake inputs. Take # note importing some modules such as home-manager are as part of the # declarative host config so be sure to check out - # `hostSpecificModule` function as well. + # `hostSpecificModule` function as well as the declarative host setup. ++ [ - inputs.nur.nixosModules.nur inputs.sops-nix.nixosModules.sops inputs.disko.nixosModules.disko - inputs.nix-index-database.nixosModules.nix-index - inputs.nixos-wsl.nixosModules.default ]; # Set some extra, yeah? diff --git a/setups/nixos.nix b/setups/nixos.nix index efe16110..6fcad48f 100644 --- a/setups/nixos.nix +++ b/setups/nixos.nix @@ -11,6 +11,23 @@ ni = { systems = [ "x86_64-linux" ]; format = "iso"; + modules = [ + inputs.nur.nixosModules.nur + inputs.nix-index-database.nixosModules.nix-index + + { + nixpkgs.overlays = [ + # Neovim nightly! + inputs.neovim-nightly-overlay.overlays.default + + # Emacs unstable version! + inputs.emacs-overlay.overlays.default + + # Access to NUR. + inputs.nur.overlay + ]; + } + ]; }; plover = { @@ -43,5 +60,8 @@ winnowing = { systems = [ "x86_64-linux" ]; format = "iso"; + modules = [ + inputs.nixos-wsl.nixosModules.default + ]; }; }