Avoid unfree in local dev environment

This commit is contained in:
Greg Hellings
2024-10-10 13:01:37 -05:00
parent eebeb3ca6d
commit 6803ec0e6d
4 changed files with 16 additions and 6 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ rec {
greghellings = greghellings =
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = (import inputs.nixunstable { inherit system overlays; }); pkgs = (import inputs.nixunstable { inherit system overlays; config.allowUnfree = true; });
in in
inputs.hmunstable.lib.homeManagerConfiguration { inputs.hmunstable.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
+2 -2
View File
@@ -1,9 +1,9 @@
{ pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
# The Hack font is used in the Fugitive sidebars # The Hack font is used in the Fugitive sidebars
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ (pkgs.nerdfonts.override { fonts = [ "Hack" ]; }) ]; 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; };
} }
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
vim-xonsh = pkgs.vimUtils.buildVimPlugin { vim-xonsh = pkgs.vimUtils.buildVimPlugin {
name = "vim-xonsh"; name = "vim-xonsh";
@@ -90,7 +90,7 @@ in
}; };
}; };
copilot-vim = { copilot-vim = {
enable = true; enable = config.nixpkgs.config.allowUnfree;
settings.workspace_folders = [ "~/src/ivr" ]; settings.workspace_folders = [ "~/src/ivr" ];
}; };
direnv.enable = true; direnv.enable = true;
+11 -1
View File
@@ -1,4 +1,14 @@
{ self', pkgs, nixvimunstable, ... }: { 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 { default = pkgs.mkShell {
inherit (self'.checks.pre-commit-check) shellHook; inherit (self'.checks.pre-commit-check) shellHook;
@@ -10,7 +20,7 @@
gzip gzip
inject inject
inject-darwin 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 self'.checks.pre-commit-check.enabledPackages
tmux tmux
xonsh xonsh