remove all unecessary imports for cleaner code :)

home-manager/desktop/package-configs/firefox.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [pkgs.firefoxpwa];

home-manager/desktop/package-configs/foot/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
   programs.foot = {
     enable = true;
     catppuccin.enable = true;

home-manager/desktop/package-configs/konsole/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
   home.file = {
     "profile" = {
       source = ./Catppuccin.profile;

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

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)
-{
+{pkgs, ...}: {
-  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):

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

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)
-{
+{pkgs, ...}: {
-  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):

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

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)
-{
+{pkgs, ...}: {
-  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):

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

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)
-{
+{pkgs, ...}: {
-  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):

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

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):

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

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)
-{
+{pkgs, ...}: {
-  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):

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

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):

home-manager/shared/default.nix

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./shell/helix
     ./shell/zellij
@@ -35,6 +28,7 @@
     lazygit
     navi
     yazi
+    nil
   ];
   programs.navi.enable = true;
 }

home-manager/shared/shell/bat.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  lib,
-  pkgs,
-  ...
-}: {
   programs.bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];

home-manager/shared/shell/eza.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   programs.eza = {
     enable = true;
     enableZshIntegration = true;

home-manager/shared/shell/helix/default.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: let
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
   yazi =
     pkgs.writeText "open_in_helix_from_yazi.zsh"
     ''
@@ -32,9 +27,10 @@
       }
 
       send_to_jupyter() {
-        is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25
+        is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17
         pwd >> /tmp/rjh
         zellij action write 29 25
+        zellij action write 17
         cat | just send
       }
       send_to_jupyter

home-manager/shared/shell/hyfetch.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   programs.hyfetch = {
     enable = true;
     settings = {

home-manager/shared/shell/zellij/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   inputs,
   ...

home-manager/shared/shell/zsh.nix

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   programs.zoxide = {
     enable = true;
   };

justfile

@@ -9,3 +9,7 @@ test:
 
 update:
     nix flake update
+
+clean:
+    sudo nix-collect-garbage
+    sudo nix-store --optimise

nixos/board/package-configs/pi-hole/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   services.pihole = {
     enable = true;
     hostConfig = {

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,
@@ -61,7 +60,7 @@
       tpm2-tss
       virtualgl
       vulkan-tools
-      waydroid
+      # waydroid
       waypipe
       wayland-utils
       xwaylandvideobridge

nixos/desktop/package-configs/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./firefox
   ];

nixos/hosts/EDI/configuration.nix

@@ -4,7 +4,6 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
   ...
 }: {

nixos/hosts/EDI/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/GLaDOS/configuration.nix

@@ -3,8 +3,6 @@
 {
   inputs,
   outputs,
-  lib,
-  config,
   pkgs,
   ...
 }: {
@@ -84,7 +82,7 @@
     };
   };
 
-  virtualisation.waydroid.enable = true;
+  # virtualisation.waydroid.enable = false;
   networking.hostName = "GLaDOS";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

nixos/hosts/GLaDOS/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/iso/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [

nixos/hosts/iso_server/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [

nixos/hosts/queen/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [

nixos/hosts/queen/hardware-configuration.nix

@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/shodan/auto-mount.nix

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  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"

nixos/hosts/shodan/configuration.nix

@@ -2,7 +2,6 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
   ...
 }: {

nixos/hosts/shodan/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/wheatley/armv7l.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   boot.kernelPatches = [
     rec {
       name = "compat_uts_machine";

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,
   ...
 }: {

nixos/server/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   # You can import other home-manager modules here
   imports = [
     ./package-configs

nixos/server/package-configs/akkoma/default.nix

@@ -1,7 +1,4 @@
 {
-  inputs,
-  outputs,
-  lib,
   config,
   pkgs,
   ...

nixos/server/package-configs/aria2/container.nix

@@ -1,8 +1,4 @@
-{
+{config, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;

nixos/server/package-configs/aria2/default.nix

@@ -1,10 +1,4 @@
-{
+{config, ...}: {
-  inputs,
-  outputs,
-  config,
-  pkgs,
-  ...
-}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;

nixos/server/package-configs/cinny/default.nix

@@ -1,10 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}: {
   services.nginx = {
     enable = true;
     virtualHosts = {

nixos/server/package-configs/conduit/default.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   inputs,
-  lib,
   ...
 }: let
   # You'll need to edit these values

nixos/server/package-configs/coturn/default.nix

@@ -1,8 +1,4 @@
-{
+{config, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   sops.secrets."coturn-auth-secret".mode = "0440";
   sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
   users.users.nginx.extraGroups = ["turnserver"];

nixos/server/package-configs/dashboard/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./grafana
     #./loki

nixos/server/package-configs/dashboard/grafana/default.nix

@@ -1,8 +1,4 @@
-{
+{config, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   # grafana configuration
   services.grafana = {
     enable = true;

nixos/server/package-configs/dashboard/loki/default.nix

@@ -1,8 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  ...
-}: {
   services.loki = {
     enable = true;
     configFile = ./loki.yaml;

nixos/server/package-configs/dashboard/prometheus/default.nix

@@ -1,8 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  ...
-}: {
   services.prometheus = {
     enable = true;
     port = 9001;

nixos/server/package-configs/dashboard/telegraf/default.nix

@@ -1,11 +1,4 @@
-{
+{config, ...}: {
-  inputs,
-  lib,
-  config,
-  pkgs,
-  user,
-  ...
-}: {
   sops.secrets."grafana-telegraf-key".mode = "0440";
   sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
   services.telegraf = {

nixos/server/package-configs/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./conduit
     ./forgejo

nixos/server/package-configs/forgejo/default.nix

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [];
 
   #sops.secrets."mailpassunhash".mode = "0440";

nixos/server/package-configs/gotosocial/default.nix

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   users.users.gotosocial.extraGroups = ["virtualMail"];
 
   services.nginx = {

nixos/server/package-configs/jellyfin/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   users.users.jellyfin.extraGroups = ["nextcloud" "aria2"];
 
   services.nginx = {

nixos/server/package-configs/mail-server/default.nix

@@ -1,11 +1,4 @@
-{
+{config, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   sops.secrets."mailpass".mode = "0440";
   sops.secrets."mailpass".owner = config.users.users.virtualMail.name;
 

nixos/server/package-configs/ombi/default.nix

@@ -1,8 +1,4 @@
-{
+{...}: {
-  config,
-  pkgs,
-  ...
-}: {
   users.users = {
     ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"];
   };

nixos/server/package-configs/phanpy/default.nix

@@ -1,10 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}: {
   services.nginx = {
     enable = true;
     virtualHosts = {

nixos/server/package-configs/postgres/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   services.postgresql = {
     # https://nixos.org/manual/nixos/stable/#module-postgresql
     package = pkgs.postgresql_16;

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!

nixos/shared/default.nix

@@ -1,10 +1,8 @@
 {
   inputs,
-  outputs,
   lib,
   config,
   pkgs,
-  pkgs-edge,
   ...
 }: {
   imports = [

nixos/shared/locale/default.nix

@@ -1,11 +1,4 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 

nixos/shared/packages/default.nix

@@ -1,8 +1,5 @@
 {
-  inputs,
   outputs,
-  lib,
-  config,
   pkgs,
   pkgs-edge,
   ...

pkgs/auto-mount/default.nix

@@ -1,10 +1,5 @@
 {
-  lib,
-  stdenv,
-  system,
   pkgs,
-  util-linux,
-  jq,
   writeShellApplication,
 }:
 writeShellApplication

pkgs/dvd/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   direnv,
   writeShellApplication,
 }:

pkgs/dvt/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   direnv,
   writeShellApplication,
 }:

pkgs/install-nix-no-inhibit/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   git,
   gum,
   writeShellApplication,

pkgs/install-nix/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "install-nix";

pkgs/rebuild-no-inhibit/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "rebuild-no-inhibit";

pkgs/rebuild/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "rebuild";

pkgs/restart/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "restart";

pkgs/update/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "update";

pkgs/upgrade/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "upgrade";