misc: cleanup

* fix comment that got chopped up in a separate commit
* run formatter on nix/darwin.nix
* run nix formatter on nix/mksystem.nix and remove unused wsl param
* run formatter on nix/work.nix
* cleanup lsp bindings to match defaults and add/fix comments
* change <leader>f fzf-lua binding to avoid clobbering lsp default
* cleanup comments and some unused code in lsp config
* use mainline lualine-nvim package instead of custom revision

nix/darwin.nix

···
-{ user }: { pkgs, ... }: {
+{ user }:
+{ pkgs, ... }:
+{
   nix = {
     # We install Nix using a separate installer so we don't want nix-darwin
     # to manage it for us. This tells nix-darwin to just use whatever is running.
···
 
   programs.zsh = {
     enable = true;
-    shellInit = ''
-    '';
+    shellInit = '''';
   };
 
   environment.systemPackages = with pkgs; [

nix/home-manager/nvim/config/lsp.lua

···
 	},
 })
 
+-- don't show 'E', 'H' etcs in the signcolumn; it's redunant with lualine's
 -- diagnostics summary anyway
 vim.opt.signcolumn = "no"
 
···
 	-- buf_set_keymap('n', '<C-k>', vim.lsp.buf.signature_help)
 	buf_set_keymap('n', '<C-s>', vim.lsp.buf.signature_help)
 
+	-- grr by default
 	buf_set_keymap('n', '<leader>r', vim.lsp.buf.references)
+
 	buf_set_keymap('n', '<leader>wa', vim.lsp.buf.add_workspace_folder)
 	buf_set_keymap('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder)
 	buf_set_keymap('n', '<leader>wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end)
 	buf_set_keymap('n', '<leader>D', vim.lsp.buf.type_definition)
 	buf_set_keymap('n', '<leader>ca', vim.lsp.buf.code_action)
-	buf_set_keymap('n', 'gr', vim.lsp.buf.references)
 	buf_set_keymap('n', '<leader>e', vim.diagnostic.open_float)
 	buf_set_keymap('n', '<leader>q', vim.diagnostic.setloclist)
 	-- buf_set_keymap('n', '<leader>ff', vim.lsp.buf.formatting)
+	buf_set_keymap('n', '<leader>f', function() vim.lsp.buf.format({ async = true }) end)
 	buf_set_keymap('n', '<leader>ff', function() vim.lsp.buf.format({ async = true }) end)
 
 	buf_set_keymap("n", "<leader>rs", function() vim.lsp.stop_client(vim.lsp.get_clients()) end)
 end
 
--- https://github.com/golang/tools/blob/master/gopls/doc/vim.md#imports
+-- https://github.com/golang/tools/blob/master/gopls/doc/editor/vim.md#neovim-imports
 -- https://github.com/golang/tools/blob/master/gopls/doc/features/transformation.md#source.organizeImports
 local goimports = function(client, wait_ms)
 	local params = vim.lsp.util.make_range_params(0, client.offset_encoding)
···
 		gopls = {
 			linksInHover = true,
 			completeFunctionCalls = true,
-			usePlaceholders = true,
 			experimentalPostfixCompletions = true,
 			staticcheck = true,
 		},
 	},
-	-- FIXME: yoinked from
-	-- https://github.com/hrsh7th/nvim-cmp/wiki/Language-Server-Specific-Samples#golang-gopls
-	-- i'm not sure if it's redundant with the usePlaceholders setting above?
-	init_options = {
-		usePlaceholders = true,
-	},
 	on_attach = (function(client, bufnr)
 		vim.api.nvim_create_autocmd("BufWritePre", {
 			pattern = "*.go",
···
 })
 vim.lsp.enable('gopls')
 
--- vim.lsp.config('yamlls', {
---   on_attach = on_attach,
---   settings = {
--- 	-- trace = {
--- 	--   server = verbose,
--- 	-- },
--- 	redhat = {
--- 	  telemetry = {
--- 		enabled = false,
--- 	  },
--- 	},
--- 	yaml = {
--- 	  hover = true,
--- 	  completion = true,
--- 	  format = {
--- 		enable = true,
--- 	  },
--- 	},
---   },
--- })
--- vim.lsp.enable('yamlls')
-
 vim.lsp.config('lua_ls', {
 	on_attach = on_attach,
 	capablities = capablities,
···
 })
 vim.lsp.enable('lua_ls')
 
--- https://github.com/oxalica/nil/blob/2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4/dev/nvim-lsp.nix#L83
-nvim_lsp.nil_ls.setup {
-	on_attach = on_attach,
-	capablities = capablities,
-	settings = {
-		['nil'] = {
-			formatting = {
-				command = { "nixpkgs-fmt" },
-			},
-		},
-	},
-}
-
--- local servers = { "rnix", "rust_analyzer", "tsserver", "golangcilsp" }
 local servers = {
 	"bashls",
 	"eslint", "ts_ls",

nix/home-manager/nvim/config/plugins/fzf.lua

···
 
 -- pass search="" to avoid the prompt we'd normally get
 vim.keymap.set('n', '<leader>g', function() fzf_lua.grep({ search = "" }) end, { silent = true })
-vim.keymap.set('n', '<leader>f', fzf_lua.grep_cword, { silent = true })
+vim.keymap.set('n', '<leader>h', fzf_lua.grep_cword, { silent = true })
 vim.keymap.set('n', '<leader>G', fzf_lua.live_grep, { silent = true })
 vim.keymap.set('n', ';', fzf_lua.files, { silent = true })
 vim.keymap.set('n', '<leader>t', fzf_lua.treesitter, { silent = true })

nix/home-manager/nvim/default.nix

···
     }
 
     {
-      plugin = pkgs.vimUtils.buildVimPlugin {
-        pname = "lualine-nvim";
-        version = "fix-colors";
-        src = pkgs.fetchFromGitHub {
-          owner = "nvim-lualine";
-          repo = "lualine.nvim";
-          rev = "1517caa8fff05e4b4999857319d3b0609a7f57fa";
-          sha256 = "sha256-DAYRf8JIty6W78JXBSyfnyCryUUYX+QrsHSAlcOk7Fc=";
-        };
-      };
+      plugin = lualine-nvim;
       type = "lua";
       config = builtins.readFile ./config/plugins/lualine.lua;
     }

nix/mkSystem.nix

···
 { self, nixpkgs }:
 
 name:
-{ system
-, user
-, wsl ? false
+{
+  system,
+  user,
   # optional hardware module
-, hardware ? { }
+  hardware ? { },
 }:
 
 let
···
 
   darwin = pkgs.lib.strings.hasSuffix "darwin" system;
 
-  systemFunc =
-    if darwin
-    then self.inputs.darwin.lib.darwinSystem
-    else nixpkgs.lib.nixosSystem;
+  systemFunc = if darwin then self.inputs.darwin.lib.darwinSystem else nixpkgs.lib.nixosSystem;
   home-manager =
-    if darwin
-    then self.inputs.home-manager.darwinModules
-    else self.inputs.home-manager.nixosModules;
+    if darwin then self.inputs.home-manager.darwinModules else self.inputs.home-manager.nixosModules;
 
   overlays = [
     (self: super: {
···
     home-manager.verbose = true;
     home-manager.backupFileExtension = "bak";
     home-manager.users.${user} = import ./home-manager/home.nix {
-      inherit darwin wsl;
+      inherit darwin;
     };
   };
 
-  baseConfig = { pkgs, ... }:
+  baseConfig =
+    { pkgs, ... }:
     {
       # Auto upgrade nix package and the daemon service.
       # services.nix-daemon.enable = true;

nix/work.nix

···
     programs.git.settings = {
       user.email = "[e-mail]";
 
-      url."[e-mail]:Contrast-Security-Inc/".insteadOf =
-        "https://github.com/Contrast-Security-Inc/";
+      url."[e-mail]:Contrast-Security-Inc/".insteadOf = "https://github.com/Contrast-Security-Inc/";
       url."[e-mail]:".insteadOf = "https://bitbucket.org/";
     };