From 415903451f90a69b1cf9a0875e94bfdf2d6832f7 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 28 Oct 2024 00:17:05 +0100 Subject: [PATCH] remove all unecessary imports for cleaner code :) --- home-manager/desktop/package-configs/firefox.nix | 6 +----- home-manager/desktop/package-configs/foot/default.nix | 7 +------ home-manager/desktop/package-configs/konsole/default.nix | 7 +------ home-manager/hosts/EDI/default.nix | 9 +-------- home-manager/hosts/EDI/lillian.nix | 9 +-------- home-manager/hosts/GLaDOS/default.nix | 9 +-------- home-manager/hosts/GLaDOS/lillian.nix | 9 +-------- home-manager/hosts/iso/default.nix | 9 +-------- home-manager/hosts/iso/lillian.nix | 9 +-------- home-manager/hosts/iso_server/default.nix | 9 +-------- home-manager/hosts/iso_server/lillian.nix | 9 +-------- home-manager/hosts/queen/default.nix | 9 +-------- home-manager/hosts/queen/lillian.nix | 9 +-------- home-manager/hosts/shodan/default.nix | 9 +-------- home-manager/hosts/shodan/lillian.nix | 9 +-------- home-manager/hosts/wheatley/default.nix | 9 +-------- home-manager/hosts/wheatley/lillian.nix | 9 +-------- home-manager/shared/default.nix | 9 +-------- home-manager/shared/shell/bat.nix | 6 +----- home-manager/shared/shell/eza.nix | 2 +- home-manager/shared/shell/helix/default.nix | 7 +------ home-manager/shared/shell/hyfetch.nix | 7 +------ home-manager/shared/shell/zellij/default.nix | 1 - home-manager/shared/shell/zsh.nix | 9 +-------- nixos/board/package-configs/pi-hole/default.nix | 9 +-------- nixos/desktop/default.nix | 1 - nixos/desktop/package-configs/default.nix | 9 +-------- nixos/hosts/EDI/configuration.nix | 1 - nixos/hosts/EDI/hardware-configuration.nix | 1 - nixos/hosts/GLaDOS/configuration.nix | 2 -- nixos/hosts/GLaDOS/hardware-configuration.nix | 1 - nixos/hosts/iso/configuration.nix | 2 -- nixos/hosts/iso_server/configuration.nix | 2 -- nixos/hosts/queen/configuration.nix | 2 -- nixos/hosts/queen/hardware-configuration.nix | 2 -- nixos/hosts/shodan/auto-mount.nix | 9 +-------- nixos/hosts/shodan/configuration.nix | 1 - nixos/hosts/shodan/hardware-configuration.nix | 1 - nixos/hosts/wheatley/armv7l.nix | 6 +----- nixos/hosts/wheatley/hardware-configuration.nix | 2 -- nixos/server/default.nix | 9 +-------- nixos/server/package-configs/akkoma/default.nix | 3 --- nixos/server/package-configs/aria2/container.nix | 6 +----- nixos/server/package-configs/aria2/default.nix | 8 +------- nixos/server/package-configs/cinny/default.nix | 8 +------- nixos/server/package-configs/conduit/default.nix | 1 - nixos/server/package-configs/coturn/default.nix | 6 +----- nixos/server/package-configs/dashboard/default.nix | 9 +-------- .../server/package-configs/dashboard/grafana/default.nix | 6 +----- nixos/server/package-configs/dashboard/loki/default.nix | 6 +----- .../package-configs/dashboard/prometheus/default.nix | 6 +----- .../package-configs/dashboard/telegraf/default.nix | 9 +-------- nixos/server/package-configs/default.nix | 9 +-------- nixos/server/package-configs/forgejo/default.nix | 9 +-------- nixos/server/package-configs/gotosocial/default.nix | 9 +-------- nixos/server/package-configs/jellyfin/default.nix | 9 +-------- nixos/server/package-configs/mail-server/default.nix | 9 +-------- nixos/server/package-configs/ombi/default.nix | 6 +----- nixos/server/package-configs/phanpy/default.nix | 8 +------- nixos/server/package-configs/postgres/default.nix | 6 +----- nixos/server/package-configs/roundcube/default.nix | 1 - nixos/shared/default.nix | 2 -- nixos/shared/locale/default.nix | 9 +-------- nixos/shared/packages/default.nix | 3 --- pkgs/auto-mount/default.nix | 5 ----- pkgs/dvd/default.nix | 2 -- pkgs/dvt/default.nix | 2 -- pkgs/install-nix-no-inhibit/default.nix | 2 -- pkgs/install-nix/default.nix | 6 +----- pkgs/rebuild-no-inhibit/default.nix | 6 +----- pkgs/rebuild/default.nix | 6 +----- pkgs/restart/default.nix | 6 +----- pkgs/update/default.nix | 6 +----- pkgs/upgrade/default.nix | 6 +----- 74 files changed, 52 insertions(+), 390 deletions(-) diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index 43f4854..16ad709 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index 464925f..f1839dc 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { programs.foot = { enable = true; catppuccin.enable = true; diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix index a704737..e8d5f29 100644 --- a/home-manager/desktop/package-configs/konsole/default.nix +++ b/home-manager/desktop/package-configs/konsole/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - inputs, - ... -}: { +{...}: { home.file = { "profile" = { source = ./Catppuccin.profile; diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/EDI/default.nix +++ b/home-manager/hosts/EDI/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index ce503f7..0841ff3 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso/default.nix +++ b/home-manager/hosts/iso/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 351470d..f0cd853 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/iso_server/default.nix +++ b/home-manager/hosts/iso_server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 9acd9c2..278806e 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/queen/default.nix +++ b/home-manager/hosts/queen/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 680ef4e..5acc4b0 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/shodan/default.nix +++ b/home-manager/hosts/shodan/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 232f5d7..52f1d3d 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix index c17b81a..2600642 100644 --- a/home-manager/hosts/wheatley/default.nix +++ b/home-manager/hosts/wheatley/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index c3778c3..afb1b42 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -1,13 +1,6 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index f21747d..07f7fde 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = [ ./shell/helix ./shell/zellij diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 21acc30..2afdce3 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: { +{pkgs, ...}: { programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix index b0c72f2..df2968b 100644 --- a/home-manager/shared/shell/eza.nix +++ b/home-manager/shared/shell/eza.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{...}: { programs.eza = { enable = true; enableZshIntegration = true; diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index a50bfd2..bba04a9 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: let +{pkgs, ...}: let yazi = pkgs.writeText "open_in_helix_from_yazi.zsh" '' diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 0945e59..774a3d7 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { programs.hyfetch = { enable = true; settings = { diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 1565979..6e154ec 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -1,5 +1,4 @@ { - lib, pkgs, inputs, ... diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index a3108ff..3c814c1 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { programs.zoxide = { enable = true; }; diff --git a/nixos/board/package-configs/pi-hole/default.nix b/nixos/board/package-configs/pi-hole/default.nix index 7ce2716..0596d3b 100644 --- a/nixos/board/package-configs/pi-hole/default.nix +++ b/nixos/board/package-configs/pi-hole/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { services.pihole = { enable = true; hostConfig = { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index d5e185f..44e3892 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -1,7 +1,6 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { - inputs, outputs, lib, config, diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index 95564cd..372d666 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./firefox ]; diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index 78ee9f7..a71f2fb 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -4,7 +4,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 081b9c8..40ca9e0 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index 5128343..f4e7041 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -3,8 +3,6 @@ { inputs, outputs, - lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index c4ee5ec..7c7fcbd 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index becff32..1c45890 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix index a38c7d0..9f0cd35 100644 --- a/nixos/hosts/iso_server/configuration.nix +++ b/nixos/hosts/iso_server/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 9c9ba8b..8ba1916 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -2,9 +2,7 @@ inputs, outputs, lib, - config, pkgs, - nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix index 3357ba6..cf6fbc9 100644 --- a/nixos/hosts/queen/hardware-configuration.nix +++ b/nixos/hosts/queen/hardware-configuration.nix @@ -1,7 +1,5 @@ { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 1c4a376..2924824 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index f7e0c3e..6120091 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -2,7 +2,6 @@ inputs, outputs, lib, - config, pkgs, ... }: { diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index fdfefac..fb0baa3 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix index e6a9f37..d908a24 100644 --- a/nixos/hosts/wheatley/armv7l.nix +++ b/nixos/hosts/wheatley/armv7l.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { boot.kernelPatches = [ rec { name = "compat_uts_machine"; diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index f7ea389..efbc691 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -2,9 +2,7 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { - config, lib, - pkgs, modulesPath, ... }: { diff --git a/nixos/server/default.nix b/nixos/server/default.nix index 75e56d1..99a5736 100644 --- a/nixos/server/default.nix +++ b/nixos/server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # You can import other home-manager modules here imports = [ ./package-configs diff --git a/nixos/server/package-configs/akkoma/default.nix b/nixos/server/package-configs/akkoma/default.nix index bd68ba9..d0495bf 100644 --- a/nixos/server/package-configs/akkoma/default.nix +++ b/nixos/server/package-configs/akkoma/default.nix @@ -1,7 +1,4 @@ { - inputs, - outputs, - lib, config, pkgs, ... diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix index 6d2fc82..c76c97c 100644 --- a/nixos/server/package-configs/aria2/container.nix +++ b/nixos/server/package-configs/aria2/container.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index f2a075c..e7d15bd 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -1,10 +1,4 @@ -{ - inputs, - outputs, - config, - pkgs, - ... -}: { +{config, ...}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 6079856..63891b4 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 2ea9053..b9debce 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -2,7 +2,6 @@ config, pkgs, inputs, - lib, ... }: let # You'll need to edit these values diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 4539247..5bae63e 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."coturn-auth-secret".mode = "0440"; sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; users.users.nginx.extraGroups = ["turnserver"]; diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 6cb610e..7bbb7fc 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./grafana #./loki diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 5589873..2ea84c6 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{config, ...}: { # grafana configuration services.grafana = { enable = true; diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix index 6e68716..e83159b 100644 --- a/nixos/server/package-configs/dashboard/loki/default.nix +++ b/nixos/server/package-configs/dashboard/loki/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.loki = { enable = true; configFile = ./loki.yaml; diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix index 5ea9535..36710a1 100644 --- a/nixos/server/package-configs/dashboard/prometheus/default.nix +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { services.prometheus = { enable = true; port = 9001; diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 0c6e6ba..591e279 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - lib, - config, - pkgs, - user, - ... -}: { +{config, ...}: { sops.secrets."grafana-telegraf-key".mode = "0440"; sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; services.telegraf = { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 6384555..4dd970f 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { imports = [ ./conduit ./forgejo diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index da7b467..b4efc44 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { imports = []; #sops.secrets."mailpassunhash".mode = "0440"; diff --git a/nixos/server/package-configs/gotosocial/default.nix b/nixos/server/package-configs/gotosocial/default.nix index 9e3afdf..3740c15 100644 --- a/nixos/server/package-configs/gotosocial/default.nix +++ b/nixos/server/package-configs/gotosocial/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{pkgs, ...}: { users.users.gotosocial.extraGroups = ["virtualMail"]; services.nginx = { diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix index f61461e..cc492d4 100644 --- a/nixos/server/package-configs/jellyfin/default.nix +++ b/nixos/server/package-configs/jellyfin/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index e43a5c6..878be36 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{config, ...}: { sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index 7065ae5..c82156c 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{...}: { users.users = { ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix index 216412e..362f8f7 100644 --- a/nixos/server/package-configs/phanpy/default.nix +++ b/nixos/server/package-configs/phanpy/default.nix @@ -1,10 +1,4 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: { +{pkgs, ...}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/postgres/default.nix b/nixos/server/package-configs/postgres/default.nix index 92b9478..0a3e4f6 100644 --- a/nixos/server/package-configs/postgres/default.nix +++ b/nixos/server/package-configs/postgres/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_16; diff --git a/nixos/server/package-configs/roundcube/default.nix b/nixos/server/package-configs/roundcube/default.nix index d33c621..59ee43d 100644 --- a/nixos/server/package-configs/roundcube/default.nix +++ b/nixos/server/package-configs/roundcube/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: { # TODO: Figure out how to create packages for some plugins for roundcube! diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index a845b75..b664165 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -1,10 +1,8 @@ { inputs, - outputs, lib, config, pkgs, - pkgs-edge, ... }: { imports = [ diff --git a/nixos/shared/locale/default.nix b/nixos/shared/locale/default.nix index 2444204..ea9e4e8 100644 --- a/nixos/shared/locale/default.nix +++ b/nixos/shared/locale/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 6f28f40..b59dcc2 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -1,8 +1,5 @@ { - inputs, outputs, - lib, - config, pkgs, pkgs-edge, ... diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index 3a27c32..b7a8a26 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,10 +1,5 @@ { - lib, - stdenv, - system, pkgs, - util-linux, - jq, writeShellApplication, }: writeShellApplication diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 7c6f81f..0973487 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index eabc160..7a9424c 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index f9365fe..622170a 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,6 +1,4 @@ { - lib, - stdenv, git, gum, writeShellApplication, diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index bfcf17e..51bd530 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "install-nix"; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index 4503fcc..e4bd280 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild-no-inhibit"; diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 8b59258..8c61e66 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "rebuild"; diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index c3fe9c1..2405faa 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "restart"; diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index a965b8c..7f1b3e4 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "update"; diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index d72c480..7ab662b 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -1,8 +1,4 @@ -{ - lib, - stdenv, - writeShellApplication, -}: +{writeShellApplication}: writeShellApplication { name = "upgrade";