softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Post Flakes Cleanup and Neovim updates' (#5) from neovim-updates-flakes-cleanup into main

Browse source 
Reviewed-on: https://git.softinio.com/softinio/nix-config/pulls/5
This commit is contained in:
Salar Rahmanian 2022-08-13 19:03:43 +00:00
commit 71a18a763b
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
home.nix
View file

@ -78,7 +78,7 @@
sqlite sqlite
stylua stylua
stack stack
# sumneko-lua-language-server sumneko-lua-language-server
tealdeer tealdeer
tig tig
tokei tokei
@ -270,19 +270,14 @@
gforksync="git fetch upstream && git merge upstream/master && git push origin master"; gforksync="git fetch upstream && git merge upstream/master && git push origin master";
grep="grep --color=auto"; grep="grep --color=auto";
new-sbt="sbt new scala/scala-seed.g8"; new-sbt="sbt new scala/scala-seed.g8";
nixre="home-manager switch"; nixre="nix build && sudo ./result/activate";
nixedit="home-manager edit";
nixinfo="nix-shell -p nix-info --run \"nix-info -m\""; nixinfo="nix-shell -p nix-info --run \"nix-info -m\"";
nixgc="nix-collect-garbage -d"; nixgc="nix-collect-garbage -d";
nixq="nix-env -qa"; nixq="nix-env -qa";
nixupdate="nix-channel --update"; nixupdate="sudo nix-channel --update";
nixupgrade="nix upgrade-nix";
nixup="nix-env -u";
nixversion="nix eval nixpkgs.lib.version"; nixversion="nix eval nixpkgs.lib.version";
nixdaemon="sudo launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist && launchctl start org.nixos.nix-daemon";
rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData"; rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData";
v="nvim"; v="nvim";
tabninecfg="vc /Users/salar/Library/Preferences/TabNine/TabNine.toml";
sshfre1="ssh salar@fre1.softinio.net"; sshfre1="ssh salar@fre1.softinio.net";
sshfre2="ssh -p 2022 salar@fre2.softinio.net"; sshfre2="ssh -p 2022 salar@fre2.softinio.net";
}; };

15
programs/neovim/init.lua
View file

@ -7,7 +7,7 @@ local function load_plugins()
require('packer').startup(function() require('packer').startup(function()
use 'wbthomason/packer.nvim' -- Package manager use 'wbthomason/packer.nvim' -- Package manager
use 'neovim/nvim-lspconfig' -- Collection of configurations for built-in LSP client use 'neovim/nvim-lspconfig' -- Collection of configurations for built-in LSP client
use 'nvim-treesitter/nvim-treesitter' use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
use 'nvim-treesitter/nvim-treesitter-textobjects' use 'nvim-treesitter/nvim-treesitter-textobjects'
use 'nvim-treesitter/playground' use 'nvim-treesitter/playground'
use 'folke/which-key.nvim' use 'folke/which-key.nvim'
@ -135,7 +135,7 @@ _G.load_config = function()
use_virtual_text = true, use_virtual_text = true,
lint_events = { 'BufWrite', 'CursorHold' }, lint_events = { 'BufWrite', 'CursorHold' },
}, },
ensure_installed = 'maintained', -- ensure_installed = 'maintained',
highlight = { enable = true }, highlight = { enable = true },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
@ -206,6 +206,17 @@ _G.load_config = function()
max_file_lines = 1000, max_file_lines = 1000,
}, },
} }
-- vim.opt.foldmethod = 'expr'
-- vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
---WORKAROUND
vim.api.nvim_create_autocmd({'BufEnter','BufAdd','BufNew','BufNewFile','BufWinEnter'}, {
group = vim.api.nvim_create_augroup('TS_FOLD_WORKAROUND', {}),
callback = function()
vim.opt.foldmethod = 'expr'
vim.opt.foldexpr = 'nvim_treesitter#foldexpr()'
end
})
---ENDWORKAROUND
-- neogit -- neogit
require('neogit').setup { require('neogit').setup {