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

jsstevenson · Sep 7, 2022 · e29a7ee · e29a7ee
2 parents a28268e + 283781e
commit e29a7ee
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 42 deletions.
diff --git a/.condarc b/.condarc
@@ -2,4 +2,5 @@ channels:
   - conda-forge
   - bioconda
   - defaults
-auto_activate_base: false
+always_yes: True
+auto_activate_base: False
diff --git a/alacritty.yml b/alacritty.yml
@@ -7,17 +7,16 @@ scrolling:
 
 font:
   normal:
-    family: 'SF Mono Powerline'
+    family: 'Fira Code'
     style: Regular
   bold:
-    family: 'SF Mono Powerline'
-    style: Semibold
-  size: 11
+    family: 'Fira Code'
+    style: Bold
+  size: 12
 
   #offset:
   #  x: 0
   #  y: 0
-
   # Thin stroke font rendering (macOS only)
   #
   # Thin strokes are suitable for retina displays, but for non-retina screens
@@ -312,9 +311,9 @@ key_bindings:
   #- { key: N,      mods: Command,            action: SpawnNewInstance }
   #- { key: F,      mods: Command|Control,    action: ToggleFullscreen }
 
-# Colors
+# Colors (Tomorrow Night Bright)
 schemes:
-  solarized_dark: &dark
+  solarized_dark: &solarized_dark
     primary:
       background: '#002b36' # base03
       foreground: '#839496' # base0
@@ -346,7 +345,7 @@ schemes:
       cyan:    '#93a1a1' # base1
       white:   '#fdf6e3' # base3
 
-  solarized_light: &light
+  solarized_light: &solarized_light
     # Default colors
     primary:
       background: '#fdf6e3' # base3
@@ -379,6 +378,67 @@ schemes:
       cyan:    '#93a1a1' # base1
       white:   '#fdf6e3' # base3
 
+
+    gruvbox_light: &gruvbox_light
+      # Default colors
+      primary:
+        # hard contrast: background = '#f9f5d7'
+        background: '#fbf1c7'
+        # soft contrast: background = '#f2e5bc'
+        foreground: '#3c3836'
+
+      # Normal colors
+      normal:
+        black:   '#fbf1c7'
+        red:     '#cc241d'
+        green:   '#98971a'
+        yellow:  '#d79921'
+        blue:    '#458588'
+        magenta: '#b16286'
+        cyan:    '#689d6a'
+        white:   '#7c6f64'
+
+      # Bright colors
+      bright:
+        black:   '#928374'
+        red:     '#9d0006'
+        green:   '#79740e'
+        yellow:  '#b57614'
+        blue:    '#076678'
+        magenta: '#8f3f71'
+        cyan:    '#427b58'
+        white:   '#3c3836'
+
+    gruvbox_dark: &gruvbox_dark
+      # Default colors
+      primary:
+        # hard contrast: background = '#1d2021'
+        background: '#282828'
+        # soft contrast: background = '#32302f'
+        foreground: '#ebdbb2'
+
+      # Normal colors
+      normal:
+        black:   '#282828'
+        red:     '#cc241d'
+        green:   '#98971a'
+        yellow:  '#d79921'
+        blue:    '#458588'
+        magenta: '#b16286'
+        cyan:    '#689d6a'
+        white:   '#a89984'
+
+      # Bright colors
+      bright:
+        black:   '#928374'
+        red:     '#fb4934'
+        green:   '#b8bb26'
+        yellow:  '#fabd2f'
+        blue:    '#83a598'
+        magenta: '#d3869b'
+        cyan:    '#8ec07c'
+        white:   '#ebdbb2'
+
   tokyo_night_light: &tokyo_light
     # Default colors
     primary:

diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
@@ -223,6 +223,43 @@ local options_ruby = {
   },
 }
 
+--------------------------------------------------------------------------------
+-- efm
+--------------------------------------------------------------------------------
+local options_efm = {
+  init_options = {
+    documentFormatting = true,
+  },
+  settings = {
+    rootMarkers = { ".git/" },
+    languages = {
+      lua = {
+        { formatCommand = "stylua -", formatStdin = true },
+      },
+      python = {
+        {
+          formatCommand = "black --quiet -",
+          formatStdin = true,
+        },
+        {
+          formatCommand = "isort --quiet -",
+          formatStdin = true,
+        },
+        {
+          lintCommand = "flake8 -",
+          lintStdin = true,
+          lintFormats = { "%f:%l:%c: %m" },
+        },
+      },
+      yaml = { { formatCommand = "prettierd -", formatStdin = true } },
+      html = { { formatCommand = "prettierd -", formatStdin = true } },
+      css = { { formatCommand = "prettierd -", formatStdin = true } },
+      json = { { formatCommand = "prettier -", formatStdin = true } },
+    },
+  },
+  filetypes = { "lua", "python", "yaml", "html", "css", "json" },
+}
+
 --------------------------------------------------------------------------------
 -- initialize
 --------------------------------------------------------------------------------
@@ -251,38 +288,6 @@ require("mason-lspconfig").setup_handlers({
     lspconfig.rust_analyzer.setup(options_rust)
   end,
   ["efm"] = function()
-    lspconfig.efm.setup({
-      init_options = {
-        documentFormatting = true,
-      },
-      settings = {
-        rootMarkers = { ".git/" },
-        languages = {
-          lua = {
-            { formatCommand = "stylua -", formatStdin = true },
-          },
-          python = {
-            {
-              formatCommand = "black --quiet -",
-              formatStdin = true,
-            },
-            {
-              formatCommand = "isort --quiet -",
-              formatStdin = true,
-            },
-            {
-              lintCommand = "flake8 -",
-              lintStdin = true,
-              lintFormats = { "%f:%l:%c: %m" },
-            },
-          },
-          yaml = { { formatCommand = "prettierd -", formatStdin = true } },
-          html = { { formatCommand = "prettierd -", formatStdin = true } },
-          css = { { formatCommand = "prettierd -", formatStdin = true } },
-          json = { { formatCommand = "prettier -", formatStdin = true } },
-        },
-      },
-      filetypes = { "lua", "python", "yaml", "html", "css", "json" },
-    })
+    lspconfig.efm.setup(options_efm)
   end,
 })