Pass inputs around instead of each individual input

This commit is contained in:
Gene Liverman 2024-12-04 21:39:03 -05:00
parent e1d4cddda0
commit eead479245
25 changed files with 27 additions and 29 deletions

View file

@ -80,9 +80,7 @@
nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ... nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ...
}: let }: let
# Functions that setup systems # Functions that setup systems
mylib = import ./lib { inherit inputs nixpkgs nixpkgs-unstable compose2nix disko flox genebean-omp-themes mylib = import ./lib { inherit inputs; };
home-manager nix-darwin nix-flatpak nix-homebrew nixos-cosmic
nixos-hardware nixpkgs-terraform simple-nixos-mailserver sops-nix; };
# creates a macOS system config # creates a macOS system config
darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem { darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem {

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: let { inputs, pkgs, ... }: let
sqlite_lib = if builtins.elem pkgs.system [ sqlite_lib = if builtins.elem pkgs.system [
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
@ -159,7 +159,7 @@ in {
oh-my-posh = { oh-my-posh = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (genebean-omp-themes + "/beanbag.omp.json"))); settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (inputs.genebean-omp-themes + "/beanbag.omp.json")));
}; };
ripgrep.enable = true; ripgrep.enable = true;
tmux = { tmux = {

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# nothing here right now # nothing here right now
]; ];

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { ... }: {
home.file = { home.file = {
".config/xfce4/terminal/accels.scm".source = ../../files/xfce4/terminal/accels.scm; ".config/xfce4/terminal/accels.scm".source = ../../files/xfce4/terminal/accels.scm;
}; };

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, sops-nix, username, ... }: { { username, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, sops-nix, username, ... }: { { username, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { ... }: {
home.stateVersion = "24.05"; home.stateVersion = "24.05";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { ... }: {
home.stateVersion = "24.05"; home.stateVersion = "24.05";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { ... }: {
home.stateVersion = "24.05"; home.stateVersion = "24.05";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, sops-nix, username, ... }: { { username, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, genebean-omp-themes, ... }: { { pkgs, ... }: {
home.stateVersion = "23.11"; home.stateVersion = "23.11";
imports = [ imports = [
../../common/all-cli.nix ../../common/all-cli.nix

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { ... }: {
system.stateVersion = 4; system.stateVersion = 4;
homebrew = { homebrew = {

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ lib, ... }: { ... }:
{ {
disko.devices = { disko.devices = {
disk = { disk = {

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ compose2nix, config, pkgs, username, ... }: let { inputs, config, pkgs, username, ... }: let
http_port = 80; http_port = 80;
https_port = 443; https_port = 443;
home_domain = "home.technicalissues.us"; home_domain = "home.technicalissues.us";
@ -29,7 +29,7 @@ in {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
compose2nix.packages.${pkgs.system}.default inputs.compose2nix.packages.${pkgs.system}.default
docker-compose docker-compose
intel-gpu-tools intel-gpu-tools
jellyfin jellyfin

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ config, inputs, pkgs, username, ... }: { { inputs, config, pkgs, username, ... }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../../system/common/linux/flatpaks.nix ../../../system/common/linux/flatpaks.nix

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ config, hostname, pkgs, sops-nix, username, ... }: { { hostname, pkgs, username, ... }: {
imports = [ imports = [
./linux/internationalisation.nix ./linux/internationalisation.nix
]; ];

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { { ... }: {
# Select internationalisation properties. # Select internationalisation properties.
i18n = { i18n = {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";