From 5d7cff125e15dea29e1610c4023cb6d6ac4aaa63 Mon Sep 17 00:00:00 2001 From: yemou Date: Fri, 13 Feb 2026 03:58:28 -0500 Subject: [PATCH] flake.nix: add formatter ad format all nix files --- flake.nix | 35 ++++++++++++++++++------ nix/colorgrab.nix | 70 ++++++++++++++++++++++++----------------------- nix/prefon.nix | 40 ++++++++++++++------------- nix/scr.nix | 70 ++++++++++++++++++++++++----------------------- nix/thm.nix | 44 +++++++++++++++-------------- nix/vid2gif.nix | 40 ++++++++++++++------------- 6 files changed, 164 insertions(+), 135 deletions(-) diff --git a/flake.nix b/flake.nix index e00edbf..b28100a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,28 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs, ... }: + outputs = + { self, nixpkgs, ... }: let - forAllSystems = function: nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] - (system: function (import nixpkgs { - inherit system; - overlays = [ self.overlays.default ]; - })); + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + forSystems = + func: + nixpkgs.lib.genAttrs systems ( + system: + func ( + import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + } + ) + ); in { + formatter = forSystems (pkgs: pkgs.nixfmt-tree.override { settings.formatter.nixfmt.options = [ "-w 120" ]; }); + overlays.default = final: prev: rec { colorgrab = final.callPackage ./nix/colorgrab.nix { }; prefon = final.callPackage ./nix/prefon.nix { }; @@ -20,11 +33,17 @@ vid2gif = final.callPackage ./nix/vid2gif.nix { }; yemou-scripts = final.symlinkJoin { name = "yemou-scripts"; - paths = [ colorgrab prefon scr thm vid2gif ]; + paths = [ + colorgrab + prefon + scr + thm + vid2gif + ]; }; }; - packages = forAllSystems (pkgs: { + packages = forSystems (pkgs: { colorgrab = pkgs.colorgrab; default = pkgs.yemou-scripts; prefon = pkgs.prefon; diff --git a/nix/colorgrab.nix b/nix/colorgrab.nix index 8eb9e71..a90f556 100644 --- a/nix/colorgrab.nix +++ b/nix/colorgrab.nix @@ -1,37 +1,39 @@ -{ writeScriptBin -, bash -, coreutils -, grim -, imagemagick -, libnotify -, slurp -, wl-clipboard -, xdg-utils -, ... +{ + writeScriptBin, + bash, + coreutils, + grim, + imagemagick, + libnotify, + slurp, + wl-clipboard, + xdg-utils, + ... }: -writeScriptBin "colorgrab" (builtins.replaceStrings - [ - "#!/bin/sh" - "mkdir" - "printf" - "grim" - "slurp" - "convert" - "wl-copy" - "xdg-open " - "notify-send" - ] - [ - "#!${bash}/bin/sh" - "${coreutils}/bin/mkdir" - "${coreutils}/bin/printf" - "${grim}/bin/grim" - "${slurp}/bin/slurp" - "${imagemagick}/bin/convert" - "${wl-clipboard}/bin/wl-copy" - "${xdg-utils}/bin/xdg-open " - "${libnotify}/bin/notify-send" - ] - (builtins.readFile ../scritps/colorgrab) +writeScriptBin "colorgrab" ( + builtins.replaceStrings + [ + "#!/bin/sh" + "mkdir" + "printf" + "grim" + "slurp" + "convert" + "wl-copy" + "xdg-open " + "notify-send" + ] + [ + "#!${bash}/bin/sh" + "${coreutils}/bin/mkdir" + "${coreutils}/bin/printf" + "${grim}/bin/grim" + "${slurp}/bin/slurp" + "${imagemagick}/bin/convert" + "${wl-clipboard}/bin/wl-copy" + "${xdg-utils}/bin/xdg-open " + "${libnotify}/bin/notify-send" + ] + (builtins.readFile ../scritps/colorgrab) ) diff --git a/nix/prefon.nix b/nix/prefon.nix index 7f7b168..a0a0690 100644 --- a/nix/prefon.nix +++ b/nix/prefon.nix @@ -1,22 +1,24 @@ -{ writeScriptBin -, bash -, coreutils -, imagemagick -, ... +{ + writeScriptBin, + bash, + coreutils, + imagemagick, + ... }: -writeScriptBin "prefon" (builtins.replaceStrings - [ - "#!/bin/sh" - "printf" - "convert" - "rm" - ] - [ - "#!${bash}/bin/sh" - "${coreutils}/bin/printf" - "${imagemagick}/bin/convert" - "${coreutils}/bin/rm" - ] - (builtins.readFile ../scritps/prefon) +writeScriptBin "prefon" ( + builtins.replaceStrings + [ + "#!/bin/sh" + "printf" + "convert" + "rm" + ] + [ + "#!${bash}/bin/sh" + "${coreutils}/bin/printf" + "${imagemagick}/bin/convert" + "${coreutils}/bin/rm" + ] + (builtins.readFile ../scritps/prefon) ) diff --git a/nix/scr.nix b/nix/scr.nix index b8d60dc..eec3a76 100644 --- a/nix/scr.nix +++ b/nix/scr.nix @@ -1,37 +1,39 @@ -{ writeScriptBin -, bash -, coreutils -, ffmpeg -, grim -, pulseaudio -, slurp -, wf-recorder -, wl-clipboard -, ... +{ + writeScriptBin, + bash, + coreutils, + ffmpeg, + grim, + pulseaudio, + slurp, + wf-recorder, + wl-clipboard, + ... }: -writeScriptBin "scr" (builtins.replaceStrings - [ - "#!/bin/sh" - "printf" - "mkdir" - "ffmpeg" - "grim" - "slurp" - "wl-copy" - "pactl" - "wf-recorder" - ] - [ - "#!${bash}/bin/sh" - "${coreutils}/bin/printf" - "${coreutils}/bin/mkdir" - "${ffmpeg}/bin/ffmpeg" - "${grim}/bin/grim" - "${slurp}/bin/slurp" - "${wl-clipboard}/bin/wl-copy" - "${pulseaudio}/bin/pactl" - "${wf-recorder}/bin/wf-recorder" - ] - (builtins.readFile ../scritps/scr) +writeScriptBin "scr" ( + builtins.replaceStrings + [ + "#!/bin/sh" + "printf" + "mkdir" + "ffmpeg" + "grim" + "slurp" + "wl-copy" + "pactl" + "wf-recorder" + ] + [ + "#!${bash}/bin/sh" + "${coreutils}/bin/printf" + "${coreutils}/bin/mkdir" + "${ffmpeg}/bin/ffmpeg" + "${grim}/bin/grim" + "${slurp}/bin/slurp" + "${wl-clipboard}/bin/wl-copy" + "${pulseaudio}/bin/pactl" + "${wf-recorder}/bin/wf-recorder" + ] + (builtins.readFile ../scritps/scr) ) diff --git a/nix/thm.nix b/nix/thm.nix index 60d173a..d74ba9d 100644 --- a/nix/thm.nix +++ b/nix/thm.nix @@ -1,24 +1,26 @@ -{ writeScriptBin -, bash -, coreutils -, gnused -, ... +{ + writeScriptBin, + bash, + coreutils, + gnused, + ... }: -writeScriptBin "thm" (builtins.replaceStrings - [ - "#!/bin/sh" - "printf" - "mkdir" - "mv" - "sed" - ] - [ - "#!${bash}/bin/sh" - "${coreutils}/bin/printf" - "${coreutils}/bin/mkdir" - "${coreutils}/bin/mv" - "${gnused}/bin/sed" - ] - (builtins.readFile ../scritps/thm) +writeScriptBin "thm" ( + builtins.replaceStrings + [ + "#!/bin/sh" + "printf" + "mkdir" + "mv" + "sed" + ] + [ + "#!${bash}/bin/sh" + "${coreutils}/bin/printf" + "${coreutils}/bin/mkdir" + "${coreutils}/bin/mv" + "${gnused}/bin/sed" + ] + (builtins.readFile ../scritps/thm) ) diff --git a/nix/vid2gif.nix b/nix/vid2gif.nix index 9cd9793..18cfe07 100644 --- a/nix/vid2gif.nix +++ b/nix/vid2gif.nix @@ -1,22 +1,24 @@ -{ writeScriptBin -, bash -, coreutils -, ffmpeg -, ... +{ + writeScriptBin, + bash, + coreutils, + ffmpeg, + ... }: -writeScriptBin "vid2gif" (builtins.replaceStrings - [ - "#!/bin/sh" - "mktemp" - "rm" - "ffmpeg" - ] - [ - "#!${bash}/bin/sh" - "${coreutils}/bin/mktemp" - "${coreutils}/bin/rm" - "${ffmpeg}/bin/ffmpeg" - ] - (builtins.readFile ../scritps/vid2gif) +writeScriptBin "vid2gif" ( + builtins.replaceStrings + [ + "#!/bin/sh" + "mktemp" + "rm" + "ffmpeg" + ] + [ + "#!${bash}/bin/sh" + "${coreutils}/bin/mktemp" + "${coreutils}/bin/rm" + "${ffmpeg}/bin/ffmpeg" + ] + (builtins.readFile ../scritps/vid2gif) ) -- 2.51.2