Browse Source

config rearrangement

pull/3/head
Jibreil 3 years ago
parent
commit
9146886372
  1. 117
      i3/.config/i3/config
  2. 217
      nvim/.config/nvim/init.vim
  3. 19
      polybar/.config/polybar/config

117
i3/.config/i3/config

@ -1,89 +1,50 @@ @@ -1,89 +1,50 @@
#####################################################
# __ __ _ __ ___ ___ _
# / //_/(_)___ ___ _ / /__ |_ | |_ |( )___
# / ,< / // _ \/ _ `// '_// __/ / __/ |/(_-<
# /_/|_|/_//_//_/\_, //_/\_\/____//____/ /___/
# /___/
# _ ____ _____ ___ _
# (_)|_ / / ___/___ ___ / _/(_)___ _
# / /_/_ < / /__ / _ \ / _ \ / _// // _ `/
# /_//____/ \___/ \___//_//_//_/ /_/ \_, /
# /___/
#
#####################################################
## auto start locker
exec --no-startup-id betterlockscreen -l dim
## bar
exec_always --no-startup-id ~/.config/polybar/launch.sh
## borders
for_window [class=".*"] border pixel 0
for_window [class="URxvt"] border pixel 8
for_window [class="Zathura"] border pixel 8
## brightness
bindsym XF86MonBrightnessUp exec brightnessctl set +10% && sleep 0.1 && brightnessctl get
bindsym XF86MonBrightnessDown exec brightnessctl set 10%- && sleep 0.1 && brightnessctl get
## colours
# class border bg text indicator child_border
client.focused #151718 #151718 #A074C4 #A074C4 #A074C4
client.focused_inactive #151718 #151718 #d0d0d0 #2c2e2f #2c2e2f
client.unfocused #151718 #151718 #d0d0d0 #2c2e2f #2c2e2f
client.urgent #151718 #151718 #e6cd69 #e6cd69
## compton
exec_always --no-startup-id compton
## change window focus
bindsym $mod+Left focus left
bindsym $mod+Down focus down
bindsym $mod+Up focus up
bindsym $mod+Right focus right
## dunst
exec_always --no-startup-id ~/.config/dunst/launch.sh
## floating windows
floating_modifier $mod
bindsym $mod+Shift+space floating toggle
bindsym $mod+space focus mode_toggle
bindsym $mod+Control+space move position center
## font
font pango:iosevka 18
## gaps
gaps inner 60
gaps outer 0
bindsym $mod+g mode "gaps: [i]nner | [o]uter"
mode "gaps: [i]nner | [o]uter" {
bindsym o mode "gaps_outer"
bindsym i mode "gaps_inner"
@ -91,7 +52,6 @@ mode "gaps: [i]nner | [o]uter" { @@ -91,7 +52,6 @@ mode "gaps: [i]nner | [o]uter" {
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "gaps_inner" {
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
@ -101,7 +61,6 @@ mode "gaps_inner" { @@ -101,7 +61,6 @@ mode "gaps_inner" {
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "gaps_outer" {
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
@ -112,41 +71,27 @@ mode "gaps_outer" { @@ -112,41 +71,27 @@ mode "gaps_outer" {
bindsym Escape mode "default"
}
## kill window
bindsym $mod+Shift+q kill
## layout
bindsym $mod+f fullscreen toggle
bindsym $mod+t layout toggle
## lock + suspend
#bindsym $mod+l exec i3lock-fancy -pt ""
#bindsym $mod+s exec i3lock-fancy -pt "" && systemctl suspend
bindsym $mod+l exec betterlockscreen -l dim
bindsym $mod+s exec betterlockscreen -s dim
## media controls
bindsym XF86AudioPlay exec playerctl play-pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
bindsym XF86AudioStop exec playerctl stop
## mod key
set $mod Mod4
## move window to workspace
bindsym $mod+Shift+1 move container to workspace 1
bindsym $mod+Shift+2 move container to workspace 2
bindsym $mod+Shift+3 move container to workspace 3
@ -158,9 +103,7 @@ bindsym $mod+Shift+8 move container to workspace 8 @@ -158,9 +103,7 @@ bindsym $mod+Shift+8 move container to workspace 8
bindsym $mod+Shift+9 move container to workspace 9
bindsym $mod+Shift+0 move container to workspace 10
## move window to workspace and go to workspace
bindsym $mod+Ctrl+1 move container to workspace 1; workspace 1
bindsym $mod+Ctrl+2 move container to workspace 2; workspace 2
bindsym $mod+Ctrl+3 move container to workspace 3; workspace 3
@ -172,56 +115,18 @@ bindsym $mod+Ctrl+8 move container to workspace 8; workspace 8 @@ -172,56 +115,18 @@ bindsym $mod+Ctrl+8 move container to workspace 8; workspace 8
bindsym $mod+Ctrl+9 move container to workspace 9; workspace 9
bindsym $mod+Ctrl+0 move container to workspace 10; workspace 10
## move window within workspace
bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right
## power menu
bindsym $mod+x mode "power: [l]ock | [r]eboot | [s]uspend | sh[u]tdown"
mode "power: [l]ock | [r]eboot | [s]uspend | sh[u]tdown" {
bindsym l exec i3-msg mode "default" && i3lock-fancy -pt ""
bindsym r mode "reboot: [y]es or [n]o"
bindsym s exec i3-msg mode "default" && i3lock-fancy -pt "" && systemctl suspend
bindsym u mode "shutdown: [y]es or [n]o"
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "reboot: [y]es or [n]o" {
bindsym y exec systemctl reboot
bindsym n mode "default"
bindsym Return exec systemctl reboot
bindsym Escape mode "default"
}
mode "shutdown: [y]es or [n]o" {
bindsym y exec systemctl poweroff
bindsym n mode "default"
bindsym Return exec systemctl poweroff
bindsym Escape mode "default"
}
## reload/restart i3
bindsym $mod+Shift+w reload
bindsym $mod+Shift+r restart
## resize windows
bindsym $mod+r mode "resize"
mode "resize" {
bindsym Up resize grow height
bindsym Down resize shrink height
@ -232,61 +137,42 @@ mode "resize" { @@ -232,61 +137,42 @@ mode "resize" {
bindsym Escape mode "default"
}
## rofi (replacing dmenu)
## rofi
bindsym $mod+d exec rofi -show run
bindsym $mod+w exec rofi -show window
## scratchpad
bindsym $mod+End move scratchpad
bindsym $mod+Home scratchpad show
## screenshot (nougat)
bindsym $mod+Ctrl+f exec nougat --screenshot -fcs && dunstify "fullscreen screenshot saved"
bindsym $mod+Shift+f exec nougat --screenshot -fcst && dunstify "fullscreen screenshot copied"
bindsym $mod+Ctrl+s exec nougat --screenshot -cs && dunstify "area/window screenshot saved"
bindsym $mod+Shift+s exec nougat --screenshot -cst && dunstify "area/window screenshot copied"
bindsym Print exec nougat --screenshot -fcst && dunstify "fullscreen screenshot copied"
bindsym $mod+Print exec nougat --screenshot -fcs && dunstify "fullscreen screenshot saved"
## URxvt
bindsym $mod+Return exec urxvt --depth 32
## volume
bindsym XF86AudioRaiseVolume exec pulseaudio-ctl up 5
bindsym XF86AudioLowerVolume exec pulseaudio-ctl down 5
bindsym XF86AudioMute exec pulseaudio-ctl mute
## wallpaper/colours
exec_always --no-startup-id xrdb -load ~/.Xresources
exec_always --no-startup-id hsetroot -solid "#151718"
## window titles
for_window [class=".*"] title_format " %title"
## window split direction
bindsym $mod+h split h
bindsym $mod+v split v
## workspace switching settings
workspace_auto_back_and_forth yes
bindsym $mod+Tab workspace next
bindsym $mod+Shift+Tab workspace prev
@ -294,7 +180,6 @@ bindsym $mod+Next workspace next @@ -294,7 +180,6 @@ bindsym $mod+Next workspace next
bindsym $mod+Prior workspace prev
## workspace switching
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
bindsym $mod+3 workspace 3

217
nvim/.config/nvim/init.vim

@ -1,195 +1,126 @@ @@ -1,195 +1,126 @@
"=====================================================
" __ __ _ __ ___ ___ _
" / //_/(_)___ ___ _ / /__ |_ | |_ |( )___
" / ,< / // _ \/ _ `// '_// __/ / __/ |/(_-<
" /_/|_|/_//_//_/\_, //_/\_\/____//____/ /___/
" /___/
" _
" ___ ___ ___ _ __ (_)__ _
" / _ \/ -_)/ _ \| |/ // // ' \
" /_//_/\__/ \___/|___//_//_/_/_/
"
" _____ ___ _
" / ___/___ ___ / _/(_)___ _
" / /__ / _ \ / _ \ / _// // _ `/
" \___/ \___//_//_//_/ /_/ \_, /
" /___/
"
"=====================================================
" Always exit all files
" cnoreabbrev q qa
" cnoreabbrev wq wqa
"=====================================================
" Auto commands
" auto commands
augroup General
autocmd FileType markdown,text,tex setlocal spell
" autocmd BufReadPost *.md Goyo 85%x85%
autocmd VimResized * execute "normal \<C-W>="
augroup END
"=====================================================
" Basic options
set nocompatible
" basic options
filetype plugin on
syntax on
set nocompatible
set path+=**
set wildmenu
set updatetime=100
set wildmenu
syntax on
"=====================================================
" Colours
" colours
hi LineNr ctermfg=8
hi CursorLineNr ctermfg=5
hi TabLineSel ctermfg=5 ctermbg=0
hi TabLine ctermfg=7 ctermbg=0
hi TabLineFill ctermfg=0 ctermbg=1
hi LineNr ctermfg=8
hi CursorLineNr ctermfg=1
"=====================================================
" Hide end-of-file symbols
" disable bells
set t_vb=
set visualbell
" hide end of file symbols
hi EndOfBuffer ctermbg=black ctermfg=black guibg=black guifg=black
"=====================================================
" Indenting
" indenting
set autoindent
set smartindent
"=====================================================
" Netrw
" netrw
let g:netrw_banner=0 " disable annoying banner
"let g:netrw_browse_split=4 " open in prior window
"let g:netrw_altv=1 " open splits to the right
let g:netrw_liststyle=3 " tree view
let g:netrw_list_hide=netrw_gitignore#Hide()
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
"=====================================================
" No backup file
" no backup file
set nobackup
"=====================================================
" On pressing tab, insert 4 spaces
set expandtab
set tabstop=4
set shiftwidth=4
"=====================================================
" Plugins
" plugins
call plug#begin('~/.vim/plugged')
"Plug 'francoiscabrol/ranger.vim'
Plug 'lervag/vimtex'
Plug 'junegunn/goyo.vim'
Plug 'google/vim-codefmt'
Plug 'google/vim-maktaba'
Plug 'google/vim-glaive'
Plug 'airblade/vim-gitgutter'
"Plug 'mzlogin/vim-markdown-toc'
Plug 'junegunn/goyo.vim'
Plug 'airblade/vim-gitgutter'
Plug 'lervag/vimtex'
Plug 'google/vim-codefmt'
Plug 'google/vim-maktaba'
Plug 'google/vim-glaive'
call plug#end()
"=====================================================
" Ranger
"let g:ranger_map_keys = 0
"map <leader>r :Ranger<CR>
"let g:ranger_replace_netrw = 1
"=====================================================
" Searching
" searching
set hlsearch
set incsearch
set ignorecase
set incsearch
set smartcase
nnoremap <esc> :noh<CR>
"=====================================================
" Set title of file as window title
" set title of file as window title
set title
"=====================================================
" Show invisible characters
" show invisible characters
set listchars=tab:▸\ ,trail,eol,nbsp:_
"=====================================================
" Spelling
" spelling
set spelllang=en_au
hi SpellBad ctermbg=1 ctermfg=0
"=====================================================
" Splits
" splits
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>
set splitbelow
set splitright
"=====================================================
" UI
" tab > 4 spaces
set expandtab
set shiftwidth=4
set tabstop=4
set cmdheight=1
set laststatus=1
"set noshowmode
set number
" ui
set relativenumber
set scrolloff=10
set shortmess=at
set ttyfast
"=====================================================
" Wrapping
set breakindent
set linebreak
nnoremap <down> gj
nnoremap <up> gk
vnoremap <down> gj
vnoremap <up> gk
"set cmdheight=1
"set laststatus=1
"set noshowmode
"set shortmess=at
" wrapping
"nnoremap <down> gj
"nnoremap <up> gk
"vnoremap <down> gj
"vnoremap <up> gk
"set breakindent
"set linebreak
" no line wrapping
set nowrap
set textwidth=0
set wrapmargin=0
" status bar colors
hi StatusLine ctermfg=0 ctermbg=8 cterm=none term=none
hi User1 ctermfg=8 ctermbg=0 cterm=none term=none
hi User2 ctermfg=8 ctermbg=none cterm=none term=none
hi User3 ctermfg=8 ctermbg=0 cterm=none term=none
hi User4 ctermfg=0 ctermbg=8 cterm=none term=none
" status bar
set statusline=\ "
set statusline+=%t "
set statusline+=\ %1*\ "
set statusline+=%y "
set statusline+=\ %2*\ "
set statusline+=%= "
set statusline+=\ %3*\ "
set statusline+=line "
set statusline+=\ "
set statusline+=%l "
set statusline+=\ %4*\ "
set statusline+=of "
set statusline+=\ "
set statusline+=%L "
set statusline+=\ "

19
polybar/.config/polybar/config

@ -1,21 +1,3 @@ @@ -1,21 +1,3 @@
;=====================================================
; __ __ _ __ ___ ___ _
; / //_/(_)___ ___ _ / /__ |_ | |_ |( )___
; / ,< / // _ \/ _ `// '_// __/ / __/ |/(_-<
; /_/|_|/_//_//_/\_, //_/\_\/____//____/ /___/
; /___/
; ___ __ __
; / _ \ ___ / /__ __ / / ___ _ ____
; / ___// _ \ / // // // _ \/ _ `// __/
; /_/ \___//_/ \_, //_.__/\_,_//_/
; /___/
; _____ ___ _
; / ___/___ ___ / _/(_)___ _
; / /__ / _ \ / _ \ / _// // _ `/
; \___/ \___//_//_//_/ /_/ \_, /
; /___/
;=====================================================
[colours]
; dark
@ -34,7 +16,6 @@ alert = ${xrdb:color1} @@ -34,7 +16,6 @@ alert = ${xrdb:color1}
;primary = ${xrdb:color4}
; end
secondary = #bf5f4d
;=====================================================

Loading…
Cancel
Save