From 3b1a010fb7e0cd52a4930973c973a66548954670 Mon Sep 17 00:00:00 2001
From: vorboyvo <mrsirofvibe@outlook.com>
Date: Wed, 24 Jan 2024 10:40:30 -0500
Subject: [PATCH] Added extra hosts to easily connect to servers through
 Tailscale Fixed ocaml in home manager packages, adding the standard
 distribution of packages as per https://ocaml.org/install Enabled lazy vim

---
 configuration.nix        |  6 ++++++
 home.nix                 |  2 +-
 programs/neovim/init.lua | 26 ++++++++++++++++++++++++++
 programs/thunderbird.nix |  1 -
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index c7c85c5..715e437 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -35,6 +35,12 @@
   networking.hostName = "oyvoLaptop"; # Define your hostname.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
+  # Extra hosts for connecting to tailscale'd servers
+  networking.extraHosts = ''
+    100.89.185.72 raymond
+    100.119.100.64 sherbrooke
+  '';
+
   # Set your time zone.
   time.timeZone = "America/Montreal";
 
diff --git a/home.nix b/home.nix
index d41a366..ea15b28 100644
--- a/home.nix
+++ b/home.nix
@@ -19,7 +19,7 @@ in
   # Install packages
   home.packages = with pkgs;
   [ texliveFull ] ++ # TeX distribution
-  [ ocaml ] ++ # OCaml
+  (with ocamlPackages; [ ocaml dune_3 dune-release merlin ocaml-lsp odoc ocamlformat utop ]) ++ # OCaml
   [ grim slurp wl-clipboard jq ] ++ # Basic utilities
   [ bitwarden-cli ] ++ # Personalized selection of command-line (CLI/TUI) apps
   [ wezterm ] ++ # Terminal emulator
diff --git a/programs/neovim/init.lua b/programs/neovim/init.lua
index 326c02e..3d7a331 100644
--- a/programs/neovim/init.lua
+++ b/programs/neovim/init.lua
@@ -4,3 +4,29 @@ vim.opt.number = true
 vim.opt.syntax = 'on'
 vim.opt.smartcase = true
 
+--- clipboard
+vim.opt.clipboard = 'unnamedplus'
+
+-- Enable lazy.vim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+vim.g.mapleader = " " -- Make sure to set `mapleader` before lazy so your mappings are correct
+
+plugins = {
+	"folke/which-key.nvim",
+	{ "folke/neoconf.nvim", cmd = "Neoconf" },
+	"folke/neodev.nvim",
+}
+
+require("lazy").setup(plugins)
diff --git a/programs/thunderbird.nix b/programs/thunderbird.nix
index 277c027..60818fc 100644
--- a/programs/thunderbird.nix
+++ b/programs/thunderbird.nix
@@ -3,7 +3,6 @@
   profiles = {
     main = {
       isDefault = true;
-      name = "Main";
     };
   };
 }