steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

chore: nix fmt

Browse source
This commit is contained in:
steveej 2025-05-28 17:06:11 +02:00
parent a9be5375ca
commit a1df9205d5
8 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Justfile
View file

@ -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. # Connect the new device and then run this script to make it known to gnupg.
# #
set -xe set -xe
if [[ -n "{{key-id}}" ]]; then if [[ -n "{{ key-id }}" ]]; then
KEY_ID="{{key-id}}" KEY_ID="{{ key-id }}"
else else
KEY_ID=$(gpg --card-status | rg sec | rg -o '[0-9A-Z]{16}') KEY_ID=$(gpg --card-status | rg sec | rg -o '[0-9A-Z]{16}')
fi fi

3
nix/home-manager/profiles/sway-desktop.nix
View file

@ -161,7 +161,8 @@ in
# TODO: i've been hitting this one accidentally way too often. find a better place. # 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}+Shift+e" = "exec ${pkgs.sway}/bin/swaymsg exit";
"${modifier}+q" = "kill"; "${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}"; "${modifier}+x" = "exec ${swapOutputWorkspaces}";

1
nix/home-manager/programs/firefox.nix
View file

@ -173,6 +173,7 @@ let
# enable pipewire (and libcamera) sources # enable pipewire (and libcamera) sources
"media.webrtc.camera.allow-pipewire" = true; "media.webrtc.camera.allow-pipewire" = true;
}; };
userChrome = userChrome =

7
nix/home-manager/programs/gpg-agent.nix
View file

@ -1,4 +1,9 @@
{ lib, pkgs, osConfig, ... }: {
lib,
pkgs,
osConfig,
...
}:
{ {
home.packages = [ pkgs.gcr ]; home.packages = [ pkgs.gcr ];

1
nix/os/containers/syncthing.nix
View file

@ -70,7 +70,6 @@
}; };
}; };
# TODO: find out if smbpasswd file is still used and set it here. or find an alternative # TODO: find out if smbpasswd file is still used and set it here. or find an alternative
# sops.secrets.smbpasswd = { # sops.secrets.smbpasswd = {
# }; # };

1
nix/os/containers/webserver.nix
View file

@ -406,7 +406,6 @@ in
domain = "kanidm.${domain}"; domain = "kanidm.${domain}";
origin = "https://kanidm.${domain}"; origin = "https://kanidm.${domain}";
bindaddress = "127.0.0.1:8444"; bindaddress = "127.0.0.1:8444";
# don't expose ldap # don't expose ldap

5
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -87,7 +87,7 @@
{ {
networking.nat = { networking.nat = {
enable = true; enable = true;
internalInterfaces = ["ve-+"]; internalInterfaces = [ "ve-+" ];
# externalInterface = "enu1u1u2"; # externalInterface = "enu1u1u2";
# Lazy IPv6 connectivity for the container # Lazy IPv6 connectivity for the container
# enableIPv6 = true; # enableIPv6 = true;
@ -283,5 +283,6 @@
nix.settings.sandbox = lib.mkForce "relaxed"; 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";
} }

6
nix/os/devices/steveej-x13s/flake.nix
View file

@ -95,10 +95,8 @@
inherit mkNixosConfiguration; inherit mkNixosConfiguration;
}; };
overlays.default = overlays.default = _final: _previous: {
_final: _previous: };
{
};
nixosConfigurations = { nixosConfigurations = {
native = mkNixosConfiguration { system = nativeSystem; }; native = mkNixosConfiguration { system = nativeSystem; };