From 2b2661e0671ff291d901a748df488cd43af100a2 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Tue, 29 Oct 2019 22:35:15 +0100 Subject: [PATCH] Add config for kitty and nvim --- awesome/rc.lua | 18 ++-- install.sh | 2 + kitty/kitty.conf | 32 ++++++ nvim/ginit.vim | 6 ++ nvim/init.vim | 199 ++++++++++++++++++++++++++++++++++++ nvim/spell/pl.utf-8.add | 12 +++ nvim/spell/pl.utf-8.add.spl | Bin 0 -> 215 bytes 7 files changed, 263 insertions(+), 6 deletions(-) create mode 100644 kitty/kitty.conf create mode 100644 nvim/ginit.vim create mode 100644 nvim/init.vim create mode 100644 nvim/spell/pl.utf-8.add create mode 100644 nvim/spell/pl.utf-8.add.spl diff --git a/awesome/rc.lua b/awesome/rc.lua index 45b3540..0242b5f 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -61,7 +61,7 @@ end -- Autostart programs run_once({ "xcompmgr", - "sleep 0.25 && xrandr --output DP-1 --primary --auto --pos 0x0 --output HDMI-0 --auto --pos 2560x180", +-- "sleep 0.25 && xrandr --output DP-1 --primary --auto --pos 0x0 --output HDMI-0 --auto --pos 2560x180", "keepassxc" }) @@ -72,7 +72,7 @@ local window_titlebar = false -- Settings for dmenu prompt local modkey = "Mod4" local altkey = "Mod1" -local terminal = "urxvt" +local terminal = "kitty" local editor = os.getenv("EDITOR") or "vim" local browser = "firefox-developer-edition" local gui_editor = "code" @@ -375,7 +375,7 @@ globalkeys = awful.util.table.join( -- User programs awful.key({ modkey }, "c", function () awful.spawn(gui_editor) end, { group = "launcher", description = "Open GUI editor" }), - awful.key({ modkey }, "c", function () awful.spawn("xdg-open .") end, { group = "launcher", description = "Open File Explorer" }), + awful.key({ modkey }, "e", function () awful.spawn("xdg-open .") end, { group = "launcher", description = "Open File Explorer" }), awful.key({ modkey }, "q", function () awful.spawn(browser) end, { group = "launcher", description = "Open browser window" }), awful.key({ modkey }, "Return", function () awful.spawn(terminal) end, { group = "launcher", description = "Open terminal" }), awful.key({ }, "Pause", function () awful.spawn("playerctl play-pause") end, { group = "launcher", description = "Play/Pause" }), @@ -520,6 +520,9 @@ awful.rules.rules = { { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, properties = { titlebars_enabled = false, tag = awful.util.tagnames[1], maximized = false } }, + { rule_any = { name = { "*Emulator*", "Emulator" } }, + properties = { floating = true, titlebar_enabled = false, border_width = 0 } }, + -- flameshot { rule = { class = "flameshot" }, properties = { titlebars_enabled = true, floating = true, focus = true } }, @@ -532,11 +535,14 @@ awful.rules.rules = { properties = { titlebars_enabled = true, floating = true, focus = true } }, -- messaging - { rule_any = { class = { "TelegramDesktop", "Thunderbird" } }, - properties = { screen = 2, tag = awful.util.tagnames[4] } }, + { rule = { class = "Thunderbird" }, + properties = { tag = awful.util.tagnames[4] } }, + + { rule = { class = "TelegramDesktop" }, + properties = { tag = awful.util.tagnames[4], focusable = true, focus = true } }, { rule = { class = "jetbrains-toolbox" }, - properties = { screen = 2, tag = awful.util.tagnames[5] } }, + properties = { tag = awful.util.tagnames[5], floating = true, sticky = true } }, -- dialogs { rule = { type = "dialog" }, diff --git a/install.sh b/install.sh index 32641e6..995b1ac 100755 --- a/install.sh +++ b/install.sh @@ -25,3 +25,5 @@ ln -s $DIR/.zshrc ~/.zshrc ln -s $DIR/.Xdefaults ~/.Xdefaults ln -s $DIR/awesome/ ~/.config/awesome/ +ln -s $DIR/kitty/ ~/.config/kitty/ +ln -s $DIR/nvim/ ~/.config/nvim/ diff --git a/kitty/kitty.conf b/kitty/kitty.conf new file mode 100644 index 0000000..42a4f1b --- /dev/null +++ b/kitty/kitty.conf @@ -0,0 +1,32 @@ +font_family Fira Code Medium +font_size 9.0 + +adjust_column_width -1 + +disable_ligratures never + +window_padding_width 7 + +background_opacity 0.9 + +background #0d0f18 +foreground #fffaf3 +cursor #fffaf3 +selection_background #002a3a +color0 #222222 +color8 #444444 +color1 #ff000f +color9 #ff273f +color2 #8ce00a +color10 #abe05a +color3 #ffb900 +color11 #ffd141 +color4 #008df8 +color12 #0092ff +color5 #6c43a5 +color13 #9a5feb +color6 #00d7eb +color14 #67ffef +color7 #ffffff +color15 #ffffff +selection_foreground #0d0f18 diff --git a/nvim/ginit.vim b/nvim/ginit.vim new file mode 100644 index 0000000..b90f118 --- /dev/null +++ b/nvim/ginit.vim @@ -0,0 +1,6 @@ +" Author : kadet +" Created : 19/02/2019 +" License : MIT +" Description : + +:set guifont=Fira\ Mono\ Medium:h9 diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..5939ceb --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,199 @@ +if has('win32') || has ('win64') + let $VIMHOME = $HOME."/vimfiles" + + set backupdir=$TEMP// + set directory=$TEMP// +else + let $VIMHOME = $HOME."/.vim" +endif + +let g:vimtex_latexmk_progname = 'nvr' +let g:vimtex_view_method = 'general' +let g:vimtex_view_general_viewer = 'llpp' +let g:vimtex_latexmk_options = '-pdf -bibtex -pdflatex="xelatex -synctex=1 \%S \%O" -verbose -file-line-error -interaction=nonstopmode' +let g:deoplete#enable_at_startup = 1 + +set mouse=a + +let g:tmpl_search_paths = [ $VIMHOME.'/templates' ] + +call plug#begin($VIMHOME.'/plugged') + " Plug 'terryma/vim-multiple-cursors' + Plug 'thinca/vim-localrc' + Plug 'vim-airline/vim-airline' + Plug 'vim-airline/vim-airline-themes' + Plug 'rafi/awesome-vim-colorschemes' + Plug 'lervag/vimtex' + Plug 'ctrlpvim/ctrlp.vim' + Plug 'tpope/vim-surround' + Plug 'airblade/vim-gitgutter' + Plug 'tpope/vim-commentary' + Plug 'tibabit/vim-templates' + Plug 'Shougo/deoplete.nvim' + Plug 'gootorov/q-sharp.vim' + Plug 'tpope/vim-fugitive' + + " load local plugins + if filereadable("~/.local-plugins.vimrc") + source "~/.local-plugins.vimrc" + endif +call plug#end() + +let g:deoplete#enable_at_startup = 1 +let g:deoplete#disable_auto_complete = 1 + +call deoplete#custom#var('omni', 'input_patterns', { + \ 'tex': g:vimtex#re#deoplete +\}) + +set colorcolumn=80,120 +set t_Co=256 +set diffopt+=vertical + +" +" My own config +" + +" one time settings +if !exists("g:running") +" " Conemu specific settings +" if !has('gui_running') && !has('nvim') +" set term=xterm + +" inoremap +" nnoremap + +" let &t_AB="\e[48;5;%dm" +" let &t_AF="\e[38;5;%dm" + +" inoremap [62~ +" inoremap [63~ +" nnoremap [62~ +" nnoremap [63~ +" endif + + if has('gui_running') + set guifont=Fira_Code_Medium:h9:cANSI:qDRAFT + set guioptions= + + set columns=200 + set lines=58 + endif +endif + +let g:running = 1 + +" UTF-8 support +if has("multi_byte") + if &termencoding == "" + let &termencoding = &encoding + endif + set enc=utf-8 + set encoding=utf-8 + setglobal fileencoding=utf-8 + " setglobal bomb + " set fileencodings=ucs-bom,utf-8,latin1 +endif + +" i like to have ctrl-x menu +set shortmess-=c + +" Required for operations modifying multiple buffers like rename. +set hidden +set splitbelow +set shellslash + +" set backspace=2 +set autoindent + +" tabs +set expandtab +set tabstop=4 +set shiftwidth=4 + +" syntax +syntax on +set number + +" colors +set termguicolors +colorscheme molokai + +" disable bells +set noeb vb t_vb= + +let &t_SI = "\[6 q" +let &t_SR = "\[6 q" +let &t_EI = "\[2 q" + +" filetypes +" autocmd FileType c,cpp :compiler cl +au FileType asm :set ft=masm +au FileType tex :set tw=120 spell spelllang=pl + +" airline +let g:airline_powerline_fonts = 0 +let g:airline_theme = "powerlineish" +let g:airline#extensions#tabline#enabled = 1 + +" ctrlp +let g:ctrlp_switch_buffer = 'Et' + +" ycm config +let g:ycm_confirm_extra_conf = 0 + +" no arrows +nnoremap +nnoremap +nnoremap +nnoremap + +set completeopt=longest,menuone + +" remapings +nnoremap YY :%y+ + +nnoremap :nohlsearch + +noremap y "*y +noremap Y "*Y +noremap p "*p +noremap P "*P +noremap q gq + +nnoremap gT +nnoremap gt + +nnoremap a ggVG + +vnoremap > >gv +vnoremap < :diffget //3 | diffupdate + +command! SetCwd :cd %:p:h + +nnoremap :SetCwd + +map :set rnu! +map :source ~/.vimrc + +vnoremap gO "py:e p +vnoremap gT "py:tabe p + +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ deoplete#mappings#manual_complete() + function! s:check_back_space() abort "{{{ + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~ '\s' +endfunction"}}} + +nmap \\ :CtrlP + +" local settings +if filereadable("~/.local.vimrc") + source "~/.local.vimrc" +endif diff --git a/nvim/spell/pl.utf-8.add b/nvim/spell/pl.utf-8.add new file mode 100644 index 0000000..2ea732c --- /dev/null +++ b/nvim/spell/pl.utf-8.add @@ -0,0 +1,12 @@ +progowaniem +progowaniu +progowanie +progowania +Lakunarność +Perlina +unaturalnić +Minecraft +Bourke +Kena +predefiniowanych +turowych diff --git a/nvim/spell/pl.utf-8.add.spl b/nvim/spell/pl.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..6b23645944983b6831cc70a17a28e323c6f47405 GIT binary patch literal 215 zcmX|6yA8rH5WQy#dI|<%3kq6#2OMn0v7-%d&_d`P%B>-|peuII~ha50`f zBC_q9F80GzkWnzAgM%>~2@pA0SW<<^QcN_xvEilKia^HUM#Z94ZZd8pj1?S%aT#|y vT6G4dXF3xWW;_IsKNEHgc