Skip to content

Commit 1efb849

Browse files
authored
Merge pull request #59 from ntsk/fix/rename-extraLuaConfig-to-initLua
Rename extraLuaConfig to initLua
2 parents 7003a5b + 21ee711 commit 1efb849

6 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
x86_64-linux) SYSTEM="x86_64-linux" ;;
2727
esac
2828
nix build "./nix#homeConfigurations.${SYSTEM}.activationPackage" --impure --print-build-logs --show-trace
29+
env:
30+
NIXPKGS_ALLOW_UNFREE: "1"
2931

3032
install-test:
3133
name: install-test (${{ matrix.os }})
@@ -44,5 +46,6 @@ jobs:
4446
run: $HOME/dotfiles/bin/install.sh
4547
env:
4648
NIX_CONFIG: "access-tokens = github.com=${{ github.token }}"
49+
NIXPKGS_ALLOW_UNFREE: "1"
4750
- name: validate
4851
run: test -d $HOME/dotfiles

nix/home/home.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
usage
3434
nerd-fonts.meslo-lg
3535
ripgrep
36+
terraform
3637
tig
3738
tmux
3839
wget

nix/home/nvim/config/autocmds.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Auto commands for file types and events
44
{
5-
programs.neovim.extraLuaConfig = ''
5+
programs.neovim.initLua = ''
66
local augroup = vim.api.nvim_create_augroup
77
local autocmd = vim.api.nvim_create_autocmd
88

nix/home/nvim/config/keymaps.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Key mappings
44
{
5-
programs.neovim.extraLuaConfig = ''
5+
programs.neovim.initLua = ''
66
local keymap = vim.keymap.set
77
88
keymap("n", "<Esc>", "<cmd>nohlsearch<CR>", { desc = "Clear search highlight" })

nix/home/nvim/config/lazy.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# lazy.nvim plugin manager setup
44
# Plugins are defined in nvim/lua/plugins/
55
{
6-
programs.neovim.extraLuaConfig = ''
6+
programs.neovim.initLua = ''
77
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
88
if not vim.loop.fs_stat(lazypath) then
99
vim.fn.system({

nix/home/nvim/config/options.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Editor options and settings
44
{
5-
programs.neovim.extraLuaConfig = lib.mkBefore ''
5+
programs.neovim.initLua = lib.mkBefore ''
66
vim.g.mapleader = " "
77
vim.g.maplocalleader = " "
88

0 commit comments

Comments
 (0)