fix various linting errors throughout the repo
* replace `rec` attrs with let bindings * remove unused args
This commit is contained in:
parent
9ba71d5b62
commit
14edf3fd19
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, options, ... }:
|
{ config, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
inherit (builtins) readFile fetchurl;
|
inherit (builtins) readFile fetchurl;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, options, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
final: prev: {
|
let version = "1.6.0";
|
||||||
pcsx2 = prev.pcsx2.overrideAttrs (o: rec {
|
in final: prev: {
|
||||||
version = "1.6.0";
|
pcsx2 = prev.pcsx2.overrideAttrs (o: {
|
||||||
|
inherit version;
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
owner = "PCSX2";
|
owner = "PCSX2";
|
||||||
repo = "pcsx2";
|
repo = "pcsx2";
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
final: prev: {
|
let version = "1.8.9";
|
||||||
retroarchBare = prev.retroarchBare.overrideAttrs (o: rec {
|
in final: prev: {
|
||||||
version = "1.8.9";
|
retroarchBare = prev.retroarchBare.overrideAttrs (o: {
|
||||||
|
inherit version;
|
||||||
|
|
||||||
src = prev.fetchFromGitHub {
|
src = prev.fetchFromGitHub {
|
||||||
owner = "libretro";
|
owner = "libretro";
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
{ stdenv, fetchFromGitHub, ... }:
|
{ stdenv, fetchFromGitHub, ... }:
|
||||||
stdenv.mkDerivation rec {
|
let version = "0.1.5";
|
||||||
|
in stdenv.mkDerivation {
|
||||||
pname = "sddm-chili";
|
pname = "sddm-chili";
|
||||||
version = "0.1.5";
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MarianArlt";
|
owner = "MarianArlt";
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
{ stdenv, fetchzip }:
|
let version = "2.0.0";
|
||||||
|
in { stdenv, fetchzip }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "dejavu-nerdfont";
|
pname = "dejavu-nerdfont";
|
||||||
version = "2.0.0";
|
inherit version;
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url =
|
url =
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, meson, ninja, fetchFromGitHub, ... }:
|
{ stdenv, meson, ninja, fetchFromGitHub, ... }:
|
||||||
|
let version = "r50";
|
||||||
stdenv.mkDerivation rec {
|
in stdenv.mkDerivation {
|
||||||
pname = "libinih";
|
pname = "libinih";
|
||||||
version = "r50";
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "benhoyt";
|
owner = "benhoyt";
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
{ stdenv, appstream, meson, ninja, pkgsi686Linux, polkit, pkgconfig, systemd
|
let version = "1.5.1";
|
||||||
, dbus, libinih, fetchFromGitHub, ... }:
|
in { stdenv, meson, ninja, polkit, pkgconfig, systemd, dbus, libinih
|
||||||
|
, fetchFromGitHub, ... }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "gamemode";
|
pname = "gamemode";
|
||||||
version = "1.5.1";
|
inherit version;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FeralInteractive";
|
owner = "FeralInteractive";
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
|
{ stdenv, fetchFromGitHub }:
|
||||||
|
let version = "0e87bd8";
|
||||||
stdenv.mkDerivation rec {
|
in stdenv.mkDerivation {
|
||||||
pname = "pure";
|
pname = "pure";
|
||||||
version = "0e87bd8";
|
inherit version;
|
||||||
|
|
||||||
srcs = fetchFromGitHub {
|
srcs = fetchFromGitHub {
|
||||||
owner = "sindresorhus";
|
owner = "sindresorhus";
|
||||||
|
@ -37,7 +37,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
shellAliases =
|
shellAliases =
|
||||||
let ifSudo = string: lib.mkIf config.security.sudo.enable string;
|
let ifSudo = lib.mkIf config.security.sudo.enable;
|
||||||
in {
|
in {
|
||||||
# quick cd
|
# quick cd
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let inherit (builtins) readFile;
|
let inherit (builtins) readFile;
|
||||||
in {
|
in {
|
||||||
imports = [ ./sway ../develop ./xmonad ../networkmanager ../im ];
|
imports = [ ./sway ../develop ./xmonad ../networkmanager ../im ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ autostart, screenshots, touchtoggle, pkgs, stoggle, volnoti }:
|
{ autostart, screenshots, pkgs, stoggle, volnoti }:
|
||||||
let inherit (pkgs) alsaUtils;
|
let inherit (pkgs) alsaUtils;
|
||||||
in ''
|
in ''
|
||||||
-- Function for fullscreen toggle
|
-- Function for fullscreen toggle
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }: {
|
{ ... }: {
|
||||||
services.stubby = {
|
services.stubby = {
|
||||||
enable = true;
|
enable = true;
|
||||||
upstreamServers = ''
|
upstreamServers = ''
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dataDir = "/srv/postgres";
|
dataDir = "/srv/postgres";
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
libvirt = if prev.libvirt.version <= "5.4.0" && prev.ebtables.version
|
||||||
> "2.0.10-4" then
|
> "2.0.10-4" then
|
||||||
prev.libvirt.overrideAttrs
|
prev.libvirt.overrideAttrs
|
||||||
(oldAttrs: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
|
(o: { EBTABLES_PATH = "${final.ebtables}/bin/ebtables-legacy"; })
|
||||||
else
|
else
|
||||||
prev.libvirt;
|
prev.libvirt;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user