From 71decebd734289deb03006e558f280054c485409 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 18 Jul 2021 21:25:34 -0400 Subject: [PATCH] Add neovim-nightly overlay --- common/packages.nix | 9 +--- flake.lock | 99 ++++++++++++++++++++++++++++++++++-- flake.nix | 14 +++-- home/default.nix | 8 ++- home/nvim/init.vim | 31 ++++------- home/nvim/init2.lua | 2 +- lib/default.nix | 12 ----- modules/darwin/brew.nix | 3 ++ modules/overlays/default.nix | 3 ++ 9 files changed, 131 insertions(+), 50 deletions(-) delete mode 100644 lib/default.nix diff --git a/common/packages.nix b/common/packages.nix index 64c35c3..bc303b6 100644 --- a/common/packages.nix +++ b/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 diff --git a/flake.lock b/flake.lock index 838c1ec..a235700 100644 --- a/flake.lock +++ b/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, - "narHash": "sha256-4ONLWH4UygF4pI0XBej8+2OMUrdb8HsUUFsiRDFmjrk=", + "lastModified": 1626645263, + "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" } } }, diff --git a/flake.nix b/flake.nix index 9917389..93dff54 100644 --- a/flake.nix +++ b/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; diff --git a/home/default.nix b/home/default.nix index 0852ea2..de108ff 100644 --- a/home/default.nix +++ b/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" ]; }; }; diff --git a/home/nvim/init.vim b/home/nvim/init.vim index ce816e4..eae2540 100644 --- a/home/nvim/init.vim +++ b/home/nvim/init.vim @@ -46,7 +46,7 @@ map :tabn map :tabp map :tabnew -" Copypasta +" Copy/paste with OS clipboard noremap y "+y noremap 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 ff Telescope find_files -nnoremap fg Telescope live_grep -nnoremap fb Telescope buffers -nnoremap fh Telescope help_tags - " 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 and to navigate through popup menu inoremap pumvisible() ? "\" : "\" inoremap pumvisible() ? "\" : "\" -imap (completion_smart_tab) -imap (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 ff Telescope find_files +nnoremap fg Telescope live_grep +nnoremap fb Telescope buffers +nnoremap fh Telescope help_tags + +imap (completion_smart_tab) +imap (completion_smart_s_tab) + luafile ~/.config/nvim/init2.lua diff --git a/home/nvim/init2.lua b/home/nvim/init2.lua index 1508685..4538bf1 100644 --- a/home/nvim/init2.lua +++ b/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" }, }, diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 7dbe838..0000000 --- a/lib/default.nix +++ /dev/null @@ -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; - }; - -} diff --git a/modules/darwin/brew.nix b/modules/darwin/brew.nix index 0a4358d..9f501ce 100644 --- a/modules/darwin/brew.nix +++ b/modules/darwin/brew.nix @@ -20,6 +20,9 @@ in brews = [ "aws-sam-cli" + "coreutils" + "gnu-sed" + "gnu-tar" "fabianishere/personal/pam_reattach" "netdata" ]; diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index 69274ee..e6eeed1 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -8,4 +8,7 @@ final: prev: { vpngate = prev.callPackage ./vpngate { }; yar = prev.callPackage ./yar { }; + # overrides + neovim = prev.pkgs.neovim-nightly; + }