diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3e5935..7396df6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,8 @@ jobs: x86_64-linux) SYSTEM="x86_64-linux" ;; esac nix build "./nix#homeConfigurations.${SYSTEM}.activationPackage" --impure --print-build-logs --show-trace + env: + NIXPKGS_ALLOW_UNFREE: "1" install-test: name: install-test (${{ matrix.os }}) @@ -44,5 +46,6 @@ jobs: run: $HOME/dotfiles/bin/install.sh env: NIX_CONFIG: "access-tokens = github.com=${{ github.token }}" + NIXPKGS_ALLOW_UNFREE: "1" - name: validate run: test -d $HOME/dotfiles diff --git a/nix/home/home.nix b/nix/home/home.nix index c0f751b..2003108 100644 --- a/nix/home/home.nix +++ b/nix/home/home.nix @@ -33,6 +33,7 @@ usage nerd-fonts.meslo-lg ripgrep + terraform tig tmux wget diff --git a/nix/home/nvim/config/autocmds.nix b/nix/home/nvim/config/autocmds.nix index 91f1cff..8f64886 100644 --- a/nix/home/nvim/config/autocmds.nix +++ b/nix/home/nvim/config/autocmds.nix @@ -2,7 +2,7 @@ # Auto commands for file types and events { - programs.neovim.extraLuaConfig = '' + programs.neovim.initLua = '' local augroup = vim.api.nvim_create_augroup local autocmd = vim.api.nvim_create_autocmd diff --git a/nix/home/nvim/config/keymaps.nix b/nix/home/nvim/config/keymaps.nix index 18c8972..1fdc85d 100644 --- a/nix/home/nvim/config/keymaps.nix +++ b/nix/home/nvim/config/keymaps.nix @@ -2,7 +2,7 @@ # Key mappings { - programs.neovim.extraLuaConfig = '' + programs.neovim.initLua = '' local keymap = vim.keymap.set keymap("n", "", "nohlsearch", { desc = "Clear search highlight" }) diff --git a/nix/home/nvim/config/lazy.nix b/nix/home/nvim/config/lazy.nix index 21481a4..3769d43 100644 --- a/nix/home/nvim/config/lazy.nix +++ b/nix/home/nvim/config/lazy.nix @@ -3,7 +3,7 @@ # lazy.nvim plugin manager setup # Plugins are defined in nvim/lua/plugins/ { - programs.neovim.extraLuaConfig = '' + programs.neovim.initLua = '' local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ diff --git a/nix/home/nvim/config/options.nix b/nix/home/nvim/config/options.nix index ab93952..592c224 100644 --- a/nix/home/nvim/config/options.nix +++ b/nix/home/nvim/config/options.nix @@ -2,7 +2,7 @@ # Editor options and settings { - programs.neovim.extraLuaConfig = lib.mkBefore '' + programs.neovim.initLua = lib.mkBefore '' vim.g.mapleader = " " vim.g.maplocalleader = " "