diff --git a/flake.nix b/flake.nix index 82ad7c2..2fc52a9 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; } ]; diff --git a/hosts/aristotle/configuration.nix b/hosts/aristotle/configuration.nix index 4c0e1ff..2594ae7 100644 --- a/hosts/aristotle/configuration.nix +++ b/hosts/aristotle/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, nixos-hardware, ... }: +{ pkgs, nixos-hardware, ... }: { imports = [ diff --git a/hosts/aristotle/hardware-configuration.nix b/hosts/aristotle/hardware-configuration.nix index 3285e7b..5aef844 100644 --- a/hosts/aristotle/hardware-configuration.nix +++ b/hosts/aristotle/hardware-configuration.nix @@ -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") ]; diff --git a/hosts/epicurus/darwin-configuration.nix b/hosts/epicurus/darwin-configuration.nix index a217c0f..5f2ce7d 100644 --- a/hosts/epicurus/darwin-configuration.nix +++ b/hosts/epicurus/darwin-configuration.nix @@ -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; }); }; diff --git a/hosts/epicurus/homebrew.nix b/hosts/epicurus/homebrew.nix index 94dce06..fba6dc4 100644 --- a/hosts/epicurus/homebrew.nix +++ b/hosts/epicurus/homebrew.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { homebrew = { diff --git a/hosts/heraclitus/darwin-configuration.nix b/hosts/heraclitus/darwin-configuration.nix index 7768c00..26afee3 100644 --- a/hosts/heraclitus/darwin-configuration.nix +++ b/hosts/heraclitus/darwin-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, dotfiles, ... }: +{ config, pkgs, dotfiles, ... }: { imports = [ ./homebrew.nix diff --git a/hosts/heraclitus/homebrew.nix b/hosts/heraclitus/homebrew.nix index 04b352e..ec32387 100644 --- a/hosts/heraclitus/homebrew.nix +++ b/hosts/heraclitus/homebrew.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { homebrew = { diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index 351f95d..88fa842 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, home-manager, ... }: { +{ config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix diff --git a/hosts/plato/hardware-configuration.nix b/hosts/plato/hardware-configuration.nix index d89f32f..e117e67 100644 --- a/hosts/plato/hardware-configuration.nix +++ b/hosts/plato/hardware-configuration.nix @@ -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") ]; diff --git a/modules/base/darwin.nix b/modules/base/darwin.nix index 5f06299..8a6f597 100644 --- a/modules/base/darwin.nix +++ b/modules/base/darwin.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +_: { nix = { configureBuildUsers = true; diff --git a/modules/base/default.nix b/modules/base/default.nix index 52dd0ee..5da7218 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ inetutils vim diff --git a/modules/builder/default.nix b/modules/builder/default.nix index 6c74d61..9d99ae3 100644 --- a/modules/builder/default.nix +++ b/modules/builder/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { nix.distributedBuilds = true; nix.buildMachines = [{ diff --git a/modules/code-server/default.nix b/modules/code-server/default.nix index 65afa95..83cbc02 100644 --- a/modules/code-server/default.nix +++ b/modules/code-server/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ code-server ]; diff --git a/modules/code-server/nginx.nix b/modules/code-server/nginx.nix index 40a9ba8..a5860ca 100644 --- a/modules/code-server/nginx.nix +++ b/modules/code-server/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services.nginx = { diff --git a/modules/coredns/default.nix b/modules/coredns/default.nix index d9b0d79..a5b4229 100644 --- a/modules/coredns/default.nix +++ b/modules/coredns/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.walkah.coredns; diff --git a/modules/dev/default.nix b/modules/dev/default.nix index c6ef735..cb764f1 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ diff --git a/modules/drone/nginx.nix b/modules/drone/nginx.nix index 58f7f34..6253209 100644 --- a/modules/drone/nginx.nix +++ b/modules/drone/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services.nginx = { diff --git a/modules/drone/runner-docker.nix b/modules/drone/runner-docker.nix index 7ea0c81..6f9c35c 100644 --- a/modules/drone/runner-docker.nix +++ b/modules/drone/runner-docker.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, ... }: { systemd.services.drone-runner-docker = { wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/modules/drone/runner-exec.nix b/modules/drone/runner-exec.nix index 07f7672..c3d8aff 100644 --- a/modules/drone/runner-exec.nix +++ b/modules/drone/runner-exec.nix @@ -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 = { diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index aad170c..f06d926 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: let cfg = config.services.gitea; in diff --git a/modules/gitea/nginx.nix b/modules/gitea/nginx.nix index c7e9508..3129348 100644 --- a/modules/gitea/nginx.nix +++ b/modules/gitea/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services.nginx = { diff --git a/modules/home-assistant/nginx.nix b/modules/home-assistant/nginx.nix index 368f375..f3f7127 100644 --- a/modules/home-assistant/nginx.nix +++ b/modules/home-assistant/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services.nginx = { diff --git a/modules/ipfs/cluster.nix b/modules/ipfs/cluster.nix index 5635649..453c6bc 100644 --- a/modules/ipfs/cluster.nix +++ b/modules/ipfs/cluster.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { imports = [ diff --git a/modules/ipfs/default.nix b/modules/ipfs/default.nix index e161d95..654d7c3 100644 --- a/modules/ipfs/default.nix +++ b/modules/ipfs/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ ipfs-migrator ]; diff --git a/modules/ipfs/gateway.nix b/modules/ipfs/gateway.nix index 90f87bc..8c288b3 100644 --- a/modules/ipfs/gateway.nix +++ b/modules/ipfs/gateway.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let peers = [ diff --git a/modules/matrix/default.nix b/modules/matrix/default.nix index ed3a79d..4e054f9 100644 --- a/modules/matrix/default.nix +++ b/modules/matrix/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { services = { diff --git a/modules/matrix/nginx.nix b/modules/matrix/nginx.nix index d6a5b44..3ef5ec4 100644 --- a/modules/matrix/nginx.nix +++ b/modules/matrix/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { services.nginx = { diff --git a/modules/minecraft/default.nix b/modules/minecraft/default.nix index 9fe3fe3..9bbed34 100644 --- a/modules/minecraft/default.nix +++ b/modules/minecraft/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +_: { services.minecraft-server = { enable = true; diff --git a/modules/minecraft/proxy.nix b/modules/minecraft/proxy.nix index d4f221d..abbaa37 100644 --- a/modules/minecraft/proxy.nix +++ b/modules/minecraft/proxy.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let dest_ip = "100.111.208.75"; in diff --git a/modules/pleroma/default.nix b/modules/pleroma/default.nix index 84531cb..b6d24cb 100644 --- a/modules/pleroma/default.nix +++ b/modules/pleroma/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services = { diff --git a/modules/pleroma/nginx.nix b/modules/pleroma/nginx.nix index 73e6181..f02ad46 100644 --- a/modules/pleroma/nginx.nix +++ b/modules/pleroma/nginx.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +_: { services.nginx = { diff --git a/modules/traefik/default.nix b/modules/traefik/default.nix index 417ae26..0443b7d 100644 --- a/modules/traefik/default.nix +++ b/modules/traefik/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { services.traefik = { diff --git a/overlays/default.nix b/overlays/default.nix index ddb4f23..d66d809 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1 +1 @@ -self: super: { } +_self: _super: { } diff --git a/services/ipfs-cluster.nix b/services/ipfs-cluster.nix index 905041a..d09e196 100644 --- a/services/ipfs-cluster.nix +++ b/services/ipfs-cluster.nix @@ -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 [ diff --git a/users/default.nix b/users/default.nix index dd93d5a..7ba6e59 100644 --- a/users/default.nix +++ b/users/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { imports = [ ./walkah.nix ]; diff --git a/users/walkah.nix b/users/walkah.nix index c5c24fd..2bc52bf 100644 --- a/users/walkah.nix +++ b/users/walkah.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, dotfiles, ... }: +{ pkgs, dotfiles, ... }: { users.users.walkah = {