noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-12-05 02:29:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: noah:7a39acef1a0b7367b0a518403987e661d46fcefc
Branches Tags
noah:master
noah:microcode
noah:nixd
noah:eblume-mole
noah:language-checks
noah:keyd-2.4.3
noah:sway
noah:nixosmodules
noah:unfree-predicate-by-pkgs
noah:darwin-ssl
noah:begin-nixos
noah:begin-nix
noah:neovim-lua
noah:pre-nix
noah:legacy
...
compare: noah:397b08fab448c97199913a2d86f80e32b0308ac4
Branches Tags
noah:master
noah:microcode
noah:nixd
noah:eblume-mole
noah:language-checks
noah:keyd-2.4.3
noah:sway
noah:nixosmodules
noah:unfree-predicate-by-pkgs
noah:darwin-ssl
noah:begin-nixos
noah:begin-nix
noah:neovim-lua
noah:pre-nix
noah:legacy

2 Commits
7a39acef1a ... 397b08fab4

Author SHA1 Message Date
Noah Masur
397b08fab4 remove more unnecessary plugin flake inputs 2022-11-29 09:44:10 -07:00
Noah Masur
33e8a6bc9b refactor vim settings 2022-11-29 09:35:39 -07:00
6 changed files with 34 additions and 140 deletions
Show Stats Expand all files Collapse all files

74
flake.lock
View File

@ -32,22 +32,6 @@
"type": "github"
}
},
"cmp-buffer-src": {
"flake": false,
"locked": {
"lastModified": 1660101488,
"narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=",
"owner": "hrsh7th",
"repo": "cmp-buffer",
"rev": "3022dbc9166796b644a841a02de8dd1cc1d311fa",
"type": "github"
},
"original": {
"owner": "hrsh7th",
"repo": "cmp-buffer",
"type": "github"
}
},
"cmp-nvim-lsp-src": {
"flake": false,
"locked": {
@ -164,22 +148,6 @@
"type": "github"
}
},
"gitsigns-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1668016276,
"narHash": "sha256-u8nHB4QwP1hkfI64MGF5luTof88hTdpF5s1KBr3X2jE=",
"owner": "lewis6991",
"repo": "gitsigns.nvim",
"rev": "9ff7dfb051e5104088ff80556203634fc8f8546d",
"type": "github"
},
"original": {
"owner": "lewis6991",
"repo": "gitsigns.nvim",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -202,22 +170,6 @@
"type": "github"
}
},
"lualine-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1669435324,
"narHash": "sha256-nbvFpC6/QEIwbnw1Zy4mEutpfI/lFKfPeTXUJmRIODc=",
"owner": "hoob3rt",
"repo": "lualine.nvim",
"rev": "b6314ac556098d7abea9bb8cf896d2e3500eca41",
"type": "github"
},
"original": {
"owner": "hoob3rt",
"repo": "lualine.nvim",
"type": "github"
}
},
"nil": {
"inputs": {
"flake-utils": "flake-utils",
@ -313,11 +265,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1669165918,
"narHash": "sha256-hIVruk2+0wmw/Kfzy11rG3q7ev3VTi/IKVODeHcVjFo=",
"lastModified": 1669597967,
"narHash": "sha256-R+2NaDkXsYkOpFOhmVR8jBZ77Pq55Z6ilaqwFLLn000=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3b400a525d92e4085e46141ff48cbf89fd89739e",
"rev": "be9e3762e719211368d186f547f847737baad720",
"type": "github"
},
"original": {
@ -441,13 +393,10 @@
"inputs": {
"Comment-nvim-src": "Comment-nvim-src",
"bufferline-nvim-src": "bufferline-nvim-src",
"cmp-buffer-src": "cmp-buffer-src",
"cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
"darwin": "darwin",
"firefox-darwin": "firefox-darwin",
"gitsigns-nvim-src": "gitsigns-nvim-src",
"home-manager": "home-manager",
"lualine-nvim-src": "lualine-nvim-src",
"nil": "nil",
"nix2vim": "nix2vim",
"nixos-generators": "nixos-generators",
@ -460,7 +409,6 @@
"telescope-nvim-src": "telescope-nvim-src",
"telescope-project-nvim-src": "telescope-project-nvim-src",
"toggleterm-nvim-src": "toggleterm-nvim-src",
"vim-matchup-src": "vim-matchup-src",
"wallpapers": "wallpapers",
"wsl": "wsl"
}
@ -553,22 +501,6 @@
"type": "github"
}
},
"vim-matchup-src": {
"flake": false,
"locked": {
"lastModified": 1668349349,
"narHash": "sha256-Btpninxq1B7/iIsn106hvPx1v5BPyLwADd2YcmliEZw=",
"owner": "andymass",
"repo": "vim-matchup",
"rev": "55e3330436784fb8ccc35a5cfeb13e48bab9dcd2",
"type": "github"
},
"original": {
"owner": "andymass",
"repo": "vim-matchup",
"type": "github"
}
},
"wallpapers": {
"flake": false,
"locked": {

16
flake.nix
View File

@ -59,10 +59,6 @@
url = "github:hrsh7th/cmp-nvim-lsp";
flake = false;
};
cmp-buffer-src = {
url = "github:hrsh7th/cmp-buffer";
flake = false;
};
null-ls-nvim-src = {
url = "github:jose-elias-alvarez/null-ls.nvim";
flake = false;
@ -75,10 +71,6 @@
url = "github:nvim-treesitter/nvim-treesitter";
flake = false;
};
vim-matchup-src = {
url = "github:andymass/vim-matchup";
flake = false;
};
telescope-nvim-src = {
url = "github:nvim-telescope/telescope.nvim";
flake = false;
@ -91,14 +83,6 @@
url = "github:akinsho/toggleterm.nvim";
flake = false;
};
gitsigns-nvim-src = {
url = "github:lewis6991/gitsigns.nvim";
flake = false;
};
lualine-nvim-src = {
url = "github:hoob3rt/lualine.nvim";
flake = false;
};
bufferline-nvim-src = {
url = "github:akinsho/bufferline.nvim";
flake = false;

5
modules/neovim/plugins-overlay.nix
View File

@ -21,21 +21,16 @@ in {
nvim-lspconfig =
(withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig);
cmp-nvim-lsp = (withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp);
cmp-buffer = (withSrc prev.vimPlugins.cmp-buffer inputs.cmp-buffer);
plenary-nvim = (withSrc prev.vimPlugins.plenary-nvim inputs.plenary-nvim);
null-ls-nvim = (withSrc prev.vimPlugins.null-ls-nvim inputs.null-ls-nvim);
comment-nvim = (withSrc prev.vimPlugins.comment-nvim inputs.comment-nvim);
nvim-treesitter =
(withSrc prev.vimPlugins.nvim-treesitter inputs.nvim-treesitter);
vim-matchup = (withSrc prev.vimPlugins.vim-matchup inputs.vim-matchup);
telescope-nvim =
(withSrc prev.vimPlugins.telescope-nvim inputs.telescope-nvim);
telescope-project-nvim = (withSrc prev.vimPlugins.telescope-project-nvim
inputs.telescope-project-nvim);
toggleterm-nvim =
(withSrc prev.vimPlugins.toggleterm-nvim inputs.toggleterm-nvim);
gitsigns-nvim = (withSrc prev.vimPlugins.gitsigns-nvim inputs.gitsigns-nvim);
lualine-nvim = (withSrc prev.vimPlugins.lualine-nvim inputs.lualine-nvim);
bufferline-nvim =
(withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim);
nvim-tree-lua = (withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua);

24
modules/neovim/plugins/lsp.nix
View File

@ -26,30 +26,6 @@
vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
# setup."null-ls" = {
# sources = [
# (dsl.rawLua
# "require('null-ls').builtins.formatting.black.with({ command = ${pkgs.black}/bin/black })")
# (dsl.rawLua
# "require('null-ls').builtins.formatting.flake8.with({ command = ${pkgs.python310Packages.flake8}/bin/flake8 })")
# (dsl.rawLua
# "require('null-ls').builtins.formatting.fish_indent.with({ command = ${pkgs.fish}/bin/fish_indent })")
# (dsl.rawLua
# "require('null-ls').builtins.formatting.nixfmt.with({ command = ${pkgs.nixfmt}/bin/nixfmt })")
# (dsl.rawLua
# "require('null-ls').builtins.formatting.rustfmt.with({ command = ${pkgs.rustfmt}/bin/rustfmt })")
# (dsl.rawLua
# "require('null-ls').builtins.diagnostics.shellcheck.with({ command = ${pkgs.shellcheck}/bin/shellcheck })")
# (dsl.rawLua ''
# require('null-ls').builtins.formatting.shfmt.with(
# command = {${pkgs.shfmt}/bin/shfmt },
# extra_args = { '-i', '4', '-ci' },
# )'')
# (dsl.rawLua
# "require('null-ls').builtins.formatting.terraform_fmt.with({ command = ${pkgs.terraform}/bin/terraform })")
# ];
# };
lua = ''
${builtins.readFile ./lsp.lua}

49
modules/neovim/plugins/misc.nix
View File

@ -13,28 +13,33 @@
setup.Comment = { };
setup.colorizer = { };
vim.o.termguicolors = true; # Set to truecolor
vim.o.hidden = true; # Don't unload buffers when leaving them
vim.wo.number = true; # Show line numbers
vim.wo.relativenumber = true; # Relative numbers instead of absolute
vim.o.list = true; # Reveal whitespace with dashes
vim.o.expandtab = true; # Tabs into spaces
vim.o.shiftwidth = 4; # Amount to shift with > key
vim.o.softtabstop = 4; # Amount to shift with <TAB> key
vim.o.ignorecase = true; # Ignore case when searching
vim.o.smartcase = true; # Check case when using capitals in search
vim.o.infercase = true; # Don't match cases when completing suggestions
vim.o.incsearch = true; # Search while typing
vim.o.visualbell = true; # No sounds
vim.o.scrolljump = 1; # Number of lines to scroll
vim.o.scrolloff = 3; # Margin of lines to see while scrolling
vim.o.splitright = true; # Vertical splits on the right side
vim.o.splitbelow = true; # Horizontal splits on the bottom side
vim.o.pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
vim.o.clipboard = "unnamedplus"; # Uses system clipboard for yanking
vim.o.updatetime = 300; # Faster diagnostics
vim.o.mouse = "nv"; # Mouse interaction / scrolling
vim.o.inccommand = "split"; # Live preview search and replace
vim.o = {
termguicolors = true; # Set to truecolor
hidden = true; # Don't unload buffers when leaving them
list = true; # Reveal whitespace with dashes
expandtab = true; # Tabs into spaces
shiftwidth = 4; # Amount to shift with > key
softtabstop = 4; # Amount to shift with <TAB> key
ignorecase = true; # Ignore case when searching
smartcase = true; # Check case when using capitals in search
infercase = true; # Don't match cases when completing suggestions
incsearch = true; # Search while typing
visualbell = true; # No sounds
scrolljump = 1; # Number of lines to scroll
scrolloff = 3; # Margin of lines to see while scrolling
splitright = true; # Vertical splits on the right side
splitbelow = true; # Horizontal splits on the bottom side
pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
clipboard = "unnamedplus"; # Uses system clipboard for yanking
updatetime = 300; # Faster diagnostics
mouse = "nv"; # Mouse interaction / scrolling
inccommand = "split"; # Live preview search and replace
};
vim.wo = {
number = true; # Show line numbers
relativenumber = true; # Relative numbers instead of absolute
};
# Better backup, swap and undo storage
vim.o.backup = true; # Easier to recover and more secure

6
modules/neovim/plugins/tree.nix
View File

@ -4,8 +4,10 @@
# Disable netrw eagerly
# https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
vim.g.loaded = 1;
vim.g.loaded_netrwPlugin = 1;
vim.g = {
loaded = 1;
loaded_netrwPlugin = 1;
};
setup.nvim-tree = {
disable_netrw = true;