From 6754eed1d88b19216575bdb8c8d8c2d388fd973a Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 15 Sep 2025 19:40:49 +0200
Subject: [PATCH] lint checks, formatting, update statix url

---
 flake.nix                                   | 66 ++++++++++-----------
 homeConfigurations/vinzenz/editorconfig.nix |  1 -
 homeConfigurations/vinzenz/git.nix          |  1 -
 homeConfigurations/vinzenz/ssh.nix          |  1 -
 homeConfigurations/vinzenz/zsh.nix          |  2 +-
 nixosConfigurations/hetzner-vpn2/nginx.nix  |  4 +-
 nixosConfigurations/vinzenz-lpt2/nginx.nix  |  4 +-
 7 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0096a20..4d7ec50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,7 +120,7 @@
           additional-modules = [ self.nixosModules.podman ];
         };
       };
-      lib = nixpkgs.lib;
+      inherit (nixpkgs) lib;
       forDevice = f: lib.mapAttrs (device: value: f (value // { inherit device; })) devices;
       supported-systems = lib.attrsets.mapAttrsToList (k: v: v.system) devices;
       forAllSystems =
@@ -143,6 +143,36 @@
           ) (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 (
         {
           device,
@@ -153,8 +183,6 @@
         let
           specialArgs = {
             inherit device;
-            vinzenzHomeModules = self.homeModules;
-            vinzenzLib = self.lib;
           };
         in
         nixpkgs.lib.nixosSystem {
@@ -178,7 +206,6 @@
               nix.settings.experimental-features = [
                 "nix-command"
                 "flakes"
-                "repl-flake"
               ];
 
               documentation = {
@@ -242,36 +269,5 @@
           ++ 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);
     };
 }
diff --git a/homeConfigurations/vinzenz/editorconfig.nix b/homeConfigurations/vinzenz/editorconfig.nix
index 496c714..1ebffa8 100644
--- a/homeConfigurations/vinzenz/editorconfig.nix
+++ b/homeConfigurations/vinzenz/editorconfig.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   config.editorconfig = {
     enable = true;
diff --git a/homeConfigurations/vinzenz/git.nix b/homeConfigurations/vinzenz/git.nix
index ddaa890..537fe61 100644
--- a/homeConfigurations/vinzenz/git.nix
+++ b/homeConfigurations/vinzenz/git.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   config.programs.git = {
     enable = true;
diff --git a/homeConfigurations/vinzenz/ssh.nix b/homeConfigurations/vinzenz/ssh.nix
index 98acce9..20b4bae 100644
--- a/homeConfigurations/vinzenz/ssh.nix
+++ b/homeConfigurations/vinzenz/ssh.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   config.programs.ssh = {
     enable = true;
diff --git a/homeConfigurations/vinzenz/zsh.nix b/homeConfigurations/vinzenz/zsh.nix
index d7cbcfa..1278aca 100644
--- a/homeConfigurations/vinzenz/zsh.nix
+++ b/homeConfigurations/vinzenz/zsh.nix
@@ -20,7 +20,7 @@
       my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
       my-ip4 = "ip addr show | grep 192";
       deadnix = "nix run github:astro/deadnix -- ";
-      statix = "nix run git+https://git.peppe.rs/languages/statix -- ";
+      statix = "nix run github:oppiliappan/statix -- ";
     };
 
     history = {
diff --git a/nixosConfigurations/hetzner-vpn2/nginx.nix b/nixosConfigurations/hetzner-vpn2/nginx.nix
index 85207bc..2520533 100644
--- a/nixosConfigurations/hetzner-vpn2/nginx.nix
+++ b/nixosConfigurations/hetzner-vpn2/nginx.nix
@@ -72,7 +72,7 @@ in
             addSSL = true;
             enableACME = true;
             locations."/" = {
-              proxyPass = ("http://unix:" + anubis-domain-socket);
+              proxyPass = "http://unix:" + anubis-domain-socket;
             };
           };
 
@@ -80,7 +80,7 @@ in
             root = pkgs.zerforschen-plus-content;
             listen = [
               {
-                addr = ("unix:" + blog-domain-socket);
+                addr = "unix:" + blog-domain-socket;
               }
             ];
           };
diff --git a/nixosConfigurations/vinzenz-lpt2/nginx.nix b/nixosConfigurations/vinzenz-lpt2/nginx.nix
index fef3dec..d5fd6a4 100644
--- a/nixosConfigurations/vinzenz-lpt2/nginx.nix
+++ b/nixosConfigurations/vinzenz-lpt2/nginx.nix
@@ -29,7 +29,7 @@ in
 
         "vinzenz-lpt2" = {
           locations."/" = {
-            proxyPass = ("http://unix:" + anubis-domain-socket);
+            proxyPass = "http://unix:" + anubis-domain-socket;
           };
         };
 
@@ -37,7 +37,7 @@ in
           root = pkgs.zerforschen-plus-content;
           listen = [
             {
-              addr = ("unix:" + blog-domain-socket);
+              addr = "unix:" + blog-domain-socket;
             }
           ];
         };