Commit 33c76e38 authored by Franciszek Madej's avatar Franciszek Madej 🤞

fix

parent 32a0bde8
...@@ -9,8 +9,7 @@ Xft.lcdfilter: lcddefault ...@@ -9,8 +9,7 @@ Xft.lcdfilter: lcddefault
! xft font ! xft font
! URxvt*letterSpace:-1 ! URxvt*letterSpace:-1
URxvt*font:xft:scientifica *.font:Fira Code:size=8
st.font:scientifica
! ui ! ui
URxvt*cursorUnderline: true URxvt*cursorUnderline: true
...@@ -28,38 +27,38 @@ URxvt*.shading: 40 ...@@ -28,38 +27,38 @@ URxvt*.shading: 40
URxvt*blurRadius: 35 URxvt*blurRadius: 35
! special ! special
*.foreground: #c5c8c6 *.foreground: #ababab
*.background: #1d1f21 *.background: #000000
*.cursorColor: #c5c8c6 *.cursorColor: #ababab
! black ! black
*.color0: #1d1f21 *.color0: #000000
*.color8: #969896 *.color8: #343434
! red ! red
*.color1: #cc342b *.color1: #e92f2f
*.color9: #cc342b *.color9: #e92f2f
! green ! green
*.color2: #198844 *.color2: #0ed839
*.color10: #198844 *.color10: #0ed839
! yellow ! yellow
*.color3: #fba922 *.color3: #dddd13
*.color11: #fba922 *.color11: #dddd13
! blue ! blue
*.color4: #3971ed *.color4: #3b48e3
*.color12: #3971ed *.color12: #3b48e3
! magenta ! magenta
*.color5: #a36ac7 *.color5: #f996e2
*.color13: #a36ac7 *.color13: #f996e2
! cyan ! cyan
*.color6: #3971ed *.color6: #23edda
*.color14: #3971ed *.color14: #23edda
! white ! white
*.color7: #c5c8c6 *.color7: #ababab
*.color15: #ffffff *.color15: #f9f9f9
...@@ -19,7 +19,7 @@ bold_font Fira Code Bold ...@@ -19,7 +19,7 @@ bold_font Fira Code Bold
bold_italic_font Fira Code Bold bold_italic_font Fira Code Bold
# Font size (in pts) # Font size (in pts)
font_size 10.0 font_size 9.0
# The amount the font size is changed by (in pts) when increasing/decreasing # The amount the font size is changed by (in pts) when increasing/decreasing
# the font size in a running terminal. # the font size in a running terminal.
...@@ -185,7 +185,7 @@ window_border_width 1 ...@@ -185,7 +185,7 @@ window_border_width 1
window_margin_width 0 window_margin_width 0
# The window padding (in pts) (blank area between the text and the window border) # The window padding (in pts) (blank area between the text and the window border)
window_padding_width 3 window_padding_width 10
# The color for the border of the active window # The color for the border of the active window
#active_border_color #00ff00 #active_border_color #00ff00
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
set encoding =utf-8 " https://xkcd.com/927/ set encoding =utf-8 " https://xkcd.com/927/
set autoindent " Indent according to previous line. set autoindent " Indent according to previous line.
set expandtab " Use spaces instead of tabs. " set expandtab " Use spaces instead of tabs. - not active
set tabstop =4 " Tab key indents by 4 spaces. set tabstop =2 " Tab key indents by 4 spaces.
set shiftwidth =0 " >> indents by tabstop spaces. set shiftwidth =2 " >> indents by tabstop spaces.
set softtabstop =-1 " >> indents by softtabstop spaces. "set softtabstop =4 " >> indents by softtabstop spaces.
set shiftround " >> indents to next multiple of 'shiftwidth'. set shiftround " >> indents to next multiple of 'shiftwidth'.
set textwidth =120 " switched from 79. I'm a heathen, I know. set textwidth =120 " switched from 79. I'm a heathen, I know.
set signcolumn =yes " Better UX for linters set signcolumn =yes " Better UX for linters
...@@ -37,18 +37,14 @@ set wrapscan " Searches wrap around end-of-file. ...@@ -37,18 +37,14 @@ set wrapscan " Searches wrap around end-of-file.
set report =0 " Always report changed lines. set report =0 " Always report changed lines.
set synmaxcol =200 " Only highlight the first 200 columns. set synmaxcol =200 " Only highlight the first 200 columns.
set list " Show non-printable characters. "set list " Show non-printable characters.
if has('multi_byte') && &encoding ==# 'utf-8' "if has('multi_byte') && &encoding ==# 'utf-8'
let &listchars = 'tab:▸ ,extends:❯,precedes:❮,nbsp:±' " let &listchars = 'tab:▸ ,extends:❯,precedes:❮,nbsp:±'
else " let &listchars = 'extends:❯,precedes:❮,nbsp:±'
let &listchars = 'tab:> ,extends:>,precedes:<,nbsp:.' "else
endif " " let &listchars = 'tab:> ,extends:>,precedes:<,nbsp:.'
" let &listchars = 'extends:>,precedes:<,nbsp:.'
" The fish shell is not very compatible to other shells and unexpectedly "endif
" breaks things that use 'shell'.
if &shell =~# 'fish$'
set shell=/bin/bash
endif
"" Disable arrows "" Disable arrows
map <right> <nop> " normal, visual, operation-pending map <right> <nop> " normal, visual, operation-pending
...@@ -70,45 +66,47 @@ nnoremap <C-H> <C-W><C-H> ...@@ -70,45 +66,47 @@ nnoremap <C-H> <C-W><C-H>
" Normally `:set nocp` is not needed, because it is done automatically " Normally `:set nocp` is not needed, because it is done automatically
" when .vimrc is found. " when .vimrc is found.
if &compatible if &compatible
" `:set nocp` has many side effects. Therefore this should be done " `:set nocp` has many side effects. Therefore this should be done
" only when 'compatible' is set. " only when 'compatible' is set.
set nocompatible set nocompatible
endif endif
" Add the dein installation directory into runtimepath " Add the dein installation directory into runtimepath
set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim
if dein#load_state('~/.config/nvim/dein') if dein#load_state('~/.config/nvim/dein')
call dein#begin('~/.config/nvim/dein') call dein#begin('~/.config/nvim/dein')
call dein#add('~/.config/nvim/dein') call dein#add('~/.config/nvim/dein/repos/github.com/Shougo/dein.vim')
call dein#add('chriskempson/base16-vim') call dein#add('wsdjeg/dein-ui.vim')
call dein#add('chaoren/vim-wordmotion') call dein#add('Shougo/denite.nvim')
call dein#add('myusuf3/numbers.vim') call dein#add('Shougo/defx.nvim')
call dein#add('chriskempson/base16-vim')
call dein#add('Vimjas/vim-python-pep8-indent') call dein#add('chaoren/vim-wordmotion')
call dein#add('ekalinin/Dockerfile.vim') call dein#add('myusuf3/numbers.vim')
call dein#add('framallo/taskwarrior.vim')
call dein#add('cespare/vim-toml') call dein#add('framallo/taskwarrior.vim')
call dein#add('chr4/nginx.vim') call dein#add('sheerun/vim-polyglot')
call dein#add('plasticboy/vim-markdown') call dein#add('iamcco/markdown-preview.nvim', { 'build': 'cd app & yarn install' })
call dein#add('posva/vim-vue')
call dein#add('editorconfig/editorconfig-vim')
if !exists('g:gui_oni')
" Statusline " Statusline
call dein#add('vim-airline/vim-airline') call dein#add('vim-airline/vim-airline')
call dein#add('vim-airline/vim-airline-themes') call dein#add('vim-airline/vim-airline-themes')
""" File managment """ """ File managment """
call dein#add('junegunn/fzf') call dein#add('junegunn/fzf')
call dein#add('junegunn/fzf.vim') call dein#add('junegunn/fzf.vim')
""" Prose """ """ Prose """
call dein#add('junegunn/goyo.vim') call dein#add('junegunn/goyo.vim')
call dein#add('junegunn/limelight.vim') call dein#add('junegunn/limelight.vim')
endif
call dein#add('neoclide/coc.nvim', {'build': 'yarn install'})
call dein#end() call dein#add('prettier/vim-prettier', {'build': 'yarn install'})
call dein#save_state()
call dein#end()
call dein#save_state()
endif endif
filetype plugin indent on filetype plugin indent on
...@@ -126,6 +124,12 @@ let g:airline#extensions#tabline#formatter = 'default' ...@@ -126,6 +124,12 @@ let g:airline#extensions#tabline#formatter = 'default'
let g:airline_theme = 'base16_tomorrow' let g:airline_theme = 'base16_tomorrow'
let g:airline_section_z = '%l:%v' " Simple line and row counter let g:airline_section_z = '%l:%v' " Simple line and row counter
" if you want to disable auto detect, comment out those two lines
"let g:airline#extensions#disable_rtp_load = 1
"let g:airline_extensions = ['branch', 'hunks', 'coc']
let g:airline_section_error = '%{airline#util#wrap(airline#extensions#coc#get_error(),0)}'
let g:airline_section_warning = '%{airline#util#wrap(airline#extensions#coc#get_warning(),0)}'
""""""""""""""""""" """""""""""""""""""
""" Keybindings """ """ Keybindings """
""""""""""""""""""" """""""""""""""""""
...@@ -135,6 +139,9 @@ map <leader>F :F .<CR> ...@@ -135,6 +139,9 @@ map <leader>F :F .<CR>
map <leader>f :Files .<CR> map <leader>f :Files .<CR>
map <leader>b :Buffers <CR> map <leader>b :Buffers <CR>
" completion
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<cr>"
"""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""
""" Python code editing settings """ """ Python code editing settings """
"""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""
...@@ -147,7 +154,7 @@ let python_highlight_all=1 ...@@ -147,7 +154,7 @@ let python_highlight_all=1
""" Ensure conforming to PEP8 """ Ensure conforming to PEP8
au FileType python au FileType python
\ setlocal tabstop=4 | \ setlocal tabstop=4 |
"""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""
...@@ -156,7 +163,7 @@ au FileType python ...@@ -156,7 +163,7 @@ au FileType python
""" Ensure conforming to my style. :D """ Ensure conforming to my style. :D
au FileType javascript,html,css,vue,typescript au FileType javascript,html,css,vue,typescript
\ setlocal tabstop=2 | \ setlocal tabstop=2 |
"""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""
"""""""" Writing prose settings """""""" """""""" Writing prose settings """"""""
......
...@@ -17,11 +17,11 @@ exports.deactivate = function (oni) { ...@@ -17,11 +17,11 @@ exports.deactivate = function (oni) {
}; };
exports.configuration = { exports.configuration = {
//add custom config here, such as //add custom config here, such as
"ui.colorscheme": "base16-tomorrow-night", // "ui.colorscheme": "base16-tomorrow-night",
"oni.hideMenu": true, "oni.hideMenu": true,
//"oni.useDefaultConfig": true, //"oni.useDefaultConfig": true,
//"oni.bookmarks": ["~/Documents"], //"oni.bookmarks": ["~/Documents"],
"oni.loadInitVim": true, // "oni.loadInitVim": true,
//"editor.fontSize": "12px", //"editor.fontSize": "12px",
"editor.fontFamily": "Fira Code", "editor.fontFamily": "Fira Code",
"experimental.markdownPreview.enabled": true, "experimental.markdownPreview.enabled": true,
......
...@@ -24,12 +24,12 @@ export const deactivate = (oni: Oni.Plugin.Api) => { ...@@ -24,12 +24,12 @@ export const deactivate = (oni: Oni.Plugin.Api) => {
export const configuration = { export const configuration = {
//add custom config here, such as //add custom config here, such as
"ui.colorscheme": "base16-tomorrow-night", // "ui.colorscheme": "base16-tomorrow-night",
"oni.hideMenu": true, "oni.hideMenu": true,
//"oni.useDefaultConfig": true, //"oni.useDefaultConfig": true,
//"oni.bookmarks": ["~/Documents"], //"oni.bookmarks": ["~/Documents"],
"oni.loadInitVim": true, // "oni.loadInitVim": true,
//"editor.fontSize": "12px", //"editor.fontSize": "12px",
"editor.fontFamily": "Fira Code", "editor.fontFamily": "Fira Code",
"experimental.markdownPreview.enabled": true, "experimental.markdownPreview.enabled": true,
......
...@@ -47,16 +47,13 @@ width = 768 ...@@ -47,16 +47,13 @@ width = 768
inherit = bar/toplane-x200 inherit = bar/toplane-x200
[bar/toplane-zilean] [bar/toplane-zilean]
font-0 = Aileron Black:size=10;0
width = 1888 width = 1888
inherit = bar/toplane-x200 inherit = bar/toplane-x200
padding = 0 padding = 1
modules-left = xworkspaces modules-left = xworkspaces
modules-right = pulseaudio-tail ethernet time modules-right = pulseaudio-tail ethernet time
network-interface = enp2s0 network-interface = enp2s0
font-0 = Fira Code Retina:size=10;0
font-1 = NotoEmoji Nerd Font Mono:size=8;0
font-2 = Noto Sans Symbols:size=8;0
font-3 = icons\-in\-terminal:size=10;1
[bar/toplane-diana] [bar/toplane-diana]
inherit = bar/toplane-x200 inherit = bar/toplane-x200
...@@ -70,8 +67,8 @@ network-interface = enp3s0 ...@@ -70,8 +67,8 @@ network-interface = enp3s0
type = internal/xworkspaces type = internal/xworkspaces
label-empty-foreground = #30 label-empty-foreground = #30
label-urgent-foreground = ${colors.yellow} label-urgent-foreground = ${colors.yellow}
label-active = "⧓ %name%" #label-active = "⧓ %name%"
label-empty = "⧑ %name%" #label-empty = "⧑ %name%"
label-active-padding = 1 label-active-padding = 1
label-empty-padding = 1 label-empty-padding = 1
label-active-foreground = ${colors.purple} label-active-foreground = ${colors.purple}
......
...@@ -74,11 +74,11 @@ layouts = [ ...@@ -74,11 +74,11 @@ layouts = [
terminal_emulator = 'urxvt' terminal_emulator = 'urxvt'
if shutil.which('xst'):
terminal_emulator = 'xst'
if shutil.which('kitty'): if shutil.which('kitty'):
terminal_emulator = 'kitty' terminal_emulator = 'kitty'
elif shutil.which('sakura'): if shutil.which('xterm'):
terminal_emulator = 'xst'
elif shutil.which('xst'):
terminal_emulator = 'xterm' terminal_emulator = 'xterm'
keys += [ keys += [
......
...@@ -21,7 +21,7 @@ dbus-send --print-reply --dest=com.github.chjj.compton.${DISPLAY/:/_} / com.gith ...@@ -21,7 +21,7 @@ dbus-send --print-reply --dest=com.github.chjj.compton.${DISPLAY/:/_} / com.gith
pkill -u $USER -USR1 dunst pkill -u $USER -USR1 dunst
i3lock \ i3lock \
-i $LOCKPAPER -t \ -i $LOCKPAPER \
-S=0 --force-clock --redraw-thread \ -S=0 --force-clock --redraw-thread \
--time-font="scientifica" \ --time-font="scientifica" \
--verif-font="scientifica" \ --verif-font="scientifica" \
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
export QT_QPA_PLATFORMTHEME="qt5ct" export QT_QPA_PLATFORMTHEME="qt5ct"
setxkbmap pl &
~/documents/scripts/autolock & ~/documents/scripts/autolock &
dunst & dunst &
...@@ -13,25 +15,20 @@ mpDris2 & ...@@ -13,25 +15,20 @@ mpDris2 &
indicator-kdeconnect & indicator-kdeconnect &
redshift & redshift &
feh --bg-tile ~/.config/misc/wallpapers/portal_out.png &
if [ "$(hostname)" = "lucian" ]; then if [ "$(hostname)" = "lucian" ]; then
# xcalib -d :0 ~/.color/icc/x200.icc & feh --bg-center ~/.config/misc/wallpapers/portal_out.png &
polybar toplane-x200 & polybar toplane-x200 &
# conky -c ~/.config/conky/config.lua &
sudo rfkill block bluetooth & sudo rfkill block bluetooth &
elif [ "$(hostname)" = "zilean" ]; then elif [ "$(hostname)" = "zilean" ]; then
polybar toplane-zilean & polybar toplane-zilean &
sudo blackwidowcontrol -i & sudo blackwidowcontrol -i &
feh --bg-center ~/.config/misc/wallpapers/plane.jpg &
firefox & firefox &
elif [ "$(hostname)" = "diana" ]; then elif [ "$(hostname)" = "diana" ]; then
polybar toplane-diana & polybar toplane-diana &
firefox & firefox &
discord & discord &
fi fi
setxkbmap pl &
telegram-desktop & telegram-desktop &
workrave &
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment