From a1df9205d5228fee9555ffd439fd9d93a3d1381c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 28 May 2025 17:06:11 +0200 Subject: [PATCH] chore: nix fmt --- Justfile | 4 ++-- nix/home-manager/profiles/sway-desktop.nix | 3 ++- nix/home-manager/programs/firefox.nix | 1 + nix/home-manager/programs/gpg-agent.nix | 7 ++++++- nix/os/containers/syncthing.nix | 1 - nix/os/containers/webserver.nix | 1 - nix/os/devices/steveej-x13s/configuration.nix | 5 +++-- nix/os/devices/steveej-x13s/flake.nix | 6 ++---- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Justfile b/Justfile index 414e736..c7fa7b3 100755 --- a/Justfile +++ b/Justfile @@ -230,8 +230,8 @@ switch-gpg-card key-id="6EEFA706CB17E89B": # Connect the new device and then run this script to make it known to gnupg. # set -xe - if [[ -n "{{key-id}}" ]]; then - KEY_ID="{{key-id}}" + if [[ -n "{{ key-id }}" ]]; then + KEY_ID="{{ key-id }}" else KEY_ID=$(gpg --card-status | rg sec | rg -o '[0-9A-Z]{16}') fi diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index c6b1e1f..acd4ef9 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -161,7 +161,8 @@ in # TODO: i've been hitting this one accidentally way too often. find a better place. # "${modifier}+Shift+e" = "exec ${pkgs.sway}/bin/swaymsg exit"; "${modifier}+q" = "kill"; - "${modifier}+Shift+q" = "exec ${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq 'recurse(.nodes[], .floating_nodes[]) | select(.focused).pid' | ${pkgs.findutils}/bin/xargs -L1 kill -9"; + "${modifier}+Shift+q" = + "exec ${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq 'recurse(.nodes[], .floating_nodes[]) | select(.focused).pid' | ${pkgs.findutils}/bin/xargs -L1 kill -9"; "${modifier}+x" = "exec ${swapOutputWorkspaces}"; diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index 51c7a93..0a9bced 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -173,6 +173,7 @@ let # enable pipewire (and libcamera) sources "media.webrtc.camera.allow-pipewire" = true; + }; userChrome = diff --git a/nix/home-manager/programs/gpg-agent.nix b/nix/home-manager/programs/gpg-agent.nix index b81c150..b66f9b2 100644 --- a/nix/home-manager/programs/gpg-agent.nix +++ b/nix/home-manager/programs/gpg-agent.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, osConfig, ... }: +{ + lib, + pkgs, + osConfig, + ... +}: { home.packages = [ pkgs.gcr ]; diff --git a/nix/os/containers/syncthing.nix b/nix/os/containers/syncthing.nix index 921662f..4cd736a 100644 --- a/nix/os/containers/syncthing.nix +++ b/nix/os/containers/syncthing.nix @@ -70,7 +70,6 @@ }; }; - # TODO: find out if smbpasswd file is still used and set it here. or find an alternative # sops.secrets.smbpasswd = { # }; diff --git a/nix/os/containers/webserver.nix b/nix/os/containers/webserver.nix index 6389cc5..3d5b173 100644 --- a/nix/os/containers/webserver.nix +++ b/nix/os/containers/webserver.nix @@ -406,7 +406,6 @@ in domain = "kanidm.${domain}"; origin = "https://kanidm.${domain}"; - bindaddress = "127.0.0.1:8444"; # don't expose ldap diff --git a/nix/os/devices/steveej-x13s/configuration.nix b/nix/os/devices/steveej-x13s/configuration.nix index d5c9475..bc2cde1 100644 --- a/nix/os/devices/steveej-x13s/configuration.nix +++ b/nix/os/devices/steveej-x13s/configuration.nix @@ -87,7 +87,7 @@ { networking.nat = { enable = true; - internalInterfaces = ["ve-+"]; + internalInterfaces = [ "ve-+" ]; # externalInterface = "enu1u1u2"; # Lazy IPv6 connectivity for the container # enableIPv6 = true; @@ -283,5 +283,6 @@ nix.settings.sandbox = lib.mkForce "relaxed"; - systemd.user.services.wireplumber.environment.LIBCAMERA_IPA_PROXY_PATH = "${pkgs.libcamera}/libexec/libcamera"; + systemd.user.services.wireplumber.environment.LIBCAMERA_IPA_PROXY_PATH = + "${pkgs.libcamera}/libexec/libcamera"; } diff --git a/nix/os/devices/steveej-x13s/flake.nix b/nix/os/devices/steveej-x13s/flake.nix index 533e475..ee2645d 100644 --- a/nix/os/devices/steveej-x13s/flake.nix +++ b/nix/os/devices/steveej-x13s/flake.nix @@ -95,10 +95,8 @@ inherit mkNixosConfiguration; }; - overlays.default = - _final: _previous: - { - }; + overlays.default = _final: _previous: { + }; nixosConfigurations = { native = mkNixosConfiguration { system = nativeSystem; };