feat: more updates
This commit is contained in:
parent
cc24078e0f
commit
78dc911b16
@ -317,11 +317,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724710305,
|
"lastModified": 1724800090,
|
||||||
"narHash": "sha256-qotbY/mgvykExLqRLAKN4yeufPfIjnMaK6hQQFhE2DE=",
|
"narHash": "sha256-7KxGFZ40pidca5gcdI2weGanfB74yDxrErFNElOZWqA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "eac092c876e4c4861c6df0cff93e25b972b1842c",
|
"rev": "4814147442cd3f12f8160ecad9e36751f68cdc22",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs;
|
||||||
|
};
|
||||||
modules = [ ./yadunut-mbp/home.nix ];
|
modules = [ ./yadunut-mbp/home.nix ];
|
||||||
};
|
};
|
||||||
"yadunut@yadunut-mba" = home-manager.lib.homeManagerConfiguration {
|
"yadunut@yadunut-mba" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
@ -54,6 +54,7 @@
|
|||||||
settings = {
|
settings = {
|
||||||
sources = [
|
sources = [
|
||||||
{ name = "nvim_lsp"; }
|
{ name = "nvim_lsp"; }
|
||||||
|
{ name = "nvim_lua"; }
|
||||||
{ name = "emoji"; }
|
{ name = "emoji"; }
|
||||||
{ name = "emoji"; }
|
{ name = "emoji"; }
|
||||||
{ name = "buffer"; option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; keywordLength = 3; }
|
{ name = "buffer"; option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; keywordLength = 3; }
|
||||||
@ -77,6 +78,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
cmp-nvim-lsp.enable = true;
|
cmp-nvim-lsp.enable = true;
|
||||||
|
cmp-nvim-lua.enable = true;
|
||||||
cmp-buffer.enable = true;
|
cmp-buffer.enable = true;
|
||||||
cmp-path.enable = true;
|
cmp-path.enable = true;
|
||||||
cmp_luasnip.enable = true;
|
cmp_luasnip.enable = true;
|
||||||
@ -100,8 +102,11 @@
|
|||||||
indent.enable = true;
|
indent.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
which-key.enable = true;
|
treesitter-context.enable = true;
|
||||||
|
treesitter-textobjects.enable = true;
|
||||||
ts-autotag.enable = true;
|
ts-autotag.enable = true;
|
||||||
|
|
||||||
|
which-key.enable = true;
|
||||||
telescope = {
|
telescope = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extensions.fzf-native.enable = true;
|
extensions.fzf-native.enable = true;
|
||||||
@ -114,11 +119,19 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
project-nvim = {
|
||||||
|
enable = true;
|
||||||
|
enableTelescope = true;
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
opts = {
|
opts = {
|
||||||
number = true;
|
number = true;
|
||||||
relativenumber = true;
|
relativenumber = true;
|
||||||
signcolumn = "yes";
|
signcolumn = "yes";
|
||||||
|
updatetime = 250;
|
||||||
undofile = true;
|
undofile = true;
|
||||||
ignorecase = true;
|
ignorecase = true;
|
||||||
smartcase = true;
|
smartcase = true;
|
||||||
@ -131,6 +144,7 @@
|
|||||||
expandtab = true;
|
expandtab = true;
|
||||||
smarttab = true;
|
smarttab = true;
|
||||||
scrolloff = 5;
|
scrolloff = 5;
|
||||||
|
termguicolors = true;
|
||||||
};
|
};
|
||||||
globals = {
|
globals = {
|
||||||
mapleader = " ";
|
mapleader = " ";
|
||||||
@ -138,15 +152,18 @@
|
|||||||
};
|
};
|
||||||
keymaps = [
|
keymaps = [
|
||||||
{ action = ":"; key = ";"; mode = [ "n" ]; }
|
{ action = ":"; key = ";"; mode = [ "n" ]; }
|
||||||
{ action = "<cmd>Telescope find_files<CR>"; key = "<leader><leader>"; options.desc = "Find Files"; }
|
|
||||||
{ action = "<cmd>Telescope live_grep<CR>"; key = "<leader>fg"; options.desc = "Grep";}
|
|
||||||
{ action = "<cmd>Telescope buffers<CR>"; key = "<leader>fb"; options.desc = "Find Buffers";}
|
|
||||||
{ action = "<cmd>NvimTreeToggle<CR>"; key = "<leader>tt"; options.desc = "Tree View";}
|
|
||||||
{ action = "gj"; key = "j"; mode = [ "n" ]; }
|
{ action = "gj"; key = "j"; mode = [ "n" ]; }
|
||||||
{ action = "gk"; key = "k"; mode = [ "n" ]; }
|
{ action = "gk"; key = "k"; mode = [ "n" ]; }
|
||||||
{ action = "<Esc>"; key = "jk"; mode = [ "i" ]; }
|
{ action = "<Esc>"; key = "jk"; mode = [ "i" ]; }
|
||||||
|
|
||||||
|
{ action = "<cmd>Telescope find_files<CR>"; key = "<leader><leader>"; options.desc = "Find Files"; }
|
||||||
|
{ action = "<cmd>Telescope live_grep<CR>"; key = "<leader>fg"; options.desc = "Grep";}
|
||||||
|
{ action = "<cmd>Telescope buffers<CR>"; key = "<leader>fb"; options.desc = "Find Buffers";}
|
||||||
|
{ action = "<cmd>Telescope projects<CR>"; key = "<leader>pp"; options.desc = "Switch Projects";}
|
||||||
|
|
||||||
{ action = "<cmd>Trouble diagnostics toggle<CR>"; key = "<leader>tr"; }
|
{ action = "<cmd>Trouble diagnostics toggle<CR>"; key = "<leader>tr"; }
|
||||||
{ action = "<cmd>Neogit<CR>"; key = "<leader>gg"; options.desc = "Open Git"; }
|
{ action = "<cmd>Neogit<CR>"; key = "<leader>gg"; options.desc = "Open Git"; }
|
||||||
|
{ action = "<cmd>NvimTreeToggle<CR>"; key = "<leader>tt"; options.desc = "Tree View";}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
(import ../modules/zsh.nix)
|
(import ../modules/zsh.nix)
|
||||||
(import ../modules/git.nix)
|
(import ../modules/git.nix)
|
||||||
(import ../modules/neovim.nix)
|
(import ../modules/neovim.nix)
|
||||||
|
(import ../modules/wezterm)
|
||||||
];
|
];
|
||||||
# Home Manager needs a bit of information about you and the paths it should
|
# Home Manager needs a bit of information about you and the paths it should
|
||||||
# manage.
|
# manage.
|
||||||
@ -38,6 +39,7 @@
|
|||||||
pkgs.pyright
|
pkgs.pyright
|
||||||
pkgs.yt-dlp
|
pkgs.yt-dlp
|
||||||
pkgs.rsync
|
pkgs.rsync
|
||||||
|
pkgs.k9s
|
||||||
# Neovim deps
|
# Neovim deps
|
||||||
# pkgs.texlab
|
# pkgs.texlab
|
||||||
# pkgs.efm-langserver
|
# pkgs.efm-langserver
|
||||||
@ -70,6 +72,7 @@
|
|||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
|
VISUAL = "nvim";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zsh.shellAliases = {
|
programs.zsh.shellAliases = {
|
||||||
|
Loading…
Reference in New Issue
Block a user