diff --git a/nix/user/sh.nix b/nix/user/sh.nix index f20c75f..177d8c7 100644 --- a/nix/user/sh.nix +++ b/nix/user/sh.nix @@ -56,6 +56,11 @@ export CARGO_HOME="$HOME/.cargo" [ -f "$CARGO_HOME/env" ] && . "$CARGO_HOME/env" fi; + if [[ "$(uname -r)" == *Microsoft* ]]; then + if command -v tmuxp &> /dev/null && [ -z "$TMUX" ]; then + tmuxp load --yes misc + fi + fi; ''; }; diff --git a/nvim/base.lua b/nvim/base.lua index babed6d..267b15b 100644 --- a/nvim/base.lua +++ b/nvim/base.lua @@ -170,3 +170,4 @@ vim.cmd([[highlight DiagnosticUnderlineError gui=undercurl guifg=Red]]) vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]]) vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]]) vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]]) + diff --git a/nvim/plugins.lua b/nvim/plugins.lua index a837ebe..3576a05 100644 --- a/nvim/plugins.lua +++ b/nvim/plugins.lua @@ -10,6 +10,10 @@ require('mini.move').setup() require('flash').setup() require('ts-comments').setup() +local function is_wsl_env() + return os.getenv("WSL_DISTRO_NAME") ~= nil or os.getenv("WSL_INTEROP") ~= nil +end + vim.g.tagbar_left=1 vim.g.tagbar_autoclose=1 vim.g.tagbar_autofocus=1 @@ -317,7 +321,9 @@ if vim.fn.has("mac") then default_tags = { "journal" }, template = "daily.md" } -elseif vim.fn.has("win32") then +end + +if is_wsl_env() then workspaces = { { name = "work",