Merge pull request 'plugins-need-update' (#20) from plugins-need-update into bleed

Reviewed-on: #20
2023-09-25 05:06:03 +00:00 · 2023-09-25 05:06:03 +00:00 · 7f87490ce0
parent b5b08fdfd9 fbbbd6510e
commit 7f87490ce0
5 changed files with 68 additions and 19 deletions
--- a/flake.lock
+++ b/flake.lock
@ -758,11 +758,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1695544722,
-        "narHash": "sha256-cEnhsF44oNXvX3caEWCrbz5se9tlIsT2UGz4WT/vE0U=",
+        "lastModified": 1695550077,
+        "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4a6333265ed8f3abf4769db60735522bbaa7819d",
+        "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
        "type": "github"
      },
      "original": {
@ -1126,11 +1126,11 @@
    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1695547706,
-        "narHash": "sha256-d0K3mDswIA7BNyFSD7p0xzfBFNLZamKaw20fVqiY37g=",
+        "lastModified": 1695597504,
+        "narHash": "sha256-CKhj6wOKqndfHsDg8CKVBbpJWG8zHRZRLi7MnOatf0U=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c497931955af2ac89c77a0776bd07e8c8b410f4a",
+        "rev": "7a862f0a660d5bd850457a0ad7772e1672109ccd",
        "type": "github"
      },
      "original": {
@ -1191,6 +1191,22 @@
        "type": "github"
      }
    },
+    "nixpkgs-vimplugins": {
+      "locked": {
+        "lastModified": 1695583468,
+        "narHash": "sha256-NRbfULcsDKXH4I5qKkqaXsBTqJQswDgasHDbhoDvPOE=",
+        "owner": "cornedor",
+        "repo": "nixpkgs",
+        "rev": "dc8c9800fa19a9c44fe15507d9700d8ff1dc507c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cornedor",
+        "ref": "update-vim-plugins",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_10": {
      "locked": {
        "lastModified": 1654568412,
@ -1634,6 +1650,7 @@
        "nix-index-database": "nix-index-database",
        "nixpkgs": "nixpkgs_12",
        "nixpkgs-latest": "nixpkgs-latest",
+        "nixpkgs-vimplugins": "nixpkgs-vimplugins",
        "sg-nvim": "sg-nvim",
        "std": "std_2"
      }
--- a/flake.nix
+++ b/flake.nix
@ -33,6 +33,7 @@
      # Should show the latest nixpkgs whenever possible
      inputs.nixpkgs.follows = "nixpkgs-latest";
    };
+    nixpkgs-vimplugins.url = "github:cornedor/nixpkgs/update-vim-plugins";
    sg-nvim = {
      url = "git+https://github.com/pegasust/sg.nvim?ref=sg-cody-discover";
    };
--- a/native_configs/neovim/init.lua
+++ b/native_configs/neovim/init.lua
@ -57,7 +57,6 @@ WPlug('MunifTanjim/nui.nvim')  -- For some .so or .dylib neovim UI action


 -- plugins
-WPlug('tjdevries/nlua.nvim')                                 -- adds symbols of vim stuffs in init.lua
 WPlug('nvim-treesitter/nvim-treesitter')                     -- language parser engine for highlighting
 WPlug('nvim-treesitter/nvim-treesitter-textobjects')         -- more text objects
 WPlug('nvim-telescope/telescope.nvim', { branch = '0.1.x' }) -- file browser
@ -84,7 +83,7 @@ WPlug('hrsh7th/cmp-cmdline')
 WPlug('hrsh7th/nvim-cmp')
 WPlug('hrsh7th/cmp-nvim-lsp-signature-help')
 WPlug('onsails/lspkind-nvim')
-WPlug('yioneko/nvim-yati', { tag = '*' }) -- copium: fix Python indent auto-correct from smart-indent
+-- WPlug('yioneko/nvim-yati', { tag = '*' }) -- copium: fix Python indent auto-correct from smart-indent
 WPlug('nathanalderson/yang.vim')
 -- WPlug('tzachar/cmp-tabnine', { ['do'] = './install.sh' })

@ -116,7 +115,7 @@ WPlug('gruvbox-community/gruvbox')              -- theme provider
 WPlug('nvim-lualine/lualine.nvim')              -- fancy status line
 WPlug('lukas-reineke/indent-blankline.nvim')    -- identation lines on blank lines
 WPlug('kyazdani42/nvim-web-devicons')           -- icons for folder and filetypes
-WPlug('m-demare/hlargs.nvim')                   -- highlights arguments; great for func prog
+-- WPlug('m-demare/hlargs.nvim')                   -- highlights arguments; great for func prog
 WPlug('folke/todo-comments.nvim')               -- Highlights TODO
 WPlug('NvChad/nvim-colorizer.lua')              -- color highlighter with tailwind support
 WPlug('roobert/tailwindcss-colorizer-cmp.nvim') -- color for tailiwnd for compe
@ -253,7 +252,7 @@ vim.keymap.set('n', '<leader>gg', '<cmd>GuessIndent<cr>')
 vim.cmd([[
 colorscheme gruvbox
 ]])
-require('hlargs').setup()
+-- require('hlargs').setup()
 require('nvim-web-devicons').setup()
 require('trouble').setup {
  position = "bottom", -- position of the list can be: bottom, top, left, right
@ -588,12 +587,12 @@ vim.api.nvim_set_keymap('n', '<C-t>x', ':tabdo if tabpagenr() > 1 | tabclose | e
 -- treesitter
 require 'treesitter-context'
 require('nvim-treesitter.configs').setup {
-  yati = {
-    enable = true,
-    default_lazy = true,
-    default_fallback = "auto",
-    disable = { "nix" }
-  },
+  -- yati = {
+  --   enable = true,
+  --   default_lazy = true,
+  --   default_fallback = "auto",
+  --   disable = { "nix" }
+  -- },
  indent = { enable = false },
  highlight = {
    enable = true,
--- a/nix/repo/home-configs/default.nix
+++ b/nix/repo/home-configs/default.nix
@ -74,6 +74,40 @@ in {
            home.username = "hungtran";
            home.homeDirectory = "/Users/hungtran";
            home.stateVersion = "23.11";
+            repo.shells.shellAliases = {
+              git-lol = ''
+                git log --graph --decorate --color=always --abbrev-commit \
+                  --pretty=format:'%C(auto)%h %d %C(cyan)%s %C(green)(%cr)%C(reset)' |
+                while IFS= read -r line; do
+                    # Format the relative time
+                    line=$(echo "$line" | sed -e 's/ minute/ min/' \
+                      -e 's/ week/ wk/' \
+                      -e 's/ hour/ hr/' \
+                      -e 's/ month/ mo/' \
+                      -e 's/ year/ yr/' \
+                      -e 's/ ago//')
+
+                    # Print the formatted line
+                    echo "$line"
+                done | less -R
+              '';
+              git-lola = ''
+                git log --graph --decorate --color=always --abbrev-commit --all\
+                  --pretty=format:'%C(auto)%h %d %C(cyan)%s %C(green)(%cr)%C(reset)' |
+                while IFS= read -r line; do
+                    # Format the relative time
+                    line=$(echo "$line" | sed -e 's/ minute/ min/' \
+                      -e 's/ week/ wk/' \
+                      -e 's/ hour/ hr/' \
+                      -e 's/ month/ mo/' \
+                      -e 's/ year/ yr/' \
+                      -e 's/ ago//')
+
+                    # Print the formatted line
+                    echo "$line"
+                done | less -R
+              '';
+            };
          }
        ];
    };
--- a/nix/repo/home-profiles/neovim.nix
+++ b/nix/repo/home-profiles/neovim.nix
@ -96,7 +96,7 @@ in {
      */
      plugins = let
        inherit
-          (inputs.nixpkgs-latest.legacyPackages.${system}.vimPlugins)
+          (inputs.nixpkgs-vimplugins.legacyPackages.${system}.vimPlugins)
          plenary-nvim
          nvim-treesitter
          nvim-treesitter-textobjects
@ -127,7 +127,6 @@ in {
          mason-lspconfig-nvim
          mason-nvim
          neogit
-          nlua-nvim
          nvim-jqx
          nvim-surround
          nvim-web-devicons
@ -178,7 +177,6 @@ in {
        mason-lspconfig-nvim
        mason-nvim
        neogit
-        nlua-nvim
        nvim-jqx
        nvim-surround
        nvim-web-devicons