refactor(flake): inherit inputs

This commit is contained in:
Oliver Davies 2023-08-05 01:21:31 +01:00
parent b68ad75ce3
commit aa63de628e
4 changed files with 9 additions and 20 deletions

View file

@ -8,15 +8,6 @@
outputs = outputs =
inputs@{ flake-parts, home-manager, nixpkgs, nixpkgs-unstable, self, ... }: inputs@{ flake-parts, home-manager, nixpkgs, nixpkgs-unstable, self, ... }:
let
system = "x86_64-linux";
specialArgs = {
pkgs-unstable = import nixpkgs-unstable {
inherit inputs system;
};
};
in
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
@ -29,15 +20,13 @@
flake = { flake = {
nixosConfigurations = { nixosConfigurations = {
nixedo = nixpkgs.lib.nixosSystem { nixedo = nixpkgs.lib.nixosSystem {
inherit specialArgs;
modules = [ modules = [
./system/nixos/nixedo/configuration.nix ./system/nixos/nixedo/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
extraSpecialArgs = specialArgs; extraSpecialArgs = { inherit inputs; };
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.opdavies = import ./home-manager/nixedo.nix; users.opdavies = import ./home-manager/nixedo.nix;

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, ... }: { inputs, lib, pkgs, ... }:
let let
vim-astro = pkgs.vimUtils.buildVimPlugin { vim-astro = pkgs.vimUtils.buildVimPlugin {
@ -75,7 +75,7 @@ in
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "postman" ]; builtins.elem (lib.getName pkg) [ "postman" ];
home.packages = (import ./home-manager-packages.nix) { inherit pkgs pkgs-unstable; }; home.packages = (import ./home-manager-packages.nix) { inherit inputs pkgs; };
home.file."nodemon.json".text = '' home.file."nodemon.json".text = ''
{ {
@ -164,10 +164,10 @@ in
vimPlugins.nvim-treesitter-textobjects vimPlugins.nvim-treesitter-textobjects
# LSP # LSP
inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.lsp-zero-nvim
inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
vimPlugins.null-ls-nvim vimPlugins.null-ls-nvim
vimPlugins.lsp-status-nvim vimPlugins.lsp-status-nvim
pkgs-unstable.vimPlugins.lsp-zero-nvim
pkgs-unstable.vimPlugins.nvim-lspconfig
# Completion # Completion
vimPlugins.cmp-buffer vimPlugins.cmp-buffer
@ -211,6 +211,7 @@ in
# Language servers # Language servers
ansible-language-server ansible-language-server
inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua53Packages.lua-lsp lua53Packages.lua-lsp
nodePackages.intelephense nodePackages.intelephense
nodePackages."@astrojs/language-server" nodePackages."@astrojs/language-server"
@ -224,7 +225,6 @@ in
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.yaml-language-server nodePackages.yaml-language-server
phpactor phpactor
pkgs-unstable.nixd
rnix-lsp rnix-lsp
terraform-ls terraform-ls

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, ... }: { inputs, pkgs, ... }:
with pkgs; [ with pkgs; [
awscli2 awscli2
@ -18,6 +18,7 @@ with pkgs; [
gnupg gnupg
htop htop
inotify-tools inotify-tools
inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
jq jq
just just
lua lua
@ -35,7 +36,6 @@ with pkgs; [
php81Packages.phpcs php81Packages.phpcs
php81Packages.phpstan php81Packages.phpstan
pinentry pinentry
pkgs-unstable.rustywind
platformsh platformsh
postman postman
pulumi-bin pulumi-bin

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, pkgs-unstable, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [