From 6803ec0e6dae1d2f5085868be78c0d8744dab8de Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 10 Oct 2024 13:01:37 -0500 Subject: [PATCH] Avoid unfree in local dev environment --- home/default.nix | 2 +- home/modules/baseline/vim.nix | 4 ++-- home/modules/baseline/vim/config.nix | 4 ++-- shells.nix | 12 +++++++++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/home/default.nix b/home/default.nix index 15f5a34..f4225f2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -7,7 +7,7 @@ rec { greghellings = let system = "x86_64-linux"; - pkgs = (import inputs.nixunstable { inherit system overlays; }); + pkgs = (import inputs.nixunstable { inherit system overlays; config.allowUnfree = true; }); in inputs.hmunstable.lib.homeManagerConfiguration { inherit pkgs; diff --git a/home/modules/baseline/vim.nix b/home/modules/baseline/vim.nix index cf0ce32..bbf1af5 100644 --- a/home/modules/baseline/vim.nix +++ b/home/modules/baseline/vim.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, ... }: { # The Hack font is used in the Fugitive sidebars fonts.fontconfig.enable = true; home.packages = [ (pkgs.nerdfonts.override { fonts = [ "Hack" ]; }) ]; - programs.nixvim = (import ./vim/config.nix { inherit pkgs lib; }) // { enable = true; }; + programs.nixvim = (import ./vim/config.nix { inherit config pkgs lib; }) // { enable = true; }; } diff --git a/home/modules/baseline/vim/config.nix b/home/modules/baseline/vim/config.nix index 5bf11b2..edf6f26 100644 --- a/home/modules/baseline/vim/config.nix +++ b/home/modules/baseline/vim/config.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, ... }: let vim-xonsh = pkgs.vimUtils.buildVimPlugin { name = "vim-xonsh"; @@ -90,7 +90,7 @@ in }; }; copilot-vim = { - enable = true; + enable = config.nixpkgs.config.allowUnfree; settings.workspace_folders = [ "~/src/ivr" ]; }; direnv.enable = true; diff --git a/shells.nix b/shells.nix index 58d1798..56ff6bf 100644 --- a/shells.nix +++ b/shells.nix @@ -1,4 +1,14 @@ { self', pkgs, nixvimunstable, ... }: +let + system = pkgs.system; + vim = (nixvimunstable.legacyPackages.${system}.makeNixvim + (import ./home/modules/baseline/vim/config.nix { + inherit pkgs; + inherit (pkgs) lib; + config.nixpkgs.config.allowUnfree = false; # I have tried to allow it, but I don't seem able to do so + }) + ); +in { default = pkgs.mkShell { inherit (self'.checks.pre-commit-check) shellHook; @@ -10,7 +20,7 @@ gzip inject inject-darwin - (nixvimunstable.legacyPackages.${system}.makeNixvim (import ./home/modules/baseline/vim/config.nix { inherit pkgs; inherit (pkgs) lib; })) + vim self'.checks.pre-commit-check.enabledPackages tmux xonsh