home-nix/flake.lock

@@ -69,11 +69,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1669071065,
+        "lastModified": 1669044918,
-        "narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
+        "narHash": "sha256-Lg5gOmmVlaYKhN2QM6qeZL3HOjbshms2+CJyc+ALt64=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
+        "rev": "433e8de330fd9c157b636f9ccea45e3eeaf69ad2",
         "type": "github"
       },
       "original": {

home-nix/home.nix

@@ -28,7 +28,7 @@
     pkgs.xorg.xclock
     pkgs.logseq
     pkgs.mosh
-    pkgs.nixops_unstable
+    pkgs.nixops
     # pkgs.python310 # dev packages should be in jk
     # pkgs.python310.numpy
     # pkgs.python310Packages.tensorflow
@@ -77,8 +77,6 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
-    withPython3 = true;
-    withNodeJs = true;
     # I use vim-plug, so I probably don't require packaging
     # extraConfig actually writes to init-home-manager.vim (not lua)
     # https://github.com/nix-community/home-manager/pull/3287
@@ -122,16 +120,6 @@
     extraConfig = {
       merge = { tool = "vimdiff"; conflictstyle = "diff3"; };
     };
-    ignores = [
-      # vscode-related settings
-      ".vscode"
-      # envrc cached outputs
-      ".direnv"
-    ];
-    extraConfig = {
-      # cache credential for 10 minutes.
-      credential.helper = "cache --timeout=600";
-    };
     # why is this no longer valid?
     # pull = { rebase=true; };
   };

neovim/init.lua

@@ -86,9 +86,7 @@ Plug('nvim-telescope/telescope-file-browser.nvim')
 -- cmp: auto-complete/suggestions
 Plug('neovim/nvim-lspconfig') -- built-in LSP configurations
 Plug('hrsh7th/cmp-nvim-lsp')
-Plug('hrsh7th/cmp-path')
 Plug('hrsh7th/cmp-buffer')
-Plug('hrsh7th/cmp-cmdline')
 Plug('hrsh7th/nvim-cmp')
 Plug('onsails/lspkind-nvim')
 Plug('yioneko/nvim-yati') -- hopefully fixes Python indentation auto-correct from Tree-sitter
@@ -118,10 +116,10 @@ Plug('simrat39/rust-tools.nvim') -- config rust-analyzer and nvim integration
 Plug('gruvbox-community/gruvbox') -- theme provider
 Plug('nvim-lualine/lualine.nvim') -- fancy status line
 Plug('lukas-reineke/indent-blankline.nvim') -- identation lines on blank lines
+Plug('sunjon/shade.nvim') -- make inactive panes have lower opacity
 Plug('kyazdani42/nvim-web-devicons') -- icons for folder and filetypes
 Plug('m-demare/hlargs.nvim') -- highlights arguments; great for func prog
 Plug('folke/todo-comments.nvim') -- Highlights TODO
-Plug('TaDaa/vimade') -- shade alternative
 
 -- other utilities
 Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
@@ -135,6 +133,15 @@ vim.call('plug#end')
 -- color, highlighting, UI stuffs
 vim.cmd([[ colorscheme gruvbox ]])
 require('hlargs').setup()
+require('shade').setup {
+    overlay_opacity = 60,
+    opacity_step = 1,
+    keys = {
+        brightness_up = '<C-Up>',
+        brightness_down = '<C-Down>',
+        toggle = '<Leader>s', -- s: sha
+    }
+}
 require('nvim-web-devicons').setup()
 require('trouble').setup()
 require('todo-comments').setup()
@@ -483,12 +490,11 @@ cmp.setup {
     sources = cmp.config.sources {
         { name = 'nvim_lsp' },
         { name = 'luasnip' },
-        { name = 'buffer' },
         -- { name = 'cmp_tabnine' },
     },
 }
 -- nvim-cmp supports additional completion capabilities
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 -- local tabnine = require('cmp_tabnine.config')
 -- tabnine.setup({
 --  max_lines = 1000,