diff --git a/.config/nvim/lua/tsousa/plugins/lsp.lua b/.config/nvim/lua/tsousa/plugins/lsp.lua index 89d1e02..13d38e5 100644 --- a/.config/nvim/lua/tsousa/plugins/lsp.lua +++ b/.config/nvim/lua/tsousa/plugins/lsp.lua @@ -80,6 +80,7 @@ return { buffer = "[buf]", nvim_lsp = "[lsp]", copilot = "[cop]", + org = "[org]", luasnip = "[snip]", nvim_lsp_signature_help = "[sig]", nvim_lua = "[lua]", @@ -138,12 +139,16 @@ return { { 'zbirenbaum/copilot.lua', + event = "InsertEnter", config = function() require("copilot").setup({ - suggestion = { - enabled = true, - keymap = { accept = "" }, - } + suggestion = { + enabled = true, + auto_trigger = true, + keymap = { + accept = "", + }, + } }) end }, diff --git a/.config/nvim/lua/tsousa/plugins/zen-mode.lua b/.config/nvim/lua/tsousa/plugins/zen-mode.lua new file mode 100644 index 0000000..ad87900 --- /dev/null +++ b/.config/nvim/lua/tsousa/plugins/zen-mode.lua @@ -0,0 +1,7 @@ +return { + "folke/zen-mode.nvim", + config = function () + require("zen-mode").setup() + vim.keymap.set("n", "zz", vim.cmd.ZenMode) + end +} diff --git a/.config/starship.toml b/.config/starship.toml index b5650bf..fc7063f 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -38,6 +38,7 @@ format = ' [$symbol($version(-$name) )]($style)' [conda] symbol = " " +format = "[$symbol$environment]($style)" [dart] symbol = " " @@ -115,7 +116,7 @@ format = ' [$symbol($version(-$name) )]($style)' [ocaml] symbol = "🐫 " -format = '[$symbol($version )(\($switch_indicator$switch_name\) )]($style)' +format = ' [$symbol($version )(\($switch_indicator$switch_name\) )]($style)' [package] symbol = "󰏗 " diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index df3692e..c95540c 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -23,3 +23,4 @@ bind -r j select-pane -D bind -r h select-pane -L bind -r l select-pane -R +bind-key -r f run-shell "tmux neww ~/.local/share/scripts/tmux-sessionizer.sh" diff --git a/.local/share/scripts/monitor.sh b/.local/share/scripts/monitor.sh index 33cae4d..740e451 100755 --- a/.local/share/scripts/monitor.sh +++ b/.local/share/scripts/monitor.sh @@ -1,15 +1,17 @@ #!/bin/sh -gpu_mode=$(/usr/bin/envycontrol -q) -if [ "$gpu_mode" = "nvidia" ]; then - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto - xrandr --output HDMI-0 --above eDP-1-1 - xrandr --output HDMI-0 --primary -else - xrandr --auto - xrandr --output HDMI-1-0 --above eDP-1 - xrandr --output HDMI-1-0 --primary +if [ -f /usr/bin/envycontrol ]; then + gpu_mode=$(/usr/bin/envycontrol -q) + if [ "$gpu_mode" = "nvidia" ]; then + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + xrandr --output HDMI-0 --above eDP-1-1 + xrandr --output HDMI-0 --primary + else + xrandr --auto + xrandr --output HDMI-1-0 --above eDP-1 + xrandr --output HDMI-1-0 --primary + fi fi pkill picom diff --git a/.local/share/scripts/tmux-sessionizer.sh b/.local/share/scripts/tmux-sessionizer.sh index 20f838b..9990338 100755 --- a/.local/share/scripts/tmux-sessionizer.sh +++ b/.local/share/scripts/tmux-sessionizer.sh @@ -4,7 +4,7 @@ if [[ $# -eq 1 ]]; then selected=$1 else - selected=$(find ~/Nextcloud ~/.config ~/gits ~/2sem ~/ -mindepth 1 -maxdepth 1 -type d,l | fzf) + selected=$(find -L ~/Nextcloud ~/.config ~/gits ~/2sem ~/ -mindepth 1 -maxdepth 1 -type d,l | fzf) fi if [[ -z "$selected" ]]; then diff --git a/.xinitrc b/.xinitrc index 2ff5092..33ddcd7 100755 --- a/.xinitrc +++ b/.xinitrc @@ -8,32 +8,32 @@ sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -f $sysresources ]; then - xrdb -merge $sysresources + xrdb -merge $sysresources fi if [ -f $sysmodmap ]; then - xmodmap $sysmodmap + xmodmap $sysmodmap fi if [ -f "$userresources" ]; then - xrdb -merge "$userresources" + xrdb -merge "$userresources" fi if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" + xmodmap "$usermodmap" fi # start some nice programs -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh; do + [ -x "$f" ] && . "$f" + done + unset f fi if [ -f /usr/bin/prime-offload ]; then - /usr/bin/prime-offload + /usr/bin/prime-offload fi /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & @@ -41,15 +41,19 @@ fi setxkbmap -layout us,pt setxkbmap -option grp:win_space_toggle -gpu_mode=$(/usr/bin/envycontrol -q) -if [ "$gpu_mode" = "nvidia" ]; then - xrandr --setprovideroutputsource modesetting NVIDIA-0 - xrandr --auto - xrandr --output HDMI-0 --above eDP-1-1 - xrandr --output HDMI-0 --primary -else - xrandr --auto - xrandr --output HDMI-1-0 --above eDP-1 - xrandr --output HDMI-1-0 --primary +# setup monitors (laptop only) +if [ -f /usr/bin/envycontrol ]; then + gpu_mode=$(/usr/bin/envycontrol -q) + if [ "$gpu_mode" = "nvidia" ]; then + xrandr --setprovideroutputsource modesetting NVIDIA-0 + xrandr --auto + xrandr --output HDMI-0 --above eDP-1-1 + xrandr --output HDMI-0 --primary + else + xrandr --auto + xrandr --output HDMI-1-0 --above eDP-1 + xrandr --output HDMI-1-0 --primary + fi fi + exec i3