From 079ecd0d0cc4d5ddd77e966842f77decd61c98f8 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 21 Dec 2023 01:38:32 -0500 Subject: [PATCH] argument cleanup --- hosts/hp/default.nix | 2 +- hosts/levi/default.nix | 2 +- hosts/testbox/default.nix | 2 +- modules/baseline.nix | 2 +- modules/cli/kubernetes.nix | 2 +- modules/cli/powerline.nix | 2 +- modules/desktop/chromium.nix | 2 +- modules/desktop/kitty.nix | 2 +- modules/new-lg4ff/default.nix | 2 +- modules/new-lg4ff/pkg.nix | 2 +- modules/sean.nix | 2 +- pkgs/ftb.nix | 6 +----- 12 files changed, 12 insertions(+), 16 deletions(-) diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix index 23bb8ce..ecb5935 100644 --- a/hosts/hp/default.nix +++ b/hosts/hp/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: let persist = "/nix/persist"; in diff --git a/hosts/levi/default.nix b/hosts/levi/default.nix index bae8147..ab31093 100644 --- a/hosts/levi/default.nix +++ b/hosts/levi/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let persist = "/nix/persist"; in diff --git a/hosts/testbox/default.nix b/hosts/testbox/default.nix index 5c82126..69d8a1b 100644 --- a/hosts/testbox/default.nix +++ b/hosts/testbox/default.nix @@ -1,4 +1,4 @@ -{ config, lib, modulesPath, pkgs, ... }: +{ modulesPath, ... }: { sconfig.gnome = true; sconfig.desktop.enable = true; diff --git a/modules/baseline.nix b/modules/baseline.nix index 18c2228..a9c03ef 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { time.timeZone = "America/New_York"; diff --git a/modules/cli/kubernetes.nix b/modules/cli/kubernetes.nix index e9c94de..954e321 100644 --- a/modules/cli/kubernetes.nix +++ b/modules/cli/kubernetes.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, ... }: { programs.bash.interactiveShellInit = '' source <(kubectl completion bash) diff --git a/modules/cli/powerline.nix b/modules/cli/powerline.nix index c38935e..381734b 100644 --- a/modules/cli/powerline.nix +++ b/modules/cli/powerline.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: let left_hard_divider = builtins.fromJSON '' "\uE0B0" ''; upper_left_triangle = builtins.fromJSON '' "\uE0BC" ''; diff --git a/modules/desktop/chromium.nix b/modules/desktop/chromium.nix index 3bd15e8..cba151c 100644 --- a/modules/desktop/chromium.nix +++ b/modules/desktop/chromium.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: { config = lib.mkIf (config.sconfig.desktop.enable) { nixpkgs.config.chromium.commandLineArgs = toString [ diff --git a/modules/desktop/kitty.nix b/modules/desktop/kitty.nix index e5b9a1f..8a1f2be 100644 --- a/modules/desktop/kitty.nix +++ b/modules/desktop/kitty.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = [ pkgs.kitty ]; environment.etc."xdg/kitty/kitty.conf".text = '' diff --git a/modules/new-lg4ff/default.nix b/modules/new-lg4ff/default.nix index ec775cd..2700651 100644 --- a/modules/new-lg4ff/default.nix +++ b/modules/new-lg4ff/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.sconfig.new-lg4ff; in diff --git a/modules/new-lg4ff/pkg.nix b/modules/new-lg4ff/pkg.nix index a7d3561..c744f8c 100644 --- a/modules/new-lg4ff/pkg.nix +++ b/modules/new-lg4ff/pkg.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, kmod }: +{ stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation { name = "new-lg4ff-${kernel.version}"; diff --git a/modules/sean.nix b/modules/sean.nix index b4ea7b3..c190ce0 100644 --- a/modules/sean.nix +++ b/modules/sean.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { users.users.sean = { uid = 2000; diff --git a/pkgs/ftb.nix b/pkgs/ftb.nix index f54ce0d..1fc72d1 100644 --- a/pkgs/ftb.nix +++ b/pkgs/ftb.nix @@ -1,11 +1,7 @@ # https://feed-the-beast.com/ -{ stdenv -, autoPatchelfHook -, fetchurl +{ fetchurl , jre -, bash -, makeWrapper , writeShellScriptBin , buildFHSUserEnv }: