From 6055c9e63a3feeb60ae2c0da5ab067f352d86b0c Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Thu, 4 Jul 2024 14:17:24 -0600 Subject: [PATCH] cleanup: dead-nix --- flake.nix | 6 +++--- hosts/workstation/configuration.nix | 2 +- modules/scripts/base.nix | 2 +- modules/servers/postgres.nix | 2 +- overlay.nix | 4 ++-- pkgs/shiori/shiori.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 95095e1..fcd3571 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ modules = [ ./hosts/workstation/configuration.nix sops-nix.nixosModules.sops - ({ pkgs, ... }: { nixpkgs.overlays = overlays; }) + ({ ... }: { nixpkgs.overlays = overlays; }) ]; }; miniserver = lib.nixosSystem { @@ -52,7 +52,7 @@ modules = [ ./hosts/miniserver/configuration.nix sops-nix.nixosModules.sops - ({ pkgs, ... }: { nixpkgs.overlays = overlays; }) + ({ ... }: { nixpkgs.overlays = overlays; }) ]; }; server = lib.nixosSystem { @@ -61,7 +61,7 @@ modules = [ ./hosts/server/configuration.nix sops-nix.nixosModules.sops - ({ pkgs, ... }: { nixpkgs.overlays = overlays; }) + ({ ... }: { nixpkgs.overlays = overlays; }) ]; }; }; diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 404ac82..a23dec3 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, ... }: { imports = [ ./hardware-configuration.nix ../../base.nix diff --git a/modules/scripts/base.nix b/modules/scripts/base.nix index 7f893c4..ea44f4b 100644 --- a/modules/scripts/base.nix +++ b/modules/scripts/base.nix @@ -29,7 +29,7 @@ }; config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) { - users.users.jawz.packages = lib.flatten (lib.mapAttrsToList (name: script: + users.users.jawz.packages = lib.flatten (lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package) config.my.scripts); diff --git a/modules/servers/postgres.nix b/modules/servers/postgres.nix index dae9e70..3d012dc 100644 --- a/modules/servers/postgres.nix +++ b/modules/servers/postgres.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let upgrade-pg-cluster = - let newPostgres = pkgs.postgresql_16.withPackages (pp: [ ]); + let newPostgres = pkgs.postgresql_16.withPackages (_pp: [ ]); in pkgs.writeScriptBin "upgrade-pg-cluster" '' set -eux systemctl stop postgresql diff --git a/overlay.nix b/overlay.nix index 88dd2fc..76a3367 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,6 +1,6 @@ { pkgs, pkgsU, pkgsM, pkgsJ }: -self: super: { - gnome = super.gnome.overrideScope (gFinal: gPrev: { +_self: super: { + gnome = super.gnome.overrideScope (_gFinal: gPrev: { nautilus = gPrev.nautilus.overrideAttrs (nsuper: { buildInputs = nsuper.buildInputs ++ (with pkgs.gst_all_1; [ gst-libav diff --git a/pkgs/shiori/shiori.nix b/pkgs/shiori/shiori.nix index bd6a222..a6ec72d 100644 --- a/pkgs/shiori/shiori.nix +++ b/pkgs/shiori/shiori.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "shiori";