Add neovim-nightly overlay

common/packages.nix

@@ -78,14 +78,6 @@ in
         golint
         gopls
 
-        # rust
-        cargo
-        rls
-        rust-analyzer
-        rustPackages.clippy
-        rustc
-        rustfmt
-
         # node
         nodejs-14_x
         nodePackages.prettier
@@ -191,6 +183,7 @@ in
         networkmanager-openvpn
         pulseeffects-pw
         qemu
+        rustup
         rtorrent
         spotify
         strace

flake.lock

@@ -20,6 +20,37 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1606424373,
+        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -27,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1626356862,
+        "lastModified": 1626645263,
-        "narHash": "sha256-4ONLWH4UygF4pI0XBej8+2OMUrdb8HsUUFsiRDFmjrk=",
+        "narHash": "sha256-rg93wVhy505wofd7jzf+jLNhebXxNJ1dB5PuewSgsr8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c476cc61b2dd8c7f868b213b7757b565bdf2bb7d",
+        "rev": "2b75633b2c470e1249d46fe5d9ee848e3f7ab4e7",
         "type": "github"
       },
       "original": {
@@ -40,6 +71,49 @@
         "type": "github"
       }
     },
+    "neovim-flake": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1626533979,
+        "narHash": "sha256-gPsmLCoZ32i7ISpagVFHa32OOFMX6lHsbDIpbS5S1b8=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "5377b2b00aea1a0bde1b81452e6198dabe5b9796",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "neovim-flake": "neovim-flake",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1626595888,
+        "narHash": "sha256-DAZ/bxvCQxdnulAHwT+Y+g64Q7IVfUEUQMOU+yn1Wdo=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "bcd89095ed50efc9b7eddbc9ec5c8528d92f9789",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1625333638,
@@ -57,6 +131,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1626464457,
+        "narHash": "sha256-u2PCh/+8vQSLwf0mPpKHKQ8hAPB3l4uNZR3r0TdK2Lg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c6c4a3d45ab200f17805d2d86a1ff1cc7ca2b186",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1626464457,
         "narHash": "sha256-u2PCh/+8vQSLwf0mPpKHKQ8hAPB3l4uNZR3r0TdK2Lg=",
@@ -76,8 +166,9 @@
       "inputs": {
         "darwin": "darwin",
         "home-manager": "home-manager",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },

flake.nix

@@ -15,9 +15,13 @@
       url = "github:lnl7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+
+
   };
 
-  outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware }: {
+  outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware, ... }@inputs: {
+
     nixosConfigurations =
       let
         defaultModules = [
@@ -47,7 +51,7 @@
                 trustedUsers = [ "root" "dave" ];
               };
 
-              nixpkgs.overlays = [ (import ./modules/overlays) ];
+              nixpkgs.overlays = [ (import ./modules/overlays) inputs.neovim-nightly-overlay.overlay ];
 
               home-manager = {
                 useGlobalPkgs = true;
@@ -69,6 +73,7 @@
       };
     darwinConfigurations = {
       demeter = darwin.lib.darwinSystem {
+
         modules = [
           home-manager.darwinModules.home-manager
           ./common/darwin.nix
@@ -78,7 +83,10 @@
 
           ({ config, ... }: {
             config = {
-              nixpkgs.overlays = [ (import ./modules/overlays) ];
+              nixpkgs.overlays = [
+                inputs.neovim-nightly-overlay.overlay
+                (import ./modules/overlays)
+              ];
               home-manager = {
                 useGlobalPkgs = true;
                 useUserPackages = true;

home/default.nix

@@ -125,7 +125,13 @@ in
         eval "$(rbenv init -)"
 
         setopt noincappendhistory
+
+        source $HOME/.cargo/env
+
         pfetch
+      '' + lib.optionals stdenv.isDarwin ''
+        export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH"
+        export PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
       '';
 
       shellAliases = {
@@ -140,7 +146,7 @@ in
 
       "oh-my-zsh" = {
         enable = true;
-        plugins = [ "git" "last-working-dir" ];
+        plugins = [ "last-working-dir" ];
       };
 
     };

home/nvim/init.vim

@@ -46,7 +46,7 @@ map <C-s> :tabn<CR>
 map <C-a> :tabp<CR>
 map <C-n> :tabnew<CR>
 
-" Copypasta
+" Copy/paste with OS clipboard
 noremap <Leader>y "+y
 noremap <Leader>p "+p
 
@@ -57,18 +57,12 @@ au FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
 au BufNewFile,BufRead *.py set tabstop=4 softtabstop=4 shiftwidth=4 textwidth=79 expandtab autoindent fileformat=unix
 let python_highlight_all=1
 
-set background=dark
 colorscheme gruvbox
 
 " Highlight whitespace
 highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
 
-" Groovy syntax
-au BufNewFile,BufRead *.groovy set tabstop=2 shiftwidth=2 expandtab
-au BufNewFile,BufRead Jenkinsfile setf groovy
-au BufNewFile,BufRead Jenkinsfile set tabstop=2 shiftwidth=2 expandtab
-
 " vim-go
 let g:go_auto_sameids = 0
 let g:go_fmt_command = "goimports"
@@ -111,12 +105,6 @@ let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
 
-" telescope-nvim
-nnoremap <leader>ff <cmd>Telescope find_files<cr>
-nnoremap <leader>fg <cmd>Telescope live_grep<cr>
-nnoremap <leader>fb <cmd>Telescope buffers<cr>
-nnoremap <leader>fh <cmd>Telescope help_tags<cr>
-
 " vim-markdown
 let g:vim_markdown_override_foldtext=0
 let g:vim_markdown_no_default_key_mappings=1
@@ -125,28 +113,29 @@ let g:vim_markdown_conceal=0
 let g:vim_markdown_frontmatter=1
 let g:vim_markdown_new_list_item_indent=0
 
-" vim-javacomplete2
-autocmd FileType java setlocal omnifunc=javacomplete#Complete
-
 " vim-prettier
 let g:prettier#autoformat = 1
 
-
 " completion-nvim
-" Use in every buffer
 autocmd BufEnter * lua require'completion'.on_attach()
 
 " Use <Tab> and <S-Tab> to navigate through popup menu
 inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
 inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
 
-imap <tab> <Plug>(completion_smart_tab)
-imap <s-tab> <Plug>(completion_smart_s_tab)
-
 " Set completeopt to have a better completion experience
 set completeopt=menuone,noinsert,noselect
 
 " Avoid showing message extra message when using completion
 set shortmess+=c
 
+" telescope-nvim
+nnoremap <leader>ff <cmd>Telescope find_files<cr>
+nnoremap <leader>fg <cmd>Telescope live_grep<cr>
+nnoremap <leader>fb <cmd>Telescope buffers<cr>
+nnoremap <leader>fh <cmd>Telescope help_tags<cr>
+
+imap <tab> <Plug>(completion_smart_tab)
+imap <s-tab> <Plug>(completion_smart_s_tab)
+
 luafile ~/.config/nvim/init2.lua

home/nvim/init2.lua

@@ -38,7 +38,7 @@ require('nvim-treesitter.configs').setup({
 -- twilight
 require("twilight").setup {
   dimming = {
-    alpha = 0.50, -- amount of dimming
+    alpha = 0.25, -- amount of dimming
     -- we try to get the foreground from the highlight groups or fallback color
     color = { "Normal", "#cccccc" },
   },

lib/default.nix

@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-
-with lib; rec {
-
-  pkgsImport = pkgs:
-    import pkgs {
-      config = config.nixpkgs.config;
-      overlays = config.nixpkgs.overlays;
-      system = config.nixpkgs.system;
-    };
-
-}

modules/darwin/brew.nix

@@ -20,6 +20,9 @@ in
 
     brews = [
       "aws-sam-cli"
+      "coreutils"
+      "gnu-sed"
+      "gnu-tar"
       "fabianishere/personal/pam_reattach"
       "netdata"
     ];

modules/overlays/default.nix

@@ -8,4 +8,7 @@ final: prev: {
   vpngate = prev.callPackage ./vpngate { };
   yar = prev.callPackage ./yar { };
 
+  # overrides
+  neovim = prev.pkgs.neovim-nightly;
+
 }