From 3cc381ba8332f05fe2d9a60d8906b3087c7d1593 Mon Sep 17 00:00:00 2001
From: L-Nafaryus <l.nafaryus@gmail.com>
Date: Mon, 8 Jul 2024 16:24:14 +0500
Subject: [PATCH] catarina: tune nix settings

ci: fix nix flake check with hydraJobs
---
 .gitea/workflows/nix.yml                 |  2 +-
 configurations/bonvim.nix                |  5 ++++-
 nixosConfigurations/catarina/default.nix | 10 +++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/nix.yml b/.gitea/workflows/nix.yml
index 3256704..ecf2d77 100644
--- a/.gitea/workflows/nix.yml
+++ b/.gitea/workflows/nix.yml
@@ -14,4 +14,4 @@ jobs:
           submodules: true
           token: "${{ secrets.REPO_PAT }}"
       - run: |
-          nix flake check ".?submodules=1"
+          nix flake check --allow-import-from-derivation ".?submodules=1"
diff --git a/configurations/bonvim.nix b/configurations/bonvim.nix
index c3009be..affe2bc 100644
--- a/configurations/bonvim.nix
+++ b/configurations/bonvim.nix
@@ -483,7 +483,10 @@
         };
         mapping = {
           "<c-space>" = "cmp.mapping.complete()";
-          "<cr>" = "cmp.mapping.confirm({ select = true; })";
+          "<cr>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })";
+          "<tab>" = "cmp.mapping(cmp.mapping.confirm({ select = true }), { 'i', 's', 'c' })";
+          "<c-p>" = "cmp.mapping.select_prev_item()";
+          "<c-n>" = "cmp.mapping.select_next_item()";
         };
       };
     };
diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix
index 2fa8a86..425c877 100644
--- a/nixosConfigurations/catarina/default.nix
+++ b/nixosConfigurations/catarina/default.nix
@@ -21,9 +21,13 @@ in {
     settings = {
       experimental-features = ["nix-command" "flakes"];
       trusted-users = ["l-nafaryus"];
-      allowed-users = ["l-nafaryus" "hydra"];
-      substituters = ["https://nix-community.cachix.org"];
+      allowed-users = ["l-nafaryus" "hydra" "hydra-www"];
+      substituters = [
+        "https://bonfire.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
       trusted-public-keys = [
+        "bonfire.cachix.org-1:mzAGBy/Crdf8NhKail5ciK7ZrGRbPJJobW6TwFb7WYM="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       auto-optimise-store = true;
@@ -38,7 +42,7 @@ in {
     gc = {
       automatic = lib.mkDefault true;
       dates = lib.mkDefault "weekly";
-      options = lib.mkDefault "--delete-older-than 14d";
+      options = lib.mkDefault "--delete-older-than 28d";
     };
   };