From a5ed8b213f90ac9fc6a916dad8de06d369380ad5 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 3 Sep 2022 17:11:00 +0200
Subject: [PATCH] treewide: apply statix fixes

---
 modules/default.nix         | 3 +--
 modules/home-manager.nix    | 2 +-
 modules/nixpkgs/options.nix | 4 ++--
 tests/proot-test.nix        | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index e5367bd..d1396a7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -16,8 +16,7 @@ let
   configModule =
     if config != null then config
     else if builtins.pathExists defaultConfigFile then defaultConfigFile
-    else if pkgs.config ? nix-on-droid then pkgs.config.nix-on-droid
-    else throw "No config file found! Create one in ~/.config/nixpkgs/nix-on-droid.nix";
+    else pkgs.config.nix-on-droid or (throw "No config file found! Create one in ~/.config/nixpkgs/nix-on-droid.nix");
 
   rawModule = evalModules {
     modules = [
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index de8b92c..d1836d7 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -128,7 +128,7 @@ in
     # Fortunately, it's not that hard to us to workaround with just a symlink.
     environment.etc = mkIf cfg.useUserPackages {
       "profiles/per-user/${config.user.userName}".source =
-        builtins.toPath "${config.user.home}/.nix-profile";
+        /. + "${config.user.home}/.nix-profile";
     };
 
   };
diff --git a/modules/nixpkgs/options.nix b/modules/nixpkgs/options.nix
index cffb9da..2f793ce 100644
--- a/modules/nixpkgs/options.nix
+++ b/modules/nixpkgs/options.nix
@@ -28,12 +28,12 @@ let
     optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:
         optCall lhs.packageOverrides pkgs //
-        optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs;
+        optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs;
     } //
     optionalAttrs (lhs ? perlPackageOverrides) {
       perlPackageOverrides = pkgs:
         optCall lhs.perlPackageOverrides pkgs //
-        optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs;
+        optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs;
     };
 
   configType = mkOptionType {
diff --git a/tests/proot-test.nix b/tests/proot-test.nix
index fdb855e..d2f9438 100644
--- a/tests/proot-test.nix
+++ b/tests/proot-test.nix
@@ -3,7 +3,7 @@
 { pkgs ? (import ../pkgs/lib/load-nixpkgs.nix { }) }:
 
 pkgs.callPackage ../pkgs/proot-termux {
-  stdenv = pkgs.stdenv;
+  inherit (pkgs) stdenv;
   static = false;
   outputBinaryName = "proot";
 }