Commit 213211b8 authored by Franciszek Madej's avatar Franciszek Madej 🤞

Merge branch 'master' of https://gitlab.com/franek_madej/dotfiles

parents 6224d314 5ae6be3b
......@@ -2,10 +2,6 @@
""" Neovim Configuration """
""""""""""""""""""""""""""""
let OS=substitute(system('uname -o'),"\n","","")
filetype plugin indent on " Load plugins according to detected filetype.
syntax on " Enable syntax highlighting.
set encoding =utf-8 " https://xkcd.com/927/
set autoindent " Indent according to previous line.
......@@ -14,7 +10,7 @@ set tabstop =4 " Tab key indents by 4 spaces.
set shiftwidth =0 " >> indents by tabstop spaces.
set softtabstop =-1 " >> indents by softtabstop spaces.
set shiftround " >> indents to next multiple of 'shiftwidth'.
set textwidth =79 " https://www.youtube.com/watch?v=4fndeDfaWCg
set textwidth =120 " switched from 79. I'm a heathen, I know.
set signcolumn =yes " Better UX for linters
set fileformat =unix " Obviously
......@@ -79,85 +75,43 @@ if &compatible
set nocompatible
endif
function! s:hook(hooktype, name)
echom a:hooktype
" You can use `minpac#getpluginfo()` to get the information about
" the plugin.
echom 'Directory:' minpac#getpluginfo(a:name).dir
call system('./install.sh')
endfunction
if exists('*minpac#init')
" minpac is loaded.
call minpac#init()
call minpac#add('k-takata/minpac', { 'type': 'opt' })
"""""""""""""""""""""""""
""" Installed plugins """
"""""""""""""""""""""""""
""" Speed Ups """
call minpac#add('tpope/vim-commentary') " Better comments
call minpac#add('tpope/vim-surround') " Better bracketing
"""" UI """"
call minpac#add('chriskempson/base16-vim') " Color scheme
call minpac#add('Yggdroot/indentLine') " Shows indent level
call minpac#add('myusuf3/numbers.vim') " Toggle numbers between modes
call minpac#add('vim-airline/vim-airline') " Better statusline
call minpac#add('vim-airline/vim-airline-themes') " Better statusline themes
call minpac#add('junegunn/goyo.vim') " Distraction Free!
call minpac#add('junegunn/limelight.vim') " More!
call minpac#add('ap/vim-css-color') " Color Highlighting
call minpac#add('airblade/vim-gitgutter') " Git Status on Gutter
""" File managment """
call minpac#add('scrooloose/nerdtree') " Tree explorer plugin
call minpac#add('Xuyuanp/nerdtree-git-plugin') " Show git status in NERDTree
call minpac#add('junegunn/fzf') " Super fast file finder
call minpac#add('junegunn/fzf.vim') " Same as above, just even more awesome
call minpac#add('tpope/vim-fugitive') " Git support
""" Code completion and errors """
call minpac#add('w0rp/ale') " Linter plugin
if (OS != "Android") " do something that doesn't make sense on phone
call minpac#add('autozimu/LanguageClient-neovim',
\{
\'do': function('s:hook')
\}) " LSP Plugin (run ./install.sh)
" Add the dein installation directory into runtimepath
set runtimepath+=~/.config/nvim/dein/repos/github.com/Shougo/dein.vim
if dein#load_state('~/.config/nvim/dein')
call dein#begin('~/.config/nvim/dein')
call dein#add('~/.config/nvim/dein')
call dein#add('chaoren/vim-wordmotion')
call dein#add('chriskempson/base16-vim')
call dein#add('myusuf3/numbers.vim')
call dein#add('Vimjas/vim-python-pep8-indent')
call dein#add('ekalinin/Dockerfile.vim')
call dein#add('framallo/taskwarrior.vim')
call dein#add('cespare/vim-toml')
call dein#add('chr4/nginx.vim')
call dein#add('plasticboy/vim-markdown')
if !exists('g:gui_oni')
" Statusline
call dein#add('vim-airline/vim-airline')
call dein#add('vim-airline/vim-airline-themes')
""" File managment """
call dein#add('junegunn/fzf')
call dein#add('junegunn/fzf.vim')
""" Prose """
call dein#add('junegunn/goyo.vim')
call dein#add('junegunn/limelight.vim')
endif
call minpac#add('Shougo/deoplete.nvim',
\{
\'do': ':UpdateRemotePlugins'
\}) " Autocomplete plugin
""" Language specific """
""" Python """
call minpac#add('vim-scripts/indentpython.vim') " Better Python Indentation
call minpac#add('fisadev/vim-isort') " Python imports sorting
""" Webdev """
call minpac#add('leafgarland/typescript-vim') " Typescript syntax
call minpac#add('posva/vim-vue') " Vue Single File Components Syntax
call minpac#add('mattn/emmet-vim') " Sane HTML
call minpac#add('gregsexton/MatchTag') " HTML Tags Matching
call minpac#add('wavded/vim-stylus') " Stylus Syntax
call minpac#add('pangloss/vim-javascript') " JS Syntax Improved
""" Misc """
call minpac#add('rhysd/vim-crystal') " Crystal Language Support
""" Sysadmin """
call minpac#add('ekalinin/Dockerfile.vim') " Dockerfile support
call minpac#add('framallo/taskwarrior.vim') " Taskwarrior syntax
call minpac#add('cespare/vim-toml') " TOML File syntax
call minpac#add('chr4/nginx.vim') " Nginx Configuration Files
""" Prose """
call minpac#add('plasticboy/vim-markdown') " Markdown syntax
call dein#end()
call dein#save_state()
endif
filetype plugin indent on
syntax on
""""""""""""""""""""""""""""""
""" Plugin settings here. """
""""""""""""""""""""""""""""""
......@@ -168,53 +122,17 @@ colorscheme base16-tomorrow
let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#tabline#formatter = 'default'
let g:airline_theme = 'base16_tomorrow'
let g:airline#extensions#ale#enabled = 1
let g:airline#extensions#taboo#enabled = 1
let g:airline_section_z = '%l:%v' " Simple line and row counter
" Show all levels of indent
let g:indentLine_showFirstIndentLevel = 1
" Enable autocomplete
let g:deoplete#enable_at_startup = 1
" LanguageClient
let g:LanguageClient_autoStart=1
let g:LanguageClient_serverCommands = {
\ 'vue': ['vls'],
\ 'crystal': ['scry'],
\ 'python': ['pyls'],
\ 'javascript': ['javascript-typescript-stdio'],
\ 'typescript': ['javascript-typescript-stdio']
\}
nnoremap <F5> :call LanguageClient_contextMenu()<CR>
"""""""""""""""""""
""" Keybindings """
"""""""""""""""""""
let g:rg_command = '
\ rg --column --line-number --no-heading --fixed-strings
\ --ignore-case --no-ignore --hidden --follow --color "always"
\ -g "*.{js,json,php,md,styl,jade,html,config,py,cpp,c,go,hs,rb,conf}"
\ -g "!{.git,node_modules,vendor}/*" '
command! -bang -nargs=* F call fzf#vim#grep(g:rg_command .shellescape(<q-args>), 1, <bang>0)
" File and editor navigation
map <leader>n :NERDTreeToggle<CR>
map <leader>F :F .<CR>
map <leader>f :Files .<CR>
map <leader>b :Buffers <CR>
" Linter and completion settings
map <leader>i :call LanguageClient_textDocument_hover()<CR>
map <leader>d :call LanguageClient_textDocument_definition()<CR>
map <leader>r :call LanguageClient_textDocument_rename()<CR>
""""""""""""""""""""""""""""""""""""
""" Python code editing settings """
""""""""""""""""""""""""""""""""""""
......@@ -237,8 +155,6 @@ au FileType python
""" Ensure conforming to my style. :D
au FileType javascript,html,css,vue,typescript
\ setlocal tabstop=2 |
au FileType html
\ setlocal textwidth=
""""""""""""""""""""""""""""""""""""""""
"""""""" Writing prose settings """"""""
......@@ -246,9 +162,3 @@ au FileType html
autocmd! User GoyoEnter Limelight
autocmd! User GoyoLeave Limelight!
" Define user commands for updating/cleaning the plugins.
" Each of them loads minpac, reloads .vimrc to register the
" information of plugins, then performs the task.
command! PackUpdate packadd minpac | source $MYVIMRC | call minpac#update()
command! PackClean packadd minpac | source $MYVIMRC | call minpac#clean()
"use strict";
exports.__esModule = true;
exports.activate = function (oni) {
console.log("config activated");
// Input
//
// Add input bindings here:
//
oni.input.bind("<c-enter>", function () { return console.log("Control+Enter was pressed"); });
//
// Or remove the default bindings here by uncommenting the below line:
//
// oni.input.unbind("<c-p>")
};
exports.deactivate = function (oni) {
console.log("config deactivated");
};
exports.configuration = {
//add custom config here, such as
"ui.colorscheme": "base16-tomorrow",
"oni.hideMenu": true,
//"oni.useDefaultConfig": true,
//"oni.bookmarks": ["~/Documents"],
"oni.loadInitVim": true,
//"editor.fontSize": "12px",
"editor.fontFamily": "Fira Code",
"experimental.markdownPreview.enabled": true,
"experimental.markdownPreview.autoscroll": true,
"editor.clipboard.enabled": true,
// UI customizations
"ui.animations.enabled": true,
"ui.fontSmoothing": "auto",
"ui.fontFamily": "Fira Sans"
};
import * as React from "react"
import * as Oni from "oni-api"
export const activate = (oni: Oni.Plugin.Api) => {
console.log("config activated")
// Input
//
// Add input bindings here:
//
oni.input.bind("<c-enter>", () => console.log("Control+Enter was pressed"))
//
// Or remove the default bindings here by uncommenting the below line:
//
// oni.input.unbind("<c-p>")
}
export const deactivate = (oni: Oni.Plugin.Api) => {
console.log("config deactivated")
}
export const configuration = {
//add custom config here, such as
"ui.colorscheme": "base16-tomorrow",
"oni.hideMenu": true,
//"oni.useDefaultConfig": true,
//"oni.bookmarks": ["~/Documents"],
"oni.loadInitVim": true,
//"editor.fontSize": "12px",
"editor.fontFamily": "Fira Code",
"experimental.markdownPreview.enabled": true,
"experimental.markdownPreview.autoscroll": true,
"editor.clipboard.enabled": true,
// UI customizations
"ui.animations.enabled": true,
"ui.fontSmoothing": "auto",
"ui.fontFamily": "Fira Sans"
}
......@@ -23,8 +23,8 @@ module-margin = 1
padding = 1
foreground = ${colors.black}
background = ${colors.clear}
border-size = 1
border-color = ${colors.purple}
border-size = 0
border-color = ${colors.black}
font-0 = Fira Code:size=8;0
font-1 = NotoEmoji Nerd Font Mono:size=8;0
......@@ -32,7 +32,7 @@ font-2 = Noto Sans Symbols:size=8;0
font-3 = Noto Sans Symbols2:size=8;0
font-4 = icons\-in\-terminal:size=8;0
line-size = 1
line-color = ${colors.black}
line-color = ${colors.purple}
modules-left = xworkspaces
modules-right = battery pulseaudio network time
......@@ -43,6 +43,10 @@ tray-padding = 5
tray-maxsize = 20
tray-background = ${colors.clear}
[bar/toplane-x200-external]
width = 1888
inherit = bar/toplane-x200
[bar/toplane-zilean]
width = 1888
inherit = bar/toplane-x200
......@@ -62,7 +66,7 @@ network-interface = enp3s0
type = internal/xworkspaces
; very light on not used
label-empty-foreground = #30
label-active-underline = ${colors.black}
label-active-underline = ${colors.purple}
; icons are smaller
icon-default = ▲
label-active = " %icon% "
......@@ -77,9 +81,9 @@ time-format = %H:%M
label-charging = 🔌 %percentage%% (%time%)
label-full = 🔌 100%
label-discharging = 🔋 %percentage%% (%time%)
format-charging-underline = ${colors.black}
format-discharging-underline = ${colors.black}
format-full-underline = ${colors.black}
format-charging-underline = ${colors.purple}
format-discharging-underline = ${colors.yellow}
format-full-underline = ${colors.yellow}
format-discharging-padding = 1
format-charging-padding = 1
......@@ -88,7 +92,7 @@ format-charging-padding = 1
type = internal/pulseaudio
label-volume = 🔊 %percentage%%
label-muted = 🔇 %percentage%%
format-volume-underline = ${colors.black}
format-volume-underline = ${colors.red}
format-muted-underline = ${colors.red}
format-volume-padding = 1
format-muted-padding = 1
......@@ -100,20 +104,20 @@ interface = ${root.network-interface}
label-connected = 🌍 %local_ip%
label-connected-padding = 1
format-connected = <label-connected>
format-connected-underline = ${colors.black}
format-connected-underline = ${colors.green}
[module/network]
type = internal/network
interface = wls1
format-connected = <label-connected><ramp-signal>
label-connected-underline = ${colors.black}
label-connected-underline = ${colors.blue}
label-connected = "%essid%"
label-connected-padding = 0
label-disconnected-padding = 0
ramp-signal-font = 3
ramp-signal-underline = ${colors.black}
ramp-signal-underline = ${colors.purple}
ramp-signal-0 = " 🜄 "
ramp-signal-1 = " 🜃 "
ramp-signal-2 = " 🜃 "
......@@ -126,13 +130,13 @@ type = internal/date
time = %H:%M
time-alt= %H:%M:%S %A, %d %B %Y
label = %time%
label-underline = ${colors.black}
label = %time% %date%
label-underline = ${colors.light-blue}
label-padding = 1
[module/pulseaudio-tail]
type = custom/script
exec = /home/kosciak/documents/scripts/sinkcheck
tail = true
label-underline = ${colors.black}
label-underline = ${colors.purple}
label-padding = 1
......@@ -69,7 +69,7 @@ for index, group_name in enumerate(groups):
layouts = [
layout.MonadTall(border_focus=color_list['purple'],
border_normal=color_list['clear'],
border_width=1, margin=16, ratio=0.65),
border_width=2, margin=16, ratio=0.65),
]
terminal_emulator = 'urxvt'
......
......@@ -5,6 +5,7 @@ set -g @plugin "tmux-plugins/tmux-online-status"
set -g @plugin "tmux-plugins/tmux-yank"
set -g @plugin "tmux-plugins/tmux-prefix-highlight"
set -g @plugin 'tmux-plugins/tmux-pain-control'
set -g @plugin "tmux-plugins/tmux-sidebar"
set -g @online_icon "↑"
set -g @offline_icon "↓"
......@@ -55,40 +56,18 @@ set -g @prefix_highlight_fg "colour231 bold"
set -g @prefix_highlight_bg "colour9"
set -g @prefix_highlight_copy_prompt "visual"
# Tree View
set -g @sidebar-tree-command 'exa -T -L=4 --git --git-ignore --color=always'
set -g @sidebar-tree-pager 'less -r'
# Keybindings
# remap prefix from "C-b" to "C-a"
unbind C-b
set-option -g prefix C-a
# bind-key C-a send-prefix
# split panes using | and -
# bind | split-window -h
# bind - split-window -v
# unbind '"'
# unbind %
# enable mouse control
# set -g mouse on
# disable windows renaming. use , (comma)
# set-window-option -g automatic-rename off
# set-option -g allow-rename off
# vim-like navigation
# bind h select-pane -L
# bind j select-pane -D
# bind k select-pane -U
# bind l select-pane -R
# copy tmux buffer to clipboard
# bind C-y run "tmux show-buffer | xclip -selection clipboard"
# move x clipboard into tmux paste buffer
# bind C-p run "tmux set-buffer \"$(xclip -selection clipboard)\"; tmux paste-buffer"
# nested sessions - Ctrl+t
bind-key -n C-t send-prefix
# nested sessions - Ctrl+a
# bind-key -n C-t send-prefix
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run "~/.tmux/plugins/tpm/tpm"
......@@ -66,24 +66,3 @@ nnoremap <C-J> <C-W><C-J>
nnoremap <C-K> <C-W><C-K>
nnoremap <C-L> <C-W><C-L>
nnoremap <C-H> <C-W><C-H>
""""""""""""""""""""""""""""""""""""
""" Python code editing settings """
""""""""""""""""""""""""""""""""""""
""" loosley based on
""" https://realpython.com/vim-and-python-a-match-made-in-heaven/
""" Ensure conforming to PEP8
au FileType python
\ setlocal tabstop=4 |
""""""""""""""""""""""""""""""""""""""""
""" JavaScript code editing settings """
""""""""""""""""""""""""""""""""""""""""
""" Ensure conforming to my style. :D
au FileType javascript,html,css,vue
\ setlocal tabstop=2 |
......@@ -12,6 +12,12 @@ cd;
git clone https://github.com/k-takata/minpac.git .config/nvim/pack/minpac/opt/minpac
echo ""
# Tmux setup
echo "Installing tmux plugin manager"
cd;
git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
echo ""
# Kitty Terminal Emulator Setup
tic ~/.terminfo/kitty.terminfo;
......
No preview for this file type
......@@ -9,7 +9,7 @@ setxkbmap pl &
unclutter &
mpDris2 &
mconnect -d &
indicator-kdeconnect &
redshift &
feh --bg-tile ~/.config/misc/wallpaper-tile-light.png &
......@@ -17,6 +17,7 @@ feh --bg-tile ~/.config/misc/wallpaper-tile-light.png &
if [ "$HOSTNAME" = "lucian" ]; then
xcalib -d :0 ~/.color/icc/x200.icc &
polybar toplane-x200 &
sudo rfkill block bluetooth &
elif [ "$HOSTNAME" = "zilean" ]; then
polybar toplane-zilean &
......@@ -30,3 +31,4 @@ elif [ "$HOSTNAME" = "diana" ]; then
fi
telegram-desktop &
workrave &
......@@ -23,7 +23,7 @@ if which reflector 1> /dev/null 2>&1; then
echo "";
echo "$bold_color$fg[blue]updating mirrorlist${reset_color}";
echo "";
sudo reflector --latest 200 --age 24 --sort rate --save /etc/pacman.d/mirrorlist;
sudo reflector --verbose --latest 200 --age 24 --sort rate --save /etc/pacman.d/mirrorlist;
if [ -f /etc/pacman.d/mirrorlist.pacnew ]; then
sudo rm /etc/pacman.d/mirrorlist.pacnew;
fi
......
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