diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json index 4d9feed..18b8598 100644 --- a/.config/Code/User/settings.json +++ b/.config/Code/User/settings.json @@ -1,19 +1,38 @@ { - "workbench.colorTheme": "Solarized Dark", + "window.autoDetectColorScheme": true, + "workbench.preferredDarkColorTheme": "Solarized Dark", + "workbench.preferredLightColorTheme": "Solarized Light", "workbench.startupEditor": "none", "files.autoSave": "afterDelay", + "gitlens.statusBar.enabled": false, "vim.normalModeKeyBindings": [ { - "before": ["K"], - "commands": ["editor.action.showHover"], + "before": [ + "K" + ], + "commands": [ + "editor.action.showHover" + ], }, { - "before": ["", "r", "f"], - "commands": ["fileutils.renameFile"], + "before": [ + "", + "r", + "f" + ], + "commands": [ + "fileutils.renameFile" + ], }, { - "before": ["", "f"], - "commands": ["editor.action.formatDocument"], + "before": [ + "", + "f" + ], + "commands": [ + "editor.action.formatDocument" + ], }, ], -} \ No newline at end of file + "workbench.colorTheme": "Solarized Dark", +} diff --git a/.config/sway/config b/.config/sway/config index c93fdd4..121e122 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -173,9 +173,15 @@ bindsym $mod+p input type:pointer events toggle enabled disabled; input type:key # back and forth bindsym $mod+period workspace back_and_forth + # # Displays: # + # move workspace to output + bindsym $mod+Control+Shift+$left move workspace to output left + bindsym $mod+Control+Shift+$down move workspace to output down + bindsym $mod+Control+Shift+$up move workspace to output up + bindsym $mod+Control+Shift+$right move workspace to output right # TODO # # Layout stuff: diff --git a/.config/sway/work b/.config/sway/work index 01a3102..bb52d8e 100644 --- a/.config/sway/work +++ b/.config/sway/work @@ -1,25 +1,38 @@ # # Output configuration: # -set $output_primary "Dell Inc. DELL P2317H F4VYG7561H1S" +set $output_primary "Dell Inc. DELL P2319H 7C8XMM2" +set $output_secondary "Dell Inc. DELL P2317H F4VYG7561H1S" set $output_laptop "Unknown 0x573D 0x00000000" set $output_tv "Unknown Beyond TV 0x00000100" -output $output_primary position 0 0 transform 270 -output $output_laptop position 1080 840 transform 0 scale 1 -output $output_tv mode --custom 2560x1440@60Hz +output $output_primary position 1080 0 transform 90 +output $output_secondary position 0 0 transform 270 +output $output_laptop position 2160 420 transform 0 scale 1 +output $output_tv position 4080 320 mode --custom 2560x1440@60Hz bindsym $mod+Shift+F4 output $output_primary transform 90 clockwise bindsym $mod+F4 output $output_primary transform 90 anticlockwise # # Workspaces # -workspace 1 output $output_primary +workspace 1 output $output_secondary +workspace 2 output $output_primary +workspace 7 output $output_tv $output_laptop workspace 10 output $output_laptop # # Windows # -assign [title = "apps"] 10 +assign [app_id="org.telegram.desktop.*"] workspace 9 +assign [instance="mattermost"] workspace 10 +assign [instance="google-chrome"] workspace 1 +for_window [instance="google-chrome" title="Meet – ...-....-..."] move container to workspace 7 +for_window [instance="google-chrome" title="apps"] move container to workspace 10 +# +# Shortcuts +# +bindsym XF86Favorites exec google-chrome --new-window $DAILY +bindsym $mod+Shift+Control+a exec google-chrome --new-window $PAGES # # Display controls: diff --git a/.zshrc b/.zshrc index 5de2d3f..44ad042 100644 --- a/.zshrc +++ b/.zshrc @@ -151,12 +151,6 @@ setup_rbenv_on_demand() { setup_rbenv && rbenv_loaded=1 fi } - setup_rbenv_when_python_version() { - if [[ -f .python-version ]]; then - setup_rbenv_once - fi - } - precmd_functions+=( setup_rbenv_when_python_version ) rbenv() { setup_rbenv_once && rbenv "$@" } ruby() { setup_rbenv_once && ruby "$@" } gem() { setup_rbenv_once && gem "$@" } @@ -282,6 +276,10 @@ else } fi +# theme + +[[ -f ~/.zshrc-theme ]] && eval "$(cat ~/.zshrc-theme)" + # prompt setopt prompt_subst @@ -538,6 +536,7 @@ function theme { iterm_profile=Light kitty_theme=${kitty_variation}light export LIGHT=true + echo "LIGHT=true" > ~/.zshrc-theme gnome_theme=Adwaita macos_theme=false ;; @@ -545,6 +544,7 @@ function theme { iterm_profile=Default kitty_theme=${kitty_variation}dark export LIGHT=false + echo "LIGHT=false" > ~/.zshrc-theme gnome_theme=Adwaita-dark macos_theme=true ;;