Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

removed useless and cargo-culted outputs inherrits.

Browse source
This commit is contained in:
Gabe Venberg 2024-06-10 16:19:36 -05:00
parent 296fbdb3c5
commit f27b5ac056
11 changed files with 18 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/nixos/common.nix
View file

@ -2,7 +2,6 @@
config,
pkgs,
inputs,
outputs,
lib,
...
}: {
@ -57,5 +56,5 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
home-manager.extraSpecialArgs = {inherit inputs;};
}

1
configs/nixos/sshd.nix
View file

@ -2,7 +2,6 @@
config,
pkgs,
inputs,
outputs,
configLib,
lib,
...

21
flake.nix
View file

@ -59,7 +59,6 @@
deploy-rs,
...
} @ inputs: let
inherit (self) outputs;
forAllSystems = nixpkgs.lib.genAttrs [
"x86_64-linux"
"aarch64-linux"
@ -89,25 +88,25 @@
# NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs outputs configLib;};
workstation-vm = import ./hosts/workstation-vm {inherit inputs outputs configLib;};
gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs outputs configLib;};
archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs configLib;};
workstation-vm = import ./hosts/workstation-vm {inherit inputs configLib;};
gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs configLib;};
};
# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
"gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;};
"gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs outputs configLib;};
"gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;};
"gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs outputs configLib;};
"gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs configLib;};
"gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs configLib;};
"gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
"gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;};
};
packages.x86_64-linux = {
proxmox = import ./packages/proxmox.nix {inherit inputs outputs configLib;};
iso = import ./packages/iso.nix {inherit inputs outputs configLib;};
proxmox = import ./packages/proxmox.nix {inherit inputs configLib;};
iso = import ./packages/iso.nix {inherit inputs configLib;};
};
templates = import ./templates {inherit inputs outputs;};
templates = import ./templates;
};
}

3
hosts/archlaptop-vm/default.nix
View file

@ -1,12 +1,11 @@
{
inputs,
outputs,
configLib,
...
}:
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;};
specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file <
modules = [
inputs.home-manager.nixosModules.home-manager

3
hosts/home-personal.nix
View file

@ -1,12 +1,11 @@
{
inputs,
outputs,
configLib,
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs configLib;};
extraSpecialArgs = {inherit inputs configLib;};
modules = [
({
config,

3
hosts/home-workstation.nix
View file

@ -1,12 +1,11 @@
{
inputs,
outputs,
configLib,
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs configLib;};
extraSpecialArgs = {inherit inputs configLib;};
modules = [
inputs.nixvim.homeManagerModules.nixvim
({

3
hosts/workstation-vm/default.nix
View file

@ -3,13 +3,12 @@
# and in the NixOS manual (accessible by running ‘nixos-help’).
{
inputs,
outputs,
configLib,
...
}:
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;};
specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file <
modules = [
inputs.home-manager.nixosModules.home-manager

3
hosts/wsl-workstation.nix
View file

@ -1,11 +1,10 @@
{
inputs,
outputs,
configLib,
}:
inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;};
specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file <
modules = [
inputs.home-manager.nixosModules.home-manager

3
packages/iso.nix
View file

@ -3,13 +3,12 @@
# and in the NixOS manual (accessible by running ‘nixos-help’).
{
inputs,
outputs,
configLib,
...
}:
(inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;};
specialArgs = {inherit inputs configLib;};
# > Our main nixos configuration file <
modules = [
inputs.home-manager.nixosModules.home-manager

3
packages/proxmox.nix
View file

@ -1,12 +1,11 @@
{
inputs,
outputs,
configLib,
...
}:
(inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs configLib;};
specialArgs = {inherit inputs configLib;};
modules = [
inputs.home-manager.nixosModules.home-manager
../configs/nixos/sshd.nix

4
templates/default.nix
View file

@ -1,8 +1,4 @@
{
inputs,
outputs,
...
}: {
default = {
path = ./default;
description = "a basic blank devshell flake";