diff options
| -rw-r--r-- | .alacritty.yml | 20 | ||||
| -rw-r--r-- | .config/i3/config | 208 | ||||
| -rw-r--r-- | .config/i3/workspace.json | 64 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 5 | ||||
| -rw-r--r-- | .config/nvim/vim-plug/plugins.vim | 8 | ||||
| -rw-r--r-- | .gitconfig | 7 | ||||
| -rwxr-xr-x | .local/bin/i3-workspace.sh | 21 | ||||
| -rw-r--r-- | .vimrc | 138 | ||||
| -rw-r--r-- | .xinitrc | 41 | ||||
| -rw-r--r-- | .zshrc | 18 |
10 files changed, 530 insertions, 0 deletions
diff --git a/.alacritty.yml b/.alacritty.yml new file mode 100644 index 0000000..de68a05 --- /dev/null +++ b/.alacritty.yml @@ -0,0 +1,20 @@ +font: + normal: + family: DejaVuSansMono Nerd Font + size: 7 + +# Gruvbox theme +colors: + primary: + background: '#282828' + foreground: '#ebdbb2' + + normal: + black: '#282828' + red: '#cc241d' + green: '#98971a' + yellow: '#d79921' + blue: '#458588' + magenta: '#b16286' + cyan: '#689d6a' + white: '#a89984' diff --git a/.config/i3/config b/.config/i3/config new file mode 100644 index 0000000..c06ea59 --- /dev/null +++ b/.config/i3/config @@ -0,0 +1,208 @@ +# i3 config file (v4) +set $mod Mod4 +font pango:DejaVu Sans Mono 8 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio and display it in Volnoti +set $show_volume volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1) +bindsym XF86AudioRaiseVolume exec --no-startup-id "pactl set-sink-volume @DEFAULT_SINK@ +5% && $show_volume" +bindsym XF86AudioLowerVolume exec --no-startup-id "pactl set-sink-volume @DEFAULT_SINK@ -5% && $show_volume" +bindsym XF86AudioMute exec --no-startup-id "pactl set-sink-mute @DEFAULT_SINK@ toggle && if amixer get Master | grep -Fq '[off]'; then volnoti-show -m; else $show_volume; fi" +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle + +# Screenshot via ImageMagick +bindsym --release Shift+Print exec --no-startup-id import screenshot.png && xclip -selection clipboard -target image/png -i < screenshot.png && rm screenshot.png +bindsym --release Print exec --no-startup-id import -window root screenshot.png && xclip -selection clipboard -target image/png -i < screenshot.png && rm screenshot.png + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# start a terminal (default: i3-sensible-terminal) +bindsym $mod+Return exec alacritty + +# kill focused window +bindsym $mod+Shift+q kill + +# start dmenu (a program launcher) +bindsym $mod+d exec rofi -show combi -theme gruvbox-dark-soft + +# change focus +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+h move left +bindsym $mod+Shift+j move down +bindsym $mod+Shift+k move up +bindsym $mod+Shift+l move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation (!) changed to g +bindsym $mod+g split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +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" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt + bindsym k resize shrink height 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# mic crazy bassboost mode +set $default_volume 17000 +set $bass_volume 90000 +set $change_volume pacmd set-source-volume 1 +bindsym $mod+b mode "bassboost" exec $change_volume $bass_volume +mode "bassboost" { + bindsym --release $mod+b mode "default" exec $change_volume $default_volume +} + + +# set primary gruvbox colorscheme colors +set $bg #282828 +set $red #cc241d +set $green #98971a +set $yellow #d79921 +set $blue #458588 +set $purple #b16286 +set $aqua #689d68 +set $gray #a89984 +set $darkgray #1d2021 + +# green gruvbox +# class border|backgr|text|indicator|child_border +client.focused $darkgray $yellow $darkgray $purple $darkgray +client.focused_inactive $darkgray $darkgray $yellow $purple $darkgray +client.unfocused $darkgray $darkgray $yellow $purple $darkgray +client.urgent $red $red $white $red $red + +# i3gaps +for_window [class=".*"] border pixel 0 +gaps inner 12 + +# i3blocks +bar { + status_command i3blocks -c ~/.config/i3blocks.conf + position top + colors { + focused_workspace $yellow $yellow #000000 + active_workspace #333333 #333333 $purple + inactive_workspace #CECECE #333333 #f1f1f1 + urgent_workspace #eb709b #eb709b #ffffff + } +} + +exec volnoti +exec hsetroot -cover ~/wallpaper.jpg +exec redshift -P & +exec picom -c -i 0.9 -D 0 & + diff --git a/.config/i3/workspace.json b/.config/i3/workspace.json new file mode 100644 index 0000000..a58da53 --- /dev/null +++ b/.config/i3/workspace.json @@ -0,0 +1,64 @@ +{ + "border": "normal", + "current_border_width": 2, + "floating": "auto_off", + "geometry": { + "height": 436, + "width": 724, + "x": 0, + "y": 0 + }, + "percent": 0.7, + "swallows": [ + { + "title": "^nvim" + } + ], + "type": "con" +} + +{ + "border": "normal", + "floating": "auto_off", + "layout": "splitv", + "percent": 0.3, + "type": "con", + "nodes": [ + { + "border": "normal", + "current_border_width": 2, + "floating": "auto_off", + "geometry": { + "height": 436, + "width": 724, + "x": 0, + "y": 0 + }, + "percent": 0.7, + "swallows": [ + { + "title": "^primary-terminal" + } + ], + "type": "con" + }, + { + "border": "normal", + "current_border_width": 2, + "floating": "auto_off", + "geometry": { + "height": 436, + "width": 724, + "x": 0, + "y": 0 + }, + "percent": 0.3, + "swallows": [ + { + "title": "^secondary-terminal" + } + ], + "type": "con" + } + ] +} diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim new file mode 100644 index 0000000..b16b89f --- /dev/null +++ b/.config/nvim/init.vim @@ -0,0 +1,5 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.config/nvim/vim-plug/plugins.vim +source ~/.vimrc + diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim new file mode 100644 index 0000000..0663b4f --- /dev/null +++ b/.config/nvim/vim-plug/plugins.vim @@ -0,0 +1,8 @@ +call plug#begin('~/.config/nvim/autoload/plugged') + Plug 'mhinz/vim-startify', {'branch': 'center'} + Plug 'vimwiki/vimwiki' + " Dark-powered file explorer + Plug 'shougo/defx.nvim', + Plug 'kristijanhusak/defx-icons' + Plug 't9md/vim-choosewin' +call plug#end() diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..132f42d --- /dev/null +++ b/.gitconfig @@ -0,0 +1,7 @@ +[user] + email = eug-vs@keemail.me + name = eug-vs +[core] + editor = nvim +[pull] + rebase = true diff --git a/.local/bin/i3-workspace.sh b/.local/bin/i3-workspace.sh new file mode 100755 index 0000000..fdfd6b3 --- /dev/null +++ b/.local/bin/i3-workspace.sh @@ -0,0 +1,21 @@ +# !/bin/bash +# Generate layout from JSON in a separate +# workspace and open nvim + alacritty. +# Requires workspace.json (see $LAYOUT, can be copied +# from config/i3/workspace.json). + +LAYOUT=~/.config/i3/workspace.json + +WORKSPACE=$(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1)) +WORKDIR=$1 + +i3-msg "workspace $WORKSPACE; append_layout $LAYOUT" +alacritty --title "nvim" --working-directory $WORKDIR -e zsh -c "nvim; zsh" & +alacritty --title "primary-terminal" --working-directory $WORKDIR -e zsh & +alacritty --title "secondary-terminal" --working-directory $WORKDIR -e zsh & + +# Fix weird nvim + Alacritty behaviour +# TODO: remove this hack after you start using Tmux +sleep 0.3 +i3-msg reload + @@ -0,0 +1,138 @@ +" Vim configuration file +" Author: eug-vs + + +" enter the current millenium +set nocompatible +syntax enable +filetype plugin on + +" general stuff +set number +set relativenumber +set cursorline +set hidden " Required to keep multiple buffers open multiple buffers +set nowrap " Display long lines as just one line +set ruler " Show the cursor position all the time +set conceallevel=0 " So that I can see `` in markdown files +set tabstop=2 " Insert 2 spaces for a tab +set shiftwidth=2 " Change the number of space characters inserted for indentation +set smarttab " Makes tabbing smarter will realize you have 2 vs 4 +set expandtab " Converts tabs to spaces +set smartindent " Makes indenting smart +set autoindent " Good auto indent +set showtabline=2 " Always show tabs +set noshowmode " We don't need to see things like -- INSERT -- anymore +set clipboard=unnamedplus " Copy paste between vim and everything else + +" enable gruvbox colorscheme from AUR: +" https://aur.archlinux.org/packages/vim-gruvbox-git/ +autocmd vimenter * ++nested colorscheme gruvbox + +" vimrc management +nnoremap <leader>ev :rightbelow vs ~/.vimrc<CR> +nnoremap <leader>sv :source $MYVIMRC<CR> + +" windows +set splitbelow +set splitright +nnoremap <TAB> <C-w>w +nnoremap <S-TAB> <C-w>W +nnoremap <c-h> <C-w>h +nnoremap <c-j> <C-w>j +nnoremap <c-k> <C-w>k +nnoremap <c-l> <C-w>l + +" Defx +nnoremap <silent> <F3> :Defx<CR> +autocmd FileType defx call s:defx_my_settings() +autocmd BufEnter * if(winnr("$") == 1 && &ft == 'defx') | q | endif + +function! s:defx_my_settings() abort + set nonumber + set norelativenumber + + nnoremap <buffer><expr> l + \ defx#is_directory() ? + \ defx#do_action('open_tree') : + \ defx#do_action('open', 'choose') + nnoremap <silent><buffer><expr> h + \ defx#do_action('close_tree') + nnoremap <silent><buffer><expr> dd + \ defx#do_action('remove') + nnoremap <silent><buffer><expr> cw + \ defx#do_action('rename') + nnoremap <silent><buffer><expr> q + \ defx#do_action('quit') +endfunction + +call defx#custom#option('_', { +\ 'toggle': 1, +\ 'resume': 1, +\ 'show_ignored_files': 1, +\ 'buffer_name': 'explorer', +\ 'split': 'vertical', +\ 'direction': 'topleft', +\ 'columns': 'space:indent:git:icons:filename:mark', +\ 'winwidth': 30, +\ }) + +" Startify +let g:startify_custom_header = [ + \ ' ___ __ ______ _ _ _______', + \ ' / _ \/ / / / __ `/____| | / / ___/', + \ ' / __/ /_/ / /_/ /_____/ |/ (__ ) ', + \ ' \___/\__,_/\__, / |___/____/ ', + \ ' /____/ ', +\] + +" startup screen +autocmd VimEnter * + \ if !argc() + \ | Startify + \ | Defx + \ | wincmd w + \ | endif + +" built-in fuzzy-finder +set path=.,** +set wildmenu +set wildignore+=**/node_modules/**,**/build/**,**/dist/**,**/__pycache__/** + +" tags +command! MakeTags !ctags -R -f .git/tags --tag-relative --exclude=node_modules --exclude=.git --exclude=build --exclude=dist --map-Typescript=+.tsx +set tags+=.git/tags + +" enable typescipt highlighting +augroup SyntaxSettings + autocmd! + autocmd BufNewFile,BufRead *.tsx set filetype=typescript +augroup END + +" easier indentation +vnoremap < <gv +vnoremap > >gv + +" Vimwiki +let g:vimwiki_list = [{'path': '~/Documents/Projects/env/', 'syntax': 'markdown', 'ext': '.md'}] +nnoremap <Leader>c :let &cole=(&cole == 2) ? 0 : 2 <bar> echo 'conceallevel ' . &cole <CR> + +function! VimwikiLinkHandler(link) + let link = a:link + if link =~# '^vfile:' + let link = link[1:] + else + return 0 + endif + let link_infos = vimwiki#base#resolve_link(link) + if link_infos.filename == '' + echomsg 'Vimwiki Error: Unable to resolve link!' + return 0 + else + exe 'e ' . fnameescape(link_infos.filename) + return 1 + endif +endfunction + +" TODO: command to toggle comments https://www.chrisatmachine.com/Neovim/09-vim-commentary/ +" TODO: sessions https://www.chrisatmachine.com/Neovim/11-startify/ diff --git a/.xinitrc b/.xinitrc new file mode 100644 index 0000000..e50dbcc --- /dev/null +++ b/.xinitrc @@ -0,0 +1,41 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# start some nice programs +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +# increase keyboard speed +xset r rate 250 22 + +# change bell sound +xset b 5 150 300 + +# start i3 window manager +exec i3 + @@ -0,0 +1,18 @@ +export ZSH="$HOME/.oh-my-zsh" + +ZSH_THEME="ys" + +plugins=(git) +source $ZSH/oh-my-zsh.sh + +alias pass='lpass show -cp' + +alias vi=nvim +alias vim=nvim +alias config='git --git-dir=$HOME/.dotfiles.git --work-tree=$HOME' + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +export PATH=$PATH:~/.local/bin |