servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Update to latest nix

Browse Source
This commit is contained in:
uttarayan21
2024-08-30 15:10:10 +05:30
parent 3ab509a81c
commit 9a08453063
3 changed files with 282 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

446
neovim/nvim.nix
View File

@@ -245,7 +245,7 @@ in rec {
html.enable = true;
ast-grep.enable = true;
# pylyzer.enable = true;
rust-analyzer.enable = false;
# rust-analyzer.enable = false;
};
onAttach =
/*
@@ -419,246 +419,246 @@ in rec {
lua
*/
''
function catcher(callback)
do
success, output = pcall(callback)
if not success then
print("Failed to setup: " .. output)
end
end
end
do
function setup()
require'neotest'.setup({
adapters = {
require('rustaceanvim.neotest'),
}
})
end
success, output = pcall(setup)
if not success then
print("Failed to setup neotest: " .. output)
end
end
-- catcher(require('rest-nvim').setup)
-- catcher(require('lspconfig').ast_grep.setup)
-- require('telescope').load_extension("dap")
-- require('telescope').load_extension("rest")
require('telescope').load_extension("neorg")
require("copilot").setup({
suggestion = {
enabled = true,
auto_trigger = true,
keymap = {
accept = "<C-l>",
}
},
panel = { enabled = true },
})
catcher(require('crates').setup)
catcher(require('outline').setup)
-- catcher(require('navigator').setup)
require('FTerm').setup({
border = 'single',
dimensions = {
height = 0.99,
width = 0.95,
},
cmd = "sh -c 'tmux new -As scratch'",
blend = 10,
})
local load = {
["core.defaults"] = {},
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
["core.concealer"] = {
config = { icon_preset = "diamond" }
},
["core.export"] = {},
["core.keybinds"] = {
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
config = {
default_keybinds = true,
neorg_leader = "<C-m>",
},
},
["core.dirman"] = {
config = {
default_workspace = "Notes",
workspaces = {
Notes = "~/Nextcloud/Notes",
Work = "~/Nextcloud/Work",
}
}
}
}
require('neorg').setup({
load = load,
})
require('chatgpt').setup({
api_key_cmd = "${apikey}/bin/openapikey",
})
require('octo').setup({
use_local_fs = false,
enable_builtin = false,
default_remote = {"upstream", "origin"};
default_merge_method = "squash";
})
local rr_dap = require('nvim-dap-rr')
rr_dap.setup({
mappings = {
continue = "<F7>"
},
})
local dap = require'dap';
dap.configurations.rust = { rr_dap.get_rust_config() }
dap.configurations.cpp = { rr_dap.get_config() }
if not vim.g.neovide then
require('neoscroll').setup()
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
load["core.integrations.image"] = {
config = {
tmux_show_only_in_active_window = true,
}
}
else
vim.o.guifont = "Hasklug Nerd Font Mono:h13"
vim.g.neovide_cursor_vfx_mode = "railgun"
end
function catcher(callback)
do
success, output = pcall(callback)
if not success then
print("Failed to setup: " .. output)
end
end
end
-- do
-- function setup()
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
-- capabilities.textDocument.foldingRange = {
-- dynamicRegistration = false,
-- lineFoldingOnly = true
-- }
-- -- local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
-- local language_servers = {"nil_ls"};
-- for _, ls in ipairs(language_servers) do
-- require('lspconfig')[ls].setup({
-- capabilities = capabilities
-- -- you can add other fields for setting up lsp server in this table
-- })
-- end
-- require'neotest'.setup({
-- adapters = {
-- require('rustaceanvim.neotest'),
-- }
-- })
-- end
-- success, output = pcall(setup)
-- if not success then
-- print("Failed to setup lspconfig folds: " .. output)
-- print("Failed to setup neotest: " .. output)
-- end
-- end
require('lspconfig.ui.windows').default_options.border = 'single'
catcher(require('nvim_context_vt').setup)
catcher(function()
require('nvim-devdocs').setup({
ensure_installed = {"nix", "rust"},
float_win = {
relative = "editor",
height = 80,
width = 100,
border = "rounded",
},
after_open = function()
vim.o.conceallevel = 3
end,
})
end)
-- catcher(require('rest-nvim').setup)
vim.api.nvim_create_user_command('Reso',
function()
pcall(vim.cmd'source ~/.config/nvim/init.lua')
end,
{})
-- catcher(require('lspconfig').ast_grep.setup)
vim.api.nvim_create_user_command('Sqlfmt',
function()
pcall(vim.cmd'%!${pkgs.sleek}/bin/sleek')
end,
{})
-- require('telescope').load_extension("dap")
-- require('telescope').load_extension("rest")
require('telescope').load_extension("neorg")
local iron = require("iron.core")
iron.setup({
config = {
-- Whether a repl should be discarded or not
scratch_repl = true,
-- Your repl definitions come here
repl_definition = {
sh = {
-- Can be a table or a function that
-- returns a table (see below)
command = {"${pkgs.zsh}/bin/zsh"}
require("copilot").setup({
suggestion = {
enabled = true,
auto_trigger = true,
keymap = {
accept = "<C-l>",
}
},
sql = {
command = function(meta)
local db = os.getenv("DATABASE_PATH")
if db == nil then
return { '${pkgs.sqlite}/bin/sqlite3', ':memory:' }
else
return { '${pkgs.sqlite}/bin/sqlite3', db }
end
panel = { enabled = true },
})
end
catcher(require('crates').setup)
catcher(require('outline').setup)
-- catcher(require('navigator').setup)
require('FTerm').setup({
border = 'single',
dimensions = {
height = 0.99,
width = 0.95,
},
rust = {
command = {"${pkgs.evcxr}/bin/evcxr"}
cmd = "sh -c 'tmux new -As scratch'",
blend = 10,
})
local load = {
["core.defaults"] = {},
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
["core.concealer"] = {
config = { icon_preset = "diamond" }
},
["core.export"] = {},
["core.keybinds"] = {
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
config = {
default_keybinds = true,
neorg_leader = "<C-m>",
},
},
["core.dirman"] = {
config = {
default_workspace = "Notes",
workspaces = {
Notes = "~/Nextcloud/Notes",
Work = "~/Nextcloud/Work",
}
}
}
}
require('neorg').setup({
load = load,
})
require('chatgpt').setup({
api_key_cmd = "${apikey}/bin/openapikey",
})
require('octo').setup({
use_local_fs = false,
enable_builtin = false,
default_remote = {"upstream", "origin"};
default_merge_method = "squash";
})
local rr_dap = require('nvim-dap-rr')
rr_dap.setup({
mappings = {
continue = "<F7>"
},
})
local dap = require'dap';
-- dap.configurations.rust = { rr_dap.get_rust_config() }
dap.configurations.cpp = { rr_dap.get_config() }
if not vim.g.neovide then
require('neoscroll').setup()
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
load["core.integrations.image"] = {
config = {
tmux_show_only_in_active_window = true,
}
}
else
vim.o.guifont = "Hasklug Nerd Font Mono:h13"
vim.g.neovide_cursor_vfx_mode = "railgun"
end
-- do
-- function setup()
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
-- capabilities.textDocument.foldingRange = {
-- dynamicRegistration = false,
-- lineFoldingOnly = true
-- }
-- -- local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
-- local language_servers = {"nil_ls"};
-- for _, ls in ipairs(language_servers) do
-- require('lspconfig')[ls].setup({
-- capabilities = capabilities
-- -- you can add other fields for setting up lsp server in this table
-- })
-- end
-- end
-- success, output = pcall(setup)
-- if not success then
-- print("Failed to setup lspconfig folds: " .. output)
-- end
-- end
require('lspconfig.ui.windows').default_options.border = 'single'
catcher(require('nvim_context_vt').setup)
-- catcher(function()
-- require('nvim-devdocs').setup({
-- ensure_installed = {"nix", "rust"},
-- float_win = {
-- relative = "editor",
-- height = 80,
-- width = 100,
-- border = "rounded",
-- },
-- after_open = function()
-- vim.o.conceallevel = 3
-- end,
-- })
-- end)
vim.api.nvim_create_user_command('Reso',
function()
pcall(vim.cmd'source ~/.config/nvim/init.lua')
end,
{})
vim.api.nvim_create_user_command('Sqlfmt',
function()
pcall(vim.cmd'%!${pkgs.sleek}/bin/sleek')
end,
{})
local iron = require("iron.core")
-- iron.setup({
-- config = {
-- -- Whether a repl should be discarded or not
-- scratch_repl = true,
-- -- Your repl definitions come here
-- repl_definition = {
-- sh = {
-- -- Can be a table or a function that
-- -- returns a table (see below)
-- command = {"${pkgs.zsh}/bin/zsh"}
-- },
-- sql = {
-- command = function(meta)
-- local db = os.getenv("DATABASE_PATH")
-- if db == nil then
-- return { '${pkgs.sqlite}/bin/sqlite3', ':memory:' }
-- else
-- return { '${pkgs.sqlite}/bin/sqlite3', db }
-- end
-- end
-- },
-- rust = {
-- command = {"${pkgs.evcxr}/bin/evcxr"}
-- },
-- },
-- -- How the repl window will be displayed
-- -- See below for more information
-- repl_open_cmd = require('iron.view').right(60),
-- },
-- -- Iron doesn't set keymaps by default anymore.
-- -- You can set them here or manually add keymaps to the functions in iron.core
-- keymaps = {
-- send_motion = "<space>sc",
-- visual_send = "<space>sc",
-- send_file = "<space>sf",
-- send_line = "<space>sl",
-- send_until_cursor = "<space>su",
-- send_mark = "<space>sm",
-- mark_motion = "<space>mc",
-- mark_visual = "<space>mc",
-- remove_mark = "<space>md",
-- cr = "<space>s<cr>",
-- interrupt = "<space>s<space>",
-- exit = "<space>sq",
-- clear = "<space>cl",
-- },
-- -- If the highlight is on, you can change how it looks
-- -- For the available options, check nvim_set_hl
-- highlight = {
-- italic = true
-- },
-- ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
-- })
vim.filetype.add({
extension = {
http = "http",
},
-- How the repl window will be displayed
-- See below for more information
repl_open_cmd = require('iron.view').right(60),
},
-- Iron doesn't set keymaps by default anymore.
-- You can set them here or manually add keymaps to the functions in iron.core
keymaps = {
send_motion = "<space>sc",
visual_send = "<space>sc",
send_file = "<space>sf",
send_line = "<space>sl",
send_until_cursor = "<space>su",
send_mark = "<space>sm",
mark_motion = "<space>mc",
mark_visual = "<space>mc",
remove_mark = "<space>md",
cr = "<space>s<cr>",
interrupt = "<space>s<space>",
exit = "<space>sq",
clear = "<space>cl",
},
-- If the highlight is on, you can change how it looks
-- For the available options, check nvim_set_hl
highlight = {
italic = true
},
ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
})
})
vim.filetype.add({
extension = {
http = "http",
},
})
vim.filetype.add({
filename = {
['nurfile'] = "nu",
},
})
vim.filetype.add({
filename = {
['nurfile'] = "nu",
},
})
'';
# package = pkgs.neovim-unwrapped;