run formatter

elohmeier · Mar 1, 2025 · 735e1da · 735e1da
1 parent c7605da
commit 735e1da
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 38 deletions.
diff --git a/modules/home/i3sway/keybindings.nix b/modules/home/i3sway/keybindings.nix
@@ -26,7 +26,8 @@ in
 
   "${modifier}+Shift+a" = "exec xrandr --output Virtual-1 --auto";
 
-  "${modifier}+d" = "exec ${pkgs.bemenu}/bin/bemenu-run --list 10 --prompt 'Run:' ${config.ptsd.style.bemenuOpts}";
+  "${modifier}+d" =
+    "exec ${pkgs.bemenu}/bin/bemenu-run --list 10 --prompt 'Run:' ${config.ptsd.style.bemenuOpts}";
   #"${modifier}+d" = "exec ${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu -p \"Run:\" -l 10 | ${pkgs.findutils}/bin/xargs ${pkgs.sway}/bin/swaymsg exec";
 
   # change focus
@@ -103,8 +104,10 @@ in
 
   "${modifier}+Shift+w" = "exec ${termExec "nmtui" ""}";
 
-  "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%+ | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
-  "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%- | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
+  "XF86MonBrightnessUp" =
+    "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%+ | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
+  "XF86MonBrightnessDown" =
+    "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%- | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
 
   "XF86AudioMute" =
     mkIf (enableAudio && cfg.primarySpeaker != null)
@@ -124,8 +127,10 @@ in
   "XF86Search" = "exec firefox";
   "XF86Mail" = "exec evolution";
   "XF86Launch5" = "exec spotify"; # Label: 1
-  "XF86Launch8" = mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo -5%"; # Label: 4
-  "XF86Launch9" = mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo +5%"; # Label: 5
+  "XF86Launch8" =
+    mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo -5%"; # Label: 4
+  "XF86Launch9" =
+    mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo +5%"; # Label: 5
 
   "XF86AudioPlay" = mkIf enableAudio "exec ${pkgs.playerctl}/bin/playerctl play-pause";
   "${modifier}+p" = mkIf enableAudio "exec ${pkgs.playerctl}/bin/playerctl play-pause";
@@ -161,7 +166,8 @@ in
   #"${modifier}+e" ="exec pcmanfm \"`${cwdCmd}`\"";
 
   # screenshots
-  "Print" = ''exec ${pkgs.grim}/bin/grim -t png ~/Pocket/Screenshots/$(${pkgs.coreutils}/bin/date +"%Y-%m-%d_%H:%M:%S.png")'';
+  "Print" =
+    ''exec ${pkgs.grim}/bin/grim -t png ~/Pocket/Screenshots/$(${pkgs.coreutils}/bin/date +"%Y-%m-%d_%H:%M:%S.png")'';
   "${modifier}+Ctrl+Shift+4" =
     if enableFlameshot then
       "exec ${pkgs.flameshot}/bin/flameshot gui"

diff --git a/modules/home/pass.nix b/modules/home/pass.nix
@@ -13,7 +13,8 @@ with lib;
     # PASSAGE_DIR = "${config.home.homeDirectory}/repos/passage-store";
   };
 
-  home.file.".password-store".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/password-store";
+  home.file.".password-store".source =
+    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/password-store";
   # home.file.".passage".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/passage-store";
 
   home.packages = with pkgs; [

diff --git a/modules/nixos/mjpg-streamer.nix b/modules/nixos/mjpg-streamer.nix
@@ -8,9 +8,13 @@
 with lib;
 let
   cfg = config.ptsd.mjpg-streamer;
-  outputPlugin = builtins.replaceStrings [ "@www@" ] [
-    "${cfg.package}/share/mjpg-streamer/www"
-  ] cfg.outputPlugin;
+  outputPlugin =
+    builtins.replaceStrings
+      [ "@www@" ]
+      [
+        "${cfg.package}/share/mjpg-streamer/www"
+      ]
+      cfg.outputPlugin;
 in
 {
   options = {

diff --git a/modules/nixos/orbstack-defaults/orbstack.nix b/modules/nixos/orbstack-defaults/orbstack.nix
@@ -51,8 +51,7 @@
   systemd.services."systemd-hostnamed".serviceConfig.WatchdogSec = 0;
   systemd.services."systemd-homed".serviceConfig.WatchdogSec = 0;
   systemd.services."systemd-networkd".serviceConfig.WatchdogSec =
-    lib.mkIf config.systemd.network.enable
-      0;
+    lib.mkIf config.systemd.network.enable 0;
 
   # ssh config
   programs.ssh.extraConfig = ''

diff --git a/modules/nixos/tp4.nix b/modules/nixos/tp4.nix
@@ -55,7 +55,7 @@
     };
 
     boot.kernelPackages = pkgs.linuxPackages_latest.extend (
-      selfLinux: superLinux: { nvidia_x11 = superLinux.nvidia_x11_legacy390; }
+      _selfLinux: superLinux: { nvidia_x11 = superLinux.nvidia_x11_legacy390; }
     );
 
     nixpkgs.config.packageOverrides = pkgs: {

diff --git a/packages/logseq-query/node-env.nix b/packages/logseq-query/node-env.nix
@@ -455,11 +455,15 @@ let
     stdenv.mkDerivation (
       {
         name = "${name}${if version == null then "" else "-${version}"}";
-        buildInputs = [
-          tarWrapper
-          python
-          nodejs
-        ] ++ lib.optional stdenv.isLinux utillinux ++ lib.optional stdenv.isDarwin libtool ++ buildInputs;
+        buildInputs =
+          [
+            tarWrapper
+            python
+            nodejs
+          ]
+          ++ lib.optional stdenv.isLinux utillinux
+          ++ lib.optional stdenv.isDarwin libtool
+          ++ buildInputs;
 
         inherit nodejs;
 
@@ -570,11 +574,15 @@ let
       {
         name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
 
-        buildInputs = [
-          tarWrapper
-          python
-          nodejs
-        ] ++ lib.optional stdenv.isLinux utillinux ++ lib.optional stdenv.isDarwin libtool ++ buildInputs;
+        buildInputs =
+          [
+            tarWrapper
+            python
+            nodejs
+          ]
+          ++ lib.optional stdenv.isLinux utillinux
+          ++ lib.optional stdenv.isDarwin libtool
+          ++ buildInputs;
 
         inherit dontStrip; # Stripping may fail a build for some package deployments
         inherit dontNpmInstall unpackPhase buildPhase;
@@ -657,10 +665,13 @@ let
       {
         name = "node-shell-${name}${if version == null then "" else "-${version}"}";
 
-        buildInputs = [
-          python
-          nodejs
-        ] ++ lib.optional stdenv.isLinux utillinux ++ buildInputs;
+        buildInputs =
+          [
+            python
+            nodejs
+          ]
+          ++ lib.optional stdenv.isLinux utillinux
+          ++ buildInputs;
         buildCommand = ''
           mkdir -p $out/bin
           cat > $out/bin/shell <<EOF

diff --git a/packages/node-packages/default.nix b/packages/node-packages/default.nix
@@ -14,14 +14,14 @@ let
     ;
 
   nodePackages =
-    final:
+    _final:
     import ./composition.nix {
       inherit pkgs nodejs;
       inherit (stdenv.hostPlatform) system;
     };
 
   mainProgramOverrides =
-    final: prev:
+    _final: prev:
     mapAttrs (
       pkgName: mainProgram:
       prev.${pkgName}.override (oldAttrs: {

diff --git a/packages/node-packages/node-env.nix b/packages/node-packages/node-env.nix
@@ -130,7 +130,7 @@ let
       src,
       dependencies ? [ ],
       ...
-    }@args:
+    }:
     builtins.addErrorContext "while evaluating node package '${packageName}'" ''
       installPackage "${packageName}" "${src}"
       ${includeDependencies { inherit dependencies; }}
@@ -221,7 +221,7 @@ let
       dependencies ? [ ],
       production ? true,
       ...
-    }@args:
+    }:
     ''
       if [ -d "${packageName}" ]
       then
@@ -551,7 +551,9 @@ let
             python
             nodejs
           ]
-          ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
 
         inherit nodejs;
 
@@ -671,7 +673,9 @@ let
             python
             nodejs
           ]
-          ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
 
         inherit dontStrip; # Stripping may fail a build for some package deployments
         inherit dontNpmInstall unpackPhase buildPhase;
@@ -764,10 +768,13 @@ let
       {
         name = "node-shell-${name}${if version == null then "" else "-${version}"}";
 
-        buildInputs = [
-          python
-          nodejs
-        ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+        buildInputs =
+          [
+            python
+            nodejs
+          ]
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ buildInputs;
         buildCommand = ''
           mkdir -p $out/bin
           cat > $out/bin/shell <<EOF

diff --git a/packages/node-packages/overrides.nix b/packages/node-packages/overrides.nix
@@ -4,7 +4,7 @@ let
   inherit (pkgs) stdenv lib;
 in
 
-final: prev: {
+_final: prev: {
   inherit nodejs;
 
   readability-cli = prev.readability-cli.override {