Merge pull request #13 from jeremy-hanna/current-macbook-dotfiles

Current macbook dotfiles
jeremy-hanna · Nov 28, 2022 · 2109c8d · 2109c8d
2 parents f8c759c + 97e1dbb
commit 2109c8d
Show file tree

Hide file tree

Showing 7 changed files with 797 additions and 57 deletions.
diff --git a/.config/karabiner/karabiner.json b/.config/karabiner/karabiner.json
@@ -57,104 +57,141 @@
                     "ignore": false,
                     "manipulate_caps_lock_led": false,
                     "simple_modifications": []
+                },
+                {
+                    "disable_built_in_keyboard_if_exists": false,
+                    "fn_function_keys": [],
+                    "identifiers": {
+                        "is_keyboard": true,
+                        "is_pointing_device": false,
+                        "product_id": 638,
+                        "vendor_id": 1452
+                    },
+                    "ignore": false,
+                    "manipulate_caps_lock_led": true,
+                    "simple_modifications": []
                 }
             ],
             "fn_function_keys": [
                 {
                     "from": {
                         "key_code": "f1"
                     },
-                    "to": {
-                        "key_code": "display_brightness_decrement"
-                    }
+                    "to": [
+                        {
+                            "key_code": "display_brightness_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f2"
                     },
-                    "to": {
-                        "key_code": "display_brightness_increment"
-                    }
+                    "to": [
+                        {
+                            "key_code": "display_brightness_increment"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f3"
                     },
-                    "to": {
-                        "key_code": "mission_control"
-                    }
+                    "to": [
+                        {
+                            "key_code": "mission_control"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f4"
                     },
-                    "to": {
-                        "key_code": "launchpad"
-                    }
+                    "to": [
+                        {
+                            "key_code": "launchpad"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f5"
                     },
-                    "to": {
-                        "key_code": "illumination_decrement"
-                    }
+                    "to": [
+                        {
+                            "key_code": "illumination_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f6"
                     },
-                    "to": {
-                        "key_code": "illumination_increment"
-                    }
+                    "to": [
+                        {
+                            "key_code": "illumination_increment"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f7"
                     },
-                    "to": {
-                        "key_code": "rewind"
-                    }
+                    "to": [
+                        {
+                            "key_code": "rewind"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f8"
                     },
-                    "to": {
-                        "key_code": "play_or_pause"
-                    }
+                    "to": [
+                        {
+                            "key_code": "play_or_pause"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f9"
                     },
-                    "to": {
-                        "key_code": "fastforward"
-                    }
+                    "to": [
+                        {
+                            "key_code": "fastforward"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f10"
                     },
-                    "to": {
-                        "key_code": "mute"
-                    }
+                    "to": [
+                        {
+                            "key_code": "mute"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f11"
                     },
-                    "to": {
-                        "key_code": "volume_decrement"
-                    }
+                    "to": [
+                        {
+                            "key_code": "volume_decrement"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "f12"
                     },
-                    "to": {
-                        "key_code": "volume_increment"
-                    }
+                    "to": [
+                        {
+                            "key_code": "volume_increment"
+                        }
+                    ]
                 }
             ],
             "name": "Laptop profile",
@@ -167,22 +204,27 @@
                     "from": {
                         "key_code": "backslash"
                     },
-                    "to": {
-                        "key_code": "delete_or_backspace"
-                    }
+                    "to": [
+                        {
+                            "key_code": "delete_or_backspace"
+                        }
+                    ]
                 },
                 {
                     "from": {
                         "key_code": "delete_or_backspace"
                     },
-                    "to": {
-                        "key_code": "backslash"
-                    }
+                    "to": [
+                        {
+                            "key_code": "backslash"
+                        }
+                    ]
                 }
             ],
             "virtual_hid_keyboard": {
                 "caps_lock_delay_milliseconds": 0,
                 "country_code": 0,
+                "indicate_sticky_modifier_keys_state": true,
                 "keyboard_type": "ansi",
                 "mouse_key_xy_scale": 100
             }

diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua
@@ -0,0 +1,2 @@
+vim.g['semshi#error_sign'] = false
+
diff --git a/.config/nvim/ftplugin/rust.lua b/.config/nvim/ftplugin/rust.lua
@@ -0,0 +1 @@
+require('rust-tools').setup({})
diff --git a/.config/nvim/lua/config.lua b/.config/nvim/lua/config.lua
@@ -1,5 +1,23 @@
 local Plug = vim.fn['plug#']
 
+local set = vim.opt
+local cmd = vim.cmd
+local g = vim.g
+local function map(mode, lhs, rhs, opts)
+  local options = { noremap = true, silent = true }
+  if opts then
+    options = vim.tbl_extend("force", options, opts)
+  end
+  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+end
+
+g.mapleader = " "
+
+-- colorschemes
+cmd [[colorscheme seoul256]]
+--set.termguicolors = true
+--cmd [[colorscheme allomancer]]
+
 vim.call('plug#begin', '~/.vim/bundle')
 -- --- Editing utility ---
 Plug('godlygeek/tabular')     -- align tables
@@ -23,6 +41,7 @@ Plug('ntpeters/vim-better-whitespace')
 Plug('simrat39/rust-tools.nvim')
 Plug('saecki/crates.nvim', { branch = 'main' })
 -- --- Python ---
+Plug('numirias/semshi', { ['do'] = ':UpdateRemotePlugins' })
 -- --- Elixir ---
 Plug('elixir-editors/vim-elixir') -- elixir syntax highlight
 Plug('andyl/vim-textobj-elixir')  -- make elixir blocks text-objects
@@ -45,27 +64,13 @@ Plug('nvim-lua/plenary.nvim')
 Plug('scalameta/nvim-metals', { branch = 'main' })
 vim.call('plug#end')
 
-local set = vim.opt
-local cmd = vim.cmd
-local g = vim.g
-local function map(mode, lhs, rhs, opts)
-  local options = { noremap = true, silent = true }
-  if opts then
-    options = vim.tbl_extend("force", options, opts)
-  end
-  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
-
-g.mapleader = " "
-
 ----------------------------------
 -- Vim settings  ------------------
 ----------------------------------
-cmd [[colorscheme apprentice]]
 set.relativenumber = true
 set.number = true
 
-cmd [[highlight ColorColumn ctermbg=235]]
+cmd [[highlight ColorColumn ctermbg=237]]
 set.colorcolumn = '80'
 set.hlsearch = false