Convert Packer to Lazy (#33)

* feat: start lazy fun

* fix: debugging cmp

* feat: lazy fun

* feat: lsp and cmp working

* feat: ups

* feat: lazy conversion fun

* feat: nvim fun

* feat: rm noice

* feat: lsp

* feat: fun fun

* feat: ups

* feat: ups

* feat: lazy fun

* fix: update todo test

* feat: rm yamlfix from nix

* feat: add :Tags command

* docs: update readme

* fix: setup-nix correct in makefile

Makefile

@@ -14,20 +14,24 @@ setup-brew:
 brew-pkgs: setup-brew
 	brew install hadolint vale actionlint fzf mactex pandoc
 
-setup-macos: brew-pkgs nix-setup
+setup-macos: brew-pkgs setup-nix
 	bash ./macos/setup.sh
 
-setup-linux:
+setup-linux: setup-nix
 	bash ./linux/setup.sh
 
 .PHONY: dotfiles
 dotfiles:
 	bash ./dotfiles/setup.sh
 
-.PHONY: python js
-python:
-	zsh ./python/setup-general-venv.sh general 3.10.6
-	zsh ./python/setup-general-venv-pkgs.sh
+.PHONY: python js setup-pyenv
+
+setup-pyenv:
+	bash ./python/setup-pyenv.sh
+
+python: setup-pyenv
+	bash ./python/setup-general-venv.sh general 3.10.6
+	bash ./python/setup-general-venv-pkgs.sh
 
 js:
 	npm install -g @tailwindcss/language-server markserv

README.md

@@ -1,4 +1,4 @@
-# Dotfiles
+# dotfiles
 
 Setup and configuration for a terminal based developer workflow.
 
@@ -10,9 +10,14 @@ Setup `.bashrc`, `.zshrc` & `.gitconfig` in `$HOME`:
 $ make dotfiles
 ```
 
-This appends to your `rc` files in `$HOME` -- beware running this multiple times, as you will end up sourcing the `rc` files multiple times.
+This runs a script `./dotfiles/setup.sh` which either:
 
-This is destructive to your Git config - your `$HOME/.{gitconfig,gitignore}` will be overwritten.
+- appends to your `rc` files in `$HOME`, 
+- copies over files in `$HOME` for `.gitignore`, `.gitconfig` and `.npmrc`.
+
+Beware running this multiple times, as you will end up sourcing the `rc` files multiple times.
+
+Beware overwriting your `.gitignore`, `.gitconfig` and `.npmrc` files in `$HOME`.
 
 ## Linux
 
@@ -22,6 +27,8 @@ Setup an Linux machine:
 $ make setup-linux OS=linux
 ```
 
+This will also setup dependencies with Nix from `./nix/default.nix`.
+
 ## MacOS
 
 Setup an MacOS machine:
@@ -30,27 +37,25 @@ Setup an MacOS machine:
 $ make setup-macos OS=macoS
 ```
 
+This will also setup dependencies with Nix from `./nix/default.nix`.
+
 ## Global Python Virtual Env
 
 Install pyenv and pyenv-virtualenv:
 
 ```bash
-$ bash ./python/setup-pyenv.sh
-```
-
-Setup a global Python installation in a pyenv virtual environment - requires `pyenv`:
-
-```shell-session
 $ make python
 ```
 
+This will setup a global Python installation in a pyenv virtual environment.
+
 ## Neovim
 
-Neovim setup is in [nvim](https://github.com/ADGEfficiency/dotfiles/tree/master/nvim) -- it's a Lua based setup.
+Neovim setup is in [./nvim](https://github.com/ADGEfficiency/dotfiles/tree/master/nvim) -- it's a Lua based setup.
 
 To use my Neovim setup, you would put this folder into `$XDG_CONFIG_HOME`.
 
-### Formatting and Linting,
+### Formatting and Linting
 
 I used to use NullLS, then tried efm - I now use [conform](https://github.com/stevearc/conform.nvim) to manage formatters and `nvim-lint` to manage linting.
 
@@ -74,13 +79,13 @@ I don't use this package -- I used to use Null LS -- their list of tools is stil
 
 ### Conform
 
-https://github.com/stevearc/conform.nvim#formatters
+[Conform formatters](https://github.com/stevearc/conform.nvim#formatters).
 
 ### Nvim Lint
 
-https://github.com/mfussenegger/nvim-lint#available-linters
+[nvim-lint linters](https://github.com/mfussenegger/nvim-lint#available-linters).
 
-## Getting Kitty to Play Nice
+## Getting Kitty to Play Nice on MacOS
 
 Had weird issue with the first execution of Kitty not loading the config correctly - fixed with:
 

dotfiles/.zshrc

@@ -82,7 +82,7 @@ alias brew='arch -x86_64 brew'
 export PATH="$HOME/.poetry/bin:$PATH"
 export PATH="$HOME/checkmake:$PATH"
 export PATH="$HOME/dotfiles/scripts:$PATH"
-export PATH="$HOME/personal/scripts:$PATH"
+export PATH="$HOME/personal/para/area/script:$PATH"
 
 source ~/dotfiles/macos/pyenv-flags
 source $HOME/dotfiles/scripts/funcs.sh

git/.gitconfig

@@ -18,6 +18,9 @@
 [pull]
   rebase = false
 
+[diff]
+  algorithm = histogram
+
 [alias]
   diffs = diff --staged
   logg = log --pretty=fuller --abbrev-commit --stat -n 5

marksman/config.toml

@@ -0,0 +1,2 @@
+[completion]
+wiki.style = "file-path-stem"

nix/default.nix

@@ -24,13 +24,14 @@ with pkgs; [
   zsh
   inetutils
 ]
-++ lib.optionals isLinux [ python310 ]
+++ lib.optionals isLinux [ python311 ]
 ++ lib.optionals isDarwin [
   cargo
   locale
   llvm
   cmakeMinimal
   gtk4
+  python311
 ]
 ++ lib.optionals devShell [
   bat
@@ -52,7 +53,7 @@ with pkgs; [
   pandoc
   texlive.combined.scheme-tetex
   beautysh
-  # hadolint
+  #hadolint
   htop
   tig
   ov
@@ -65,7 +66,7 @@ with pkgs; [
   nodePackages_latest.prettier
   nodePackages_latest.sql-formatter
   nodePackages_latest.stylelint
-  yamlfix
+  #yamlfix
   shellcheck
   starship
   stylua

nvim/init.lua

@@ -1,22 +1,25 @@
 -- Entrypoint
 -- The order of the `require` below is important.
+-- require("adam.plugins")
+-- require("adam.color")
+-- require("adam.alpha")
+-- require("adam.cmp")
+-- require("adam.gitsigns")
+-- require("adam.lsp")
+-- require("adam.format")
+-- require("adam.lint")
+-- require("adam.lualine")
+-- require("adam.luasnip")
+-- require("adam.pairs")
+-- require("adam.telescope")
+-- require("adam.treesitter")
+-- require("adam.whichkey")
+-- require("adam.barbar")
+-- require("adam.copilot")
+-- require("adam.signature")
+-- require("adam.keys")
+
 vim.lsp.set_log_level("debug")
-require("adam.options")
-require("adam.plugins")
-require("adam.color")
-require("adam.alpha")
-require("adam.cmp")
-require("adam.gitsigns")
-require("adam.lsp")
-require("adam.format")
-require("adam.lint")
-require("adam.lualine")
-require("adam.luasnip")
-require("adam.pairs")
-require("adam.telescope")
-require("adam.treesitter")
-require("adam.whichkey")
-require("adam.barbar")
-require("adam.copilot")
-require("adam.signature")
-require("adam.keys")
+require("config.options")
+require("config.lazy")
+require("config.keymaps")

nvim/lazy-lock.json

@@ -0,0 +1,71 @@
+{
+  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
+  "Vim-Jinja2-Syntax": { "branch": "master", "commit": "2c17843b074b06a835f88587e1023ceff7e2c7d1" },
+  "barbar.nvim": { "branch": "master", "commit": "71ac376acd000743146b1e08e62151b4d887bbac" },
+  "bullets.vim": { "branch": "master", "commit": "d9a47f114031d3030b1e4de3c0b6a664b1201524" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
+  "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
+  "cmp-dictionary": { "branch": "main", "commit": "afa18f35a818af7bcb65b05c183a6777ede6c0ad" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-pypi": { "branch": "main", "commit": "69a3c7eca2d430dabb8d8df5b17f4ce11b256f25" },
+  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" },
+  "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
+  "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" },
+  "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
+  "friendly-snippets": { "branch": "main", "commit": "dbd45e9ba76d535e4cba88afa1b7aa43bb765336" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
+  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" },
+  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
+  "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
+  "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
+  "nvim-autopairs": { "branch": "master", "commit": "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8" },
+  "nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" },
+  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
+  "nvim-lint": { "branch": "master", "commit": "31be66c27214174a28fc092ffcf4bb3e8f6cfd43" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" },
+  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
+  "nvim-treesitter": { "branch": "master", "commit": "eb1914bb10dc9b114a61197de0ec58a308c40071" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "23b699ac40091d8c729f024b3f1400bc7e26e0c5" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
+  "obsidian.nvim": { "branch": "main", "commit": "0a6739d2229c8eb30396db550f3818e092088c27" },
+  "oil.nvim": { "branch": "master", "commit": "6953c2c17d8ae7454b28c44c8767eebede312e6f" },
+  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope-makefile": { "branch": "master", "commit": "6e5b5767751dbf73ad4f126840dcf1abfc38e891" },
+  "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" },
+  "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
+  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" },
+  "vim": { "branch": "master", "commit": "6495b4ff40479ec7705addb4ea800ec308026648" },
+  "vim-argwrap": { "branch": "master", "commit": "f3e26a5ad249d09467804b92e760d08b1cc457a1" },
+  "vim-bufkill": { "branch": "master", "commit": "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5" },
+  "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
+  "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" },
+  "vim-grepper": { "branch": "master", "commit": "485d349125d46f2788833ecb43df7a14c46706f6" },
+  "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
+  "vim-lastplace": { "branch": "master", "commit": "a715d602745cdb1c35cfe73c50d3dd266eb5a349" },
+  "vim-markdown-toc": { "branch": "master", "commit": "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd" },
+  "vim-pandoc-syntax": { "branch": "master", "commit": "16939cda184ff555938cc895cc62477c172997f9" },
+  "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
+  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
+  "vim-strip-trailing-whitespace": { "branch": "master", "commit": "59385775cbe416b2797ec5e2c7eb445a3398dd46" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-table-mode": { "branch": "master", "commit": "4ff8de2ac93431ee6d85a9e04177012752e6abdc" },
+  "vim-textobj-markdown": { "branch": "master", "commit": "9cba182b2c30afc982ace0deb1200cc394799799" },
+  "vim-textobj-python": { "branch": "master", "commit": "06de233e805b6bcfd0fde7591c64cf927637feb7" },
+  "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" },
+  "winresizer": { "branch": "master", "commit": "9bd559a03ccec98a458e60c705547119eb5350f3" }
+}

nvim/lazyvim.json

@@ -0,0 +1,9 @@
+{
+  "extras": [
+
+  ],
+  "news": {
+    "NEWS.md": "2123"
+  },
+  "version": 2
+}