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

View File

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

View File

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ lib, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{ config, pkgs, home-manager, ... }: {
{ config, pkgs, ... }: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix

View File

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ config, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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