diff --git a/home/default.nix b/home/default.nix index b6eb72b..91d79be 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,7 +13,10 @@ rec { in top.hmunstable.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./home.nix ]; + modules = [ + ../modules/nix-conf.nix + ./home.nix + ]; extraSpecialArgs = { inherit top; nixvim = top.nixvimunstable; diff --git a/home/home.nix b/home/home.nix index e268953..2cbfe09 100644 --- a/home/home.nix +++ b/home/home.nix @@ -7,7 +7,6 @@ }: { - nixpkgs.config.allowUnfreePredicate = (_: true); imports = [ nixvim.homeManagerModules.default ./modules diff --git a/home/modules/baseline/default.nix b/home/modules/baseline/default.nix index 18fdb03..749fd47 100644 --- a/home/modules/baseline/default.nix +++ b/home/modules/baseline/default.nix @@ -2,7 +2,6 @@ { imports = [ - ../../../modules/nix-conf.nix ./ansible.nix ./bash.nix ./direnv.nix diff --git a/home/modules/baseline/vim/config.nix b/home/modules/baseline/vim/config.nix index effee27..7c0a9e2 100644 --- a/home/modules/baseline/vim/config.nix +++ b/home/modules/baseline/vim/config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: let vim-xonsh = pkgs.vimUtils.buildVimPlugin { name = "vim-xonsh"; @@ -86,10 +86,6 @@ in name = "buffer"; group_index = 2; } - { - name = "copilot-vim"; - group_index = 2; - } { name = "path"; gruop_index = 3; @@ -104,10 +100,6 @@ in }; }; }; - copilot-vim = { - enable = (config.nixpkgs.config ? "allowUnfree" && config.nixpkgs.config.allowUnfree); - settings.workspace_folders = [ "~/src/ivr" ]; - }; direnv.enable = true; gitgutter.enable = true; fugitive.enable = true;