diff --git a/dot_bash_aliases b/dot_bash_aliases new file mode 100644 index 0000000..b739592 --- /dev/null +++ b/dot_bash_aliases @@ -0,0 +1 @@ +alias work2='cd ~/Programming/aps-internal/grogu/grogu-mobile' diff --git a/dot_bash_profile b/dot_bash_profile index 63d7f10..50c7488 100644 --- a/dot_bash_profile +++ b/dot_bash_profile @@ -1,2 +1,3 @@ -. ~/.bashrc - +if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" +fi diff --git a/dot_bashrc b/dot_bashrc index 6c2cae6..7574c5c 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -1,12 +1,17 @@ # imports +export EDITOR=nvim if [ -f "$HOME/.bash_private" ]; then . "$HOME/.bash_private" fi +if [ -f "$HOME/.bash_aliases" ]; then + . "$HOME/.bash_aliases" +fi # saving aliases aliases -alias aliasd='alias |diff -u ~/.bashrc -' +alias aliasm='alias |comm -13 <(grep -h ^alias ~/.bashrc ~/.bash_private | sort) -' +alias aliasd='aliasm |diff -u --color ~/.bash_aliases -' alias aliasr='unalias -a; . ~/.bashrc' -alias aliass='alias > ~/.bashrc' +alias aliass='aliasm > ~/.bash_aliases' # ls aliases alias ll='ls -lah' diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf index 2971f8d..c50a084 100644 --- a/dot_config/hypr/hyprland.conf +++ b/dot_config/hypr/hyprland.conf @@ -27,7 +27,7 @@ input { kb_layout = us, ru kb_variant = kb_model = - kb_options = grp:alt_shift_toggle + kb_options = grp:alt_shift_toggle, caps:escape kb_rules = follow_mouse = 1 diff --git a/dot_config/nvim/lua/functions/python.lua b/dot_config/nvim/lua/functions/python.lua index 82fcdba..214f24f 100644 --- a/dot_config/nvim/lua/functions/python.lua +++ b/dot_config/nvim/lua/functions/python.lua @@ -25,6 +25,11 @@ function export.get_python_path() return path.join(vim.env.VIRTUAL_ENV, "bin", "python") end + local match = vim.fn.glob(path.join(workspace, ".venv")) + if match ~= "" then + return path.join(workspace, ".venv", "bin", "python") + end + -- Find and use virtualenv via poetry in workspace directory. while workspace ~= "" do if workspace ~= "" then diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua index bdf050e..7ed4c17 100644 --- a/dot_config/nvim/lua/plugins/lsp.lua +++ b/dot_config/nvim/lua/plugins/lsp.lua @@ -21,24 +21,30 @@ return { local python_path = python_utils.get_python_path() vim.lsp.config("ruff", { + root_markers = { ".git" }, settings = { interpreter = python_path }, }) vim.lsp.enable("ruff") vim.lsp.config("basedpyright", { + root_markers = { ".git" }, + python = { pythonPath = python_path }, settings = { - python = { pythonPath = python_path }, basedpyright = { analysis = { typeCheckingMode = "standard", + diagnosticSeverityOverrides = { + reportUnusedImport = "none", + reportMissingImports = "none", + }, }, }, }, }) vim.lsp.enable("basedpyright") - vim.lsp.config("bashls", { - cmd = { "bash-language-server", "start" }, - filetypes = { "bash", "sh" }, - }) - vim.lsp.enable("bashls") + -- vim.lsp.config("bashls", { + -- cmd = { "bash-language-server", "start" }, + -- filetypes = { "bash", "sh" }, + -- }) + -- vim.lsp.enable("bashls") end, }