format with alejandra

flake.nix

@@ -57,8 +57,7 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     nixpkgs,
     nix-cachyos-kernel,
     catppuccin,
@@ -72,10 +71,8 @@
     nixvim,
     apple-silicon,
     ...
-    }:
+  }: let
-    let
+    mkNixosSystem = {
-      mkNixosSystem =
-        {
       hostname,
       system,
       extraModules ? [],
@@ -83,11 +80,13 @@
     }:
       nixpkgs.lib.nixosSystem {
         inherit system;
-          specialArgs = {
+        specialArgs =
+          {
             inherit catppuccin;
           }
           // extraSpecialArgs;
-          modules = [
+        modules =
+          [
             {
               nixpkgs.overlays = [
                 catppuccin-palette.overlays.default
@@ -122,8 +121,7 @@
           ++ extraModules;
       };
 
-      mkHomeConfig =
+    mkHomeConfig = {
-        {
       user,
       hostname,
       system,
@@ -145,8 +143,7 @@
           nixvim.homeModules.nixvim
         ];
       };
-    in
+  in {
-    {
     nixosConfigurations = {
       peach = mkNixosSystem {
         hostname = "peach";

hardware/alien/default.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

hardware/peach/default.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

hardware/vm-aarch64/default.nix

@@ -1,9 +1,13 @@
 # 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, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports = [];
 
   boot.initrd.availableKernelModules = ["ehci_pci" "xhci_pci" "usbhid" "sr_mod"];

home/default.nix

@@ -4,9 +4,7 @@
   lib,
   types,
   ...
-}:
+}: {
-
-{
   options = {
     catppuccinUpper = {
       accent = lib.mkOption {
@@ -108,11 +106,9 @@
           default = pkgs.noto-fonts-color-emoji;
         };
       };
-      cursor =
+      cursor = let
-        let
         attrName = config.catppuccin.flavor + config.catppuccinUpper.accent;
-        in
+      in {
-        {
         name = lib.mkOption {
           type = lib.types.str;
           readOnly = true;
@@ -173,7 +169,7 @@
         # gui applications
         input-leap
         libreoffice-qt-fresh
-        nur.repos.forkprince.helium-nightly
+        # nur.repos.forkprince.helium-nightly
         bitwarden-desktop
         qbittorrent
 
@@ -234,15 +230,24 @@
     gtk = {
       enable = true;
 
-      colorScheme = if config.userOptions.isDark then "dark" else "light";
+      colorScheme =
+        if config.userOptions.isDark
+        then "dark"
+        else "light";
 
       theme = {
         package = pkgs.kdePackages.breeze-gtk;
-        name = if config.userOptions.isDark then "Breeze-Dark" else "Breeze";
+        name =
+          if config.userOptions.isDark
+          then "Breeze-Dark"
+          else "Breeze";
       };
 
       iconTheme = {
-        name = if config.userOptions.isDark then "Colloid-Dark" else "Colloid-Light";
+        name =
+          if config.userOptions.isDark
+          then "Colloid-Dark"
+          else "Colloid-Light";
         package = pkgs.colloid-icon-theme;
       };
 
@@ -286,13 +291,11 @@
           fixed = "\"${config.userOptions.fontMono.name},${toString config.userOptions.fontMono.size}\"";
           general = "\"${config.userOptions.fontSans.name},${toString config.userOptions.fontSans.size}\"";
         };
-        ColorScheme =
+        ColorScheme = let
-          let
           c = pkgs.catppuccin.bare.${config.catppuccin.flavor};
           accent = c.${config.catppuccin.accent};
           mkColors = roles: builtins.concatStringsSep ", " (map (r: "#ff${r}") roles);
-          in
+        in {
-          {
           active_colors = mkColors [
             c.text
             c.surface0

home/games/minecraft/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [
     (prismlauncher.override {
       jdks = [

home/games/morrowind/default.nix

@@ -1,5 +1,7 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [openmw];
 }

home/graphical/discord/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{
-
+  config,
-let
+  pkgs,
+  ...
+}: let
   catppuccin-discord-src = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "discord";
@@ -79,8 +81,7 @@ let
       height = 1071;
     };
   };
-in
+in {
-{
   home.packages = with pkgs; [vesktop];
 
   home.file.".config/vesktop/settings.json" = {

home/graphical/firefox/default.nix

@@ -5,9 +5,7 @@
   config,
   lib,
   ...
-}:
+}: {
-
-{
   home.file.".mozilla/firefox/default/chrome/theme" = {
     source = ./chrome/theme;
     force = true;

home/graphical/mpv/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{
-
+  config,
-let
+  pkgs,
+  ...
+}: let
   catppuccin-mpv = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "mpv";
@@ -14,8 +16,7 @@ let
       ${catppuccin-mpv}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
       > $out/mpv.conf
   '';
-in
+in {
-{
   home.packages = with pkgs; [
     (mpv.override {
       scripts = with mpvScripts; [

home/hosts/alien/default.nix

@@ -3,16 +3,13 @@
   pkgs,
   spicetify-nix,
   ...
-}:
+}: {
-
-{
   catppuccin = {
     accent = "blue";
     flavor = "mocha";
   };
 
   home.packages = with pkgs; [
-
     # steam gtk theming
     adwsteamgtk
 
@@ -36,11 +33,9 @@
     scale = 1.75;
   };
 
-  programs.spicetify =
+  programs.spicetify = let
-    let
     spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-    in
+  in {
-    {
     enable = true;
 
     enabledExtensions = with spicePkgs.extensions; [

home/hosts/peach/default.nix

@@ -1,13 +1,14 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   catppuccin = {
     accent = "peach";
     flavor = "mocha";
   };
 
   home.packages = with pkgs; [
-
     asahi-nvram
     asahi-bless
     asahi-btsync

home/hosts/vm-aarch64/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   catppuccin = {
     accent = "green";
     flavor = "mocha";

home/kde/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.ghostwriter = {
     enable = true;
     font = {

home/systemd/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: {
-
-{
   systemd.user.sessionVariables = {
     XCURSOR_THEME = config.userOptions.cursor.name;
     XCURSOR_SIZE = toString config.userOptions.cursor.size;

home/terminal/btop/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{
-
+  config,
-let
+  pkgs,
+  ...
+}: let
   catppuccin-btop = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "btop";
@@ -15,8 +17,7 @@ let
     cp ${catppuccin-btop}/themes/catppuccin_latte.theme $out/themes/
     cp ${catppuccin-btop}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/
   '';
-in
+in {
-{
   home.file.".config/btop" = {
     source = mergedConfig;
     recursive = true;

home/terminal/fish/default.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [kdePackages.qttools];
 
   programs.fish = {

home/terminal/kitty/default.nix

@@ -3,9 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-
-let
   catppuccin-kitty = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "kitty";
@@ -20,8 +18,7 @@ let
     }/g' ${catppuccin-kitty}/themes/${config.catppuccin.flavor}.conf > \
     $out/${config.catppuccinUpper.flavor}${config.catppuccinUpper.accent}.conf
   '';
-in
+in {
-{
   home.file.".config/kitty/themes" = {
     source = mergedConfig;
     recursive = true;

home/terminal/nvim/default.nix

@@ -1,6 +1,8 @@
-{ pkgs, config, ... }:
-
 {
+  pkgs,
+  config,
+  ...
+}: {
   home.sessionVariables = {
     EDITOR = "nvim";
   };
@@ -9,7 +11,7 @@
     kdePackages.qtdeclarative
     prettier
     prettierd
-    nixfmt-rfc-style
+    alejandra
     stylua
     black
   ];
@@ -96,7 +98,7 @@
           formatters_by_ft = {
             lua = ["stylua"];
             python = ["black"];
-            nix = [ "nixfmt" ];
+            nix = ["alejandra"];
             javascript = ["prettier"];
             css = ["prettier"];
             json = ["prettier"];

home/tiling/niri/default.nix

@@ -1,14 +1,15 @@
-{ config, pkgs, ... }:
+{
-
+  config,
-let
+  pkgs,
+  ...
+}: let
   catppuccin-fuzzel = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "fuzzel";
     rev = "0af0e26901b60ada4b20522df739f032797b07c3";
     sha256 = "sha256-XpItMGsYq4XvLT+7OJ9YRILfd/9RG1GMuO6J4hSGepg=";
   };
-in
+in {
-{
   imports = [
     ./niri.nix
     ./noctalia.nix

home/tiling/niri/niri.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.niri.package = pkgs.niri-unstable.overrideAttrs (old: {
     doCheck = false;
   });

home/tiling/niri/noctalia.nix

@@ -3,9 +3,7 @@
   config,
   lib,
   ...
-}:
+}: let
-
-let
   # Get the actual color palettes
   darkPalette = pkgs.catppuccin.${config.catppuccin.flavor};
   lightPalette = pkgs.catppuccin.latte;
@@ -46,7 +44,9 @@ let
     pname = "noctalia-shell-custom";
     nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.jq];
 
-    postPatch = (oldAttrs.postPatch or "") + ''
+    postPatch =
+      (oldAttrs.postPatch or "")
+      + ''
               echo "Patching noctalia-shell with Cat-Custom theme..."
               echo "  Dark: ${config.catppuccin.flavor} / Light: latte"
               echo "  Accent: ${config.catppuccin.accent}"
@@ -77,12 +77,13 @@ let
               fi
       '';
 
-    meta = oldAttrs.meta // {
+    meta =
+      oldAttrs.meta
+      // {
         description = "${oldAttrs.meta.description} (Cat-Custom: ${config.catppuccin.flavor}/${config.catppuccin.accent})";
       };
   });
-in
+in {
-{
   programs.noctalia-shell = {
     enable = true;
     package = customPackage;

home/tiling/wallpaper/default.nix

@@ -1,5 +1,8 @@
-{ pkgs, config, ... }:
+{
-let
+  pkgs,
+  config,
+  ...
+}: let
   bingWallpaperScript = pkgs.writeShellScript "bing-wallpaper" ''
     set -euo pipefail
 
@@ -59,8 +62,7 @@ let
 
     echo "Wallpaper downloaded and applied successfully."
   '';
-in
+in {
-{
   systemd.user.services.bing-wallpaper = {
     Unit = {
       Description = "Download and set Bing wallpaper of the day";

home/vscode/default.nix

@@ -3,14 +3,10 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-
+  capitalize = str:
-let
-  capitalize =
-    str:
     (lib.toUpper (builtins.substring 0 1 str)) + (builtins.substring 1 (builtins.stringLength str) str);
-in
+in {
-{
   # home.sessionVariables = {
   #   EDITOR = "code";
   # };

packages/overlay.nix

@@ -1,9 +1,8 @@
 final: prev: {
   widevine-helium =
-    if prev.stdenv.hostPlatform.system == "aarch64-linux" then
+    if prev.stdenv.hostPlatform.system == "aarch64-linux"
-      prev.callPackage ./helium-browser/widevine-aarch64-linux.nix { }
+    then prev.callPackage ./helium-browser/widevine-aarch64-linux.nix {}
-    else
+    else null;
-      null;
 
   # helium-browser =
   #   prev.callPackage

packages/spotify/package.nix

@@ -5,9 +5,7 @@
   copyDesktopItems,
   chromium,
   writeShellScriptBin,
-}:
+}: let
-
-let
   pname = "spotify-webapp";
   version = "1.0.0";
 
@@ -25,7 +23,6 @@ let
       --ozone-platform=wayland \
       "$@"
   '';
-
 in
   stdenv.mkDerivation {
     inherit pname version;

packages/spotifyd/package.nix

@@ -20,7 +20,6 @@
   withPortAudio ? stdenv.hostPlatform.isDarwin,
   withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
 }:
-
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spotifyd";
   version = "0.4.2";

system/default.nix

@@ -1,16 +1,13 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
 {
   config,
   lib,
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
@@ -79,7 +76,6 @@
   };
 
   boot = {
-
     plymouth = {
       enable = true;
     };
@@ -227,5 +223,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "25.05"; # Did you read the comment?
-
 }

system/hosts/alien/default.nix

@@ -6,8 +6,7 @@
   catppuccin,
   nix-cachyos-kernel,
   ...
-}:
+}: {
-{
   networking.hostName = "alien";
 
   environment.systemPackages = with pkgs; [

system/hosts/peach/default.nix

@@ -4,8 +4,7 @@
   lib,
   catppuccin,
   ...
-}:
+}: {
-{
   networking.hostName = "peach";
 
   boot.binfmt.emulatedSystems = [

system/hosts/vm-aarch64/default.nix

@@ -4,8 +4,7 @@
   lib,
   catppuccin,
   ...
-}:
+}: {
-{
   networking.hostName = "vm-aarch64";
 
   boot.binfmt.emulatedSystems = [

system/shell/fish.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   programs.bash = {
     interactiveShellInit = ''
       if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]

system/tailscale/default.nix

@@ -4,9 +4,7 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-
-let
   tailscaleWaitScript = pkgs.writeShellScript "tailscale-wait-for-ip" ''
     echo "Waiting for tailscale0 to get an IP address..."
     for i in {1..15}; do
@@ -20,8 +18,7 @@ let
     echo "Warning: tailscale0 did not get IP address within 15 seconds"
     exit 0
   '';
-in
+in {
-{
   systemd.services.tailscaled = {
     serviceConfig = {
       ExecStartPost = tailscaleWaitScript;

system/widevine/default.nix

@@ -3,15 +3,13 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   nixpkgs.overlays = lib.mkIf (config.nixpkgs.hostPlatform.isLinux) [
     (final: prev: {
-      wrapFirefox =
+      wrapFirefox = browser: opts: let
-        browser: opts:
+        extraPrefs =
-        let
+          (opts.extraPrefs or "")
-          extraPrefs = (opts.extraPrefs or "") + ''
+          + ''
             lockPref("media.gmp-widevinecdm.version", "system-installed");
             lockPref("media.gmp-widevinecdm.visible", true);
             lockPref("media.gmp-widevinecdm.enabled", true);
@@ -23,7 +21,9 @@
         widevineOutDir = "$out/gmp-widevinecdm/system-installed";
       in
         (prev.wrapFirefox browser (opts // {inherit extraPrefs;})).overrideAttrs (previousAttrs: {
-          buildCommand = previousAttrs.buildCommand + ''
+          buildCommand =
+            previousAttrs.buildCommand
+            + ''
               mkdir -p "${widevineOutDir}"
               ln -s "${widevineCdmDir}/_platform_specific/linux_arm64/libwidevinecdm.so" "${widevineOutDir}/libwidevinecdm.so"
               ln -s "${widevineCdmDir}/manifest.json" "${widevineOutDir}/manifest.json"