From c4cda77be8e170edcca725d1b23daa0fafd3fac1 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 10 Jan 2025 23:17:27 -0500 Subject: [PATCH] nix fmt --- .github/workflows/build-and-cache.yml | 8 -------- flake.nix | 2 +- home/nixvim/default.nix | 7 +++++-- hosts/chunk/default.nix | 2 +- hosts/chunk/forgejo.nix | 2 +- hosts/common.nix | 9 ++++++--- overlay/default.nix | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index d27a167..29173cb 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -1,9 +1,7 @@ name: build and cache random stuff - on: workflow_dispatch: push: - jobs: build: strategy: @@ -13,27 +11,21 @@ jobs: - .#attic-server - .#eza - .#conduwuit - runs-on: ubuntu-latest steps: - uses: DeterminateSystems/nix-installer-action@main with: logger: pretty - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@v15 with: name: cything authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: Setup Attic cache uses: ryanccn/attic-action@v0 with: endpoint: ${{ vars.ATTIC_ENDPOINT }} cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - - uses: actions/checkout@v4 - - run: nix build '${{ matrix.package }}' diff --git a/flake.nix b/flake.nix index 7d7ad97..4dd4994 100644 --- a/flake.nix +++ b/flake.nix @@ -116,7 +116,7 @@ checks = forEachSystem (pkgs: { formatting = treefmtEval.${pkgs.system}.config.build.check self; }); - # lets us build overlayed packages with `nix build .#` + # lets us build overlaid packages with `nix build .#` packages = pkgsFor; nixosConfigurations = diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 0050777..f03967a 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ...}: +{ pkgs, ... }: { programs.nixvim = { enable = true; @@ -37,7 +37,10 @@ # shortcut to command mode action = ":"; key = ";"; - mode = ["n" "x"]; + mode = [ + "n" + "x" + ]; options.silent = true; } { diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 192854e..287b57b 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -143,7 +143,7 @@ home = "/var/lib/forgejo"; group = "git"; }; - users.groups.git = {}; + users.groups.git = { }; environment.systemPackages = with pkgs; [ vim diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index 41f0278..5b8ad1d 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -1,4 +1,4 @@ -{...}: +{ ... }: { services.forgejo = { enable = true; diff --git a/hosts/common.nix b/hosts/common.nix index 100c6ec..b334b5f 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -5,7 +5,10 @@ experimental-features = "nix-command flakes"; auto-optimise-store = true; flake-registry = ""; - trusted-users = [ "root" "@wheel" ]; + trusted-users = [ + "root" + "@wheel" + ]; trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ]; substituters = [ "https://cache.cything.io/central" ]; }; @@ -21,8 +24,8 @@ options = "--delete-older-than 14d"; }; extraOptions = '' - builders-use-substitutes = true - ''; + builders-use-substitutes = true + ''; }; time.timeZone = "America/Toronto"; networking.firewall.logRefusedConnections = false; diff --git a/overlay/default.nix b/overlay/default.nix index 1710eb7..99fc17b 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -5,4 +5,4 @@ let ]; importedOverlays = map (m: import m) overlays; in - importedOverlays +importedOverlays