From 985191f9488c863472d58c639f9c9d02827772c5 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 20 Feb 2025 10:00:45 -0600 Subject: [PATCH] nixfmt --- .github/actions/nix/action.yml | 1 - hosts/algiz/caddy/nix-cache/index.html | 2 +- hosts/algiz/secrets.nix | 2 +- modules/development/git.nix | 14 +++++++------- modules/essentials.nix | 4 +--- pkgs/oizys/default.nix | 2 +- pkgs/oizys/src/oizys/substituters.json | 4 +--- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/actions/nix/action.yml b/.github/actions/nix/action.yml index aa2fa9d..0d17866 100644 --- a/.github/actions/nix/action.yml +++ b/.github/actions/nix/action.yml @@ -39,7 +39,6 @@ runs: # run: | # nix profile install "nixpkgs#attic-client" # attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}" - - name: "Show Nix Info" shell: bash run: nix run "nixpkgs#nix-info" -- -m diff --git a/hosts/algiz/caddy/nix-cache/index.html b/hosts/algiz/caddy/nix-cache/index.html index a9a34a3..4a70f59 100644 --- a/hosts/algiz/caddy/nix-cache/index.html +++ b/hosts/algiz/caddy/nix-cache/index.html @@ -31,7 +31,7 @@ - +
diff --git a/hosts/algiz/secrets.nix b/hosts/algiz/secrets.nix index 5c25355..9eb9b8f 100644 --- a/hosts/algiz/secrets.nix +++ b/hosts/algiz/secrets.nix @@ -7,7 +7,7 @@ # by default is accessible only by root:root which should work with above service secrets.restic-algiz = { }; secrets.atticd-env = { }; - secrets.harmonia-key = {}; + secrets.harmonia-key = { }; }; } diff --git a/modules/development/git.nix b/modules/development/git.nix index a562684..c2185a3 100644 --- a/modules/development/git.nix +++ b/modules/development/git.nix @@ -1,13 +1,13 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - git - git-lfs + git + git-lfs - gh - lazygit - delta + gh + lazygit + delta - jujutsu - ]; + jujutsu + ]; } diff --git a/modules/essentials.nix b/modules/essentials.nix index eb2ecc6..27c5bd4 100644 --- a/modules/essentials.nix +++ b/modules/essentials.nix @@ -69,8 +69,6 @@ # # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" # # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" # ]; - } - // ((builtins.readFile ../pkgs/oizys/src/oizys/substituters.json) |> builtins.fromJSON) - ; + } // ((builtins.readFile ../pkgs/oizys/src/oizys/substituters.json) |> builtins.fromJSON); }; } diff --git a/pkgs/oizys/default.nix b/pkgs/oizys/default.nix index a6b3595..06ea3f8 100644 --- a/pkgs/oizys/default.nix +++ b/pkgs/oizys/default.nix @@ -9,7 +9,7 @@ buildNimblePackage { name = "oizys"; version = "unstable"; src = lib.cleanSource ./.; - nativeBuildInputs = [ openssl]; + nativeBuildInputs = [ openssl ]; nimbleDepsHash = "sha256-ZNS/ak5UoH3cvOAnRdCoovo/20A8woxowa5wefluU5g="; meta = { description = "nix begat oizys"; diff --git a/pkgs/oizys/src/oizys/substituters.json b/pkgs/oizys/src/oizys/substituters.json index 9c3bc6b..5bfa1ce 100644 --- a/pkgs/oizys/src/oizys/substituters.json +++ b/pkgs/oizys/src/oizys/substituters.json @@ -1,7 +1,5 @@ { - "extra-substituters": [ - "https://nix-cache.dayl.in" - ], + "extra-substituters": ["https://nix-cache.dayl.in"], "extra-trusted-public-keys": [ "nix-cache.dayl.in-1:lj22Sov7m1snupBz/43O1fxyEfy/S7cxBpweD7iREcs" ]