From f63d899a257c6f4907fe9d7b16864593ad50893d Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 13 Jul 2025 07:16:21 -0700 Subject: [PATCH] style: nix fmt --- darwin/common/overlay.nix | 6 +----- flake.nix | 12 ++++++------ formatting.nix | 5 +---- home/environments/niri/autostart.nix | 5 +---- home/environments/niri/cursor.nix | 5 +---- modules/home/i3/functions.nix | 3 ++- nixos/profiles/bcachefs.nix | 5 +---- nixos/profiles/gaming/lutris.nix | 5 +---- nixos/servers/web/acme.nix | 2 +- nixos/servers/weechat/perl.nix | 9 +++++++-- nixos/servers/weechat/python.nix | 3 ++- outputs.nix | 1 - std.nix | 2 +- 13 files changed, 25 insertions(+), 38 deletions(-) diff --git a/darwin/common/overlay.nix b/darwin/common/overlay.nix index 81645e3d..8db08445 100644 --- a/darwin/common/overlay.nix +++ b/darwin/common/overlay.nix @@ -1,8 +1,4 @@ -{ - inputs, - system, - ... -}: { +_: { nixpkgs = { overlays = [ ]; diff --git a/flake.nix b/flake.nix index bf97c0a2..9e4ecd77 100644 --- a/flake.nix +++ b/flake.nix @@ -137,12 +137,12 @@ }; }; snowfall-lib = { - url = "github:snowfallorg/lib"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils-plus.follows = "flake-utils-plus"; - flake-compat.follows = "flake-compat"; - }; + url = "github:snowfallorg/lib"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils-plus.follows = "flake-utils-plus"; + flake-compat.follows = "flake-compat"; + }; }; nh = { url = "github:nix-community/nh"; diff --git a/formatting.nix b/formatting.nix index 697d2c84..5e1817c3 100644 --- a/formatting.nix +++ b/formatting.nix @@ -1,7 +1,4 @@ -{ - inputs, - ... -}: +{inputs, ...}: inputs.flake-utils.lib.eachDefaultSystem (system: let treefmtEval = inputs.treefmt-nix.lib.evalModule inputs.nixpkgs.legacyPackages.${system} ./treefmt.nix; in { diff --git a/home/environments/niri/autostart.nix b/home/environments/niri/autostart.nix index 474f6816..f2018374 100644 --- a/home/environments/niri/autostart.nix +++ b/home/environments/niri/autostart.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { programs.niri.settings.spawn-at-startup = let import-gsettings = pkgs.writeShellScriptBin "import-gsettings" '' # usage: import-gsettings diff --git a/home/environments/niri/cursor.nix b/home/environments/niri/cursor.nix index b69a7aec..6e837445 100644 --- a/home/environments/niri/cursor.nix +++ b/home/environments/niri/cursor.nix @@ -1,7 +1,4 @@ -{ - config, - ... -}: { +{config, ...}: { catppuccin.cursors.enable = true; home.pointerCursor = { dotIcons.enable = true; diff --git a/modules/home/i3/functions.nix b/modules/home/i3/functions.nix index 5b122b4e..9115d3fb 100644 --- a/modules/home/i3/functions.nix +++ b/modules/home/i3/functions.nix @@ -196,7 +196,8 @@ with lib; rec { level ? 1, }: let prefix = concatStringsSep "" (lib.genList (_x: " ") (level * 2)); - in lib.imap1 (i: v: "${ + in + lib.imap1 (i: v: "${ if includesWrapper && (i == 1 || i == (lib.length list)) then v else "${prefix}${v}" diff --git a/nixos/profiles/bcachefs.nix b/nixos/profiles/bcachefs.nix index 0c3ea3b7..4dc6eae6 100644 --- a/nixos/profiles/bcachefs.nix +++ b/nixos/profiles/bcachefs.nix @@ -1,7 +1,4 @@ -{ - lib, - ... -}: let +{lib, ...}: let inherit (lib.types) submodule loaOf; inherit (lib.modules) mkDefault mkAfter; inherit (lib.options) mkOption; diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix index 0cc37e0a..9580d67c 100644 --- a/nixos/profiles/gaming/lutris.nix +++ b/nixos/profiles/gaming/lutris.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { hardware.graphics = { enable32Bit = true; extraPackages32 = with pkgs; [ diff --git a/nixos/servers/web/acme.nix b/nixos/servers/web/acme.nix index efbaf6ce..54967c88 100644 --- a/nixos/servers/web/acme.nix +++ b/nixos/servers/web/acme.nix @@ -1,4 +1,4 @@ -{ config, ... }: { +{config, ...}: { security.acme = { defaults = { dnsProvider = "cloudflare"; diff --git a/nixos/servers/weechat/perl.nix b/nixos/servers/weechat/perl.nix index 8feca2f1..2922e27b 100644 --- a/nixos/servers/weechat/perl.nix +++ b/nixos/servers/weechat/perl.nix @@ -1,11 +1,16 @@ -{pkgs, inputs, ...}: { +{ + pkgs, + inputs, + ... +}: { home-manager.users.kat.programs.weechat = { plugins = { perl = { enable = true; }; }; - scripts = with inputs.arcexprs.legacyPackages.${pkgs.system}.weechatScripts; with pkgs.weechatScripts; [ + scripts = with inputs.arcexprs.legacyPackages.${pkgs.system}.weechatScripts; + with pkgs.weechatScripts; [ highmon parse_relayed_msg ]; diff --git a/nixos/servers/weechat/python.nix b/nixos/servers/weechat/python.nix index 21d2ffed..220e660e 100644 --- a/nixos/servers/weechat/python.nix +++ b/nixos/servers/weechat/python.nix @@ -15,7 +15,8 @@ in { enable = true; }; }; - scripts = with inputs.arcexprs.legacyPackages.${pkgs.system}.weechatScripts; with pkgs.weechatScripts; [ + scripts = with inputs.arcexprs.legacyPackages.${pkgs.system}.weechatScripts; + with pkgs.weechatScripts; [ colorize_nicks title weechat-go diff --git a/outputs.nix b/outputs.nix index 059ca96c..e7a4a302 100644 --- a/outputs.nix +++ b/outputs.nix @@ -7,7 +7,6 @@ shells = import ./shells {inherit inputs tree lib std pkgs;}; inherit (import ./pkgs.nix {inherit inputs tree overlay;}) pkgs; formatting = import ./formatting.nix {inherit inputs pkgs;}; - wrappers = import ./wrappers {inherit inputs;}; inherit (std) set; checks = set.map (_: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; in diff --git a/std.nix b/std.nix index 437f3f97..21eb2dd3 100644 --- a/std.nix +++ b/std.nix @@ -1,6 +1,6 @@ {inputs, ...}: let std = let - baseStd = inputs.std.lib.Std.compat // { inherit (inputs.std.lib.Std.std) tuple; }; + baseStd = inputs.std.lib.Std.compat // {inherit (inputs.std.lib.Std.std) tuple;}; inherit (baseStd) set function list bool types optional tuple; mergeWith = let append = {