small changes

modules/common/rust.nix

@@ -26,6 +26,9 @@
       nixfmt-rfc-style
 
       libiconv
+
+      clang
+      clang-analyzer
     ];
   };
 }

modules/darwin/karabiner.nix

@@ -1,18 +1,31 @@
 let
   numbers = [
-    "1" "2" "3" "4" "5" "6" "7" "8" "9" "0"
+    "1"
+    "2"
+    "3"
+    "4"
+    "5"
+    "6"
+    "7"
+    "8"
+    "9"
+    "0"
   ];
 
   number_to_symbol = num: {
     type = "basic";
     from = {
       key_code = num;
-      modifiers = { optional = [ "caps_lock" ]; };
+      modifiers = {
+        optional = [ "caps_lock" ];
       };
-    to = [{
+    };
+    to = [
+      {
         key_code = num;
         modifiers = [ "left_shift" ];
-    }];
+      }
+    ];
   };
 
   symbol_to_number = num: {
@@ -24,15 +37,19 @@ let
         optional = [ "caps_lock" ];
       };
     };
-    to = [{
+    to = [
+      {
         key_code = num;
-    }];
+      }
+    ];
   };
 
-  manipulators = builtins.concatLists (map (n: [
+  manipulators = builtins.concatLists (
+    map (n: [
       (number_to_symbol n)
       (symbol_to_number n)
-  ]) numbers);
+    ]) numbers
+  );
 
   simple_modifications = [
     {
@@ -47,32 +64,53 @@ let
 
   complex_modifications = {
     name = "Complex Modifications";
-    rules = [{
+    rules = [
-      description = "Change numbers to symbols and vice versa";
+      # {
-      manipulators = manipulators;
+      #   description = "Change numbers to symbols and vice versa";
-    }];
+      #   manipulators = manipulators;
+      # }
+      {
+        description = "Toggle Focus Mode with F6";
+        manipulators = [
+          {
+            from = {
+              "key_code" = "f6";
+            };
+            to = [ { "shell_command" = "shortcuts run 'Reduced Interruptions'"; } ];
+            type = "basic";
+          }
+        ];
+      }
+    ];
   };
 
   config = builtins.toJSON {
     global.show_in_menu_bar = false;
 
-    profiles = [{
+    profiles = [
+      {
         name = "default";
         selected = true;
         virtual_hid_keyboard.keyboard_type_v2 = "ansi";
         inherit simple_modifications;
         inherit complex_modifications;
 
-      devices = [{
+        devices = [
+          {
             identifiers.is_keyboard = true;
-      }];
+          }
-    }];
+        ];
+      }
+    ];
   };
-in {
+in
-  home-manager.sharedModules = [{
+{
+  home-manager.sharedModules = [
+    {
       home.file.".config/karabiner/karabiner.json" = {
         force = true;
         text = config;
       };
-  }];
+    }
+  ];
 }

modules/darwin/packages.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
   homebrew.enable = true;
-  homebrew.casks = [ "ungoogled-chromium" ];
+  homebrew.casks = [ "google-chrome" ];
   environment.systemPackages = [ pkgs.iina ];
 }

modules/dotfiles/nvim/lua/thegeneralist/lazy/blink.lua

@@ -18,8 +18,6 @@ return {
       -- See :h blink-cmp-config-keymap for defining your own keymap
       keymap = {
         preset = "default",
-        ["<Tab>"] = { "select_and_accept" },
-        ["<S-Tab>"] = { "select_next", "fallback_to_mappings" },
       },
 
       appearance = {

modules/dotfiles/nvim/lua/thegeneralist/lazy/lsp.lua

@@ -36,6 +36,8 @@ return {
 
       local capabilities = require("blink.cmp").get_lsp_capabilities()
       vim.lsp.enable("nixd")
+      vim.lsp.enable("clangd")
+      vim.lsp.enable("basedpyright")
       require("mason-lspconfig").setup({
         automatic_enable = true,
         ensure_installed = {