diff options
| -rw-r--r-- | bash/.profile | 5 | ||||
| -rw-r--r-- | i3/config | 4 | ||||
| -rwxr-xr-x | i3/terminal.sh | 11 | ||||
| -rw-r--r-- | subl3/Package Control.sublime-settings | 3 | ||||
| -rw-r--r-- | sway/config | 27 | ||||
| -rwxr-xr-x | terminal.sh | 21 | ||||
| -rw-r--r-- | vim/.vimrc | 26 |
7 files changed, 47 insertions, 50 deletions
diff --git a/bash/.profile b/bash/.profile index 5d249ab..046794e 100644 --- a/bash/.profile +++ b/bash/.profile @@ -2,6 +2,7 @@ export PATH=~/python/bin:~/programs:~/programs/chicken/bin:~/.gem/ruby/2.7.0/bin export CHICKEN_REPOSITORY=~/programs/chicken_repository export ATOM_NODE_URL=http://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist export QT_QPA_PLATFORMTHEME=qt5ct -export QT_AUTO_SCREEN_SCALE_FACTOR=1 -export QT_ENABLE_HIGHDPI_SCALING=1 +#export QT_AUTO_SCREEN_SCALE_FACTOR=1 +#export QT_ENABLE_HIGHDPI_SCALING=1 +#export QT_WAYLAND_FORCE_DPI=120 export VISUAL=nvim @@ -128,5 +128,5 @@ exec_always --no-startup-id feh --bg-scale ~/.dotfiles/pictures/bg1.jpg \ for_window [instance="scratchpad_term"] \ move scratchpad, \ border none, \ - exec --no-startup-id ~/.config/i3/terminal.sh -bindsym F12 exec --no-startup-id ~/.config/i3/terminal.sh + exec --no-startup-id ~/.config/terminal.sh +bindsym F12 exec --no-startup-id ~/.config/terminal.sh diff --git a/i3/terminal.sh b/i3/terminal.sh deleted file mode 100755 index 5d6808d..0000000 --- a/i3/terminal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -CLASSNAME=scratchpad_term - -[[ -z $(xdotool search --classname $CLASSNAME) ]] && \ - alacritty --class $CLASSNAME -e tmux new-session -A -s default - -i3-msg [instance=\"$CLASSNAME\"] scratchpad show, \ - resize set 100 ppt 100 ppt, \ - resize shrink height 22 px, \ - move position center diff --git a/subl3/Package Control.sublime-settings b/subl3/Package Control.sublime-settings index 15e7c51..4051f26 100644 --- a/subl3/Package Control.sublime-settings +++ b/subl3/Package Control.sublime-settings @@ -17,6 +17,7 @@ "SublimeLinter", "SublimeLinter-contrib-sass-lint", "SublimeLinter-eslint", - "SublimeLinter-flake8" + "SublimeLinter-flake8", + "Zig Language" ] } diff --git a/sway/config b/sway/config index 2579d56..6bfd198 100644 --- a/sway/config +++ b/sway/config @@ -17,27 +17,21 @@ workspace $ws1 output eDP-1 workspace $ws2 output eDP-1 workspace $ws3 output eDP-1 workspace $ws4 output eDP-1 -workspace $wsa output DP-4 DP-5 -workspace $wss output DP-4 DP-5 -workspace $wsd output DP-4 DP-5 -workspace $wsf output DP-4 DP-5 +workspace $wsa output DP-6 +workspace $wss output DP-6 +workspace $wsd output DP-6 +workspace $wsf output DP-6 output eDP-1 { position 0 0 background ~/.dotfiles/pictures/bg1.jpg fill } -output DP-4 { +output DP-6 { position 1920 0 background ~/.dotfiles/pictures/bg2.jpg fill } -output DP-5 { - position 1920 0 - background ~/.dotfiles/pictures/bg2.jpg fill -} - - bindsym $mod+Return exec alacritty bindsym $mod+space exec --no-startup-id wofi --show drun --allow-images bindsym $mod+backslash split h @@ -124,8 +118,9 @@ bar { exec xrdb -load ~/.config/sway/.Xresources -exec --no-startup-id alacritty --class scratchpad_term -e tmux new-session -A -s default -for_window [app_id="scratchpad_term"] move scratchpad -bindsym F12 [app_id="scratchpad_term"] scratchpad show, \ - resize set 100 ppt 100 ppt, \ - move position center +# terminal +for_window [app_id="scratchpad_term"] \ + move scratchpad, \ + border none, \ + exec --no-startup-id ~/.config/terminal.sh +bindsym F12 exec --no-startup-id ~/.config/terminal.sh diff --git a/terminal.sh b/terminal.sh new file mode 100755 index 0000000..2db68d3 --- /dev/null +++ b/terminal.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +CLASSNAME=scratchpad_term +RESIZE_CMD="resize set 100 ppt 100 ppt" +MOVE_CMD="move position 0 0" + +if ps -C i3 > /dev/null ; then + CMD=i3-msg + PROP=instance + RESIZE+=", resize shrink height 22 px" +elif ps -C sway > /dev/null ; then + CMD=swaymsg + PROP=app_id +else + exit 1 +fi + +$CMD -t get_tree | jq -e "[.. | .$PROP? | . == \"$CLASSNAME\"] | any" +[[ $? -ne 0 ]] && alacritty --class $CLASSNAME -e tmux new-session -A -s default + +$CMD [$PROP=\"$CLASSNAME\"] scratchpad show, $RESIZE_CMD, $MOVE_CMD @@ -9,7 +9,7 @@ let g:netrw_liststyle = 3 let g:netrw_sort_options = 'i' " autostart netrw if vim starts without arguments -autocmd VimEnter * if !argc() | Explore | endif +"autocmd VimEnter * if !argc() | Explore | endif " dont use backup files set nobackup @@ -37,6 +37,7 @@ Plug 'thaerkh/vim-indentguides' Plug 'vim-scripts/paredit.vim' Plug 'christoomey/vim-tmux-navigator' + "Plug 'dleonard0/pony-vim-syntax' "Plug 'terryma/vim-multiple-cursors' "Plug 'tpope/vim-fugitive.git' @@ -74,23 +75,9 @@ autocmd FileType make set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab " enable spell check "autocmd FileType rst set spell -" gvim settings -if has('gui_running') - - " no toolbar - set guioptions-=T - - " maximize window - "set lines=999 columns=999 - - " set font - if has('gui_win32') - set guifont=Consolas:h11 - else - set guifont=Droid\ Sans\ Mono\ 11 - endif - -endif +" gui settings +set linespace=4 +set guifont=Droid\ Sans\ Mono:h12 " reload vimrc on change augroup reload_vimrc @@ -154,3 +141,6 @@ let g:ycm_show_diagnostics_ui = 0 " completion options set completeopt=menuone + +" disable conceal +autocmd FileType json set conceallevel=0 |