Skip to content

Commit

Permalink
Merge pull request #1 from massix/feat/github-workflow
Browse files Browse the repository at this point in the history
ci: implement gh workflow
  • Loading branch information
massix authored Jan 7, 2024
2 parents c9168a3 + 8f5d128 commit 81e7f03
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 32 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Check shell and Lua
on: [ push ]
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check Lua files
uses: nebularg/actions-luacheck@v1
with:
files: ./nvim
- name: fish-actions/install-fish
uses: fish-actions/install-fish@v1.1.0
- name: fish-shop/syntax-check
uses: fish-shop/syntax-check@v1.5.0


2 changes: 2 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
global = false
max_line_length = 180
1 change: 0 additions & 1 deletion nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ require("lazy").setup({
require("config.keymaps")

vim.cmd([[colorscheme kanagawa]])

1 change: 0 additions & 1 deletion nvim/lua/config/keymaps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,3 @@ map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
map("n", "<leader><tab>[", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })

1 change: 0 additions & 1 deletion nvim/lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ api.nvim_create_autocmd("TextYankPost", {

-- Fix markdown indentation settings
vim.g.markdown_recommended_style = 0

1 change: 0 additions & 1 deletion nvim/lua/plugins/alpha.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,3 @@ return {
end,
},
}

1 change: 0 additions & 1 deletion nvim/lua/plugins/colorscheme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,3 @@ return {
config = false,
},
}

22 changes: 14 additions & 8 deletions nvim/lua/plugins/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ return {
},
},
keys = {
{ "<leader>fo", function() MiniFiles.open() end, desc = "File Browser" },
{
"<leader>fo",
function()
MiniFiles.open()
end,
desc = "File Browser",
},
},
},

Expand All @@ -85,9 +91,9 @@ return {
event = "VeryLazy",
cmd = "Telescope",
config = function(_, opts)
require('telescope').setup(opts)
require('telescope').load_extension('orgmode')
require('telescope').load_extension('projects')
require("telescope").setup(opts)
require("telescope").load_extension("orgmode")
require("telescope").load_extension("projects")
end,
dependencies = {
"nvim-lua/plenary.nvim",
Expand Down Expand Up @@ -450,7 +456,7 @@ return {
init = function()
local wk = require("which-key")
wk.register({
[ "<leader>c" ] = { name = "+code" },
["<leader>c"] = { name = "+code" },
})
end,
opts = {
Expand All @@ -461,16 +467,16 @@ return {
prefix_string = "",
},
language_config = {
org = { disabled = true }
org = { disabled = true },
},
},
keys = {
{
"<leader>cb",
function()
require('nvim-biscuits').toggle_biscuits()
require("nvim-biscuits").toggle_biscuits()
end,
desc = "Toggle biscuits"
desc = "Toggle biscuits",
},
},
},
Expand Down
5 changes: 3 additions & 2 deletions nvim/lua/plugins/git.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ return {
api.nvim_create_autocmd("User", {
group = group,
pattern = "NeogitPushComplete",
callback = function() require("neogit").close() end,
callback = function()
require("neogit").close()
end,
})
end,
opts = {
Expand Down Expand Up @@ -62,5 +64,4 @@ return {
config = true,
event = { "BufReadPre", "BufNewFile" },
},

}
13 changes: 8 additions & 5 deletions nvim/lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ return {
},
},
lualine_c = {
{ "diagnostics", },
{ "diagnostics" },
{ "filetype", icon_only = true, separator = "", padding = { left = 1, right = 1 } },
{
"filename",
Expand All @@ -60,10 +60,14 @@ return {
},
},
lualine_x = {
{ require("lazy.status").updates, cond = require("lazy.status").has_updates, },
{ require("lazy.status").updates, cond = require("lazy.status").has_updates },
{
function() return require("noice").api.status.command.get() end,
cond = function() return package.loaded["noice"] and require("noice").api.status.command.has() end,
function()
return require("noice").api.status.command.get()
end,
cond = function()
return package.loaded["noice"] and require("noice").api.status.command.has()
end,
color = fg("Statement"),
},
-- stylua: ignore
Expand Down Expand Up @@ -101,4 +105,3 @@ return {
end,
},
}

4 changes: 2 additions & 2 deletions nvim/lua/plugins/orgmode.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ return {
dependencies = {
{ "akinsho/org-bullets.nvim", config = true, lazy = false },
{ "lukas-reineke/headlines.nvim", config = true, lazy = false },
{ "nvim-treesitter/nvim-treesitter", lazy = true, },
{ "joaomsa/telescope-orgmode.nvim", lazy = false, }
{ "nvim-treesitter/nvim-treesitter", lazy = true },
{ "joaomsa/telescope-orgmode.nvim", lazy = false },
},
event = "VeryLazy",
config = function(_, opts)
Expand Down
3 changes: 1 addition & 2 deletions nvim/lua/plugins/overseer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ return {
end,
keys = {
{ "<C-c>ot", [[<cmd>OverseerToggle<cr>]], desc = "Toggle Overseer" },
{ "<C-c>or", [[<cmd>OverseerRun<cr>]], desc = "Run Overseer" }
{ "<C-c>or", [[<cmd>OverseerRun<cr>]], desc = "Run Overseer" },
},
},
}

3 changes: 1 addition & 2 deletions nvim/lua/plugins/pomodoro.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ return {
init = function()
local wk = require("which-key")
wk.register({
[ "<leader>p" ] = { name = "+pomodoro" },
["<leader>p"] = { name = "+pomodoro" },
})
end,
opts = {
Expand All @@ -30,4 +30,3 @@ return {
},
},
}

2 changes: 1 addition & 1 deletion nvim/lua/plugins/project.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ return {
},
show_hidden = false,
silent_chdir = true,
scope_chdir = 'global',
scope_chdir = "global",
datapath = vim.fn.stdpath("data"),
},
config = function(_, opts)
Expand Down
3 changes: 1 addition & 2 deletions nvim/lua/plugins/toggleterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,5 @@ return {
{ "<c-c>tS", [[<cmd>execute "ToggleTermSendCurrentLine ". v:count<CR>]], desc = "Send current line to terminal" },
{ "<c-c>tS", [[<cmd>execute "ToggleTermSendVisualSelection " . v:count<CR>]], mode = { "v" }, desc = "Send visual selection to terminal" },
},
}
},
}

2 changes: 0 additions & 2 deletions nvim/lua/plugins/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,4 @@ return {
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
end,
},


}
1 change: 0 additions & 1 deletion nvim/lua/plugins/ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -277,5 +277,4 @@ return {
},
},
},

}
4 changes: 4 additions & 0 deletions stylua.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
indent_type = "Spaces"
indent_width = 2
column_width = 120

0 comments on commit 81e7f03

Please sign in to comment.