1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00

chore: run deadnix

This commit is contained in:
oddlama 2023-09-04 22:01:47 +02:00
parent 0daf5651df
commit 562d1dffb3
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
35 changed files with 21 additions and 110 deletions

View file

@ -2,7 +2,7 @@
self, self,
pkgs, pkgs,
... ...
} @ inputs: let }: let
inherit inherit
(pkgs.lib) (pkgs.lib)
attrNames attrNames

View file

@ -1,8 +1,4 @@
{ {inputs, ...}: {
inputs,
pkgs,
...
}: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate

View file

@ -1,8 +1,4 @@
{ {config, ...}: {
config,
lib,
...
}: {
imports = [ imports = [
../../modules/optional/hardware/hetzner-cloud.nix ../../modules/optional/hardware/hetzner-cloud.nix

View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
utils,
... ...
}: { }: {
networking.hostId = config.repo.secrets.local.networking.hostId; networking.hostId = config.repo.secrets.local.networking.hostId;

View file

@ -1,7 +1,5 @@
{ {
lib,
config, config,
pkgs,
nodes, nodes,
... ...
}: { }: {

View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
nodes, nodes,
... ...
}: let }: let

View file

@ -1,8 +1,6 @@
{ {
config, config,
lib,
nodes, nodes,
pkgs,
... ...
}: let }: let
sentinelCfg = nodes.sentinel.config; sentinelCfg = nodes.sentinel.config;

View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
nodes, nodes,
pkgs, pkgs,
... ...

View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
nodes, nodes,
... ...
}: let }: let

View file

@ -1,6 +1,5 @@
{ {
config, config,
lib,
nodes, nodes,
... ...
}: let }: let

View file

@ -6,7 +6,6 @@
}: let }: let
inherit (config.repo.secrets.local) acme; inherit (config.repo.secrets.local) acme;
sentinelCfg = nodes.sentinel.config; sentinelCfg = nodes.sentinel.config;
inherit (sentinelCfg.repo.secrets.local) personalDomain;
in { in {
imports = [ imports = [
../../modules/optional/hardware/odroid-n2plus.nix ../../modules/optional/hardware/odroid-n2plus.nix

View file

@ -1,8 +1,4 @@
{ {config, ...}: {
lib,
config,
...
}: {
services.esphome = { services.esphome = {
enable = true; enable = true;
enableUnixSocket = true; enableUnixSocket = true;

View file

@ -1,8 +1,4 @@
{ {config, ...}: {
lib,
config,
...
}: {
age.secrets.mosquitto-pw-zigbee2mqtt = { age.secrets.mosquitto-pw-zigbee2mqtt = {
rekeyFile = ./secrets/mosquitto-pw-zigbee2mqtt.age; rekeyFile = ./secrets/mosquitto-pw-zigbee2mqtt.age;
mode = "440"; mode = "440";

View file

@ -1,8 +1,4 @@
{ {config, ...}: {
lib,
config,
...
}: {
age.secrets."mosquitto-pw-zigbee2mqtt.yaml" = { age.secrets."mosquitto-pw-zigbee2mqtt.yaml" = {
rekeyFile = ./secrets/mosquitto-pw-zigbee2mqtt.yaml.age; rekeyFile = ./secrets/mosquitto-pw-zigbee2mqtt.yaml.age;
mode = "440"; mode = "440";

View file

@ -1,4 +1,4 @@
inputs: self: super: { _inputs: _self: super: {
lib = lib =
super.lib super.lib
// { // {

View file

@ -1,4 +1,4 @@
inputs: self: super: let inputs: _self: super: let
inherit inherit
(inputs.nixpkgs.lib) (inputs.nixpkgs.lib)
all all

View file

@ -7,7 +7,6 @@
}: let }: let
inherit inherit
(lib) (lib)
all
any any
attrNames attrNames
attrValues attrValues
@ -16,7 +15,6 @@
concatMap concatMap
concatMapStrings concatMapStrings
converge converge
elem
escapeShellArg escapeShellArg
escapeShellArgs escapeShellArgs
filter filter

View file

@ -11,11 +11,8 @@
any any
attrNames attrNames
attrValues attrValues
concatStringsSep
disko disko
escapeShellArg escapeShellArg
filterAttrs
foldl'
makeBinPath makeBinPath
mapAttrsToList mapAttrsToList
mdDoc mdDoc
@ -24,12 +21,10 @@
mkEnableOption mkEnableOption
mkForce mkForce
mkIf mkIf
mkMerge
mkOption mkOption
net net
optional optional
optionalAttrs optionalAttrs
recursiveUpdate
types types
; ;
@ -277,11 +272,7 @@ in {
vms = mkOption { vms = mkOption {
default = {}; default = {};
description = "Defines the actual vms and handles the necessary base setup for them."; description = "Defines the actual vms and handles the necessary base setup for them.";
type = types.attrsOf (types.submodule ({ type = types.attrsOf (types.submodule ({name, ...}: {
name,
config,
...
}: {
options = { options = {
nodeName = mkOption { nodeName = mkOption {
type = types.str; type = types.str;

View file

@ -1,14 +1,11 @@
{ {
lib, lib,
config, config,
pkgs,
... ...
}: let }: let
inherit inherit
(lib) (lib)
concatStringsSep concatStringsSep
flip
mapAttrs
mdDoc mdDoc
mkDefault mkDefault
mkEnableOption mkEnableOption
@ -35,11 +32,7 @@ in {
}; };
options.services.nginx.virtualHosts = mkOption { options.services.nginx.virtualHosts = mkOption {
type = types.attrsOf (types.submodule ({ type = types.attrsOf (types.submodule ({config, ...}: {
name,
config,
...
}: {
options.oauth2 = { options.oauth2 = {
enable = mkEnableOption (mdDoc "access protection of this resource using oauth2_proxy."); enable = mkEnableOption (mdDoc "access protection of this resource using oauth2_proxy.");
allowedGroups = mkOption { allowedGroups = mkOption {

View file

@ -1,43 +1,31 @@
{ {
config, config,
lib, lib,
nodes,
pkgs,
... ...
}: let }: let
inherit inherit
(lib) (lib)
any any
assertMsg
attrNames attrNames
attrValues attrValues
concatAttrs concatAttrs
concatLists
concatMap concatMap
concatMapStrings concatMapStrings
concatStringsSep concatStringsSep
duplicates duplicates
escapeShellArg escapeShellArg
filter filter
filterAttrs
flatten
flip
genAttrs genAttrs
head head
mapAttrs'
mapAttrsToList mapAttrsToList
mdDoc mdDoc
mergeAttrs
mergeToplevelConfigs mergeToplevelConfigs
mkForce mkForce
mkIf mkIf
mkMerge
mkOption mkOption
nameValuePair
net net
optionalAttrs optionalAttrs
optionals optionals
partition
removeSuffix removeSuffix
stringLength stringLength
types types

View file

@ -3,9 +3,4 @@
./fonts.nix ./fonts.nix
./wayland.nix ./wayland.nix
]; ];
environment.systemPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
} }

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {
systemd.network.wait-online.anyInterface = true; systemd.network.wait-online.anyInterface = true;
services = { services = {

View file

@ -1,6 +1,5 @@
{ {
config, config,
inputs,
lib, lib,
options, options,
nodes, nodes,
@ -10,17 +9,12 @@
(lib) (lib)
attrNames attrNames
concatMap concatMap
elem
foldl'
getAttrFromPath getAttrFromPath
mdDoc mdDoc
mkIf
mkOption mkOption
mkOptionType mkOptionType
mkMerge mkMerge
recursiveUpdate
hasAttrByPath hasAttrByPath
setAttrByPath
types types
; ;
@ -31,7 +25,7 @@ in {
description = mdDoc "Allows extending the configuration of other machines."; description = mdDoc "Allows extending the configuration of other machines.";
type = types.attrsOf (mkOptionType { type = types.attrsOf (mkOptionType {
name = "Toplevel NixOS config"; name = "Toplevel NixOS config";
merge = loc: map (x: x.value); merge = _loc: map (x: x.value);
}); });
}; };

View file

@ -9,8 +9,6 @@
mkOption mkOption
types types
; ;
cfg = config.node;
in { in {
options.node = { options.node = {
name = mkOption { name = mkOption {

View file

@ -2,17 +2,14 @@
config, config,
inputs, inputs,
lib, lib,
pkgs,
... ...
}: let }: let
inherit inherit
(lib) (lib)
assertMsg assertMsg
attrNames
literalExpression literalExpression
mapAttrs mapAttrs
mdDoc mdDoc
mkIf
mkOption mkOption
types types
; ;

View file

@ -11,7 +11,6 @@
mkDefault mkDefault
mdDoc mdDoc
mkIf mkIf
mkMerge
mkOption mkOption
types types
; ;

View file

@ -2,14 +2,11 @@
self, self,
agenix, agenix,
agenix-rekey, agenix-rekey,
colmena,
disko, disko,
elewrap, elewrap,
home-manager, home-manager,
impermanence, impermanence,
microvm,
nixos-nftables-firewall, nixos-nftables-firewall,
nixpkgs,
... ...
} @ inputs: { } @ inputs: {
# The name of the generated node # The name of the generated node

View file

@ -3,7 +3,6 @@ self: super: let
(self.lib) (self.lib)
escapeShellArg escapeShellArg
concatMapStrings concatMapStrings
flatten
flip flip
; ;

View file

@ -1,9 +1,9 @@
[ [
(import ./caddy.nix) (import ./caddy.nix)
(import ./oauth2-proxy) (import ./oauth2-proxy)
(self: super: { (_self: super: {
kanidm-secret-manipulator = super.callPackage ./kanidm-secret-manipulator.nix {}; kanidm-secret-manipulator = super.callPackage ./kanidm-secret-manipulator.nix {};
kanidm = super.kanidm.overrideAttrs (finalAttrs: previousAttrs: { kanidm = super.kanidm.overrideAttrs (_finalAttrs: _previousAttrs: {
patches = [ patches = [
(super.fetchpatch { (super.fetchpatch {
name = "group-list-json-output.patch"; name = "group-list-json-output.patch";

View file

@ -1,4 +1,4 @@
self: super: { _self: super: {
oauth2-proxy = super.oauth2-proxy.overrideAttrs (_: { oauth2-proxy = super.oauth2-proxy.overrideAttrs (_: {
patches = [./0001-scopes-as-groups.patch]; patches = [./0001-scopes-as-groups.patch];
}); });

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
imports = [ imports = [
./modules/uid.nix ./modules/uid.nix

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
imports = [ imports = [
./nushell.nix ./nushell.nix
./starship.nix ./starship.nix

View file

@ -1,8 +1,4 @@
{ {nixosConfig, ...}: {
lib,
nixosConfig,
...
}: {
programs.gpg = { programs.gpg = {
enable = true; enable = true;
scdaemonSettings.disable-ccid = true; scdaemonSettings.disable-ccid = true;

View file

@ -1,14 +1,10 @@
{ {pkgs, ...}: {
config,
pkgs,
...
}: {
home.sessionVariables = { home.sessionVariables = {
TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo"; TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo";
}; };
programs.kitty = { programs.kitty = {
enable = true; enable = true;
package = pkgs.kitty.overrideAttrs (finalAttrs: prevAttrs: { package = pkgs.kitty.overrideAttrs (_finalAttrs: _prevAttrs: {
doCheck = false; doCheck = false;
}); });
font = { font = {

View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {
home.file.".ssh/yubikey.pub".text = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Uq+CDy5Pmt3If5M6d8K/Q7HArU6sZ7sgoj3T521Wm"; home.file.".ssh/yubikey.pub".text = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Uq+CDy5Pmt3If5M6d8K/Q7HArU6sZ7sgoj3T521Wm";
programs.ssh = { programs.ssh = {
enable = true; enable = true;