lint checks, formatting, update statix url

This commit is contained in:
Vinzenz Schroeter 2025-09-15 19:40:49 +02:00
parent 1735ec5594
commit 6754eed1d8
7 changed files with 36 additions and 43 deletions

View file

@ -120,7 +120,7 @@
additional-modules = [ self.nixosModules.podman ]; additional-modules = [ self.nixosModules.podman ];
}; };
}; };
lib = nixpkgs.lib; inherit (nixpkgs) lib;
forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices; forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices;
supported-systems = lib.attrsets.mapAttrsToList (k: v: v.system) devices; supported-systems = lib.attrsets.mapAttrsToList (k: v: v.system) devices;
forAllSystems = forAllSystems =
@ -143,6 +143,36 @@
) (builtins.readDir dir)); ) (builtins.readDir dir));
}; };
overlays = {
unstable-packages = final: prev: {
unstable = import nixpkgs-unstable {
inherit (prev) system config;
};
};
};
nixosModules = (self.lib.importDir ./nixosModules) // {
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
};
pkgs-unstable = {
nixpkgs.overlays = [ self.overlays.unstable-packages ];
};
pkgs-vscode-extensions = {
nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
};
# required modules to use other modules, should not do anything on their own
default = {
imports = [ self.nixosModules.allowed-unfree-list ];
};
};
homeModules = self.lib.importDir ./homeModules;
homeConfigurations = self.lib.importDir ./homeConfigurations;
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
nixosConfigurations = forDevice ( nixosConfigurations = forDevice (
{ {
device, device,
@ -153,8 +183,6 @@
let let
specialArgs = { specialArgs = {
inherit device; inherit device;
vinzenzHomeModules = self.homeModules;
vinzenzLib = self.lib;
}; };
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
@ -178,7 +206,6 @@
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
"repl-flake"
]; ];
documentation = { documentation = {
@ -242,36 +269,5 @@
++ additional-modules; ++ additional-modules;
} }
); );
overlays = {
unstable-packages = final: prev: {
unstable = import nixpkgs-unstable {
system = prev.system;
config = prev.config;
};
};
};
nixosModules = (self.lib.importDir ./nixosModules) // {
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
};
pkgs-unstable = {
nixpkgs.overlays = [ self.overlays.unstable-packages ];
};
pkgs-vscode-extensions = {
nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
};
# required modules to use other modules, should not do anything on their own
default = {
imports = [ self.nixosModules.allowed-unfree-list ];
};
};
homeModules = self.lib.importDir ./homeModules;
homeConfigurations = self.lib.importDir ./homeConfigurations;
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
}; };
} }

View file

@ -1,4 +1,3 @@
{ ... }:
{ {
config.editorconfig = { config.editorconfig = {
enable = true; enable = true;

View file

@ -1,4 +1,3 @@
{ ... }:
{ {
config.programs.git = { config.programs.git = {
enable = true; enable = true;

View file

@ -1,4 +1,3 @@
{ ... }:
{ {
config.programs.ssh = { config.programs.ssh = {
enable = true; enable = true;

View file

@ -20,7 +20,7 @@
my-direnvallow = "echo \"use nix\" > .envrc && direnv allow"; my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
my-ip4 = "ip addr show | grep 192"; my-ip4 = "ip addr show | grep 192";
deadnix = "nix run github:astro/deadnix -- "; deadnix = "nix run github:astro/deadnix -- ";
statix = "nix run git+https://git.peppe.rs/languages/statix -- "; statix = "nix run github:oppiliappan/statix -- ";
}; };
history = { history = {

View file

@ -72,7 +72,7 @@ in
addSSL = true; addSSL = true;
enableACME = true; enableACME = true;
locations."/" = { locations."/" = {
proxyPass = ("http://unix:" + anubis-domain-socket); proxyPass = "http://unix:" + anubis-domain-socket;
}; };
}; };
@ -80,7 +80,7 @@ in
root = pkgs.zerforschen-plus-content; root = pkgs.zerforschen-plus-content;
listen = [ listen = [
{ {
addr = ("unix:" + blog-domain-socket); addr = "unix:" + blog-domain-socket;
} }
]; ];
}; };

View file

@ -29,7 +29,7 @@ in
"vinzenz-lpt2" = { "vinzenz-lpt2" = {
locations."/" = { locations."/" = {
proxyPass = ("http://unix:" + anubis-domain-socket); proxyPass = "http://unix:" + anubis-domain-socket;
}; };
}; };
@ -37,7 +37,7 @@ in
root = pkgs.zerforschen-plus-content; root = pkgs.zerforschen-plus-content;
listen = [ listen = [
{ {
addr = ("unix:" + blog-domain-socket); addr = "unix:" + blog-domain-socket;
} }
]; ];
}; };