Skip to content

Commit 735e1da

Browse files
elohmeierelohmeier
committed
run formatter
1 parent c7605da commit 735e1da

File tree

9 files changed

+66
-38
lines changed

9 files changed

+66
-38
lines changed

‎modules/home/i3sway/keybindings.nix

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ in
2626

2727
"${modifier}+Shift+a" = "exec xrandr --output Virtual-1 --auto";
2828

29-
"${modifier}+d" = "exec ${pkgs.bemenu}/bin/bemenu-run --list 10 --prompt 'Run:' ${config.ptsd.style.bemenuOpts}";
29+
"${modifier}+d" =
30+
"exec ${pkgs.bemenu}/bin/bemenu-run --list 10 --prompt 'Run:' ${config.ptsd.style.bemenuOpts}";
3031
#"${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";
3132

3233
# change focus
@@ -103,8 +104,10 @@ in
103104

104105
"${modifier}+Shift+w" = "exec ${termExec "nmtui" ""}";
105106

106-
"XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%+ | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
107-
"XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%- | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
107+
"XF86MonBrightnessUp" =
108+
"exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%+ | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
109+
"XF86MonBrightnessDown" =
110+
"exec ${pkgs.brightnessctl}/bin/brightnessctl s 10%- | sed -En 's/.*\\(([0-9]+)%\\).*/\\1/p' > $WOBSOCK";
108111

109112
"XF86AudioMute" =
110113
mkIf (enableAudio && cfg.primarySpeaker != null)
@@ -124,8 +127,10 @@ in
124127
"XF86Search" = "exec firefox";
125128
"XF86Mail" = "exec evolution";
126129
"XF86Launch5" = "exec spotify"; # Label: 1
127-
"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
128-
"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
130+
"XF86Launch8" =
131+
mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo -5%"; # Label: 4
132+
"XF86Launch9" =
133+
mkIf enableAudio "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume alsa_output.usb-LG_Electronics_Inc._USB_Audio-00.analog-stereo +5%"; # Label: 5
129134

130135
"XF86AudioPlay" = mkIf enableAudio "exec ${pkgs.playerctl}/bin/playerctl play-pause";
131136
"${modifier}+p" = mkIf enableAudio "exec ${pkgs.playerctl}/bin/playerctl play-pause";
@@ -161,7 +166,8 @@ in
161166
#"${modifier}+e" ="exec pcmanfm \"`${cwdCmd}`\"";
162167

163168
# screenshots
164-
"Print" = ''exec ${pkgs.grim}/bin/grim -t png ~/Pocket/Screenshots/$(${pkgs.coreutils}/bin/date +"%Y-%m-%d_%H:%M:%S.png")'';
169+
"Print" =
170+
''exec ${pkgs.grim}/bin/grim -t png ~/Pocket/Screenshots/$(${pkgs.coreutils}/bin/date +"%Y-%m-%d_%H:%M:%S.png")'';
165171
"${modifier}+Ctrl+Shift+4" =
166172
if enableFlameshot then
167173
"exec ${pkgs.flameshot}/bin/flameshot gui"

‎modules/home/pass.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ with lib;
1313
# PASSAGE_DIR = "${config.home.homeDirectory}/repos/passage-store";
1414
};
1515

16-
home.file.".password-store".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/password-store";
16+
home.file.".password-store".source =
17+
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/password-store";
1718
# home.file.".passage".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/repos/passage-store";
1819

1920
home.packages = with pkgs; [

‎modules/nixos/mjpg-streamer.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
with lib;
99
let
1010
cfg = config.ptsd.mjpg-streamer;
11-
outputPlugin = builtins.replaceStrings [ "@www@" ] [
12-
"${cfg.package}/share/mjpg-streamer/www"
13-
] cfg.outputPlugin;
11+
outputPlugin =
12+
builtins.replaceStrings
13+
[ "@www@" ]
14+
[
15+
"${cfg.package}/share/mjpg-streamer/www"
16+
]
17+
cfg.outputPlugin;
1418
in
1519
{
1620
options = {

‎modules/nixos/orbstack-defaults/orbstack.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
systemd.services."systemd-hostnamed".serviceConfig.WatchdogSec = 0;
5252
systemd.services."systemd-homed".serviceConfig.WatchdogSec = 0;
5353
systemd.services."systemd-networkd".serviceConfig.WatchdogSec =
54-
lib.mkIf config.systemd.network.enable
55-
0;
54+
lib.mkIf config.systemd.network.enable 0;
5655

5756
# ssh config
5857
programs.ssh.extraConfig = ''

‎modules/nixos/tp4.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
};
5656

5757
boot.kernelPackages = pkgs.linuxPackages_latest.extend (
58-
selfLinux: superLinux: { nvidia_x11 = superLinux.nvidia_x11_legacy390; }
58+
_selfLinux: superLinux: { nvidia_x11 = superLinux.nvidia_x11_legacy390; }
5959
);
6060

6161
nixpkgs.config.packageOverrides = pkgs: {

‎packages/logseq-query/node-env.nix

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,15 @@ let
455455
stdenv.mkDerivation (
456456
{
457457
name = "${name}${if version == null then "" else "-${version}"}";
458-
buildInputs = [
459-
tarWrapper
460-
python
461-
nodejs
462-
] ++ lib.optional stdenv.isLinux utillinux ++ lib.optional stdenv.isDarwin libtool ++ buildInputs;
458+
buildInputs =
459+
[
460+
tarWrapper
461+
python
462+
nodejs
463+
]
464+
++ lib.optional stdenv.isLinux utillinux
465+
++ lib.optional stdenv.isDarwin libtool
466+
++ buildInputs;
463467

464468
inherit nodejs;
465469

@@ -570,11 +574,15 @@ let
570574
{
571575
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
572576

573-
buildInputs = [
574-
tarWrapper
575-
python
576-
nodejs
577-
] ++ lib.optional stdenv.isLinux utillinux ++ lib.optional stdenv.isDarwin libtool ++ buildInputs;
577+
buildInputs =
578+
[
579+
tarWrapper
580+
python
581+
nodejs
582+
]
583+
++ lib.optional stdenv.isLinux utillinux
584+
++ lib.optional stdenv.isDarwin libtool
585+
++ buildInputs;
578586

579587
inherit dontStrip; # Stripping may fail a build for some package deployments
580588
inherit dontNpmInstall unpackPhase buildPhase;
@@ -657,10 +665,13 @@ let
657665
{
658666
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
659667

660-
buildInputs = [
661-
python
662-
nodejs
663-
] ++ lib.optional stdenv.isLinux utillinux ++ buildInputs;
668+
buildInputs =
669+
[
670+
python
671+
nodejs
672+
]
673+
++ lib.optional stdenv.isLinux utillinux
674+
++ buildInputs;
664675
buildCommand = ''
665676
mkdir -p $out/bin
666677
cat > $out/bin/shell <<EOF

‎packages/node-packages/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ let
1414
;
1515

1616
nodePackages =
17-
final:
17+
_final:
1818
import ./composition.nix {
1919
inherit pkgs nodejs;
2020
inherit (stdenv.hostPlatform) system;
2121
};
2222

2323
mainProgramOverrides =
24-
final: prev:
24+
_final: prev:
2525
mapAttrs (
2626
pkgName: mainProgram:
2727
prev.${pkgName}.override (oldAttrs: {

‎packages/node-packages/node-env.nix

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ let
130130
src,
131131
dependencies ? [ ],
132132
...
133-
}@args:
133+
}:
134134
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
135135
installPackage "${packageName}" "${src}"
136136
${includeDependencies { inherit dependencies; }}
@@ -221,7 +221,7 @@ let
221221
dependencies ? [ ],
222222
production ? true,
223223
...
224-
}@args:
224+
}:
225225
''
226226
if [ -d "${packageName}" ]
227227
then
@@ -551,7 +551,9 @@ let
551551
python
552552
nodejs
553553
]
554-
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
554+
++ lib.optional (stdenv.isLinux) utillinux
555+
++ lib.optional (stdenv.isDarwin) libtool
556+
++ buildInputs;
555557

556558
inherit nodejs;
557559

@@ -671,7 +673,9 @@ let
671673
python
672674
nodejs
673675
]
674-
++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs;
676+
++ lib.optional (stdenv.isLinux) utillinux
677+
++ lib.optional (stdenv.isDarwin) libtool
678+
++ buildInputs;
675679

676680
inherit dontStrip; # Stripping may fail a build for some package deployments
677681
inherit dontNpmInstall unpackPhase buildPhase;
@@ -764,10 +768,13 @@ let
764768
{
765769
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
766770

767-
buildInputs = [
768-
python
769-
nodejs
770-
] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
771+
buildInputs =
772+
[
773+
python
774+
nodejs
775+
]
776+
++ lib.optional (stdenv.isLinux) utillinux
777+
++ buildInputs;
771778
buildCommand = ''
772779
mkdir -p $out/bin
773780
cat > $out/bin/shell <<EOF

‎packages/node-packages/overrides.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ let
44
inherit (pkgs) stdenv lib;
55
in
66

7-
final: prev: {
7+
_final: prev: {
88
inherit nodejs;
99

1010
readability-cli = prev.readability-cli.override {

0 commit comments

Comments
 (0)