Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I made a few changes #38

Open
wants to merge 928 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
928 commits
Select commit Hold shift + click to select a range
2a4cebb
Fix the install script so it runs single steps again
notahat Nov 10, 2023
439a913
Fix error in the README
notahat Nov 10, 2023
6be6c5c
Simplify README
notahat Nov 10, 2023
0728e39
Add nvim-surround and tweak many things
notahat Nov 10, 2023
004f881
Update plugins, plus a couple of new ones to try
notahat Nov 10, 2023
d539617
Tweak nvim-notify config
notahat Nov 10, 2023
3295f62
Try out neo-tree
notahat Nov 11, 2023
ee4c4c2
Get away from installing gems and npm packages globally
notahat Nov 11, 2023
b4957b8
Use stylua for lua formatting
notahat Nov 11, 2023
d156ec4
Move everything around
notahat Nov 11, 2023
33a2c0c
Make sure we install the latest bundler
notahat Nov 11, 2023
290eaf9
Rename nvim config files to match plugin dirs
notahat Nov 11, 2023
11c3f6c
Add a heading to the readme
notahat Nov 11, 2023
bfc50c6
Make the name of upgrade-plugins match the readme
notahat Nov 11, 2023
e99be10
Readme rewrites
notahat Nov 11, 2023
15aa682
Tweak neo-tree config
notahat Nov 11, 2023
b582939
Update README.md
notahat Nov 11, 2023
5236fe3
Switch my vim leader to space 😱
notahat Nov 12, 2023
002c1fd
Tell telescope.nvim to ignore all my plugins
notahat Nov 12, 2023
cb69b39
Pull all the key mappings into one file
notahat Nov 12, 2023
e639126
Make neo-tree behave a bit more nicely
notahat Nov 12, 2023
c1fd422
Add a quicker way to quit neovim
notahat Nov 12, 2023
f8834dd
Add a nice way to close the current buffer in neovim
notahat Nov 12, 2023
9cb9086
Fix a typo in README.md
notahat Nov 12, 2023
f6c7ab9
Make my default iTerm2 windows wider
notahat Nov 12, 2023
e2503ed
Get rid of ~ chars on empty lines neovim
notahat Nov 12, 2023
e0817a7
Add some work stuff to my zshrc
notahat Nov 12, 2023
eba8eb2
Try out LazyVim
notahat Nov 13, 2023
cbf1037
Try out conform for formatting in noevim
notahat Nov 13, 2023
5728f5b
Config polishing
notahat Nov 14, 2023
241cd4c
Didn't need as much lualine config
notahat Nov 14, 2023
da5bbb2
Try out nvim-lint for eslint
notahat Nov 14, 2023
4d6d3ea
Trying out vim-test
notahat Nov 14, 2023
a985fd6
Tweak running tests in neovim
notahat Nov 16, 2023
49cab33
Configure prettierd for faster neovim formatting
notahat Nov 16, 2023
e09ebe2
Ongoing neovim config tweaks
notahat Nov 17, 2023
05fb6d9
Make key repeats in Warp behave
notahat Nov 17, 2023
1117c4f
Use Lazy to manage all my neovim plugins
notahat Nov 17, 2023
e2815b0
Strip out submodules for neovim plugins
notahat Nov 17, 2023
4765a1c
Ongoing neovim config tweaking
notahat Nov 17, 2023
96502d1
Organise neovim plugins better
notahat Nov 17, 2023
d40fb93
Continuing neovim config cleaning
notahat Nov 17, 2023
1f09ad2
Better neovim snippets
notahat Nov 18, 2023
33a1bd9
Use the right version of cmp-nvim-lsp
notahat Nov 18, 2023
f85185d
Tinker tinker tinker
notahat Nov 18, 2023
b9a7fa2
Configure dressing.nvim and some more helpful keys
notahat Nov 18, 2023
122e1b3
Neovim configuring...and on it goes
notahat Nov 18, 2023
0b8ac8a
I could reconfigure neovim forever
notahat Nov 18, 2023
3032ca2
Get conform to trip whitspace
notahat Nov 18, 2023
65b4f95
Merge pull request #5 from notahat/lazy
notahat Nov 18, 2023
95e968c
Take removed files out of .rgignore
notahat Nov 18, 2023
27b75d6
Configure neovim for better fonting
notahat Nov 19, 2023
741bbeb
Use neo-tree's buffer explorer
notahat Nov 19, 2023
76bc03f
Move completion and LSP neovim config into its own directory
notahat Nov 19, 2023
a28538a
Neaten up neovim key mappings a bit
notahat Nov 19, 2023
dc44557
Add some config for Warp
notahat Nov 19, 2023
cd4d248
Brewfile improvements
notahat Nov 20, 2023
e667a33
Fix completely broken treesitter setup
notahat Nov 20, 2023
1fd0d02
Improving lazy.nvim config
notahat Nov 20, 2023
8554e24
Fix nvim-notify config
notahat Nov 23, 2023
037ab60
More lazy.nvim config tweaking
notahat Nov 23, 2023
dcad137
Bump work node version, and make reinstalling easier
notahat Nov 23, 2023
d2ec5ac
Config for colima
notahat Nov 23, 2023
ca83faa
More neovim configing
notahat Nov 23, 2023
cd8a49d
Update neovim plugins
notahat Nov 24, 2023
c88063a
Make zsh faster on Warp
notahat Nov 25, 2023
cf25d39
Use the good font in iTerm too
notahat Nov 25, 2023
fe43f14
Break up my zshrc
notahat Nov 25, 2023
0b8edb4
Neatening up zsh config
notahat Nov 25, 2023
7134377
Take shellcheck's advice about my scripts
notahat Nov 25, 2023
a022bf0
Fix Warp config
notahat Nov 25, 2023
b4f4a25
Don't complete in neovim unless I select a completion
notahat Nov 25, 2023
00b9aa9
Make neovim lint the scripts in here with shellcheck
notahat Nov 25, 2023
4b5677a
Tweak the readme
notahat Nov 25, 2023
6e97eec
Tidying, forever tidying
notahat Nov 25, 2023
4566eb7
Simplify a bit
notahat Nov 26, 2023
bbf555e
Improved editor config
notahat Nov 26, 2023
5fd0d66
Make bootstrapping on a new mcahine behave
notahat Nov 27, 2023
b0fac63
Add some neovim shortcuts for restarting things
notahat Nov 28, 2023
699e8ab
Neovim colour tweaking
notahat Nov 28, 2023
b291097
Neovim colour tweaking
notahat Nov 28, 2023
3ceded1
Turn on unlimited scrollback in iTerm2
notahat Nov 28, 2023
88a11cf
Cleaning up neovim key mappings
notahat Nov 30, 2023
5970421
Better treesitter key mappings
notahat Nov 30, 2023
322a090
Tidy up vim keymap a bit more
notahat Dec 1, 2023
d088d9f
Neovim keymapping cleanup
notahat Dec 1, 2023
c6896ac
Try out mason.nvim
notahat Dec 6, 2023
9978cc4
Neovim config tidying
notahat Dec 6, 2023
6ce885e
Try out refactoring.nvim
notahat Dec 6, 2023
1fec20d
And so it goes on.
notahat Dec 7, 2023
6d6a167
I should save before I commit.
notahat Dec 7, 2023
f5036bb
Neovim plugin updates.
notahat Dec 7, 2023
ad62e24
Tweak neovim refactoring
notahat Dec 8, 2023
7a850ca
Update neovim plugins
notahat Dec 14, 2023
95bc633
Tuning neovim LSP, formatters, and linters
notahat Dec 19, 2023
3f4ea65
Snippets really belong in editing
notahat Dec 19, 2023
4465867
Better neovim config comments
notahat Dec 20, 2023
aa09957
Remove stylua and the lua language server
notahat Dec 21, 2023
150a0f0
Make noevim config different for home and work
notahat Dec 24, 2023
ded7a96
Ruby 3.3 is out!
notahat Dec 28, 2023
c468ff5
Nicer behaviour for lualine
notahat Dec 30, 2023
0c29add
Try out none-ls instead of conform and nvim-lint
notahat Dec 28, 2023
5d258b7
Neaten up mason and none-ls config
notahat Jan 2, 2024
4ee108b
Make neovim only format using none-ls
notahat Jan 9, 2024
5025f5c
Tell neovim about fastlane files
notahat Jan 9, 2024
5a1e175
Organise my neovim plugins a bit better
notahat Jan 19, 2024
497d1b2
Update neovim plugins
notahat Jan 19, 2024
099dfce
Use prettier for the right files at work
notahat Feb 1, 2024
f831c52
Updating neovim plugins again
notahat Feb 4, 2024
d0a7d72
Simplify asdf setup
notahat Feb 12, 2024
716618f
Configure zed
notahat Mar 10, 2024
beb38d4
Organise zed config
notahat Mar 10, 2024
46e3fca
Support mise at work
notahat Mar 19, 2024
44e1714
Neovim config tweaks for better navigation
notahat Mar 21, 2024
1213b6e
Neaten neovim key mappings a little
notahat Mar 21, 2024
63c2a70
Update neovim plugins
notahat Mar 21, 2024
87279ef
Clean up nvim-lspconfig setup
notahat Mar 21, 2024
05511e5
Set default node version on work machine
notahat Mar 21, 2024
3e87f4c
No need to add the Android SDK to the path twice
notahat Mar 23, 2024
ddbb50b
Improve a couple of comments
notahat Mar 23, 2024
686ebd7
Go back to taking DOTFILES_ENV from the environment
notahat Mar 23, 2024
0978eef
Update zsh-syntax-highlighting plugin
notahat Mar 25, 2024
73befed
Fix a comment typo
notahat Mar 25, 2024
cde3dfa
Try out nvim-treesitter-context
notahat Mar 26, 2024
9bb5120
Add the file_line vim plugin
notahat Mar 28, 2024
0406706
Consistency tweak
notahat Mar 29, 2024
c1a9b14
Tweaking work machine setup.
notahat Apr 15, 2024
b8980f9
Don't need to initialise mise twice
notahat Apr 16, 2024
77caf7e
Remove colima from ssh config
notahat Apr 17, 2024
4dff76c
Bump home nodejs version to 20.12.2
notahat Apr 18, 2024
3224e5a
Consolidate zshrc into one file
notahat Apr 19, 2024
c6a91fb
Zshrc fixes
notahat Apr 20, 2024
b500b6d
Try out kitty
notahat Apr 21, 2024
298876f
Switch from asdf to mise
notahat May 5, 2024
1a0e251
Fix mise config
notahat May 5, 2024
a3b54ba
Use the Relay LSP with neovim
notahat May 5, 2024
a7c2d73
Helpful alias for starting servers
notahat May 6, 2024
13b8ddf
Configure mise for work too
notahat May 6, 2024
a6f7a78
Bump Ruby to 3.3.1
notahat May 12, 2024
1e59ca9
Clean up my Brewfile a bit
notahat May 12, 2024
6b23fec
Update neovim plugins and mason packages
notahat May 13, 2024
8e462bc
Kitty config tweaks
notahat May 14, 2024
9e6b2ee
Add node to work mise config
notahat May 16, 2024
0a98b7d
Tweak config for neovim 0.10
notahat May 17, 2024
efe952e
Adding more neovim config comments
notahat May 17, 2024
74097ec
Add neovim mappings for git status exploring
notahat May 17, 2024
bad676d
Update neovim plugins as neovim 0.10 fixes trickle in
notahat May 17, 2024
a64c82b
Tweak neovim mappings, and update plugins again
notahat May 18, 2024
1c4a991
Much tinkering with neovim key mappings
notahat May 18, 2024
c212ce6
More neovim key mapping tweaks
notahat May 18, 2024
aee16c3
Make things look a bit nicer
notahat May 18, 2024
7eae21f
More neovim styling and navigation improvements
notahat May 18, 2024
261d5d6
Neovim plugin updates
notahat May 18, 2024
5e3c63e
Tweaking neovim config is a whole hobby in and of itself
notahat May 18, 2024
3400e07
Neovim tweaking continues
notahat May 19, 2024
52a47ee
Neovim. Always neovim.
notahat May 19, 2024
b686cd6
Let's try neovim without lualine's global status for a while
notahat May 19, 2024
90fca08
README correction
notahat May 19, 2024
f293f0e
Noevim something something.
notahat May 22, 2024
91a83fc
Tweak tweak tweak
notahat May 23, 2024
7501aa2
Got back to old lspconfig
notahat May 24, 2024
b7c0039
More kitty scrollback
notahat May 24, 2024
83c18d6
Neovim plugin updates
notahat May 24, 2024
849f605
Neovim completion improvements
notahat May 26, 2024
4b8928b
Zed settings tweaks
notahat May 26, 2024
aae303e
Don't show keys pressed in Neovim
notahat May 26, 2024
7e9bf11
Try out the nightfox neovim theme.
notahat May 26, 2024
2b034db
Use the same diagnostic icons everywhere in neovim
notahat May 27, 2024
26c4f8b
Tidy up neovim colours and signs
notahat May 27, 2024
0e7a76f
Actually, nordfox
notahat May 27, 2024
05d5cdf
Neovim config tidying
notahat May 29, 2024
cc93490
Work around nightfox bug with neotree
notahat May 29, 2024
067238b
Neovim plugin updates and config tweaks
notahat May 29, 2024
edaee63
Use CR for confirming command line completion in neovim.
notahat May 30, 2024
bd2fa8c
Tidy.
notahat May 30, 2024
ba184e3
Better neovim treesitter config
notahat Jun 1, 2024
9a561c9
Better neovim treesitter config
notahat Jun 1, 2024
4a5a335
Neovim keymap tweaking
notahat Jun 2, 2024
9f68def
Switch git base for comparison in Neovim
notahat Jun 4, 2024
dcdbd68
Simplify mason setup in neovim
notahat Jun 6, 2024
2c3c6c9
Big Neovim config reorg
notahat Jun 7, 2024
482f1bd
Cleaning up
notahat Jun 7, 2024
6cc5004
Add the last of the old neovim plugins back in
notahat Jun 7, 2024
9b73895
Keep cleaning up neovim stuff
notahat Jun 8, 2024
7ca9638
Ongoing neovim key mapping changes
notahat Jun 8, 2024
86a7ba5
Simplify neo-tree key mappings
notahat Jun 8, 2024
0d582ec
Continuing neovim refactor
notahat Jun 8, 2024
9b4f6bf
Better neo-tree source selector
notahat Jun 8, 2024
450eb9a
Add some telescope key mappings to play with
notahat Jun 8, 2024
8f4d89f
Finish tweaking neovim navigation for now
notahat Jun 8, 2024
290a40e
Handle command keys in neovim and kitty
notahat Jun 8, 2024
2b5743e
More neovim config tidying
notahat Jun 8, 2024
c696699
Make neo-tree always stay on the right
notahat Jun 8, 2024
2a57b06
Fix missing dependency for nvim-lsp-file-operations
notahat Jun 8, 2024
16f7066
Test out saving sessions in neovim
notahat Jun 9, 2024
f1ae504
Add a Neovim shortcut for restoring sessions too
notahat Jun 9, 2024
e883e21
Handle paste in Neovim in insert and command modes
notahat Jun 9, 2024
16e8666
Add plugin links in Neovim config
notahat Jun 9, 2024
0c6a856
We don't need a .stylua.toml, coz .editorconfig covers it
notahat Jun 9, 2024
ab395cc
Still shuffling neovim config around
notahat Jun 9, 2024
6e83b82
Neovim config tidying and commenting.
notahat Jun 10, 2024
3b766e4
More commenting of Neovim config
notahat Jun 10, 2024
d4ccec8
Tidy up Neovim key mappings
notahat Jun 10, 2024
da93196
Clean up neovim completion config
notahat May 31, 2024
0bc91fb
Try out LazyGit in Neovim
notahat Jun 12, 2024
147d82c
Alias tweaks
notahat Jun 12, 2024
bde8549
Use plenary for the LazyGit window in Neovim
notahat Jun 12, 2024
5ad785e
Ongoing Neovim config tweaks
notahat Jun 15, 2024
809dc19
A foolish consistency is the hobgoblin of little minds
notahat Jun 17, 2024
a4f4a87
Continuing commenting my Neovim config
notahat Jun 17, 2024
770cfef
Cleaning up Neovim key mappings, and documenting
notahat Jun 18, 2024
e496217
Lazy load some slow Neovim plugins
notahat Jun 18, 2024
1d3fa81
Improve contrast of the Neovim cursorline
notahat Jun 19, 2024
a89686d
Be more minimalist
notahat Jun 22, 2024
71e91b9
Turn off inline-blame in zed
notahat Jun 22, 2024
7703f91
Darken visual selection in Neovim
notahat Jun 22, 2024
99e8921
Make notification in Neovim a bit cleaner
notahat Jun 22, 2024
721ec1f
Clean up Kitty config
notahat Jun 24, 2024
1ef1227
Make sure neovim installs shellcheck
notahat Jun 29, 2024
23402b5
Trying new neovim things
notahat Jun 29, 2024
4e8ab4f
Neovim config fixes
notahat Jul 1, 2024
fdf3bf5
Fix opacity on Neovim notifications
notahat Jul 6, 2024
10817b0
Bump node to 20.15.0
notahat Jul 7, 2024
3d76ffa
Make nvim-lightbulb actually work
notahat Jul 7, 2024
505e1c6
Clean up lualine a little
notahat Jul 7, 2024
7b6404f
Try adding a screenshot to the README
notahat Jul 11, 2024
b280bdb
Smaller screenshot
notahat Jul 11, 2024
20aa0c7
Change kitty title bar colour
notahat Jul 11, 2024
5f0a648
Update noevim plugins
notahat Jul 11, 2024
9346d6e
Delete things I'm not using
notahat Jul 11, 2024
230dc04
Improve kitty config
notahat Jul 11, 2024
bb6ac40
Remove Ruby-LSP from Neovim
notahat Jul 11, 2024
5f2eb67
Install Telescope fzf extension in Neovim
notahat Jul 11, 2024
77ca567
Install fzf
notahat Jul 11, 2024
1467f0d
Fix zsh completion for work stuff
notahat Jul 12, 2024
073af2a
Install bat
notahat Jul 12, 2024
f60b641
Rebuild zsh config
notahat Jul 13, 2024
6d07f61
Remove deprecated brew tap for fonts
notahat Jul 13, 2024
9bd26f7
Zsh config tweaks
notahat Jul 13, 2024
d017ce7
Move environment config from zshrc to zshenv
notahat Jul 13, 2024
ea18777
Tweak zsh config
notahat Jul 13, 2024
c0d7b56
Be more consistent in zsh config
notahat Jul 13, 2024
0c23d13
Lock which-key.nvim to ~2.1.0
notahat Jul 14, 2024
1548ef9
Zsh tweaks
notahat Jul 14, 2024
7ff2e12
Install lazygit on my home machine
notahat Jul 14, 2024
6462195
Update which-key.nvim to 3.3.0
notahat Jul 14, 2024
53543d9
Add more info to the README
notahat Jul 14, 2024
1c24753
Fix a typo in README.md
notahat Jul 14, 2024
bb6c166
Show neovim position in file as a percentage
notahat Jul 14, 2024
5bed99f
Set Android home on my work machine
notahat Jul 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try out conform for formatting in noevim
  • Loading branch information
notahat committed Nov 13, 2023
commit cbf10372e67b194336c9b741daea5516f183c431
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,6 @@
[submodule "config/nvim/pack/plugins/opt/bufdelete.nvim"]
path = config/nvim/pack/plugins/opt/bufdelete.nvim
url = https://github.com/famiu/bufdelete.nvim.git
[submodule "config/nvim/pack/plugins/opt/conform.nvim"]
path = config/nvim/pack/plugins/opt/conform.nvim
url = https://github.com/stevearc/conform.nvim.git
3 changes: 2 additions & 1 deletion config/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ if not vim.g.vscode then
require("plugins/nvim-ts-autotag").configure()
require("plugins/vim-commentary").configure()
require("plugins/nvim-surround").configure()
require("plugins/neoformat").configure()
-- require("plugins/neoformat").configure()
require("plugins/conform").configure()

require("key_mappings").configure()
end
23 changes: 23 additions & 0 deletions config/nvim/lua/plugins/conform.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
local function configure()
vim.cmd.packadd({ "conform.nvim", bang = true }) -- https://github.com/stevearc/conform.nvim
local conform = require("conform")
conform.setup({
formatters_by_ft = {
css = { "prettier" },
html = { "prettier" },
javascript = { "prettier" },
json = { "prettier" },
lua = { "stylua" },
ruby = { { "standardrb", "prettier" } },
typescript = { "prettier" },
typescriptreact = { "prettier" },
},
format_on_save = {
lsp_fallback = true,
timeout_ms = 1000,
},
notify_on_error = true,
})
end

return { configure = configure }
1 change: 1 addition & 0 deletions config/nvim/pack/plugins/opt/conform.nvim
Submodule conform.nvim added at ca3dfb