format all files

2026-04-14 01:15:18 +07:00 · 2026-04-14 01:15:18 +07:00 · a47826b7c2
commit a47826b7c2
parent f940a235f0
101 changed files with 1073 additions and 1034 deletions
--- a/devices/home-server/configuration.nix
+++ b/devices/home-server/configuration.nix
@ -1,5 +1,4 @@
-{ libs, ... }:
-{
+{libs, ...}: {
  imports = [
    ./hardware-configuration.nix
    (libs.root "/host/server/default.nix")
--- a/devices/home-server/hardware-configuration.nix
+++ b/devices/home-server/hardware-configuration.nix
@ -4,12 +4,9 @@
 {
  config,
  lib,
-  pkgs,
  modulesPath,
  ...
-}:
-
-{
+}: {
  imports = [(modulesPath + "/installer/scan/not-detected.nix")];

  boot.initrd.availableKernelModules = [
--- a/devices/ideapad-slim-5/configuration.nix
+++ b/devices/ideapad-slim-5/configuration.nix
@ -1,10 +1,8 @@
 {
-  lib,
  libs,
  pkgs,
  ...
-}:
-{
+}: {
  imports = [
    ./hardware-configuration.nix
    ./mount.nix
--- a/devices/ideapad-slim-5/hardware-configuration.nix
+++ b/devices/ideapad-slim-5/hardware-configuration.nix
@ -1,11 +1,14 @@
 # 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, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  config,
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
  ];

  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"];
@ -13,19 +16,19 @@
  boot.kernelModules = ["kvm-amd"];
  boot.extraModulePackages = [];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959";
    fsType = "ext4";
  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2221-C55B";
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2221-C55B";
    fsType = "vfat";
    options = ["fmask=0022" "dmask=0022"];
  };

-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3"; }
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3";}
  ];

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
--- a/flake.nix
+++ b/flake.nix
@ -29,14 +29,12 @@
    };
  };

-  outputs =
-    {
+  outputs = {
    self,
    nixpkgs,
    unstablepkgs,
    ...
-    }@inputs:
-    let
+  } @ inputs: let
    libs = import ./libs/default.nix inputs;
    custom = import ./packages/default.nix inputs;
    unstable = import unstablepkgs {
@ -53,8 +51,7 @@
        inputs
        ;
    };
-    in
-    {
+  in {
    nixosConfigurations = {
      ideapad-slim-5 = nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
--- a/home/asakiyuki/configuration.nix
+++ b/home/asakiyuki/configuration.nix
@ -5,11 +5,9 @@
  custom,
  unstable,
  ...
-}:
-let
+}: let
  osconfig = config;
-in
-{
+in {
  users.users.asakiyuki = {
    isNormalUser = true;
    extraGroups = ["wheel"];
@ -25,6 +23,7 @@ in
        libs
        ;
    };
+
    imports = [
      ./programs.nix
      ./files.nix
--- a/home/asakiyuki/files.nix
+++ b/home/asakiyuki/files.nix
@ -4,16 +4,17 @@
  osconfig,
  config,
  ...
-}:
-{
+}: {
  home.file = lib.mkMerge [
    (builtins.mapAttrs (_: path: {
        source = path;
-    }) osconfig.device.files.source)
+      })
+      osconfig.device.files.source)

    (builtins.mapAttrs (_: path: {
        source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/${path}";
-    }) osconfig.device.files.symlink)
+      })
+      osconfig.device.files.symlink)

    (lib.mkMerge (
      builtins.map (name: lib.setAttrByPath [name "force"] true) (
--- a/home/asakiyuki/programs.nix
+++ b/home/asakiyuki/programs.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  imports = [
    ../../modules/features/home/ghostty.nix
    ../../modules/features/home/kitty.nix
--- a/home/junko/configuration.nix
+++ b/home/junko/configuration.nix
@ -5,11 +5,9 @@
  custom,
  unstable,
  ...
-}:
-let
+}: let
  osconfig = config;
-in
-{
+in {
  users.users.junko = {
    isNormalUser = true;
  };
--- a/host/desktop/default.nix
+++ b/host/desktop/default.nix
@ -3,9 +3,9 @@
  custom,
  config,
  pkgs,
+  inputs,
  ...
-}:
-{
+}: {
  imports = [
    ./programs.nix
    ./device.nix
@ -51,6 +51,7 @@
      {pkgs = pkgs;};
  };

+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
  xdg.menus.enable = true;
  services.dbus.enable = true;
 }
--- a/host/desktop/device.nix
+++ b/host/desktop/device.nix
@ -3,11 +3,9 @@
  libs,
  pkgs,
  ...
-}:
-let
+}: let
  ENABLE_HDR = false;
-in
-{
+in {
  device = {
    flake-name = "ideapad-slim-5";
    cursors = "aemeath";
@ -62,10 +60,8 @@ in
      };

      source = {
-        ".config/qt5ct/colors/Catppuccin-Mocha.conf" =
-          "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf";
-        ".config/qt6ct/colors/Catppuccin-Mocha.conf" =
-          "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf";
+        ".config/qt5ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf";
+        ".config/qt6ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf";

        ".config/dolphinrc" = libs.root "/configs/dolphinrc";

--- a/host/desktop/programs.nix
+++ b/host/desktop/programs.nix
@ -1,7 +1,4 @@
-{
-  ...
-}:
-{
+{...}: {
  programs = {
    ffmpeg.enable = true;
    nodejs.enable = true;
--- a/host/server/default.nix
+++ b/host/server/default.nix
@ -1,5 +1,4 @@
-{ libs, ... }:
-{
+{libs, ...}: {
  imports = [
    ./device.nix
    ./programs.nix
--- a/host/server/device.nix
+++ b/host/server/device.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  device = {
    flake-name = "home-server";

--- a/host/server/networking.nix
+++ b/host/server/networking.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  networking = {
    firewall = {
      enable = true;
--- a/host/server/programs.nix
+++ b/host/server/programs.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  programs = {
    ffmpeg.enable = true;
    nodejs.enable = true;
--- a/host/server/services.nix
+++ b/host/server/services.nix
@ -1,5 +1,4 @@
-{ libs, ... }:
-{
+{libs, ...}: {
  imports = [
    (libs.root "/modules/services/adguardhome.nix")
    (libs.root "/modules/services/cloudflare-dyndns.nix")
--- a/modules/features/home/bash.nix
+++ b/modules/features/home/bash.nix
@ -1,4 +1,8 @@
-{ lib, osconfig, ... }: {
+{
+  lib,
+  osconfig,
+  ...
+}: {
  programs.bash = {
    enable = true;
    shellAliases = lib.attrsets.mergeAttrsList [
@ -29,7 +33,8 @@
      "autocd"
    ];

-        initExtra = ''
+    initExtra =
+      ''
        function git-commit() {
            git add .
            git commit -m "$1"
@ -48,8 +53,8 @@
        function get-hash() {
            nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$1")
        }
-        '' +
-        lib.optionalString osconfig.device.programs.tmux.enable ''
+      ''
+      + lib.optionalString osconfig.device.programs.tmux.enable ''
        allowed_terms=("xterm-kitty" "xterm-ghostty")

        should_run_tmux=false
--- a/modules/features/home/browsers.nix
+++ b/modules/features/home/browsers.nix
@ -1,5 +1,8 @@
-{ pkgs, libs, ... }:
 {
+  pkgs,
+  libs,
+  ...
+}: {
  programs = {
    firefox.profiles.default = {
      settings = {
--- a/modules/features/home/fastfetch.nix
+++ b/modules/features/home/fastfetch.nix
@ -1,5 +1,8 @@
-{ lib, osconfig, ... }:
 {
+  lib,
+  osconfig,
+  ...
+}: {
  programs.fastfetch = lib.mkIf osconfig.device.programs.fastfetch.enable {
    enable = true;
    settings = {
@ -173,4 +176,3 @@
    };
  };
 }
-
--- a/modules/features/home/ghostty.nix
+++ b/modules/features/home/ghostty.nix
@ -1,5 +1,8 @@
-{ lib, osconfig, ... }:
 {
+  lib,
+  osconfig,
+  ...
+}: {
  programs.ghostty =
    lib.mkIf
    (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "ghostty")
--- a/modules/features/home/kitty.nix
+++ b/modules/features/home/kitty.nix
@ -1,5 +1,8 @@
-{ lib, osconfig, ... }:
 {
+  lib,
+  osconfig,
+  ...
+}: {
  programs.kitty =
    lib.mkIf
    (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "kitty")
--- a/modules/features/home/niri.nix
+++ b/modules/features/home/niri.nix
@ -1,4 +1,8 @@
-{ osconfig, lib, ... }: {
+{
+  osconfig,
+  lib,
+  ...
+}: {
  programs.niri = lib.mkIf osconfig.device.wm.niri.enable {
    enable = true;
    settings = {
--- a/modules/features/home/obs-studio.nix
+++ b/modules/features/home/obs-studio.nix
@ -1,4 +1,10 @@
-{ pkgs, custom, lib, osconfig,  ... }:
+{
+  pkgs,
+  custom,
+  lib,
+  osconfig,
+  ...
+}:
 lib.mkIf osconfig.device.programs.obs-studio.enable {
  programs.obs-studio.enable = true;
  home.file.".config/obs-studio/themes".source = pkgs.callPackage custom.catppuccin-obs {};
--- a/modules/features/home/packages.nix
+++ b/modules/features/home/packages.nix
@ -1,13 +1,11 @@
 {
-  pkgs,
  lib,
  config,
  osconfig,
-  inputs,
  ...
-}:
-{
-  home.packages = [
+}: {
+  home.packages =
+    [
      (lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package)

      (lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package)
@ -26,7 +24,8 @@
      (lib.mkIf config.programs.hytale.enable config.programs.hytale.package)
      (lib.mkIf (
          config.programs.cider.enable && osconfig.device.programs.cider-2.enable
-    ) config.programs.cider.package)
+        )
+        config.programs.cider.package)
    ]
    ++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages)
    ++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages);
--- a/modules/features/home/starship.nix
+++ b/modules/features/home/starship.nix
@ -1,4 +1,8 @@
-{ lib, osconfig, ... }: {
+{
+  lib,
+  osconfig,
+  ...
+}: {
  programs.starship = lib.mkIf osconfig.device.programs.starship.enable {
    enable = true;
    settings = {
--- a/modules/features/home/theme.nix
+++ b/modules/features/home/theme.nix
@ -1,12 +1,14 @@
-{ pkgs, lib, ... }:
-let
+{
+  pkgs,
+  lib,
+  ...
+}: let
  catppuccin-gtk = pkgs.catppuccin-gtk.override {
    variant = "mocha";
    accents = ["sapphire"];
    size = "compact";
  };
-in
-{
+in {
  home.activation.copyGtkTheme = lib.hm.dag.entryAfter ["writeBoundary"] ''
    mkdir -p "$HOME/.themes/"

--- a/modules/features/home/tmux.nix
+++ b/modules/features/home/tmux.nix
@ -1,5 +1,9 @@
-{ lib, osconfig, pkgs, ... }:
-let
+{
+  lib,
+  osconfig,
+  pkgs,
+  ...
+}: let
  TOP_PANEL = ''
    set -g pane-border-status top
    set -g pane-border-lines single
@ -53,8 +57,7 @@ let
    bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
    bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
  '';
-in
-{
+in {
  programs.tmux = lib.mkIf osconfig.device.programs.tmux.enable {
    enable = true;
    keyMode = "vi";
--- a/modules/features/home/vscode.nix
+++ b/modules/features/home/vscode.nix
@ -1,5 +1,4 @@
-{ unstable, ... }:
-{
+{unstable, ...}: {
  programs.vscode = {
    enable = true;
    package = unstable.vscode;
--- a/modules/features/home/xdg.nix
+++ b/modules/features/home/xdg.nix
@ -1,4 +1,9 @@
-{ pkgs, lib, osconfig, ... }: {
+{
+  pkgs,
+  lib,
+  osconfig,
+  ...
+}: {
  xdg.portal = lib.mkIf osconfig.device.wm.hyprland.enable {
    enable = true;
    xdgOpenUsePortal = true;
--- a/modules/features/system/boot.nix
+++ b/modules/features/system/boot.nix
@ -1,4 +1,9 @@
-{ inputs, pkgs, libs, ... }: let
+{
+  inputs,
+  pkgs,
+  libs,
+  ...
+}: let
  background = libs.root "/assets/grub/background.png";
  baseTheme = inputs.honkai-railway-grub-theme.packages.${pkgs.stdenv.hostPlatform.system}.cyrene-grub-theme;
 in {
@ -6,7 +11,7 @@ in {
    loader = {
      efi.canTouchEfiVariables = true;

-            grub = rec {
+      grub = {
        enable = true;
        device = "nodev";
        efiSupport = true;
--- a/modules/features/system/dconf.nix
+++ b/modules/features/system/dconf.nix
@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
  programs.dconf.enable = true;
  environment.systemPackages = lib.optionals config.programs.dconf.enable [
    pkgs.glib
--- a/modules/features/system/docker.nix
+++ b/modules/features/system/docker.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  virtualisation.docker = {
    enable = true;
  };
--- a/modules/features/system/flatpak.nix
+++ b/modules/features/system/flatpak.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  services.flatpak = lib.mkIf config.device.flatpak.enable {
    enable = true;
  };
--- a/modules/features/system/gdm.nix
+++ b/modules/features/system/gdm.nix
@ -1,4 +1,5 @@
-{ lib, config, ... }: {
+{ lib, config, ... }:
+{
  services = lib.mkIf config.device.dm.gdm.enable {
    displayManager.gdm.enable = true;
  };
--- a/modules/features/system/gnome.nix
+++ b/modules/features/system/gnome.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  services = lib.mkIf config.device.de.gnome.enable {
    desktopManager.gnome.enable = true;
  };
--- a/modules/features/system/hyprland.nix
+++ b/modules/features/system/hyprland.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  programs.hyprland = lib.mkIf config.device.wm.hyprland.enable {
    enable = true;
  };
--- a/modules/features/system/kde-plasma.nix
+++ b/modules/features/system/kde-plasma.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  services = lib.mkIf config.device.de.kdePlasma.enable {
    desktopManager.plasma6.enable = true;
    xserver.enable = true;
--- a/modules/features/system/niri.nix
+++ b/modules/features/system/niri.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  programs.niri.enable = lib.mkIf config.device.wm.niri.enable true;
  services.xserver.enable = lib.mkIf config.device.wm.niri.enable true;
 }
--- a/modules/features/system/packages.nix
+++ b/modules/features/system/packages.nix
@ -3,10 +3,8 @@
  lib,
  config,
  ...
-}:
-{
-  environment.systemPackages =
-    with pkgs;
+}: {
+  environment.systemPackages = with pkgs;
    [
      git
      vim
@ -15,7 +13,7 @@
      tree

      nixd
-      nixfmt
+      alejandra

      zip
      unzip
@ -38,5 +36,6 @@
    ++ (lib.optionals config.programs.r-tensorflow.enable [config.programs.r-tensorflow.package])
    ++ (lib.optionals (
        config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable
-    ) config.programs.hyprland-portals.packages);
+      )
+      config.programs.hyprland-portals.packages);
 }
--- a/modules/features/system/sddm.nix
+++ b/modules/features/system/sddm.nix
@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }: let 
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
  custom-sddm-astronaut = pkgs.sddm-astronaut.override {
    embeddedTheme = config.device.dm.sddm.theme;
  };
@ -6,7 +11,7 @@ in {
  services.displayManager.sddm = lib.mkIf config.device.dm.sddm.enable {
    enable = true;
    wayland.enable = true;
-        extraPackages = with pkgs; [
+    extraPackages = [
      custom-sddm-astronaut
    ];
    theme = "sddm-astronaut-theme";
--- a/modules/features/system/steam.nix
+++ b/modules/features/system/steam.nix
@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
  programs.steam = lib.mkIf config.device.programs.steam.enable {
    enable = true;
  };
--- a/modules/features/system/waydroid.nix
+++ b/modules/features/system/waydroid.nix
@ -1,4 +1,9 @@
-{ pkgs, lib, config, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
  virtualisation.waydroid = {
    enable = true;
    package = pkgs.waydroid-nftables;
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@ -1,5 +1,4 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  fetch-fonts = {
    segoe-ui = {
      light = pkgs.fetchurl {
@ -62,8 +61,7 @@ let
      '';
    };
  };
-in
-{
+in {
  fonts.enableDefaultPackages = true;
  fonts.packages = with pkgs; [
    custom.tahoma
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  imports = [
    ./bluetooth.nix
  ];
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@ -1,5 +1,8 @@
-{ lib, osconfig, ... }:
 {
+  lib,
+  osconfig,
+  ...
+}: {
  imports = [
    ./settings/default.nix
  ];
@ -9,4 +12,3 @@
    xwayland.enable = true;
  };
 }
-
--- a/modules/programs/hyprland/settings/default.nix
+++ b/modules/programs/hyprland/settings/default.nix
@ -1,5 +1,4 @@
-{ osconfig, ... }:
-{
+{osconfig, ...}: {
  imports = [
    ./key-bind.nix
    ./theme.nix
@ -12,4 +11,3 @@
    monitorv2 = osconfig.device.wm.hyprland.monitors;
  };
 }
-
--- a/modules/programs/hyprland/settings/exec.nix
+++ b/modules/programs/hyprland/settings/exec.nix
@ -1,8 +1,6 @@
-{ ... }:
-{
+{...}: {
  wayland.windowManager.hyprland.settings.exec-once = [
    "quickshell"
    "fcitx5"
  ];
 }
-
--- a/modules/programs/hyprland/settings/input.nix
+++ b/modules/programs/hyprland/settings/input.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  wayland.windowManager.hyprland.settings = {
    "$LAPTOP_TOUCHPAD_ENABLE" = false;

--- a/modules/programs/hyprland/settings/key-bind.nix
+++ b/modules/programs/hyprland/settings/key-bind.nix
@ -1,7 +1,11 @@
-{ osconfig, config, ... }:
 {
+  osconfig,
+  config,
+  ...
+}: {
  wayland.windowManager.hyprland.settings = {
-    bind = [
+    bind =
+      [
        "CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}"

        "SUPER SHIFT, L, exit,"
@ -57,7 +61,8 @@
        builtins.genList (i: [
          "SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
          "SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
-      ]) 9
+        ])
+        9
      )
      ++ [
        "SUPER, 0, workspace, 10"
--- a/modules/programs/hyprland/settings/window-rules.nix
+++ b/modules/programs/hyprland/settings/window-rules.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  wayland.windowManager.hyprland.settings.windowrule = [
    "float, class:(clipse)"
    "size 622 652, class:(clipse)"
@ -19,4 +18,3 @@
    "tile, class:^(Chromium)$"
  ];
 }
-
--- a/modules/programs/nixcord/default.nix
+++ b/modules/programs/nixcord/default.nix
@ -1,5 +1,9 @@
-{ lib, libs, osconfig, ... }:
 {
+  lib,
+  libs,
+  osconfig,
+  ...
+}: {
  programs.nixcord = lib.mkIf osconfig.device.programs.nixcord.enable {
    enable = true;
    discord = {
--- a/modules/programs/nixvim/_nixvim.nix
+++ b/modules/programs/nixvim/_nixvim.nix
@ -1,5 +1,4 @@
-{ pkgs, config, ... }:
-{
+{...}: {
  programs.nixvim.imports = [
    ./default.nix
    ./extra-packages.nix
--- a/modules/programs/nixvim/default.nix
+++ b/modules/programs/nixvim/default.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  enable = true;
  vimdiffAlias = true;
  colorschemes.catppuccin.enable = true;
@ -17,4 +16,3 @@
    clipboard = "unnamedplus";
  };
 }
-
--- a/modules/programs/nixvim/extra-packages.nix
+++ b/modules/programs/nixvim/extra-packages.nix
@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
  extraPackages = with pkgs; [
    nodePackages.prettier
  ];
--- a/modules/programs/nixvim/keymaps/_keymaps.nix
+++ b/modules/programs/nixvim/keymaps/_keymaps.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  globals.mapleader = " ";
  keymaps =
    []
@ -8,4 +7,3 @@
    ++ (import ./toggleterm.nix)
    ++ (import ./nvim-tree-toggle.nix);
 }
-
--- a/modules/programs/nixvim/keymaps/barbar.nix
+++ b/modules/programs/nixvim/keymaps/barbar.nix
@ -35,5 +35,5 @@
    key = "<A-${toString (i + 1)}>";
    action = "<cmd>BufferGoto ${toString (i + 1)}<CR>";
    options.silent = true;
-}) 9)
-
+  })
+  9)
--- a/modules/programs/nixvim/keymaps/toggleterm.nix
+++ b/modules/programs/nixvim/keymaps/toggleterm.nix
@ -59,5 +59,6 @@
      options.silent = true;
      options.noremap = true;
    }
-  ]) 9
+  ])
+  9
 )
--- a/modules/programs/nixvim/lua/_lua.nix
+++ b/modules/programs/nixvim/lua/_lua.nix
@ -1,4 +1,2 @@
-{ ... }:
-{
-
+{...}: {
 }
--- a/modules/programs/nixvim/plugins/_extraPlugins.nix
+++ b/modules/programs/nixvim/plugins/_extraPlugins.nix
@ -1,5 +1,4 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  EXTRA_PLUGINS = [
    ./extras/neocord.nix
    ./extras/mini-icons.nix
@ -8,8 +7,7 @@ let
  LUA = [
    ./lua/neocord.lua
  ];
-in
-{
+in {
  extraPlugins = map (path: import path {plugins = pkgs.vimPlugins;}) EXTRA_PLUGINS;
  extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA);
 }
--- a/modules/programs/nixvim/plugins/_plugins.nix
+++ b/modules/programs/nixvim/plugins/_plugins.nix
@ -1,5 +1,4 @@
-{ ... }@inputs:
-{
+{...} @ inputs: {
  plugins = {
    nvim-tree = import ./nvimtree.nix inputs;
    lsp = import ./lsp.nix inputs;
--- a/modules/programs/nixvim/plugins/conform-nvim.nix
+++ b/modules/programs/nixvim/plugins/conform-nvim.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  enable = true;
  settings = {
    formatters_by_ft = {
--- a/modules/programs/nixvim/plugins/extras/mini-icons.nix
+++ b/modules/programs/nixvim/plugins/extras/mini-icons.nix
@ -1,4 +1,3 @@
-{ plugins, ... }:
-{
+{plugins, ...}: {
  plugin = plugins.mini-icons;
 }
--- a/modules/programs/nixvim/plugins/extras/neocord.nix
+++ b/modules/programs/nixvim/plugins/extras/neocord.nix
@ -1,4 +1,3 @@
-{ plugins, ... }:
-{
+{plugins, ...}: {
  plugin = plugins.neocord;
 }
--- a/modules/programs/nixvim/plugins/lint.nix
+++ b/modules/programs/nixvim/plugins/lint.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  enable = true;
  lintersByFt = {
  };
--- a/modules/programs/nixvim/plugins/lsp.nix
+++ b/modules/programs/nixvim/plugins/lsp.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  enable = true;
  servers = {
    phpactor.enable = true;
--- a/modules/programs/nixvim/plugins/which-key.nix
+++ b/modules/programs/nixvim/plugins/which-key.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  enable = true;
  settings = {
    preset = "modern";
--- a/modules/services/adguardhome.nix
+++ b/modules/services/adguardhome.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  services.adguardhome = {
    enable = true;
    port = 34778;
--- a/modules/services/cloudflare-dyndns.nix
+++ b/modules/services/cloudflare-dyndns.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  services.cloudflare-dyndns = {
    enable = true;
    apiTokenFile = "/home/asakiyuki/.secret/CLOUDFLARE_TOKEN_KEY";
--- a/modules/services/fail2ban.nix
+++ b/modules/services/fail2ban.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  services.fail2ban = {
    enable = true;
    ignoreIP = [
--- a/modules/services/openssh.nix
+++ b/modules/services/openssh.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  services.openssh = {
    enable = true;
    ports = [15523];
--- a/modules/services/pipewire.nix
+++ b/modules/services/pipewire.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  services.pipewire = {
    enable = true;
    pulse.enable = true;
--- a/options/home/default.nix
+++ b/options/home/default.nix
@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
  imports = [./programs.nix];
  options = {};
 }
--- a/options/home/programs.nix
+++ b/options/home/programs.nix
@ -1,11 +1,9 @@
 {
-  config,
  lib,
  pkgs,
  inputs,
  ...
-}:
-{
+}: {
  options.programs = {
    catppuccin = {
      enable = lib.mkEnableOption "catppuccin";
--- a/options/system/default.nix
+++ b/options/system/default.nix
@ -1,5 +1,4 @@
-{ lib, ... }:
-{
+{lib, ...}: {
  imports = [
    ./programs.nix
    ./file.nix
--- a/options/system/environment.nix
+++ b/options/system/environment.nix
@ -1,5 +1,4 @@
-{ lib, ... }:
-{
+{lib, ...}: {
  options.device = {
    dm = {
      sddm = {
--- a/options/system/file.nix
+++ b/options/system/file.nix
@ -1,5 +1,4 @@
-{ lib, ... }:
-{
+{lib, ...}: {
  options.device.files = {
    symlink = lib.mkOption {
      default = {};
--- a/options/system/programs.nix
+++ b/options/system/programs.nix
@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
  options.device.programs = {
    terminal = {
      enable = lib.mkEnableOption "terminal";
--- a/packages/cage-xtmapper-0.1.5.nix
+++ b/packages/cage-xtmapper-0.1.5.nix
@ -1,9 +1,8 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  RELEASE_VERSION = "20260208";
  PACKAGE_VERSION = "0.1.5";
 in
-pkgs.stdenv.mkDerivation rec {
+  pkgs.stdenv.mkDerivation {
    pname = "cage-xtmapper";
    version = PACKAGE_VERSION;

@ -45,4 +44,3 @@ pkgs.stdenv.mkDerivation rec {
      platforms = platforms.linux;
    };
  }
-
--- a/packages/cage-xtmapper-0.2.0.nix
+++ b/packages/cage-xtmapper-0.2.0.nix
@ -1,9 +1,8 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  RELEASE_VERSION = "20260208";
  PACKAGE_VERSION = "0.2.0";
 in
-pkgs.stdenv.mkDerivation rec {
+  pkgs.stdenv.mkDerivation {
    pname = "cage-xtmapper";
    version = PACKAGE_VERSION;

@ -45,4 +44,3 @@ pkgs.stdenv.mkDerivation rec {
      platforms = platforms.linux;
    };
  }
-
--- a/packages/catppuccin-obs.nix
+++ b/packages/catppuccin-obs.nix
@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{pkgs, ...}:
 pkgs.stdenv.mkDerivation {
  pname = "catppuccin-obs";
  version = "main";
@ -13,4 +13,3 @@ pkgs.stdenv.mkDerivation {
    cp -r $src/themes/* $out/
  '';
 }
-
--- a/packages/custom-cursors.nix
+++ b/packages/custom-cursors.nix
@ -1,20 +1,21 @@
 {
  cursors ? "aemeath",
  size ? 48,
-}:
-let
+}: let
  _b = name: url: hash: {inherit name url hash;};
  _q = name: hash: {${name} = _b name "https://static.asakiyuki.com/cursors/linux/${name}.tar.gz" hash;};

-  cursors-data = (
+  cursors-data =
+    (
      _q "castorice" "sha256-nqAC+Itr+TXLGG8zYDBoBve+MeRckds5BM23DrsCTMM="
      // _q "aemeath" "sha256-0eEsUks5MwW4g5Xau24SgchX+LD9Ra3azAH0KL9JzQw="
      // _q "elysia" "sha256-mjDHklWrX5Pp/vejRQiMk0VA6afY04HXGyGD0PcopdI="
      // _q "cartethyia" "sha256-jYIDoX+rfUjw6LXrqE4y8j5IL0vByrrRkgRuz08Zy6U="
-  ).${cursors};
+    ).${
+      cursors
+    };
 in
-{ pkgs, ... }:
-{
+  {pkgs, ...}: {
    gtk.enable = true;
    x11.enable = true;
    name = cursors-data.name;
--- a/packages/default.nix
+++ b/packages/default.nix
@ -1,7 +1,12 @@
-{ ... }@inputs:
-{
+{...}: {
  bun = import ./bun.nix;
  cage-xtmapper = {version ? "0.2.0"}: import ./cage-xtmapper-${version}.nix;
  catppuccin-obs = import ./catppuccin-obs.nix;
-    cursors = { name ? "aemeath", size ? 48 }: (import ./custom-cursors.nix { cursors = name; size = size; });
+  cursors = {
+    name ? "aemeath",
+    size ? 48,
+  }: (import ./custom-cursors.nix {
+    cursors = name;
+    size = size;
+  });
 }