Compare commits
No commits in common. "7f87490ce08fd2abf500d1c554f8faa88b1e19c0" and "b5b08fdfd964e467f5a9a4ec43b15f7f4a13f18d" have entirely different histories.
7f87490ce0
...
b5b08fdfd9
29
flake.lock
29
flake.lock
|
@ -758,11 +758,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1695550077,
|
"lastModified": 1695544722,
|
||||||
"narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
|
"narHash": "sha256-cEnhsF44oNXvX3caEWCrbz5se9tlIsT2UGz4WT/vE0U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
|
"rev": "4a6333265ed8f3abf4769db60735522bbaa7819d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1126,11 +1126,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-latest": {
|
"nixpkgs-latest": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1695597504,
|
"lastModified": 1695547706,
|
||||||
"narHash": "sha256-CKhj6wOKqndfHsDg8CKVBbpJWG8zHRZRLi7MnOatf0U=",
|
"narHash": "sha256-d0K3mDswIA7BNyFSD7p0xzfBFNLZamKaw20fVqiY37g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7a862f0a660d5bd850457a0ad7772e1672109ccd",
|
"rev": "c497931955af2ac89c77a0776bd07e8c8b410f4a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1191,22 +1191,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-vimplugins": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1695583468,
|
|
||||||
"narHash": "sha256-NRbfULcsDKXH4I5qKkqaXsBTqJQswDgasHDbhoDvPOE=",
|
|
||||||
"owner": "cornedor",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "dc8c9800fa19a9c44fe15507d9700d8ff1dc507c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cornedor",
|
|
||||||
"ref": "update-vim-plugins",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654568412,
|
"lastModified": 1654568412,
|
||||||
|
@ -1650,7 +1634,6 @@
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixpkgs": "nixpkgs_12",
|
"nixpkgs": "nixpkgs_12",
|
||||||
"nixpkgs-latest": "nixpkgs-latest",
|
"nixpkgs-latest": "nixpkgs-latest",
|
||||||
"nixpkgs-vimplugins": "nixpkgs-vimplugins",
|
|
||||||
"sg-nvim": "sg-nvim",
|
"sg-nvim": "sg-nvim",
|
||||||
"std": "std_2"
|
"std": "std_2"
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
# Should show the latest nixpkgs whenever possible
|
# Should show the latest nixpkgs whenever possible
|
||||||
inputs.nixpkgs.follows = "nixpkgs-latest";
|
inputs.nixpkgs.follows = "nixpkgs-latest";
|
||||||
};
|
};
|
||||||
nixpkgs-vimplugins.url = "github:cornedor/nixpkgs/update-vim-plugins";
|
|
||||||
sg-nvim = {
|
sg-nvim = {
|
||||||
url = "git+https://github.com/pegasust/sg.nvim?ref=sg-cody-discover";
|
url = "git+https://github.com/pegasust/sg.nvim?ref=sg-cody-discover";
|
||||||
};
|
};
|
||||||
|
|
|
@ -57,6 +57,7 @@ WPlug('MunifTanjim/nui.nvim') -- For some .so or .dylib neovim UI action
|
||||||
|
|
||||||
|
|
||||||
-- plugins
|
-- plugins
|
||||||
|
WPlug('tjdevries/nlua.nvim') -- adds symbols of vim stuffs in init.lua
|
||||||
WPlug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting
|
WPlug('nvim-treesitter/nvim-treesitter') -- language parser engine for highlighting
|
||||||
WPlug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
|
WPlug('nvim-treesitter/nvim-treesitter-textobjects') -- more text objects
|
||||||
WPlug('nvim-telescope/telescope.nvim', { branch = '0.1.x' }) -- file browser
|
WPlug('nvim-telescope/telescope.nvim', { branch = '0.1.x' }) -- file browser
|
||||||
|
@ -83,7 +84,7 @@ WPlug('hrsh7th/cmp-cmdline')
|
||||||
WPlug('hrsh7th/nvim-cmp')
|
WPlug('hrsh7th/nvim-cmp')
|
||||||
WPlug('hrsh7th/cmp-nvim-lsp-signature-help')
|
WPlug('hrsh7th/cmp-nvim-lsp-signature-help')
|
||||||
WPlug('onsails/lspkind-nvim')
|
WPlug('onsails/lspkind-nvim')
|
||||||
-- WPlug('yioneko/nvim-yati', { tag = '*' }) -- copium: fix Python indent auto-correct from smart-indent
|
WPlug('yioneko/nvim-yati', { tag = '*' }) -- copium: fix Python indent auto-correct from smart-indent
|
||||||
WPlug('nathanalderson/yang.vim')
|
WPlug('nathanalderson/yang.vim')
|
||||||
-- WPlug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
|
-- WPlug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })
|
||||||
|
|
||||||
|
@ -115,7 +116,7 @@ WPlug('gruvbox-community/gruvbox') -- theme provider
|
||||||
WPlug('nvim-lualine/lualine.nvim') -- fancy status line
|
WPlug('nvim-lualine/lualine.nvim') -- fancy status line
|
||||||
WPlug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
|
WPlug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
|
||||||
WPlug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
|
WPlug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
|
||||||
-- WPlug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
|
WPlug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
|
||||||
WPlug('folke/todo-comments.nvim') -- Highlights TODO
|
WPlug('folke/todo-comments.nvim') -- Highlights TODO
|
||||||
WPlug('NvChad/nvim-colorizer.lua') -- color highlighter with tailwind support
|
WPlug('NvChad/nvim-colorizer.lua') -- color highlighter with tailwind support
|
||||||
WPlug('roobert/tailwindcss-colorizer-cmp.nvim') -- color for tailiwnd for compe
|
WPlug('roobert/tailwindcss-colorizer-cmp.nvim') -- color for tailiwnd for compe
|
||||||
|
@ -252,7 +253,7 @@ vim.keymap.set('n', '<leader>gg', '<cmd>GuessIndent<cr>')
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
colorscheme gruvbox
|
colorscheme gruvbox
|
||||||
]])
|
]])
|
||||||
-- require('hlargs').setup()
|
require('hlargs').setup()
|
||||||
require('nvim-web-devicons').setup()
|
require('nvim-web-devicons').setup()
|
||||||
require('trouble').setup {
|
require('trouble').setup {
|
||||||
position = "bottom", -- position of the list can be: bottom, top, left, right
|
position = "bottom", -- position of the list can be: bottom, top, left, right
|
||||||
|
@ -587,12 +588,12 @@ vim.api.nvim_set_keymap('n', '<C-t>x', ':tabdo if tabpagenr() > 1 | tabclose | e
|
||||||
-- treesitter
|
-- treesitter
|
||||||
require 'treesitter-context'
|
require 'treesitter-context'
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
-- yati = {
|
yati = {
|
||||||
-- enable = true,
|
enable = true,
|
||||||
-- default_lazy = true,
|
default_lazy = true,
|
||||||
-- default_fallback = "auto",
|
default_fallback = "auto",
|
||||||
-- disable = { "nix" }
|
disable = { "nix" }
|
||||||
-- },
|
},
|
||||||
indent = { enable = false },
|
indent = { enable = false },
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
|
|
|
@ -74,40 +74,6 @@ in {
|
||||||
home.username = "hungtran";
|
home.username = "hungtran";
|
||||||
home.homeDirectory = "/Users/hungtran";
|
home.homeDirectory = "/Users/hungtran";
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "23.11";
|
||||||
repo.shells.shellAliases = {
|
|
||||||
git-lol = ''
|
|
||||||
git log --graph --decorate --color=always --abbrev-commit \
|
|
||||||
--pretty=format:'%C(auto)%h %d %C(cyan)%s %C(green)(%cr)%C(reset)' |
|
|
||||||
while IFS= read -r line; do
|
|
||||||
# Format the relative time
|
|
||||||
line=$(echo "$line" | sed -e 's/ minute/ min/' \
|
|
||||||
-e 's/ week/ wk/' \
|
|
||||||
-e 's/ hour/ hr/' \
|
|
||||||
-e 's/ month/ mo/' \
|
|
||||||
-e 's/ year/ yr/' \
|
|
||||||
-e 's/ ago//')
|
|
||||||
|
|
||||||
# Print the formatted line
|
|
||||||
echo "$line"
|
|
||||||
done | less -R
|
|
||||||
'';
|
|
||||||
git-lola = ''
|
|
||||||
git log --graph --decorate --color=always --abbrev-commit --all\
|
|
||||||
--pretty=format:'%C(auto)%h %d %C(cyan)%s %C(green)(%cr)%C(reset)' |
|
|
||||||
while IFS= read -r line; do
|
|
||||||
# Format the relative time
|
|
||||||
line=$(echo "$line" | sed -e 's/ minute/ min/' \
|
|
||||||
-e 's/ week/ wk/' \
|
|
||||||
-e 's/ hour/ hr/' \
|
|
||||||
-e 's/ month/ mo/' \
|
|
||||||
-e 's/ year/ yr/' \
|
|
||||||
-e 's/ ago//')
|
|
||||||
|
|
||||||
# Print the formatted line
|
|
||||||
echo "$line"
|
|
||||||
done | less -R
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,7 +96,7 @@ in {
|
||||||
*/
|
*/
|
||||||
plugins = let
|
plugins = let
|
||||||
inherit
|
inherit
|
||||||
(inputs.nixpkgs-vimplugins.legacyPackages.${system}.vimPlugins)
|
(inputs.nixpkgs-latest.legacyPackages.${system}.vimPlugins)
|
||||||
plenary-nvim
|
plenary-nvim
|
||||||
nvim-treesitter
|
nvim-treesitter
|
||||||
nvim-treesitter-textobjects
|
nvim-treesitter-textobjects
|
||||||
|
@ -127,6 +127,7 @@ in {
|
||||||
mason-lspconfig-nvim
|
mason-lspconfig-nvim
|
||||||
mason-nvim
|
mason-nvim
|
||||||
neogit
|
neogit
|
||||||
|
nlua-nvim
|
||||||
nvim-jqx
|
nvim-jqx
|
||||||
nvim-surround
|
nvim-surround
|
||||||
nvim-web-devicons
|
nvim-web-devicons
|
||||||
|
@ -177,6 +178,7 @@ in {
|
||||||
mason-lspconfig-nvim
|
mason-lspconfig-nvim
|
||||||
mason-nvim
|
mason-nvim
|
||||||
neogit
|
neogit
|
||||||
|
nlua-nvim
|
||||||
nvim-jqx
|
nvim-jqx
|
||||||
nvim-surround
|
nvim-surround
|
||||||
nvim-web-devicons
|
nvim-web-devicons
|
||||||
|
|
Loading…
Reference in New Issue