version: update to v0.1.0

This commit is contained in:
Trianta 2025-02-04 07:24:53 -06:00
parent 0b3190c4ae
commit 2530e4298a
12 changed files with 167 additions and 173 deletions

3
.zshrc
View File

@ -32,6 +32,7 @@ alias -g cmakeb="cmake --build build -j $(nproc)"
alias -g pcore="taskset -c 1-7" alias -g pcore="taskset -c 1-7"
alias -g a="notify" alias -g a="notify"
alias -g af="taskset -c 0-19 notify" alias -g af="taskset -c 0-19 notify"
alias -g tm="tmux new -A -s"
# Plugins from AUR # Plugins from AUR
source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
@ -101,4 +102,6 @@ export EDITOR="nvim"
# Global CMake clangd fix # Global CMake clangd fix
export CMAKE_EXPORT_COMPILE_COMMANDS=1 export CMAKE_EXPORT_COMPILE_COMMANDS=1
[[ "$(tty)" == /dev/tty1 ]] && Hyprland
$(&>/dev/null pw-play --volume=2.0 ~/.alert/ready.mp3 &) $(&>/dev/null pw-play --volume=2.0 ~/.alert/ready.mp3 &)

View File

@ -15,7 +15,6 @@ end)
-- Mason -- Mason
require('mason').setup({}) require('mason').setup({})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = {'tsserver', 'rust_analyzer'},
handlers = { handlers = {
lsp_zero.default_setup, lsp_zero.default_setup,
lua_ls = function() lua_ls = function()

View File

@ -1,11 +0,0 @@
return {
{
"catppuccin/nvim",
name = "catppuccin",
priority = 1000
},
{
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
}
}

View File

@ -1,45 +0,0 @@
return {
{
"folke/twilight.nvim",
opts = {
dimming = {
alpha = 0.25,
color = { "Normal", "#ffffff" },
term_bg = "#000000",
inactive = false,
},
context = 10,
treesitter = true,
expand = {
"function",
"method",
"table",
"if_statement"
},
},
},
{
"folke/zen-mode.nvim",
opts = {
{
window = {
backdrop = 0.95,
width = 120,
height = 1,
},
plugins = {
options = {
enabled = true,
ruler = false,
showcmd = false,
},
twilight = { enabled = true },
},
on_open = function(win)
end,
on_close = function()
end,
}
}
}
}

View File

@ -1,4 +1,3 @@
require("trianta.set") require("trianta.vim")
require("trianta.remap")
require("trianta.lazy") require("trianta.lazy")

View File

@ -27,10 +27,163 @@ return require('lazy').setup({
-- refer to the configuration section below -- refer to the configuration section below
} }
}, },
require("trianta.colors"), {
require("trianta.lsp"), "catppuccin/nvim",
require("trianta.nav"), name = "catppuccin",
require("trianta.focus"), priority = 1000
require("trianta.obsidian"), },
require("trianta.ollama"), -- colors
{
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
},
{
'VonHeikemen/lsp-zero.nvim',
branch = 'v3.x',
dependencies = {
-- LSP Support
"neovim/nvim-lspconfig", -- Required
'williamboman/mason.nvim', -- Optional
'williamboman/mason-lspconfig.nvim', -- Optional
-- Autocompletion
'hrsh7th/nvim-cmp', -- Required
'hrsh7th/cmp-nvim-lsp', -- Required
'hrsh7th/cmp-buffer', -- Optional
'hrsh7th/cmp-path', -- Optional
'saadparwaiz1/cmp_luasnip', -- Optional
'hrsh7th/cmp-nvim-lua', -- Optional
-- Snippets
'L3MON4D3/LuaSnip', -- Required
'rafamadriz/friendly-snippets', -- Optional
}
},
-- navigation
{
"nvim-telescope/telescope.nvim",
tag = '0.1.8',
dependencies = { "nvim-lua/plenary.nvim" },
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
},
-- focus plugins
{
"folke/twilight.nvim",
opts = {
dimming = {
alpha = 0.25,
color = { "Normal", "#ffffff" },
term_bg = "#000000",
inactive = false,
},
context = 10,
treesitter = true,
expand = {
"function",
"method",
"table",
"if_statement"
},
},
},
{
"folke/zen-mode.nvim",
opts = {
{
window = {
backdrop = 0.95,
width = 120,
height = 1,
},
plugins = {
options = {
enabled = true,
ruler = false,
showcmd = false,
},
twilight = { enabled = true },
},
on_open = function(win)
end,
on_close = function()
end,
}
}
},
-- obsidian
{
"epwalsh/obsidian.nvim",
version = "v3.2.0",
lazy = true,
ft = "markdown",
dependencies = {
"nvim-lua/plenary.nvim",
},
opts = {
workspaces = {
{
name = "trinote",
path = "~/sync/obsidian/Trinote/",
},
},
disable_frontmatter = true,
},
ui = {
enable = true
}
},
-- ollama
{
"nomnivore/ollama.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
-- All the user commands added by the plugin
cmd = { "Ollama", "OllamaModel", "OllamaServe", "OllamaServeStop" },
keys = {
-- Sample keybind for prompt menu. Note that the <c-u> is important for selections to work properly.
{
"<leader>oo",
":<c-u>lua require('ollama').prompt()<cr>",
desc = "ollama prompt",
mode = { "n", "v" },
},
-- Sample keybind for direct prompting. Note that the <c-u> is important for selections to work properly.
{
"<leader>oG",
":<c-u>lua require('ollama').prompt('Generate_Code')<cr>",
desc = "ollama Generate Code",
mode = { "n", "v" },
},
},
---@type Ollama.Config
opts = {
model = "codellama",
url = "factory.lan:11434",
serve = {
on_start = false,
command = "ollama",
args = { "serve" },
stop_command = "pkill",
stop_args = { "-SIGTERM", "ollama" },
},
-- View the actual default prompts in ./lua/ollama/prompts.lua
prompts = {
Sample_Prompt = {
prompt = "This is a sample prompt that receives $input and $sel(ection), among others.",
input_label = "> ",
model = "mistral",
action = "display",
}
}
}
}
}) })

View File

@ -1,22 +0,0 @@
return {
'VonHeikemen/lsp-zero.nvim',
branch = 'v3.x',
dependencies = {
-- LSP Support
"neovim/nvim-lspconfig", -- Required
'williamboman/mason.nvim', -- Optional
'williamboman/mason-lspconfig.nvim', -- Optional
-- Autocompletion
'hrsh7th/nvim-cmp', -- Required
'hrsh7th/cmp-nvim-lsp', -- Required
'hrsh7th/cmp-buffer', -- Optional
'hrsh7th/cmp-path', -- Optional
'saadparwaiz1/cmp_luasnip', -- Optional
'hrsh7th/cmp-nvim-lua', -- Optional
-- Snippets
'L3MON4D3/LuaSnip', -- Required
'rafamadriz/friendly-snippets', -- Optional
}
}

View File

@ -1,12 +0,0 @@
return {
{
"nvim-telescope/telescope.nvim",
tag = '0.1.8',
dependencies = { "nvim-lua/plenary.nvim" },
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
}
}

View File

@ -1,23 +0,0 @@
return {
{
"epwalsh/obsidian.nvim",
version = "v3.2.0",
lazy = true,
ft = "markdown",
dependencies = {
"nvim-lua/plenary.nvim",
},
opts = {
workspaces = {
{
name = "trinote",
path = "~/sync/obsidian/Trinote/",
},
},
disable_frontmatter = true,
},
ui = {
enable = true
}
}
}

View File

@ -1,49 +0,0 @@
return {
"nomnivore/ollama.nvim",
dependencies = {
"nvim-lua/plenary.nvim",
},
-- All the user commands added by the plugin
cmd = { "Ollama", "OllamaModel", "OllamaServe", "OllamaServeStop" },
keys = {
-- Sample keybind for prompt menu. Note that the <c-u> is important for selections to work properly.
{
"<leader>oo",
":<c-u>lua require('ollama').prompt()<cr>",
desc = "ollama prompt",
mode = { "n", "v" },
},
-- Sample keybind for direct prompting. Note that the <c-u> is important for selections to work properly.
{
"<leader>oG",
":<c-u>lua require('ollama').prompt('Generate_Code')<cr>",
desc = "ollama Generate Code",
mode = { "n", "v" },
},
},
---@type Ollama.Config
opts = {
model = "codellama",
url = "factory.lan:11434",
serve = {
on_start = false,
command = "ollama",
args = { "serve" },
stop_command = "pkill",
stop_args = { "-SIGTERM", "ollama" },
},
-- View the actual default prompts in ./lua/ollama/prompts.lua
prompts = {
Sample_Prompt = {
prompt = "This is a sample prompt that receives $input and $sel(ection), among others.",
input_label = "> ",
model = "mistral",
action = "display",
}
}
}
}

View File

@ -1,2 +0,0 @@
vim.g.mapleader = " "
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)

View File

@ -1,3 +1,4 @@
-- vim core settings
vim.opt.nu = true vim.opt.nu = true
vim.opt.tabstop = 4 vim.opt.tabstop = 4
@ -24,3 +25,6 @@ vim.opt.colorcolumn = "80"
vim.g.mapleader = " " vim.g.mapleader = " "
vim.opt.mouse = "" vim.opt.mouse = ""
vim.g.mapleader = " "
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)