reformat with nixpkgs-fmt

2023-11-04 16:12:45 +05:30 · 2023-11-04 16:12:45 +05:30 · 24ae3a3bc1
commit 24ae3a3bc1
parent 26a9022f4b
79 changed files with 344 additions and 333 deletions
--- a/common/nix.nix
+++ b/common/nix.nix
@ -1,7 +1,6 @@
-{
-  nixpkgs,
-  pkgs,
-  ...
+{ nixpkgs
+, pkgs
+, ...
 }: {
  environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
  nix = {
--- a/common/users/default.nix
+++ b/common/users/default.nix
@ -1,10 +1,11 @@
-{
-  pkgs,
-  secrets,
-  ...
-}: let
+{ pkgs
+, secrets
+, ...
+}:
+let
  user = secrets.users;
-in {
+in
+{
  users.mutableUsers = false;
  users.users = {
    root = {
--- a/flake.nix
+++ b/flake.nix
@ -60,18 +60,20 @@
    };
  };

-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-    home-manager,
-    impermanence,
-    lanzaboote,
-    nixvim,
-    www,
-    wiki,
-    if3,
-  } @ inputs: let
+  outputs =
+    { self
+    , nixpkgs
+    , flake-utils
+    , home-manager
+    , impermanence
+    , lanzaboote
+    , nixvim
+    , www
+    , wiki
+    , if3
+    ,
+    } @ inputs:
+    let
      secrets = import ./secrets.nix;
      nixpkgs-config = {
        allowUnfree = true;
@ -150,13 +152,14 @@
      };
    }
    // flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
        pkgs = import nixpkgs {
          inherit system;
        };
      in
      with pkgs; {
-          formatter = pkgs.alejandra;
+        formatter = nixpkgs-fmt;
        devShells.default = mkShell {
          buildInputs = [
            git
--- a/home/gtk.nix
+++ b/home/gtk.nix
@ -1,8 +1,8 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
+{ lib
+, pkgs
+, ...
+}:
+let
  gtkTheme = {
    name = "Dracula";
    package = pkgs.dracula-gtk;
@ -17,7 +17,8 @@
    name = "Bibata-Modern-Classic";
    package = pkgs.bibata-cursors;
  };
-in {
+in
+{
  gtk = {
    enable = true;
    theme = gtkTheme;
--- a/home/programs/firefox.nix
+++ b/home/programs/firefox.nix
@ -1,7 +1,6 @@
-{
-  pkgs,
-  osConfig,
-  ...
+{ pkgs
+, osConfig
+, ...
 }: {
  programs = {
    firefox = {
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@ -1,6 +1,8 @@
-{secrets, ...}: let
+{ secrets, ... }:
+let
  user = secrets.users;
-in {
+in
+{
  programs.git = {
    enable = true;
    delta = {
--- a/home/programs/kitty.nix
+++ b/home/programs/kitty.nix
@ -1,11 +1,13 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
  dracula-kitty = pkgs.fetchFromGitHub {
    owner = "dracula";
    repo = "kitty";
    rev = "87717a3f00e3dff0fc10c93f5ff535ea4092de70";
    hash = "sha256-78PTH9wE6ktuxeIxrPp0ZgRI8ST+eZ3Ok2vW6BCIZkc=";
  };
-in {
+in
+{
  programs.kitty = {
    enable = true;
    font.package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; };
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@ -1,7 +1,6 @@
-{
-  config,
-  pkgs,
-  ...
+{ config
+, pkgs
+, ...
 }: {
  programs.zsh = {
    enable = true;
--- a/home/services/aria2c.nix
+++ b/home/services/aria2c.nix
@ -1,8 +1,7 @@
-{
-  config,
-  pkgs,
-  secrets,
-  ...
+{ config
+, pkgs
+, secrets
+, ...
 }: {
  systemd.user.services = {
    ariang = {
--- a/home/services/spotifyd.nix
+++ b/home/services/spotifyd.nix
@ -1,7 +1,6 @@
-{
-  pkgs,
-  secrets,
-  ...
+{ pkgs
+, secrets
+, ...
 }: {
  services = {
    spotifyd = {
--- a/home/wm/addon/dunst.nix
+++ b/home/wm/addon/dunst.nix
@ -1,11 +1,12 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{ config
+, pkgs
+, ...
+}:
+let
  dmenu = "${config.programs.rofi.package}/bin/rofi -dmenu";
  firefox = "${config.programs.firefox.package}/bin/firefox";
-in {
+in
+{
  services.dunst = {
    enable = true;
    iconTheme.name = config.gtk.iconTheme.name;
--- a/home/wm/addon/swayidle.nix
+++ b/home/wm/addon/swayidle.nix
@ -1,7 +1,9 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
  swaylock = "${pkgs.swaylock}/bin/swaylock";
  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-in {
+in
+{
  services.swayidle = {
    enable = true;
    systemdTarget = "graphical-session.target";
--- a/home/wm/hyprland/default.nix
+++ b/home/wm/hyprland/default.nix
@ -1,8 +1,8 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{ config
+, pkgs
+, ...
+}:
+let
  dbus-update-activation-environment = "${pkgs.dbus}/bin/dbus-update-activation-environment";
  brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
  grim = "${pkgs.grim}/bin/grim";
@ -17,7 +17,8 @@
  xdg-user-dir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir";
  change-wallpaper = "${pkgs.scripts}/bin/chpaper ${config.xdg.userDirs.pictures}/Wallpapers";
  wallhaven-wallpaper = "${pkgs.scripts}/bin/chpaper \$(${pkgs.scripts}/bin/wallhaven ${config.xdg.userDirs.pictures}/Wallpapers)";
-in {
+in
+{
  home.packages = with pkgs; [
    hyprland
  ];
--- a/hosts/rico1/hardware/kernel.nix
+++ b/hosts/rico1/hardware/kernel.nix
@ -1,7 +1,6 @@
-{
-  lib,
-  pkgs,
-  ...
+{ lib
+, pkgs
+, ...
 }: {
  boot = {
    initrd = {
--- a/hosts/rico1/services/frpc.nix
+++ b/hosts/rico1/services/frpc.nix
@ -1,10 +1,11 @@
-{
-  pkgs,
-  secrets,
-  ...
-}: let
+{ pkgs
+, secrets
+, ...
+}:
+let
  inherit (secrets) frp_config;
-in {
+in
+{
  services.frp = {
    enable = true;
    role = "client";
--- a/hosts/rico1/wireguard.nix
+++ b/hosts/rico1/wireguard.nix
@ -1,10 +1,11 @@
-{
-  config,
-  secrets,
-  ...
-}: let
+{ config
+, secrets
+, ...
+}:
+let
  inherit (secrets.wireguard_config) peers;
-in {
+in
+{
  networking.firewall.trustedInterfaces = [ "wg0" ];
  networking.wireguard = {
    enable = true;
--- a/hosts/rico2/hardware/kernel.nix
+++ b/hosts/rico2/hardware/kernel.nix
@ -1,7 +1,6 @@
-{
-  lib,
-  pkgs,
-  ...
+{ lib
+, pkgs
+, ...
 }: {
  boot = {
    initrd = {
--- a/hosts/rico2/services/adtya.xyz.nix
+++ b/hosts/rico2/services/adtya.xyz.nix
@ -1,11 +1,12 @@
-{
-  pkgs,
-  www,
-  secrets,
-  ...
-}: let
+{ pkgs
+, www
+, secrets
+, ...
+}:
+let
  system = pkgs.system;
-in {
+in
+{
  services = {
    caddy.virtualHosts."adtya.xyz" = {
      serverAliases = [ "www.adtya.xyz" ];
--- a/hosts/rico2/services/caddy.nix
+++ b/hosts/rico2/services/caddy.nix
@ -1,7 +1,6 @@
-{
-  config,
-  secrets,
-  ...
+{ config
+, secrets
+, ...
 }: {
  services.caddy = {
    enable = true;
--- a/hosts/rico2/services/frpc.nix
+++ b/hosts/rico2/services/frpc.nix
@ -1,10 +1,11 @@
-{
-  pkgs,
-  secrets,
-  ...
-}: let
+{ pkgs
+, secrets
+, ...
+}:
+let
  inherit (secrets) frp_config;
-in {
+in
+{
  services.frp = {
    enable = true;
    role = "client";
--- a/hosts/rico2/services/if3.nix
+++ b/hosts/rico2/services/if3.nix
@ -1,10 +1,11 @@
-{
-  pkgs,
-  if3,
-  ...
-}: let
+{ pkgs
+, if3
+, ...
+}:
+let
  system = pkgs.system;
-in {
+in
+{
  services = {
    caddy.virtualHosts = {
      "if3.adtya.xyz" = {
--- a/hosts/rico2/services/proofs.nix
+++ b/hosts/rico2/services/proofs.nix
@ -1,7 +1,6 @@
-{
-  config,
-  secrets,
-  ...
+{ config
+, secrets
+, ...
 }: {
  services = {
    caddy.virtualHosts = {
--- a/hosts/rico2/services/wiki.nix
+++ b/hosts/rico2/services/wiki.nix
@ -1,10 +1,11 @@
-{
-  pkgs,
-  wiki,
-  ...
-}: let
+{ pkgs
+, wiki
+, ...
+}:
+let
  system = pkgs.system;
-in {
+in
+{
  services = {
    caddy.virtualHosts = {
      "wiki.adtya.xyz" = {
--- a/hosts/rico2/wireguard.nix
+++ b/hosts/rico2/wireguard.nix
@ -1,10 +1,11 @@
-{
-  config,
-  secrets,
-  ...
-}: let
+{ config
+, secrets
+, ...
+}:
+let
  inherit (secrets.wireguard_config) peers;
-in {
+in
+{
  networking.firewall.trustedInterfaces = [ "wg0" ];
  networking.wireguard = {
    enable = true;
--- a/hosts/skipper/hardware/default.nix
+++ b/hosts/skipper/hardware/default.nix
@ -1,7 +1,6 @@
-{
-  lib,
-  pkgs,
-  ...
+{ lib
+, pkgs
+, ...
 }: {
  imports = [ ./kernel.nix ./filesystem.nix ];

--- a/hosts/skipper/hardware/kernel.nix
+++ b/hosts/skipper/hardware/kernel.nix
@ -1,7 +1,6 @@
-{
-  lib,
-  pkgs,
-  ...
+{ lib
+, pkgs
+, ...
 }: {
  boot = {
    consoleLogLevel = 3;
--- a/hosts/skipper/secureboot.nix
+++ b/hosts/skipper/secureboot.nix
@ -1,7 +1,6 @@
-{
-  lib,
-  pkgs,
-  ...
+{ lib
+, pkgs
+, ...
 }: {
  boot = {
    bootspec.enable = true;
--- a/hosts/skipper/services/default.nix
+++ b/hosts/skipper/services/default.nix
@ -1,6 +1,8 @@
-{secrets, ...}: let
+{ secrets, ... }:
+let
  user = secrets.users;
-in {
+in
+{
  imports = [
    ./dbus.nix
    ./keyd.nix
--- a/hosts/skipper/wireguard.nix
+++ b/hosts/skipper/wireguard.nix
@ -1,10 +1,11 @@
-{
-  config,
-  secrets,
-  ...
-}: let
+{ config
+, secrets
+, ...
+}:
+let
  inherit (secrets.wireguard_config) peers;
-in {
+in
+{
  networking.firewall.trustedInterfaces = [ "wg0" ];
  networking.wireguard = {
    enable = true;
--- a/packages/adi1090x-plymouth/default.nix
+++ b/packages/adi1090x-plymouth/default.nix
@ -1,9 +1,9 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  pack ? "pack_1",
-  theme ? "cuts",
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, pack ? "pack_1"
+, theme ? "cuts"
+,
 }:
 stdenvNoCC.mkDerivation {
  pname = "adi1090x-plymouth";
--- a/packages/dracula-gtk/default.nix
+++ b/packages/dracula-gtk/default.nix
@ -1,10 +1,10 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  gtk3,
-  gnome-themes-extra,
-  gtk-engine-murrine,
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, gtk3
+, gnome-themes-extra
+, gtk-engine-murrine
+,
 }:
 stdenvNoCC.mkDerivation {
  pname = "dracula-gtk";
--- a/packages/rofi-bluetooth/default.nix
+++ b/packages/rofi-bluetooth/default.nix
@ -1,10 +1,10 @@
-{
-  lib,
-  fetchFromGitHub,
-  makeWrapper,
-  stdenvNoCC,
-  bluez,
-  rofi-wayland,
+{ lib
+, fetchFromGitHub
+, makeWrapper
+, stdenvNoCC
+, bluez
+, rofi-wayland
+,
 }:
 stdenvNoCC.mkDerivation {
  pname = "rofi-bluetooth";
--- a/packages/scripts/default.nix
+++ b/packages/scripts/default.nix
@ -1,18 +1,18 @@
-{
-  lib,
-  stdenvNoCC,
-  makeWrapper,
-  libnotify,
-  rofi-wayland,
-  tmux,
-  kitty,
-  imagemagick,
-  hyprland,
-  swww,
-  jq,
-  curl,
-  ytfzf,
-  libsecret,
+{ lib
+, stdenvNoCC
+, makeWrapper
+, libnotify
+, rofi-wayland
+, tmux
+, kitty
+, imagemagick
+, hyprland
+, swww
+, jq
+, curl
+, ytfzf
+, libsecret
+,
 }:
 stdenvNoCC.mkDerivation {
  pname = "scripts";