Formatter: Switch to alejandra

I like its style better
2026-03-31 17:50:23 +02:00 · 2026-03-15 17:37:50 +01:00
parent 1f1a76b92d
commit a81caa8e1b
49 changed files with 75 additions and 183 deletions
--- a/common/default.nix
+++ b/common/default.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  imports = [
    ./modules
--- a/common/flakes/czkawka-master/flake.nix
+++ b/common/flakes/czkawka-master/flake.nix
@@ -27,24 +27,23 @@
      naersk-lib = pkgs.callPackage naersk { };

      nativeBuildInputs = with pkgs; [
-        pkg-config
+        cargo
        cmake
        makeWrapper
-        cargo
+        pkg-config
        rustc
      ];

      runtimeLibs = with pkgs; [
-        wayland
-        libxkbcommon
-        libglvnd
        fontconfig
+        libglvnd
        libX11
        libXcursor
        libXi
+        libxkbcommon
        libXrandr
+        wayland
      ];
-
    in
    {
      packages.${system}.default = naersk-lib.buildPackage {
--- a/common/flakes/fet/flake.nix
+++ b/common/flakes/fet/flake.nix
@@ -20,23 +20,23 @@
      {
        packages.default = pkgs.stdenv.mkDerivation rec {
          pname = "fet";
-          version = "7.7.7";
+          version = "7.8.0";

          src = pkgs.fetchurl {
            url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz";
-            sha256 = "0ix9h714xdg1fbbij3zays4v9s3arhz3s9n2j1pgnxmabzdxvzg2";
+            sha256 = "01hr3digrg2qs5wh10qzpgwi4clqmzd46d099r0yrx3278qvz9wj";
          };

          enableParallelBuilding = true;

-          nativeBuildInputs = [
-            pkgs.qt6.qmake
-            pkgs.qt6.wrapQtAppsHook
-            pkgs.copyDesktopItems
+          nativeBuildInputs = with pkgs; [
+            copyDesktopItems
+            qt6.qmake
+            qt6.wrapQtAppsHook
          ];

-          buildInputs = [
-            pkgs.qt6.qtbase
+          buildInputs = with pkgs; [
+            qt6.qtbase
          ];

          configurePhase = ''
--- a/common/hardware-configuration.nix
+++ b/common/hardware-configuration.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  ...
-}:
-
+{ pkgs, ... }:
 {
  boot = {
    kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;
--- a/common/modules/attic.nix
+++ b/common/modules/attic.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  nix.settings = {
    substituters = [
--- a/common/modules/default.nix
+++ b/common/modules/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./attic.nix
--- a/common/modules/flatpak.nix
+++ b/common/modules/flatpak.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  services.flatpak = {
    enable = true;
--- a/common/modules/gnome.nix
+++ b/common/modules/gnome.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  environment = {
    gnome.excludePackages = with pkgs; [
@@ -27,17 +26,17 @@
    systemPackages = with pkgs.gnomeExtensions; [
      alphabetical-app-grid
      appindicator
-      blur-my-shell
      bluetooth-quick-connect
-      caffeine
+      blur-my-shell
      bubblemail
+      caffeine
      color-picker
      dash-to-dock
      middle-click-to-close-in-overview
+      solaar-extension
      undecorate
      user-themes
      window-is-ready-remover
-      solaar-extension
    ];
  };

--- a/common/modules/home/dconf/apps.nix
+++ b/common/modules/home/dconf/apps.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  dconf.settings = {
    "org/virt-manager/virt-manager/connections" = {
--- a/common/modules/home/dconf/default.nix
+++ b/common/modules/home/dconf/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./apps.nix
--- a/common/modules/home/dconf/extensions.nix
+++ b/common/modules/home/dconf/extensions.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  dconf.settings = {
    "org/gnome/shell/extensions/user-theme" = {
@@ -156,7 +152,7 @@
      sigma = 30;
    };

-    "org/gnome/shell/ectensions/bubblemail" = {
+    "org/gnome/shell/extensions/bubblemail" = {
      newest-first = true;
    };
  };
--- a/common/modules/home/dconf/gnome.nix
+++ b/common/modules/home/dconf/gnome.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  dconf.settings = {
    "org/gnome/desktop/interface" = {
--- a/common/modules/home/default.nix
+++ b/common/modules/home/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./dconf
--- a/common/modules/home/desktop-files.nix
+++ b/common/modules/home/desktop-files.nix
@@ -3,7 +3,6 @@
  pkgs,
  ...
 }:
-
 {
  xdg.dataFile."applications/clion.desktop".text = ''
    [Desktop Entry]
--- a/common/modules/home/starship.nix
+++ b/common/modules/home/starship.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  programs.starship = {
    enable = true;
--- a/common/modules/home/zsh.nix
+++ b/common/modules/home/zsh.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  ...
-}:
-
+{ config, ... }:
 {
  programs.zsh = {
    enable = true;
--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -7,7 +7,6 @@
  fet,
  ...
 }:
-
 {
  nixpkgs = {
    config = {
@@ -23,10 +22,10 @@
          buildInputs =
            nprev.buildInputs
            ++ (with pkgs.gst_all_1; [
-              gst-plugins-good
              gst-plugins-bad
-              gst-plugins-ugly
              gst-plugins-base
+              gst-plugins-good
+              gst-plugins-ugly
            ]);
        });
      })
@@ -35,6 +34,7 @@

  environment.systemPackages = with pkgs; [
    abootimg
+    alejandra
    android-tools
    anki
    appstream
@@ -50,8 +50,8 @@
    btrfs-progs
    bubblemail
    bzip2
+    cisco-packet-tracer_9
    curl
-    fet.packages.${pkgs.stdenv.hostPlatform.system}.default
    ddcutil
    discord
    distrobox
@@ -59,6 +59,7 @@
    docker-compose
    element-desktop
    eza
+    fet.packages.${pkgs.stdenv.hostPlatform.system}.default
    ffmpeg-full
    ffmpegthumbnailer
    file
@@ -101,6 +102,7 @@
    libsForQt5.qtstyleplugins
    linux-firmware
    lm_sensors
+    logitech-udev-rules
    lrzip
    lsof
    lz4
@@ -119,7 +121,6 @@
    ntfs3g
    nufraw-thumbnailer
    obsidian
-    cisco-packet-tracer_9
    papirus-icon-theme
    pbzip2
    pciutils
@@ -130,12 +131,11 @@
    protonup-qt
    rquickshare
    saber
-    solaar
-    logitech-udev-rules
    scrcpy
    screen
    seafile-client
    smartmontools
+    solaar
    sushi
    telegram-desktop
    testdisk
@@ -144,6 +144,7 @@
    tldr
    trash-cli
    tree
+    tumbler
    unrar
    unzip
    usbutils
@@ -165,15 +166,14 @@
    which
    wineWow64Packages.waylandFull
    wireshark
-    tumbler
    xz
    yt-dlp
    zip
    zram-generator
    zstd
    zulu
-    zulu8
    zulu17
+    zulu8
  ];

  fonts = {
--- a/common/modules/programs.nix
+++ b/common/modules/programs.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  programs = {
    dconf.profiles.gdm.databases = [
@@ -43,7 +42,6 @@
      enable = true;
    };

-    bat.enable = true;
    zsh.enable = true;
    gamemode.enable = true;

--- a/common/modules/services.nix
+++ b/common/modules/services.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  services = {
    sshd.enable = true;
@@ -69,7 +68,7 @@

    btrfs = {
      autoScrub = {
-        enable = (lib.any (fs: fs.fsType == "btrfs") (lib.attrValues config.fileSystems));
+        enable = lib.any (fs: fs.fsType == "btrfs") (lib.attrValues config.fileSystems);
        interval = "monthly";
      };
    };
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  imports = [
    ./hardware-configuration.nix
--- a/desktop/hardware-configuration.nix
+++ b/desktop/hardware-configuration.nix
@@ -8,7 +8,6 @@
  modulesPath,
  ...
 }:
-
 {
  imports = [
    (modulesPath + "/installer/scan/not-detected.nix")
@@ -96,7 +95,6 @@
      "compress=zstd:10"
      "autodefrag"
    ];
-
  };

  fileSystems."/var" = {
--- a/desktop/modules/default.nix
+++ b/desktop/modules/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./flatpak.nix
--- a/desktop/modules/flatpak.nix
+++ b/desktop/modules/flatpak.nix
@@ -4,7 +4,5 @@
  lib,
  ...
 }:
-
 {
-
 }
--- a/desktop/modules/gdm-monitors.nix
+++ b/desktop/modules/gdm-monitors.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 let
  gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" ''
    <monitors version="2">
--- a/desktop/modules/gnome.nix
+++ b/desktop/modules/gnome.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  environment = {
    systemPackages = with pkgs.gnomeExtensions; [
--- a/desktop/modules/home/dconf/apps.nix
+++ b/desktop/modules/home/dconf/apps.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  dconf.settings = { };
 }
--- a/desktop/modules/home/dconf/default.nix
+++ b/desktop/modules/home/dconf/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./apps.nix
--- a/desktop/modules/home/dconf/extensions.nix
+++ b/desktop/modules/home/dconf/extensions.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  dconf.settings = { };
 }
--- a/desktop/modules/home/dconf/gnome.nix
+++ b/desktop/modules/home/dconf/gnome.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  dconf.settings = {
    "org/gnome/settings-daemon/plugins/media-keys" = {
--- a/desktop/modules/home/default.nix
+++ b/desktop/modules/home/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./dconf
--- a/desktop/modules/packages.nix
+++ b/desktop/modules/packages.nix
@@ -5,7 +5,6 @@
  czkawka-master,
  ...
 }:
-
 {
  environment.systemPackages = with pkgs; [
    amdgpu_top
--- a/desktop/modules/programs.nix
+++ b/desktop/modules/programs.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  programs = {
    ccache = {
@@ -15,12 +14,12 @@
    obs-studio = {
      enable = true;
      plugins = with pkgs.obs-studio-plugins; [
-        wlrobs
        obs-backgroundremoval
+        obs-gstreamer
        obs-pipewire-audio-capture
        obs-vaapi
-        obs-gstreamer
        obs-vkcapture
+        wlrobs
      ];
    };
  };
--- a/desktop/modules/services.nix
+++ b/desktop/modules/services.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  environment.systemPackages = with pkgs; [
    zram-generator
--- a/desktop/modules/vm.nix
+++ b/desktop/modules/vm.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  ...
-}:
-
+{ lib, ... }:
 {
  virtualisation.vmVariant = {
    virtualisation = {
--- a/flake.lock
+++ b/flake.lock
@@ -179,11 +179,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1773519908,
-        "narHash": "sha256-vAIRk0ZY1j8H0pbD4TuAgPg/JWQjhMdCcLOp4juiIJw=",
+        "lastModified": 1773563071,
+        "narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "af0e797284377c938d90601b50003415e97bf132",
+        "rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae",
        "type": "github"
      },
      "original": {
--- a/laptop/default.nix
+++ b/laptop/default.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  imports = [
    ./hardware-configuration.nix
@@ -30,7 +29,6 @@
    graphics = {
      enable = true;
      extraPackages = with pkgs; [
-
        vaapi-intel-hybrid
        vpl-gpu-rt
      ];
--- a/laptop/hardware-configuration.nix
+++ b/laptop/hardware-configuration.nix
@@ -8,7 +8,6 @@
  modulesPath,
  ...
 }:
-
 {
  imports = [
    (modulesPath + "/installer/scan/not-detected.nix")
@@ -23,6 +22,7 @@
        "uas"
        "sd_mod"
      ];
+
      kernelModules = [ ];
    };

@@ -110,7 +110,6 @@
      options = [
        "defaults"
      ];
-
    }
  ];

--- a/laptop/modules/default.nix
+++ b/laptop/modules/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./flatpak.nix
--- a/laptop/modules/flatpak.nix
+++ b/laptop/modules/flatpak.nix
@@ -4,7 +4,5 @@
  lib,
  ...
 }:
-
 {
-
 }
--- a/laptop/modules/gnome.nix
+++ b/laptop/modules/gnome.nix
@@ -4,7 +4,6 @@
  lib,
  ...
 }:
-
 {
  environment = {
    systemPackages = with pkgs.gnomeExtensions; [
--- a/laptop/modules/home/dconf/apps.nix
+++ b/laptop/modules/home/dconf/apps.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  dconf.settings = {
    "org/gnome/Console" = {
--- a/laptop/modules/home/dconf/default.nix
+++ b/laptop/modules/home/dconf/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./apps.nix
--- a/laptop/modules/home/dconf/extensions.nix
+++ b/laptop/modules/home/dconf/extensions.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  dconf.settings = { };
 }
--- a/laptop/modules/home/dconf/gnome.nix
+++ b/laptop/modules/home/dconf/gnome.nix
@@ -1,8 +1,4 @@
-{
-  ...
-
-}:
-
+{ ... }:
 {
  dconf.settings = {
    "org/gnome/desktop/peripherals/touchpad" = {
--- a/laptop/modules/home/default.nix
+++ b/laptop/modules/home/default.nix
@@ -1,7 +1,4 @@
-{
-  ...
-}:
-
+{ ... }:
 {
  imports = [
    ./dconf
--- a/laptop/modules/packages.nix
+++ b/laptop/modules/packages.nix
@@ -4,12 +4,11 @@
  lib,
  ...
 }:
-
 {
  environment.systemPackages = with pkgs; [
    btop
    gnome-power-manager
-    nvtopPackages.intel
    intel-gpu-tools
+    nvtopPackages.intel
  ];
 }
--- a/laptop/modules/programs.nix
+++ b/laptop/modules/programs.nix
@@ -1,7 +1,3 @@
+{ ... }:
 {
-  ...
-}:
-
-{
-
 }
--- a/laptop/modules/services.nix
+++ b/laptop/modules/services.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  ...
-}:
-
+{ pkgs, ... }:
 {
  services.thermald.enable = true;
  services.power-profiles-daemon.enable = false;
--- a/treefmt.toml
+++ b/treefmt.toml
@@ -0,0 +1,3 @@
+[formatter.nix]
+command = "alejandra"
+includes = ["*.nix"]