Minor home-manager updates

home/common.nix

@@ -19,8 +19,11 @@
   programs.git = {
     enable = true;
 
-    settings.user.name = "Syed Daanish";
-    settings.user.email = "me@syedm.dev";
+    settings = {
+      user.name = "Syed Daanish";
+      user.email = "me@syedm.dev";
+      init.defaultBranch = "main";
+    };
 
     signing = {
       format = "openpgp";

home/fish/config.fish

@@ -2,9 +2,9 @@ set -gx fish_greeting
 
 function nix
   if test "$argv[1]" = "develop"; and test (count $argv) -eq 1
-    command nix develop -c fish $argv[2..-1]
+    command nix develop -c fish
   else if test "$argv[1]" = "shell"
-    env IN_NIX_SHELL=shell nix $argv -c fish
+    env IN_NIX_SHELL=shell NIXPKGS_ALLOW_UNFREE=1 nix $argv --impure -c fish
   else
     command nix $argv
   end

home/kitty/default.nix

@@ -22,14 +22,11 @@
       bold_font = "Agave Nerd Font Bold";
       # italic_font = "Operator Mono Lig";
       bold_italic_font = "Hurmit Nerd Font Bold";
-      emoji_font_family = "UnifontExMono Regular";
+      symbol_map = "U+1F300-U+1FAFF UnifontExMono Regular";
 
       cursor_shape = "block";
       cursor_blink_interval = 0;
 
-      underline_position = "+3";
-      underline_thickness = "150%";
-
       window_margin_width = 8;
 
       foreground = "#CDD6F4";
@@ -81,8 +78,6 @@
     };
 
     keybindings = {
-      "ctrl+click" = "open_link";
-      "ctrl+shift+click" = "open_link";
       "ctrl+backspace" = "send_text all \\x17";
       "ctrl+delete" = "send_text all \\x1b[1;53";
       "ctrl+]" = "send_text all \\x10";

home/nvim/lua/formatting.lua

@@ -2,6 +2,7 @@ require("conform").setup({
   formatters_by_ft = {
     lua = { "stylua" },
     nix = { "nixfmt" },
+    ocaml = { "ocamlformat" },
   },
 
   format_on_save = {

home/nvim/lua/lsp.lua

@@ -12,7 +12,7 @@ vim.lsp.config("lua_ls", {
   },
 })
 
-local servers = { "clangd", "solargraph", "hls", "nixd" }
+local servers = { "clangd", "solargraph", "hls", "nixd", "ocamllsp" }
 
 for _, server in ipairs(servers) do
   vim.lsp.config(server, { capabilities = capabilities })