Merge branch 'main' of https://github.com/jsstevenson/dotfiles

alacritty.yml

@@ -28,7 +28,7 @@ font:
   #   `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO`
   # This is a global setting and will require a log out or restart to take
   # effect.
-  use_thin_strokes: true
+  # use_thin_strokes: true
 
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false

ipython_config.py

@@ -346,7 +346,8 @@
 TEAL = "#1ABC9C"
 RED = "#DB4B4B"
 LIGHT_RED = "#F7768E"
-PURPLE = "#9D7CD8"
+PURPLE = "#BB9AF7"
+# PURPLE = "#9D7CD8"
 BLUE = "#7AA2F7"
 WHITE = "#C0CAF5"
 
@@ -366,7 +367,7 @@
     Keyword.Reserved:           PURPLE,                     # except, finally, for, if, not, raise, etc
     Keyword.Namespace:          RED,                        # "from" and "import" keywords
 
-    Operator:                   WHITE,                      # brackets, parens
+    Operator:                   PURPLE,                      # brackets, parens
     Operator.Word:              PURPLE,                     # in, is, and, or, not
 
     Punctuation:                WHITE,

nvim/lua/packer_plugins.lua

@@ -117,7 +117,7 @@ return require("packer").startup({
     })
 
     -- git
-    use("itchyny/vim-gitbranch") -- until I feel better about vim-fugitive
+    -- vim-fugitive, someday?
     use({
       "rhysd/conflict-marker.vim",
       config = function()
@@ -158,6 +158,7 @@ return require("packer").startup({
     use({
       -- "~/code/nvim-tmux/",
       "jsstevenson/nvim-tmux",
+      ft = { "tmux" },
       requires = { "nvim-lua/plenary.nvim" },
       config = function()
         require("nvim_tmux").setup()