Skip to content

Commit 2977eba

Browse files
joehannesjoehannes
committed
chore(compilation): fnl => lua
1 parent b107621 commit 2977eba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2534
-8952
lines changed

‎init.lua

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
--@diagnostic disable:undefined-global
22
vim.cmd([[
3-
set shell=/opt/homebrew/bin/zsh
3+
set shell=/usr/bin/zsh
44
]])
55

6-
require("utils")
7-
86
vim.api.nvim_set_var("mapleader", " ")
97
vim.api.nvim_set_var("maplocalleader", ";")
108

11-
require("settings")
9+
require("utils")
1210

1311
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
1412
if not vim.loop.fs_stat(lazypath) then
1513
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", lazypath })
1614
vim.fn.system({ "git", "-C", lazypath, "checkout", "tags/stable" }) -- last stable release
1715
end
18-
vim.opt.rtp:prepend(lazypath)
16+
17+
-- As per lazy's install instructions, but insert hotpots path at the front
18+
vim.opt.runtimepath:prepend(lazypath)
1919

2020
require("lazy").setup({
2121
root = vim.fn.stdpath("data") .. "/lazy",
2222
spec = {
2323
import = "plugins",
2424
},
2525
defaults = { lazy = false, version = "*" },
26-
install = { colorscheme = { "habamax" } },
2726
checker = { enabled = false },
2827
diff = {
2928
cmd = "git",
@@ -47,8 +46,7 @@ require("lazy").setup({
4746
debug = false,
4847
})
4948

49+
require("settings")
5050
require("lang")
5151
require("keymappings")
5252
require("colorschemes")
53-
54-
-- vim.cmd("colo lush_jsx")

‎lazy-lock.json

+81-74
Large diffs are not rendered by default.

‎lua/colorschemes/catpuccin.lua

+2-54
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,3 @@
1+
-- [nfnl] Compiled from fnl/colorschemes/catpuccin.fnl by https://github.com/Olical/nfnl, do not edit.
12
local catppuccino = require("catppuccin")
2-
3-
catppuccino.setup({
4-
transparent_background = false,
5-
term_colors = false,
6-
styles = {
7-
comments = "italic",
8-
functions = "bold,italic",
9-
keywords = "bold",
10-
strings = "NONE",
11-
variables = "italic",
12-
},
13-
integrations = {
14-
treesitter = true,
15-
native_lsp = {
16-
enabled = true,
17-
virtual_text = {
18-
errors = "italic",
19-
hints = "italic",
20-
warnings = "italic",
21-
information = "italic",
22-
},
23-
underlines = {
24-
errors = "undercurl",
25-
hints = "underdotted",
26-
warnings = "underdouble",
27-
information = "underline",
28-
},
29-
},
30-
lsp_trouble = true,
31-
lsp_saga = true,
32-
gitgutter = false,
33-
gitsigns = true,
34-
telescope = true,
35-
nvimtree = {
36-
enabled = false,
37-
show_root = false,
38-
},
39-
which_key = true,
40-
indent_blankline = {
41-
enabled = false,
42-
colored_indent_levels = false,
43-
},
44-
dashboard = false,
45-
neogit = true,
46-
vim_sneak = false,
47-
fern = false,
48-
barbar = false,
49-
bufferline = true,
50-
markdown = true,
51-
lightspeed = false,
52-
ts_rainbow = true,
53-
hop = true,
54-
},
55-
})
3+
return catppuccino.setup({integrations = {bufferline = true, gitsigns = true, hop = true, indent_blankline = {colored_indent_levels = false, enabled = false}, lsp_saga = true, lsp_trouble = true, markdown = true, native_lsp = {enabled = true, underlines = {errors = "undercurl", hints = "underdotted", information = "underline", warnings = "underdouble"}, virtual_text = {errors = "italic", hints = "italic", information = "italic", warnings = "italic"}}, neogit = true, nvimtree = {show_root = false, enabled = false}, telescope = true, treesitter = true, ts_rainbow = true, which_key = true, lightspeed = false, gitgutter = false, fern = false, dashboard = false, barbar = false, vim_sneak = false}, styles = {comments = "italic", functions = "bold,italic", keywords = "bold", strings = "NONE", variables = "italic"}, term_colors = false, transparent_background = false})

‎lua/colorschemes/init.lua

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
---@diagnostic disable: undefined-global
2-
3-
-- require('colorschemes.catpuccin')
4-
require('colorschemes.kat')
5-
require('colorschemes.neon')
6-
--require('colorschemes.onedarkpro')
7-
require('colorschemes.tokyonight')
1+
-- [nfnl] Compiled from fnl/colorschemes/init.fnl by https://github.com/Olical/nfnl, do not edit.
2+
require("colorschemes.kat")
3+
require("colorschemes.neon")
4+
return require("colorschemes.tokyonight")

‎lua/colorschemes/kat.lua

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
local opts = {
2-
kat_nvim_commentStyle = "italic",
3-
kat_nvim_integrations = { "lsp", "treesitter", "ts_rainbow", "cmp" }, --, "bufferline" }
4-
kat_nvim_stupidFeatures = true,
5-
}
6-
1+
-- [nfnl] Compiled from fnl/colorschemes/kat.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local opts = {kat_nvim_commentStyle = "italic", kat_nvim_integrations = {"lsp", "treesitter", "ts_rainbow", "cmp"}, kat_nvim_stupidFeatures = true}
73
for key, value in pairs(opts) do
84
vim.api.nvim_set_var(key, value)
95
end
6+
return nil

‎lua/colorschemes/neon.lua

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
local opts = {
2-
neon_style = "dark",
3-
neon_italic_keyword = true,
4-
neon_italic_variable = true,
5-
neon_italic_functions = true,
6-
neon_bold = true,
7-
neon_transparent = false,
8-
}
9-
1+
-- [nfnl] Compiled from fnl/colorschemes/neon.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local opts = {neon_bold = true, neon_italic_functions = true, neon_italic_keyword = true, neon_italic_variable = true, neon_style = "dark", neon_transparent = false}
103
for key, value in pairs(opts) do
114
vim.api.nvim_set_var(key, value)
125
end
6+
return nil

‎lua/colorschemes/onedarkpro.lua

+3-50
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,5 @@
1-
---@diagnostic disable: undefined-global
2-
1+
-- [nfnl] Compiled from fnl/colorschemes/onedarkpro.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local my = _G.my
33
local onedarkpro = require("onedarkpro")
44
local odp_utils = require("onedarkpro.utils")
5-
6-
onedarkpro.setup({
7-
colors = {
8-
bg = my.color.my.dark,
9-
fg = my.color.my.light,
10-
red = my.color.my.red,
11-
orange = my.color.my.orange,
12-
yellow = my.color.my.yellow,
13-
green = my.color.my.green,
14-
cyan = my.color.my.aqua,
15-
blue = my.color.my.blue,
16-
purple = my.color.my.purple,
17-
white = my.color.my.light,
18-
black = my.color.my.dark,
19-
gray = odp_utils.lighten(my.color.my.dark, 0.50),
20-
highlight = my.color.my.yellow,
21-
cursorline = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.97),
22-
comment = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.80),
23-
selection = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.90),
24-
color_column = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.98),
25-
indentline = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.93),
26-
menu = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.95),
27-
menu_scroll = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.dark, 0.90),
28-
menu_scroll_thumb = odp_utils[vim.opt.background:get() == "dark" and "lighten" or "darken"](my.color.my.blue, 0.80),
29-
},
30-
-- hlgroups = {
31-
-- TabLineFill = { bg = odp_utils.lighten(my.color.my.cyan, 0.50), fg = my.color.my.dark },
32-
-- TabLine = { bg = odp_utils.lighten(my.color.my.cyan, 0.50), fg = my.color.my.dark },
33-
-- TabLineSel = { bg = odp_utils.lighten(my.color.my.cyan, 0.50), fg = my.color.my.dark },
34-
-- },
35-
styles = {
36-
strings = "NONE", -- Style that is applied to strings
37-
comments = "italic", -- Style that is applied to comments
38-
keywords = "bold", -- Style that is applied to keywords
39-
functions = "italic,bold", -- Style that is applied to functions
40-
variables = "italic", -- Style that is applied to variables
41-
},
42-
options = {
43-
bold = true, -- Use the themes opinionated bold styles?
44-
italic = true, -- Use the themes opinionated italic styles?
45-
underline = true, -- Use the themes opinionated underline styles?
46-
undercurl = true, -- Use the themes opinionated undercurl styles?
47-
cursorline = true,
48-
transparency = false, -- Use a transparent background?
49-
terminal_colors = true,
50-
window_unfocused_color = true,
51-
},
52-
})
5+
return onedarkpro.setup({colors = {bg = my.color.my.dark, black = my.color.my.dark, blue = my.color.my.blue, color_column = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.98), comment = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.8), cursorline = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.97), cyan = my.color.my.aqua, fg = my.color.my.light, gray = odp_utils.lighten(my.color.my.dark, 0.5), green = my.color.my.green, highlight = my.color.my.yellow, indentline = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.93), menu = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.95), menu_scroll = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.9), menu_scroll_thumb = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.blue, 0.8), orange = my.color.my.orange, purple = my.color.my.purple, red = my.color.my.red, selection = odp_utils[((((vim.opt.background):get() == "dark") and "lighten") or "darken")](my.color.my.dark, 0.9), white = my.color.my.light, yellow = my.color.my.yellow}, options = {bold = true, cursorline = true, italic = true, terminal_colors = true, undercurl = true, underline = true, window_unfocused_color = true, transparency = false}, styles = {comments = "italic", functions = "italic,bold", keywords = "bold", strings = "NONE", variables = "italic"}})

‎lua/colorschemes/papercolorslim.lua

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- [nfnl] Compiled from fnl/colorschemes/papercolorslim.fnl by https://github.com/Olical/nfnl, do not edit.
2+

‎lua/colorschemes/tokyonight.lua

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
local opts = {
2-
tokyonight_style = "night",
3-
tokyonight_italic_functions = true,
4-
tokyonight_sidebars = { "qf", "vista_kind", "terminal", "packer", "symbols_outline", "aerial", "trouble" },
5-
}
6-
1+
-- [nfnl] Compiled from fnl/colorschemes/tokyonight.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local opts = {tokyonight_italic_functions = true, tokyonight_sidebars = {"qf", "vista_kind", "terminal", "packer", "symbols_outline", "aerial", "trouble"}, tokyonight_style = "night"}
73
for key, value in pairs(opts) do
84
vim.api.nvim_set_var(key, value)
95
end
6+
return nil

‎lua/keymappings/init.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
---@diagnostic disable:undefined-global
2-
3-
my.io.apply_keymaps('n', require('keymappings.normal'))
4-
my.io.apply_keymaps('i', require('keymappings.insert'))
5-
my.io.apply_keymaps('t', require('keymappings.terminal'))
6-
my.io.apply_keymaps("v", require('keymappings.visualselect'))
7-
my.io.apply_keymaps("o", require('keymappings.operator'))
8-
my.io.apply_keymaps("x", require('keymappings.visual'))
1+
-- [nfnl] Compiled from fnl/keymappings/init.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local my = _G.my
3+
my.io.apply_keymaps("n", require("keymappings.normal"))
4+
my.io.apply_keymaps("i", require("keymappings.insert"))
5+
my.io.apply_keymaps("t", require("keymappings.terminal"))
6+
my.io.apply_keymaps("v", require("keymappings.visualselect"))
7+
my.io.apply_keymaps("o", require("keymappings.operator"))
8+
return my.io.apply_keymaps("x", require("keymappings.visual"))

‎lua/keymappings/insert.lua

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
local M = {
2-
{ "<f20>", "<C-o>" },
3-
{ "<C-Del>", '<cmd>lua require("notify").dismiss()<cr>' },
4-
{ "<C-l>", "<cmd>lua require('neogen').jump_next()<CR>" },
5-
{ "<C-h>", "<cmd>lua require('neogen').jump_prev()<CR>" },
6-
{ "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
7-
}
8-
1+
-- [nfnl] Compiled from fnl/keymappings/insert.fnl by https://github.com/Olical/nfnl, do not edit.
2+
local M = {{"<C-Del>", "<cmd>lua require(\"notify\").dismiss()<cr>"}, {"<C-h>", "<C-o>B"}, {"<C-l>", "<C-o>W"}, {"<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>"}}
93
return M

0 commit comments

Comments
 (0)