fix various linting errors throughout the repo

* replace `rec` attrs with let bindings
* remove unused args
This commit is contained in:
Timothy DeHerrera 2020-07-30 22:13:41 -06:00
parent 9ba71d5b62
commit 14edf3fd19
No known key found for this signature in database
GPG Key ID: 8985725DB5B0C122
15 changed files with 35 additions and 30 deletions

View File

@ -1,4 +1,4 @@
{ config, lib, options, ... }:
{ config, lib, ... }:
with lib;
let
inherit (builtins) readFile fetchurl;

View File

@ -1,4 +1,4 @@
{ config, lib, options, pkgs, ... }:
{ config, lib, pkgs, ... }:
with lib;

View File

@ -1,6 +1,7 @@
final: prev: {
pcsx2 = prev.pcsx2.overrideAttrs (o: rec {
version = "1.6.0";
let version = "1.6.0";
in final: prev: {
pcsx2 = prev.pcsx2.overrideAttrs (o: {
inherit version;
src = prev.fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";

View File

@ -1,6 +1,7 @@
final: prev: {
retroarchBare = prev.retroarchBare.overrideAttrs (o: rec {
version = "1.8.9";
let version = "1.8.9";
in final: prev: {
retroarchBare = prev.retroarchBare.overrideAttrs (o: {
inherit version;
src = prev.fetchFromGitHub {
owner = "libretro";

View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, ... }:
stdenv.mkDerivation rec {
let version = "0.1.5";
in stdenv.mkDerivation {
pname = "sddm-chili";
version = "0.1.5";
inherit version;
src = fetchFromGitHub {
owner = "MarianArlt";

View File

@ -1,8 +1,9 @@
{ stdenv, fetchzip }:
let version = "2.0.0";
in { stdenv, fetchzip }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "dejavu-nerdfont";
version = "2.0.0";
inherit version;
src = fetchzip {
url =

View File

@ -1,8 +1,8 @@
{ stdenv, meson, ninja, fetchFromGitHub, ... }:
stdenv.mkDerivation rec {
let version = "r50";
in stdenv.mkDerivation {
pname = "libinih";
version = "r50";
inherit version;
src = fetchFromGitHub {
owner = "benhoyt";

View File

@ -1,9 +1,10 @@
{ stdenv, appstream, meson, ninja, pkgsi686Linux, polkit, pkgconfig, systemd
, dbus, libinih, fetchFromGitHub, ... }:
let version = "1.5.1";
in { stdenv, meson, ninja, polkit, pkgconfig, systemd, dbus, libinih
, fetchFromGitHub, ... }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gamemode";
version = "1.5.1";
inherit version;
src = fetchFromGitHub {
owner = "FeralInteractive";

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
stdenv.mkDerivation rec {
{ stdenv, fetchFromGitHub }:
let version = "0e87bd8";
in stdenv.mkDerivation {
pname = "pure";
version = "0e87bd8";
inherit version;
srcs = fetchFromGitHub {
owner = "sindresorhus";

View File

@ -37,7 +37,7 @@ in {
'';
shellAliases =
let ifSudo = string: lib.mkIf config.security.sudo.enable string;
let ifSudo = lib.mkIf config.security.sudo.enable;
in {
# quick cd
".." = "cd ..";

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ pkgs, ... }:
let inherit (builtins) readFile;
in {
imports = [ ./sway ../develop ./xmonad ../networkmanager ../im ];

View File

@ -1,4 +1,4 @@
{ autostart, screenshots, touchtoggle, pkgs, stoggle, volnoti }:
{ autostart, screenshots, pkgs, stoggle, volnoti }:
let inherit (pkgs) alsaUtils;
in ''
-- Function for fullscreen toggle

View File

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{ ... }: {
services.stubby = {
enable = true;
upstreamServers = ''

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: {
{ pkgs, ... }: {
services.postgresql = {
enable = true;
dataDir = "/srv/postgres";

View File

@ -14,7 +14,7 @@
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
> "2.0.10-4" then
prev.libvirt.overrideAttrs
(oldAttrs: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
(o: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
else
prev.libvirt;
};