From 29b4b0fac064b2fc5d2753caad060946ff3073a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Fussing=20M=C3=B8rk?= Date: Wed, 3 Oct 2018 14:40:50 +0200 Subject: [PATCH] Moved to Source Code Pro font. Using icons instead of text for workspaces --- i3/.i3/config | 27 +++++++++++++++------------ i3/.i3/workspaces/ws00.sh | 7 ++++--- i3/.i3/workspaces/ws01.sh | 6 +++--- i3/.i3/workspaces/ws02.sh | 6 +++--- i3/.i3/workspaces/ws04.sh | 10 +++++----- i3/.i3/workspaces/ws09.sh | 10 +++++----- neovim/.config/nvim/init.vim | 11 +++++++++++ termite/.config/termite/config | 3 ++- 8 files changed, 48 insertions(+), 32 deletions(-) diff --git a/i3/.i3/config b/i3/.i3/config index 8f277b6..d894134 100644 --- a/i3/.i3/config +++ b/i3/.i3/config @@ -21,7 +21,8 @@ bindsym $mod+n border normal # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font xft:DejaVu Sans Mono for Powerline 14 +#font xft:DejaVu Sans Mono for Powerline 14 +font xft:Source Code Pro for Powerline 14 # Use Mouse+$mod to drag floating windows floating_modifier $mod @@ -129,16 +130,16 @@ bindsym $mod+Ctrl+Left workspace prev # to display names or symbols instead of plain workspace numbers you can use # something like: set $ws1 1:mail # set $ws2 2: -set $ws0 0:IRC -set $ws1 1:Comms -set $ws2 2:Web -set $ws3 3:IDE -set $ws4 4:Work -set $ws5 5:OC Test -set $ws6 6:OC Prod -set $ws7 7:Prod -set $ws8 8:Media -set $ws9 9:News +set $ws0 0: +set $ws1 1: +set $ws2 2: +set $ws3 3: +set $ws4 4: +set $ws5 5: +set $ws6 6: +set $ws7 7: +set $ws8 8: +set $ws9 9: # switch to workspace bindsym $mod+1 workspace $ws1 @@ -191,6 +192,7 @@ for_window [class="Nitrogen"] floating enable sticky enable border normal for_window [class="feh"] floating enable sticky enable border normal for_window [class="mpv"] floating enable sticky enable border normal for_window [class="vlc"] floating enable sticky enable border normal +for_window [class="^jetbrains-.+"][window_type=dialog] focus # reload the configuration file bindsym $mod+Shift+c reload @@ -248,7 +250,8 @@ bar { status_command /usr/bin/i3status-rs /home/jfm/.config/i3status-rs/config.toml position bottom - font xft:DejaVu Sans Mono for Powerline, FontAwesome 14 +# font xft:DejaVu Sans Mono for Powerline, FontAwesome 14 + font xft:Source Code Pro for Powerline, FontAwesome 14 strip_workspace_numbers yes tray_output primary diff --git a/i3/.i3/workspaces/ws00.sh b/i3/.i3/workspaces/ws00.sh index 6f06cc1..fe76ad8 100755 --- a/i3/.i3/workspaces/ws00.sh +++ b/i3/.i3/workspaces/ws00.sh @@ -1,5 +1,6 @@ #!/bin/bash . ~/.i3/env -i3-msg "workspace 0:IRC; append_layout ~/.i3/layouts/workspace0-irc.json" -i3-msg "workspace 0:IRC; exec termite -t weechat -e weechat" -i3-msg "workspace 0:IRC; move workspace to output $SECONDARY" +i3-msg "workspace 0:; append_layout ~/.i3/layouts/workspace0-irc.json" +i3-msg "workspace 0:; exec termite -t weechat -e weechat" +i3-msg "workspace 0:; exec termite -t weechat -e weechat" +i3-msg "workspace 0:; move workspace to output $SECONDARY" diff --git a/i3/.i3/workspaces/ws01.sh b/i3/.i3/workspaces/ws01.sh index 1684531..748b3ea 100755 --- a/i3/.i3/workspaces/ws01.sh +++ b/i3/.i3/workspaces/ws01.sh @@ -1,6 +1,6 @@ #!/bin/bash . ~/.i3/env -i3-msg "workspace 1:Comms; append_layout ~/.i3/layouts/workspace1-comms.json" -i3-msg "workspace 1:Comms; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" -i3-msg "workspace 1:Comms; move workspace to output $LAPTOP" +i3-msg "workspace 1:; append_layout ~/.i3/layouts/workspace1-comms.json" +i3-msg "workspace 1:; exec google-chrome-stable --no-default-browser-check --new-window https://www.toggl.com/app/timer https://mail.google.com/mail/u/0/#inbox https://calendar.google.com/calendar/r?tab=mc https://chat.google.com https://messages.android.com https://mattermost.yousee.dk/tdcgroup/channels/onboarding" +i3-msg "workspace 1:; move workspace to output $LAPTOP" diff --git a/i3/.i3/workspaces/ws02.sh b/i3/.i3/workspaces/ws02.sh index de5d30e..5fbd6e1 100755 --- a/i3/.i3/workspaces/ws02.sh +++ b/i3/.i3/workspaces/ws02.sh @@ -1,7 +1,7 @@ #!/bin/bash . ~/.i3/env -i3-msg "workspace 2:Web; append_layout ~/.i3/layouts/workspace2-web.json" -i3-msg "workspace 2:Web; exec google-chrome-stable --no-default-browser-check --new-window" -i3-msg "workspace 2:Web; move workspace to output $PRIMARY" +i3-msg "workspace 2:: append_layout ~/.i3/layouts/workspace2-web.json" +i3-msg "workspace 2:; exec google-chrome-stable --no-default-browser-check --new-window" +i3-msg "workspace 2:; move workspace to output $PRIMARY" diff --git a/i3/.i3/workspaces/ws04.sh b/i3/.i3/workspaces/ws04.sh index 44a04fc..2abd30b 100755 --- a/i3/.i3/workspaces/ws04.sh +++ b/i3/.i3/workspaces/ws04.sh @@ -1,8 +1,8 @@ #!/bin/bash . ~/.i3/env -i3-msg "workspace 4:Work; append_layout ~/.i3/layouts/workspace4-work.json" -i3-msg "workspace 4:Work; exec termite -t shell1" -i3-msg "workspace 4:Work; exec termite -t shell2" -i3-msg "workspace 4:Work; exec termite -t vim -e 'nvr -s --remote'" -i3-msg "workspace 4:Work; move workspace to output $PRIMARY" +i3-msg "workspace 4:; append_layout ~/.i3/layouts/workspace4-work.json" +i3-msg "workspace 4:; exec termite -t shell1" +i3-msg "workspace 4:; exec termite -t shell2" +i3-msg "workspace 4:; exec termite -t vim -e 'nvr -s --remote'" +i3-msg "workspace 4:; move workspace to output $PRIMARY" diff --git a/i3/.i3/workspaces/ws09.sh b/i3/.i3/workspaces/ws09.sh index e53cf2c..00eabb8 100755 --- a/i3/.i3/workspaces/ws09.sh +++ b/i3/.i3/workspaces/ws09.sh @@ -1,7 +1,7 @@ #!/bin/bash . ~/.i3/env -i3-msg "workspace 9:News; append_layout ~/.i3/layouts/workspace9-news.json" -i3-msg "workspace 9:News; exec termite -t newsboat -e newsboat" -i3-msg "workspace 9:News; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py'" -i3-msg "workspace 9:News; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark'" -i3-msg "workspace 9:News; move workspace to output $SECONDARY" +i3-msg "workspace 9:; append_layout ~/.i3/layouts/workspace9-news.json" +i3-msg "workspace 9:; exec termite -t newsboat -e newsboat" +i3-msg "workspace 9:; exec termite -t hackernews -d '/home/jfm/Repositories/bark' -e 'pipenv run python Bark.py'" +i3-msg "workspace 9:; exec termite -t rtv -e 'rtv --enable-media --theme solarized-dark'" +i3-msg "workspace 9:; move workspace to output $SECONDARY" diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 0c1e13e..5569e20 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -27,6 +27,8 @@ let g:ycm_python_binary_path = '/usr/bin/python3' let g:ycm_server_python_interpreter = 'python2' let g:ycm_autoclose_preview_window_after_completion=1 let g:ycm_min_num_of_chars_for_completion=5 +let g:ycm_add_preview_to_completeopt = 1 +set completeopt-=preview "Mappings :nmap :w @@ -37,3 +39,12 @@ nnoremap :bn "AutoCommands au BufWinEnter * set number au FileType xml setlocal equalprg=xmllint\ --format\ --recover\ -\ 2>/dev/null + +au BufNewFile,BufRead *.py + \ set tabstop=4 + \ set softtabstop=4 + \ set shiftwidth=4 + \ set textwidth=79 + \ set expandtab + \ set autoindent + \ set fileformat=unix diff --git a/termite/.config/termite/config b/termite/.config/termite/config index bda6704..5095e01 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -1,5 +1,6 @@ [options] -font = DejaVu Sans Mono for Powerline 11 +#font = DejaVu Sans Mono for Powerline 11 +font = Source Code Pro for Powerline 11 scrollback_lines = 10000 # Solarized dark color scheme