treewide: apply deadnix / statix

2023-06-11 02:08:06 -04:00 · 2023-06-11 02:08:06 -04:00 · e691a90e7f
commit e691a90e7f
parent 1c5c91f38e
37 changed files with 32 additions and 64 deletions
--- a/home/direnv/default.nix
+++ b/home/direnv/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.direnv = {
    enable = true;
    enableNushellIntegration = true;
--- a/home/git/default.nix
+++ b/home/git/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.git = {
    enable = true;
    delta.enable = true;
--- a/home/helix/themes/catppuccin_mocha.nix
+++ b/home/helix/themes/catppuccin_mocha.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.helix = {
    themes.catppuccin_mocha = let
      transparent = "none";
--- a/home/lazygit/default.nix
+++ b/home/lazygit/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.lazygit = {
    enable = true;
    settings = {
--- a/home/lf/default.nix
+++ b/home/lf/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.lf = {
    enable = true;
    settings = {
--- a/home/librewolf/default.nix
+++ b/home/librewolf/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.librewolf = {
    enable = true;
    settings = {
--- a/home/mako/default.nix
+++ b/home/mako/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.mako = {
    enable = true;
    icons = true;
--- a/home/nushell/default.nix
+++ b/home/nushell/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.nushell = {
    enable = true;
    configFile.source = ./config.nu;
--- a/home/wayland/hyprland/config.nix
+++ b/home/wayland/hyprland/config.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  wayland.windowManager.hyprland.extraConfig = ''

    monitor = HDMI-A-1,1920x1080,5760x0,1 #right
--- a/home/wezterm/default.nix
+++ b/home/wezterm/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.wezterm = {
    enable = true;
    extraConfig = ''
--- a/home/zathura/default.nix
+++ b/home/zathura/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  programs.zathura = {
    enable = true;
    extraConfig = ''
--- a/home/zellij/layouts.nix
+++ b/home/zellij/layouts.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  home.file.".config/zellij/snowflake.kdl".text = ''
      layout {
        tab name="main" {
--- a/hosts/ame/hardware-configuration.nix
+++ b/hosts/ame/hardware-configuration.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/hosts/kariru/default.nix
+++ b/hosts/kariru/default.nix
@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
  imports = [
    ./hardware-configuration.nix
    ./services
--- a/hosts/kariru/hardware-configuration.nix
+++ b/hosts/kariru/hardware-configuration.nix
@ -1,7 +1,5 @@
 {
-  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/hosts/kariru/services/default.nix
+++ b/hosts/kariru/services/default.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.radarr = {
    enable = true;
    openFirewall = true;
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
  imports = [
    ./hardware-configuration.nix
    ./services
--- a/hosts/sakura/hardware-configuration.nix
+++ b/hosts/sakura/hardware-configuration.nix
@ -1,7 +1,5 @@
 {
-  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/hosts/sakura/home.nix
+++ b/hosts/sakura/home.nix
@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
  imports = [
    ../../home
  ];
--- a/hosts/sakura/services/foundryvtt.nix
+++ b/hosts/sakura/services/foundryvtt.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  sops.secrets.foundry-username = {};
  sops.secrets.foundry-password = {};
  virtualisation.oci-containers.containers.foundryvtt = {
--- a/hosts/sakura/services/grafana.nix
+++ b/hosts/sakura/services/grafana.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.grafana = {
    enable = true;
    settings = {
--- a/hosts/sakura/services/homepage.nix
+++ b/hosts/sakura/services/homepage.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  virtualisation.oci-containers.containers.homepage = {
    image = "ghcr.io/benphelps/homepage";
    volumes = [
--- a/hosts/sakura/services/jellyfin.nix
+++ b/hosts/sakura/services/jellyfin.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.jellyfin = {
    enable = true;
    openFirewall = true;
--- a/hosts/sakura/services/prometheus.nix
+++ b/hosts/sakura/services/prometheus.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.prometheus = {
    enable = true;
    scrapeConfigs = [
--- a/hosts/sakura/services/rustypaste.nix
+++ b/hosts/sakura/services/rustypaste.nix
@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
  sops.secrets.rusty-auth-token = {};
  environment.systemPackages = with pkgs; [rustypaste];

--- a/hosts/sakura/services/searxng.nix
+++ b/hosts/sakura/services/searxng.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  virtualisation.oci-containers.containers.searxng = {
    image = "searxng/searxng";
    volumes = [
--- a/hosts/sakura/services/stash.nix
+++ b/hosts/sakura/services/stash.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  virtualisation.oci-containers.containers.stash = {
    image = "stashapp/stash";
    environment = {
--- a/hosts/sakura/services/traefik.nix
+++ b/hosts/sakura/services/traefik.nix
@ -1,14 +1,10 @@
-{config, ...}: {
+_: {
  sops.secrets.cloudflare-api-key = {};
  networking.firewall.allowedTCPPorts = [80 443];
-  systemd.user.services.traefik.after = ["docker.service"];
  systemd.services.traefik = {
    environment = {
      CLOUDFLARE_EMAIL = "jch0tm2e@notohh.dev";
    };
-    serviceConfig = {
-      EnvironmentFile = config.sops.secrets.cloudflare-api-key.path;
-    };
  };
  services.traefik = {
    enable = true;
--- a/hosts/tsuki/hardware-configuration.nix
+++ b/hosts/tsuki/hardware-configuration.nix
@ -1,10 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
@ -45,14 +41,7 @@
    {device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
  ];

-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
--- a/hosts/tsuki/home.nix
+++ b/hosts/tsuki/home.nix
@ -21,6 +21,7 @@
    username = "notoh";
    homeDirectory = "/home/notoh";
    packages = with pkgs; [
+      brave
      webcord
      discord
      spotify-player
--- a/hosts/yuki/default.nix
+++ b/hosts/yuki/default.nix
@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
  imports = [
    ./hardware-configuration.nix
    ./services
--- a/hosts/yuki/hardware-configuration.nix
+++ b/hosts/yuki/hardware-configuration.nix
@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
 }: {
--- a/hosts/yuki/services/kanboard.nix
+++ b/hosts/yuki/services/kanboard.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  virtualisation.oci-containers.containers.kanboard = {
    image = "kanboard/kanboard";
    ports = [
--- a/modules/greetd.nix
+++ b/modules/greetd.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  services.greetd = {
    enable = true;
    settings = rec {
--- a/modules/networking.nix
+++ b/modules/networking.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  networking = {
    networkmanager.enable = true;
    nameservers = ["192.168.1.221"];
--- a/modules/sops.nix
+++ b/modules/sops.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  sops = {
    defaultSopsFile = ../secrets/secrets.yaml;
    age.keyFile = "/home/notoh/.config/sops/age/keys.txt";
--- a/modules/swayidle.nix
+++ b/modules/swayidle.nix
@ -1,4 +1,4 @@
-{...}: {
+_: {
  home.file.".local/bin/lock" = {
    executable = true;
    text = ''