reformat with alejandra

2023-05-18 16:11:26 +05:30 · 2023-05-18 16:11:26 +05:30 · ccabc0d28a
commit ccabc0d28a
parent 5a385fcedc
76 changed files with 348 additions and 256 deletions
--- a/common/users/default.nix
+++ b/common/users/default.nix
@ -1,8 +1,10 @@
-{ pkgs, secrets, ... }:
-let
-  user = (import ../../secrets.nix).users;
-in
 {
+  pkgs,
+  secrets,
+  ...
+}: let
+  user = (import ../../secrets.nix).users;
+in {
  users.mutableUsers = false;
  users.users = {
    root.hashedPassword = user.root.hashedPassword;
--- a/flake.nix
+++ b/flake.nix
@ -26,11 +26,19 @@
    };
  };

-  outputs = { self, nixpkgs, home-manager, impermanence, lanzaboote, nixvim }@inputs: {
-    formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
-    nixosConfigurations = let user = (import ./secrets.nix).users; in {
+  outputs = {
+    self,
+    nixpkgs,
+    home-manager,
+    impermanence,
+    lanzaboote,
+    nixvim,
+  } @ inputs: {
+    formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".alejandra;
+    nixosConfigurations = let
+      user = (import ./secrets.nix).users;
+    in {
      Skipper = nixpkgs.lib.nixosSystem {
-
        system = "x86_64-linux";
        specialArgs = inputs;
        modules = [
--- a/home/common/programs/btop.nix
+++ b/home/common/programs/btop.nix
@ -1,5 +1,4 @@
 {...}: {
-
  xdg.desktopEntries."btop" = {
    name = "btop++";
    exec = "btop";
--- a/home/common/programs/git.nix
+++ b/home/common/programs/git.nix
@ -1,8 +1,6 @@
-{ ... }:
-let
+{...}: let
  user = (import ../../../secrets.nix).users;
-in
-{
+in {
  programs.git = {
    enable = true;
    diff-so-fancy = {
--- a/home/common/programs/starship.nix
+++ b/home/common/programs/starship.nix
@ -1,5 +1,4 @@
 {...}: {
-
  programs.starship = {
    enable = true;
    settings = {
--- a/home/common/programs/zsh.nix
+++ b/home/common/programs/zsh.nix
@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
  programs.zsh = {
    enable = true;
    defaultKeymap = "viins";
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
-let
+{
+  lib,
+  pkgs,
+  ...
+}: let
  gtkTheme = {
    name = "Dracula";
    package = pkgs.dracula-gtk;
@ -17,8 +20,7 @@ let
    name = "Bibata-Modern-Classic";
    package = pkgs.bibata-cursors;
  };
-in
-{
+in {
  gtk.enable = true;
  gtk.theme = gtkTheme;
  home.sessionVariables.GTK_THEME = gtkTheme.name;
--- a/home/desktop/persistence.nix
+++ b/home/desktop/persistence.nix
@ -20,15 +20,42 @@
      ".mozilla"
      ".nixos-config"
      ".ssh"
-      { directory = "Documents"; method = "symlink"; }
-      { directory = "Downloads"; method = "symlink"; }
-      { directory = "Music"; method = "symlink"; }
-      { directory = "Others"; method = "symlink"; }
-      { directory = "Pictures"; method = "symlink"; }
-      { directory = "Projects"; method = "symlink"; }
-      { directory = "Public"; method = "symlink"; }
-      { directory = "Templates"; method = "symlink"; }
-      { directory = "Videos"; method = "symlink"; }
+      {
+        directory = "Documents";
+        method = "symlink";
+      }
+      {
+        directory = "Downloads";
+        method = "symlink";
+      }
+      {
+        directory = "Music";
+        method = "symlink";
+      }
+      {
+        directory = "Others";
+        method = "symlink";
+      }
+      {
+        directory = "Pictures";
+        method = "symlink";
+      }
+      {
+        directory = "Projects";
+        method = "symlink";
+      }
+      {
+        directory = "Public";
+        method = "symlink";
+      }
+      {
+        directory = "Templates";
+        method = "symlink";
+      }
+      {
+        directory = "Videos";
+        method = "symlink";
+      }
    ];

    files = [
--- a/home/desktop/programs/firefox.nix
+++ b/home/desktop/programs/firefox.nix
@ -1,4 +1,8 @@
-{ pkgs, osConfig, ... }: {
+{
+  pkgs,
+  osConfig,
+  ...
+}: {
  programs = {
    firefox = {
      enable = true;
--- a/home/desktop/programs/kitty.nix
+++ b/home/desktop/programs/kitty.nix
@ -1,13 +1,11 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  dracula = 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/desktop/programs/mpv.nix
+++ b/home/desktop/programs/mpv.nix
@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
  programs.mpv = {
    enable = true;
    package = pkgs.mpv.override {youtubeSupport = true;};
--- a/home/desktop/programs/nixvim.nix
+++ b/home/desktop/programs/nixvim.nix
@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
  programs.nixvim = {
    enable = true;
    vimAlias = true;
--- a/home/desktop/services/aria2c.nix
+++ b/home/desktop/services/aria2c.nix
@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
  systemd.user.services.aria2c = {
    Unit = {
      Description = "Aria2c Download Manager";
--- a/home/desktop/wm/addon/dunst.nix
+++ b/home/desktop/wm/addon/dunst.nix
@ -1,9 +1,11 @@
-{ 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/desktop/wm/addon/rofi/default.nix
+++ b/home/desktop/wm/addon/rofi/default.nix
@ -21,5 +21,4 @@
      noDisplay = true;
    };
  };
-
 }
--- a/home/desktop/wm/addon/swayidle.nix
+++ b/home/desktop/wm/addon/swayidle.nix
@ -1,9 +1,7 @@
-{ 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/desktop/wm/addon/waybar/default.nix
+++ b/home/desktop/wm/addon/waybar/default.nix
@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
  programs.waybar = {
    enable = true;
    package = pkgs.waybar.overrideAttrs (oldAttrs: {
--- a/home/desktop/wm/hyprland/default.nix
+++ b/home/desktop/wm/hyprland/default.nix
@ -1,5 +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";
@ -14,8 +17,7 @@ let
  xdg-user-dir = "${pkgs.xdg-user-dirs}/bin/xdg-user-dir";
  change-wallpaper = "${pkgs.scripts}/bin/chpaper \${HOME}/Pictures/Wallpapers";
  wallhaven-wallpaper = "${pkgs.scripts}/bin/wallhaven";
-in
-{
+in {
  home.packages = with pkgs; [
    hyprland
  ];
--- a/home/desktop/wm/sway/default.nix
+++ b/home/desktop/wm/sway/default.nix
@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }: {
-
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
  wayland.windowManager.sway = {
    enable = true;
    systemdIntegration = true;
@ -71,8 +75,7 @@
        };
      };

-      keybindings =
-        let
+      keybindings = let
        modifier = config.wayland.windowManager.sway.config.modifier;

        brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
--- a/hosts/rico/default.nix
+++ b/hosts/rico/default.nix
@ -1,5 +1,4 @@
 {...}: {
-
  imports = [
    ./hardware
    ./programs
--- a/hosts/rico/hardware/filesystem.nix
+++ b/hosts/rico/hardware/filesystem.nix
@ -1,5 +1,4 @@
 {...}: {
-
  fileSystems."/" = {
    device = "/dev/disk/by-partlabel/NIXOS_ROOT";
    fsType = "btrfs";
--- a/hosts/rico/hardware/kernel.nix
+++ b/hosts/rico/hardware/kernel.nix
@ -1,4 +1,8 @@
-{ lib, pkgs, ... }: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
  boot = {
    initrd = {
      availableKernelModules = [
--- a/hosts/skipper/default.nix
+++ b/hosts/skipper/default.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
  imports = [
    ./hardware
    ./programs
@ -70,7 +75,6 @@
    wireless.iwd.enable = true;
  };

-
  sound.enable = true;
  time.timeZone = "Asia/Kolkata";

--- a/hosts/skipper/hardware/default.nix
+++ b/hosts/skipper/hardware/default.nix
@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }: {
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
  imports = [./kernel.nix ./filesystem.nix];

  boot = {
@ -26,7 +31,7 @@
          KernelExperimental = true;
        };
      };
-      package = (pkgs.bluez.override { withExperimental = true; });
+      package = pkgs.bluez.override {withExperimental = true;};
    };
    cpu.intel.updateMicrocode = lib.mkDefault true;
    enableRedistributableFirmware = true;
--- a/hosts/skipper/hardware/kernel.nix
+++ b/hosts/skipper/hardware/kernel.nix
@ -1,4 +1,8 @@
-{ lib, pkgs, ... }: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
  boot = {
    consoleLogLevel = 3;
    initrd = {
--- a/hosts/skipper/programs/default.nix
+++ b/hosts/skipper/programs/default.nix
@ -1,5 +1,4 @@
 {...}: {
-
  imports = [
    ./gnupg.nix
    ./neovim.nix
--- a/hosts/skipper/programs/gnupg.nix
+++ b/hosts/skipper/programs/gnupg.nix
@ -5,5 +5,4 @@
    enableSSHSupport = true;
    pinentryFlavor = "gnome3";
  };
-
 }
--- a/hosts/skipper/programs/neovim.nix
+++ b/hosts/skipper/programs/neovim.nix
@ -1,5 +1,4 @@
 {...}: {
-
  programs.neovim = {
    enable = true;
    defaultEditor = true;
--- a/hosts/skipper/secureboot.nix
+++ b/hosts/skipper/secureboot.nix
@ -1,4 +1,8 @@
-{ lib, pkgs, ... }: {
+{
+  lib,
+  pkgs,
+  ...
+}: {
  boot.bootspec.enable = true;
  boot.loader.systemd-boot.enable = lib.mkForce false;
  boot.lanzaboote = {
--- a/hosts/skipper/services/default.nix
+++ b/hosts/skipper/services/default.nix
@ -1,8 +1,10 @@
-{ pkgs, secrets, ... }:
-let
-  user = (import ../../../secrets.nix).users;
-in
 {
+  pkgs,
+  secrets,
+  ...
+}: let
+  user = (import ../../../secrets.nix).users;
+in {
  imports = [
    ./dbus.nix
    ./pipewire.nix
--- 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/newaita-icon-theme/default.nix
+++ b/packages/newaita-icon-theme/default.nix
@ -1,13 +1,13 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, gnome
-, gnome-icon-theme
-, hicolor-icon-theme
-, panel ? "dark"
-, folder ? "default"
-,
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+  gnome,
+  gnome-icon-theme,
+  hicolor-icon-theme,
+  panel ? "dark",
+  folder ? "default",
 }:
 stdenvNoCC.mkDerivation {
  pname = "newaita-icon-theme";
--- a/packages/scripts/default.nix
+++ b/packages/scripts/default.nix
@ -1,5 +1,18 @@
-{ lib, stdenvNoCC, makeWrapper, libnotify, rofi-wayland, tmux, kitty, imagemagick, sway, hyprland, swww, jq, curl }:
-
+{
+  lib,
+  stdenvNoCC,
+  makeWrapper,
+  libnotify,
+  rofi-wayland,
+  tmux,
+  kitty,
+  imagemagick,
+  sway,
+  hyprland,
+  swww,
+  jq,
+  curl,
+}:
 stdenvNoCC.mkDerivation {
  pname = "scripts";
  version = "0.1";