ci: bump cachix/cachix-action from 15 to 16

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 15 to 16.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v15...v16)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -17,10 +17,11 @@ jobs:
         with:
           tool-cache: true
       - uses: DeterminateSystems/magic-nix-cache-action@v8
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: callumio-public
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           pushFilter: '(nerdfonts)'
           extraPullNames: nix-community, om
-      - run: nix run github:juspay/omnix --accept-flake-config -- ci run "."
+      - run: nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake .
+

flake.nix

@@ -71,7 +71,7 @@
         devShells.default = final.mkShell {
           meta.description = "Default dev shell";
           inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell];
-          packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix];
+          packages = with final; [just git nvf cachix jq devour-flake om agenix deadnix];
         };
 
         apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self);
@@ -96,8 +96,8 @@
       flake = false;
     };
 
-    nixvim = {
+    nvf = {
-      url = "github:callumio/nixvim";
+      url = "github:callumio/nvf";
       inputs.nixpkgs.follows = "unstable";
     };
 
@@ -125,7 +125,6 @@
     omnix = {
       url = "github:juspay/omnix";
       inputs = {
-        treefmt-nix.follows = "treefmt-nix";
         systems.follows = "systems";
       };
     };

home/c/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   imports = [./programs ./services];
 
   programs.home-manager.enable = true;
@@ -59,7 +55,7 @@
     unzip
     just
     wireshark
-    inputs.nixvim.packages."x86_64-linux".default # nixvim
+    nvf
   ];
 
   home.stateVersion = "24.05";

hosts/artemis/programs.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs = {
     wireshark.enable = true;
     fish.enable = true;
@@ -16,7 +20,7 @@
           #   url = "https://i.redd.it/jd1nuwsl0d121.jpg";
           #   sha256 = "sha256-ff3ajGVsay2dtHiHmO2MYlqCvexUQjGifMs/ofzuyvI=";
           # };
-          fit = "Contain";
+          fit = lib.mkForce "Contain";
         };
         # GTK = {
         #   application_prefer_dark_theme = true;

hosts/hermes/configuration.nix

@@ -26,7 +26,7 @@
     openssh.authorizedKeys.keys = config.keys.c;
     packages = with pkgs; [
       tree
-      nixvim
+      nvf
     ];
   };
 

justfile

@@ -14,7 +14,7 @@ deploy MACHINE:
 	nix run .#deploy-{{MACHINE}}
 
 vim:
-  nix flake lock --update-input nixvim
+  nix flake lock --update-input nvf
 
 update:
 	nix flake update

overlays/default.nix

@@ -1,5 +1,5 @@
 {inputs, ...}: _final: prev: {
-  nixvim = inputs.nixvim.packages.${prev.system}.default;
+  nvf = inputs.nvf.packages.${prev.system}.default;
   devour-flake = prev.callPackage inputs.devour-flake {};
   agenix = inputs.agenix.packages.${prev.system}.default;
 }

packages/default.nix

@@ -5,7 +5,7 @@
 }: {
   tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {};
   om = inputs'.omnix.packages.default;
-  nixvim = inputs'.nixvim.packages.default;
+  nvf = inputs'.nvf.packages.default;
   agenix = inputs'.agenix.packages.default;
   vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
   devour-flake = pkgs.callPackage inputs.devour-flake {};