🚨 statix/deadnix fixes

This commit is contained in:
James Walker 2022-12-27 10:10:53 -05:00
parent 6abad2d5a6
commit 1dd6bb52a0
Signed by: walkah
GPG Key ID: 3C127179D6086E93
36 changed files with 43 additions and 48 deletions

View File

@ -39,31 +39,28 @@
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, nixos-hardware
, deploy-rs , deploy-rs
, darwin , darwin
, flake-utils , flake-utils
, home-manager , home-manager
, sops-nix
, devenv , devenv
, dotfiles
, workon , workon
, ... , ...
}@inputs: }@inputs:
let let
overlays = [ overlays = [
(self: super: { (self: _super: {
workon = workon.packages.${self.system}.default; workon = workon.packages.${self.system}.default;
devenv = devenv.packages.${self.system}.devenv; inherit (devenv.packages.${self.system}) devenv;
}) })
]; ];
mkSystem = hostName: system: modules: mkSystem = hostName: system: modules:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
system = system; inherit system;
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
({ config, ... }: { (_: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
}) })
@ -72,10 +69,10 @@
}; };
mkDarwin = hostName: system: modules: mkDarwin = hostName: system: modules:
darwin.lib.darwinSystem { darwin.lib.darwinSystem {
system = system; inherit system;
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
({ config, ... }: { (_: {
networking.hostName = hostName; networking.hostName = hostName;
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
}) })
@ -103,7 +100,9 @@
languages.nix.enable = true; languages.nix.enable = true;
pre-commit.hooks = { pre-commit.hooks = {
deadnix.enable = true;
nixpkgs-fmt.enable = true; nixpkgs-fmt.enable = true;
statix.enable = true;
}; };
} }
]; ];

View File

@ -1,4 +1,4 @@
{ config, pkgs, nixos-hardware, ... }: { pkgs, nixos-hardware, ... }:
{ {
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 = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

View File

@ -27,8 +27,8 @@
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
haskellPackages = pkgs.haskellPackages.override { haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: { overrides = _self: super: {
niv = pkgs.haskell.lib.overrideCabal super.niv (drv: { niv = pkgs.haskell.lib.overrideCabal super.niv (_drv: {
enableSeparateBinOutput = false; enableSeparateBinOutput = false;
}); });
}; };

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
homebrew = { homebrew = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, dotfiles, ... }: { config, pkgs, dotfiles, ... }:
{ {
imports = [ imports = [
./homebrew.nix ./homebrew.nix

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
homebrew = { homebrew = {

View File

@ -1,4 +1,4 @@
{ config, pkgs, home-manager, ... }: { { config, pkgs, ... }: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.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, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { _: {
nix = { nix = {
configureBuildUsers = true; configureBuildUsers = true;

View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inetutils inetutils
vim vim

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = [{ nix.buildMachines = [{

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ code-server ]; environment.systemPackages = with pkgs; [ code-server ];

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, ... }:
with lib; with lib;
let cfg = config.walkah.coredns; let cfg = config.walkah.coredns;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { { pkgs, config, ... }: {
systemd.services.drone-runner-docker = { systemd.services.drone-runner-docker = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {

View File

@ -1,7 +1,4 @@
{ pkgs, config, lib, ... }: { pkgs, config, ... }:
let
droneserver = config.users.users.droneserver.name;
in
{ {
nix.settings.allowed-users = [ "drone-runner-exec" ]; nix.settings.allowed-users = [ "drone-runner-exec" ];
systemd.services.drone-runner-exec = { systemd.services.drone-runner-exec = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, ... }:
let cfg = config.services.gitea; let cfg = config.services.gitea;
in in

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, ... }:
{ {
imports = [ imports = [

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ ipfs-migrator ]; environment.systemPackages = with pkgs; [ ipfs-migrator ];

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
let let
peers = [ peers = [

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
{ {
services = { services = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { _: {
services.minecraft-server = { services.minecraft-server = {
enable = true; enable = true;

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
let let
dest_ip = "100.111.208.75"; dest_ip = "100.111.208.75";
in in

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services = { services = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: _:
{ {
services.nginx = { services.nginx = {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, ... }:
{ {
services.traefik = { services.traefik = {

View File

@ -1 +1 @@
self: super: { } _self: _super: { }

View File

@ -3,7 +3,6 @@
with lib; with lib;
let let
cfg = config.services.ipfs-cluster; cfg = config.services.ipfs-cluster;
opt = options.services.ipfs-cluster;
# secret is by envvar, not flag # secret is by envvar, not flag
initFlags = toString [ initFlags = toString [

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { ... }:
{ {
imports = [ ./walkah.nix ]; imports = [ ./walkah.nix ];

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, dotfiles, ... }: { pkgs, dotfiles, ... }:
{ {
users.users.walkah = { users.users.walkah = {