From a6f4286334d4380d30c090deed05ac7b89946508 Mon Sep 17 00:00:00 2001 From: solidsnakedev Date: Tue, 23 May 2023 19:55:37 -0400 Subject: [PATCH 1/5] fix theme --- home-manager/mac/local-modules/neovim.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/mac/local-modules/neovim.nix b/home-manager/mac/local-modules/neovim.nix index 4749234..889a6f1 100644 --- a/home-manager/mac/local-modules/neovim.nix +++ b/home-manager/mac/local-modules/neovim.nix @@ -286,7 +286,9 @@ in custom_highlights = { CocMenuSel = { fg = '#000000', bg = '#89DDFF' }, Structure = { fg = '#89DDFF'}, - Identifier = {fg = '#F78C6C'} + Identifier = { fg = '#F78C6C' }, + CurSearch = { fg = '#000000', bg = '#89DDFF' }, + Search = { fg = '#000000',bg = '#F78C6C' } } }) vim.cmd("colorscheme material ") From 1faef9c6289748a16202c40999f5e26b0dacdcd3 Mon Sep 17 00:00:00 2001 From: solidsnakedev Date: Thu, 22 Jun 2023 09:59:17 -0400 Subject: [PATCH 2/5] add coc-prettier , change buffer_id to ordinal --- home-manager/mac/local-modules/neovim.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/mac/local-modules/neovim.nix b/home-manager/mac/local-modules/neovim.nix index 889a6f1..f8f983e 100644 --- a/home-manager/mac/local-modules/neovim.nix +++ b/home-manager/mac/local-modules/neovim.nix @@ -92,6 +92,7 @@ in coc-json coc-snippets coc-eslint + coc-prettier jsonc-vim #Markdown @@ -173,7 +174,7 @@ in options = { mode = 'buffers', themable = false, - numbers = 'buffer_id', + numbers = 'ordinal', offsets = { {filetype = 'NvimTree'} }, From 4d78b49a3a46062e5b96cf04224dc0fad4b186b8 Mon Sep 17 00:00:00 2001 From: solidsnakedev Date: Mon, 17 Jul 2023 09:20:37 -0400 Subject: [PATCH 3/5] update to 23.05 version --- flake.lock | 18 +++++++++--------- home-manager/mac/home.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 0f336d9..535de2b 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1684442239, - "narHash": "sha256-8wD+fQpNULCF9a88E1Knw3MtXWqvyhn8u/859QSSoE4=", + "lastModified": 1688409282, + "narHash": "sha256-nnVCN5QiZ5+DEc70PRQLEcxqlxtsmeBU1BnpsRPUJlA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c10403a5739d6275334710903fe709bc8d587980", + "rev": "c24deeca64538dcbc589ed8da9146e4ca9eb85b7", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684385584, - "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", + "lastModified": 1688231357, + "narHash": "sha256-ZOn16X5jZ6X5ror58gOJAxPfFLAQhZJ6nOUeS4tfFwo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", + "rev": "645ff62e09d294a30de823cb568e9c6d68e92606", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1683057558, - "narHash": "sha256-/kGv1CRaB1g+P1szq8acL0AwtyZMNHixdNFY2PvXViM=", + "lastModified": 1684517665, + "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", "owner": "msteen", "repo": "nixos-vscode-server", - "rev": "e26b40ef083a9e9d48b5713b0d810fe5f4d0d555", + "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", "type": "github" }, "original": { diff --git a/home-manager/mac/home.nix b/home-manager/mac/home.nix index bcf0b5c..1361637 100644 --- a/home-manager/mac/home.nix +++ b/home-manager/mac/home.nix @@ -14,7 +14,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; From 7ecec5848946d059562308496278c8ab5f8d7ce8 Mon Sep 17 00:00:00 2001 From: solidsnakedev Date: Mon, 17 Jul 2023 09:20:59 -0400 Subject: [PATCH 4/5] add nvim-ts-context-commentstring --- home-manager/mac/local-modules/neovim.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home-manager/mac/local-modules/neovim.nix b/home-manager/mac/local-modules/neovim.nix index f8f983e..2261dae 100644 --- a/home-manager/mac/local-modules/neovim.nix +++ b/home-manager/mac/local-modules/neovim.nix @@ -128,9 +128,12 @@ in plugin = comment-nvim; type = "lua"; config = '' - require('Comment').setup() + require('Comment').setup { + pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(), + } ''; } + nvim-ts-context-commentstring { plugin = todo-comments-nvim; @@ -161,6 +164,9 @@ in disable = {"haskell"}, additional_vim_regex_highlighting = false, }, + context_commentstring = { + enable = true, + }, }) ''; } @@ -358,6 +364,8 @@ in ]; extraLuaConfig = '' + -- https://github.com/JoosepAlviste/nvim-ts-context-commentstring + vim.opt.updatetime = 100 -- disable netrw at the very start of your init.lua (strongly advised) vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 From 66300d1cba52fa34947c504ce66a08285bb8b9d7 Mon Sep 17 00:00:00 2001 From: solidsnakedev Date: Sun, 17 Sep 2023 09:21:43 -0400 Subject: [PATCH 5/5] add aiken and homebrew path --- home-manager/mac/home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/mac/home.nix b/home-manager/mac/home.nix index 1361637..8e454fc 100644 --- a/home-manager/mac/home.nix +++ b/home-manager/mac/home.nix @@ -58,6 +58,8 @@ }; interactiveShellInit = '' neofetch --disable packages + export PATH="$PATH:/Users/jonathan/.aiken/bin" + eval "$(/opt/homebrew/bin/brew shellenv)" ''; plugins = [{ name = "foreign-env";