diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua index abfecdf..8714e02 100644 --- a/native_configs/neovim/init.lua +++ b/native_configs/neovim/init.lua @@ -674,6 +674,37 @@ require('mason-lspconfig').setup_handlers({ } } end, + ["pyright"] = function() + require('lspconfig').pyright.setup { + on_attach = on_attach, + capabilities = capabilities, + settings = { + pyright = { + disableLanguageServices = false, + disableOrganizeImports = false, + }, + python = { + analysis = { + autoImportCompletions = true, + autoSearchPaths = true, + diagnosticMode = "openFilesOnly", + -- diagnosticSeverityOverrides = + extraPaths = {}, + logLevel = "Information", + stubPath = "typings", + typeCheckingMode = "basic", + typeshedPaths = {}, + useLibraryCodeForTypes = false, + pythonPath = "python", + venvPath = "", + }, + linting = { + mypyEnabled = true, + } + }, + }, + } + end, ["tsserver"] = function() require('lspconfig').tsserver.setup { on_attach = on_attach, @@ -735,7 +766,7 @@ require('mason-lspconfig').setup_handlers({ }) require("rust-tools").setup { tools = { - -- rust-tools options + -- rust-tools options -- how to execute terminal commands -- options right now: termopen / quickfix diff --git a/native_configs/tmux/tmux.conf b/native_configs/tmux/tmux.conf index f5e7187..54de12d 100644 --- a/native_configs/tmux/tmux.conf +++ b/native_configs/tmux/tmux.conf @@ -14,7 +14,15 @@ setw -g pane-base-index 1 set-option -g renumber-windows on # status bar -set -g status-style 'bg=#333333 fg=#5eacd3' +# set -g status-style 'bg=#333333 fg=#5eacd3' +# set -g status-interval 60 +# set -g status-right-style 'bg=#333333 fg=#5eacd3' +# set -g status-right-length 50 +set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M ' +# set -g status-left " " # Keybinds set-window-option -g mode-keys vi + +# # Log +# set-option -g history-file /tmp/.tmux.log diff --git a/nix-conf/home-manager/base/shells.nix b/nix-conf/home-manager/base/shells.nix index e8d4db5..08e24c9 100644 --- a/nix-conf/home-manager/base/shells.nix +++ b/nix-conf/home-manager/base/shells.nix @@ -53,6 +53,9 @@ in programs.tmux = { enable = true; extraConfig = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf"; + plugins = + let inherit (pkgs.tmuxPlugins) cpu net-speed; + in [ cpu net-speed ]; }; programs.exa = { enable = true; @@ -88,8 +91,8 @@ in "command-not-found" # suggests which package to install; does not support nixos (we have solution already) "gitignore" # `gi list` -> `gi java >>.gitignore` "ripgrep" # adds completion for `rg` - "rust" # compe for rustc/cargo - "poetry" # compe for poetry - Python's cargo + "rust" # compe for rustc/cargo + "poetry" # compe for poetry - Python's cargo # "vi-mode" # edit promps with vi motions :) ]; }; diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index b99a7ac..6f499f2 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -31,3 +31,6 @@ else fi +# Attempt to reload running instances +tmux source-file ~/.config/tmux/tmux.conf +