From 197750ffa3952d2e693d1a4122973e3bcfb995bc Mon Sep 17 00:00:00 2001 From: Smirnov Alexandr Date: Wed, 3 Mar 2021 18:37:06 +0200 Subject: [PATCH] Clean dotfiles --- README.md | 14 +- config/betterlockscreenrc | 13 -- config/bspwm/bar.sh | 4 - config/bspwm/bspwmrc | 45 ++--- config/{i3 => bspwm/polybar}/bar.sh | 2 +- config/bspwm/{ => polybar}/polybar | 6 +- .../polybar/scripts/updates-pacman-aur.sh | 0 config/{ => bspwm}/polybar/scripts/weather.py | 0 .../polybar/scripts/wifi-signal.sh | 0 config/bspwm/sxhkd | 20 +- config/castero/castero.conf | 74 ------- config/i3/README.md | 10 - config/i3/config | 180 ------------------ config/i3/i3status | 40 ---- config/i3/i3status-rs.toml | 22 --- config/kitty/kitty.conf | 48 +++++ config/nvim/init.vim | 36 ++-- config/openbox/autostart | 4 +- {script => config/openbox/script}/volume | 0 {script => config/openbox/script}/wifi-signal | 0 config/openbox/tint2rc | 8 +- config/picom.conf | 1 - config/polybar/config | 117 ------------ config/polybar/launch.sh | 4 - .../rofi/script/passmenu.sh | 0 .../rofi/script/powermenu.sh | 0 gitconfig | 14 -- gitignore_global | 7 - script/kblayout | 6 - script/random-wallpaper.sh | 7 - tmux.conf | 14 +- zshrc | 6 +- 32 files changed, 123 insertions(+), 579 deletions(-) delete mode 100644 config/betterlockscreenrc delete mode 100755 config/bspwm/bar.sh rename config/{i3 => bspwm/polybar}/bar.sh (65%) rename config/bspwm/{ => polybar}/polybar (92%) rename config/{ => bspwm}/polybar/scripts/updates-pacman-aur.sh (100%) rename config/{ => bspwm}/polybar/scripts/weather.py (100%) rename config/{ => bspwm}/polybar/scripts/wifi-signal.sh (100%) delete mode 100644 config/castero/castero.conf delete mode 100644 config/i3/README.md delete mode 100644 config/i3/config delete mode 100644 config/i3/i3status delete mode 100644 config/i3/i3status-rs.toml create mode 100644 config/kitty/kitty.conf rename {script => config/openbox/script}/volume (100%) rename {script => config/openbox/script}/wifi-signal (100%) delete mode 100644 config/polybar/config delete mode 100755 config/polybar/launch.sh rename script/dmenu/dmenu-pass.sh => config/rofi/script/passmenu.sh (100%) rename script/dmenu/dmenu-power.sh => config/rofi/script/powermenu.sh (100%) delete mode 100644 gitignore_global delete mode 100755 script/kblayout delete mode 100644 script/random-wallpaper.sh diff --git a/README.md b/README.md index f6bfd59..08fae4e 100644 --- a/README.md +++ b/README.md @@ -6,29 +6,29 @@ #### System configuration - `OS` Arch - `WM` bspwm, openbox -- `Terminal` alacritty, kitty +- `Terminal` kitty - `Shell` zsh - `Editor` nvim, vscode - `File manager` ranger - `Browser` firefox - `Font` Jatbrains Mono -- `Icon font` FontAwesome +- `Icon font` Font Awesome - `Launcher` rofi #### Install config Since i use **[rcm](https://github.com/thoughtbot/rcm)** set it: -~~~bash +```bash yay -S rcm -~~~ +``` Install dependency: ```bash sudo pacman -S neovim tmux git openbox tint2 bspwm sxhkd kitty picom dunst zsh rofi ranger firefox ttf-font-awesome ttf-jetbrains -yay -S polybar xkblayout +yay -S polybar ``` And install config: -~~~bash +```bash git clone https://github.com/Smirnov-O/dotfiles .dotfiles rcup -~~~ +``` diff --git a/config/betterlockscreenrc b/config/betterlockscreenrc deleted file mode 100644 index 08ff207..0000000 --- a/config/betterlockscreenrc +++ /dev/null @@ -1,13 +0,0 @@ -insidecolor=#00000000 -ringcolor=#ffffff -keyhlcolor=#51AFEF -bshlcolor=#51AFEF -separatorcolor=#51AFEF -insidevercolor=#00000000 -insidewrongcolor=#51AFEF -ringvercolor=#ffffff -ringwrongcolor=#ffffff -verifcolor=#ffffff -timecolor=#ffffff -datecolor=#ced4da -loginbox=#000000 diff --git a/config/bspwm/bar.sh b/config/bspwm/bar.sh deleted file mode 100755 index a418af2..0000000 --- a/config/bspwm/bar.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -killall -q polybar -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -polybar -c ~/.config/bspwm/polybar bar& diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 9186074..03f27d5 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -1,24 +1,25 @@ #!/bin/sh ###== Function -Run() { +R() { if ! pgrep $1 then $@& fi } ###== Autostart -Run feh --randomize --bg-scale ~/Pictures/wallp & -Run sxhkd -c ~/.config/bspwm/sxhkd & -~/.config/bspwm/bar.sh & -Run lxsession & -Run picom -b & +R feh --randomize --bg-scale ~/Pictures/wallp & +R sxhkd -c ~/.config/bspwm/sxhkd & +R lxsession & +R picom -b & +~/.config/bspwm/polybar/bar.sh & ###== BSPWM + # Workspaces bspc monitor -d 1 2 3 4 5 6 7 8 9 # General bspc config border_width 2 -bspc config window_gap 4 +bspc config window_gap 6 bspc config split_ratio 0.50 bspc config borderless_monocle true bspc config gapless_monocle true @@ -33,18 +34,18 @@ bspc config presel_feedback_color "#51AFEF" bspc config urgent_border_color "#FF6C6B" ###== BSPWM Rules -bspc rule -a Alacritty desktop='^1' focus=on follow=on -bspc rule -a kitty desktop='^1' focus=on follow=on -bspc rule -a firefox desktop='^2' focus=on follow=on -bspc rule -a Google-chrome desktop='^2' focus=on follow=on -bspc rule -a Code desktop='^3' focus=on follow=on -bspc rule -a '*:nvim' desktop='^3' focus=on follow=on -bspc rule -a '*:ranger' desktop='^4' focus=on follow=off -bspc rule -a Thunar desktop='^4' focus=on follow=off -bspc rule -a Todoist desktop='^5' focus=on follow=off -bspc rule -a Joplin desktop='^5' focus=on follow=on -bspc rule -a Simplenote desktop='^5' focus=on follow=on -bspc rule -a discord desktop='^6' focus=off follow=off -bspc rule -a telegram-desktop desktop='^6' focus=off follow=on -bspc rule -a KeePassXC desktop='^7' focus=on follow=off -bspc rule -a Spotify desktop='^9' focus=on follow=on +bspc rule -a Alacritty desktop='^1' focus=on follow=on +bspc rule -a kitty desktop='^1' focus=on follow=on +bspc rule -a firefox desktop='^2' focus=on follow=on +bspc rule -a Google-chrome desktop='^2' focus=on follow=on +bspc rule -a Code desktop='^3' focus=on follow=on +bspc rule -a '*:nvim' desktop='^3' focus=on follow=on +bspc rule -a '*:ranger' desktop='^4' focus=on follow=off +bspc rule -a Thunar desktop='^4' focus=on follow=off +bspc rule -a Todoist desktop='^5' focus=on follow=off +bspc rule -a Joplin desktop='^5' focus=on follow=on +bspc rule -a Simplenote desktop='^5' focus=on follow=on +bspc rule -a discord desktop='^6' focus=off follow=off +bspc rule -a telegram-desktop desktop='^6' focus=off follow=on +bspc rule -a KeePassXC desktop='^7' focus=on follow=off +bspc rule -a Spotify desktop='^9' focus=on follow=on diff --git a/config/i3/bar.sh b/config/bspwm/polybar/bar.sh similarity index 65% rename from config/i3/bar.sh rename to config/bspwm/polybar/bar.sh index 23fa6a2..edda644 100755 --- a/config/i3/bar.sh +++ b/config/bspwm/polybar/bar.sh @@ -1,4 +1,4 @@ #!/bin/bash killall -q polybar while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -polybar bar & +polybar -c ~/.config/bspwm/polybar/polybar bar& diff --git a/config/bspwm/polybar b/config/bspwm/polybar/polybar similarity index 92% rename from config/bspwm/polybar rename to config/bspwm/polybar/polybar index ced9103..f4f9aef 100644 --- a/config/bspwm/polybar +++ b/config/bspwm/polybar/polybar @@ -57,18 +57,18 @@ ramp-volume-0 =  [module/weather] type = custom/script -exec = python3 ~/.config/polybar/scripts/weather.py +exec = python3 ~/.config/bspwm/polybar/scripts/weather.py interval = 60 [module/archupd] type = custom/script -exec = ~/.config/polybar/scripts/updates-pacman-aur.sh +exec = ~/.config/bspwm/polybar/scripts/updates-pacman-aur.sh interval = 60 [module/wifi-signal] type = custom/script label =  %output:%% -exec = ~/.config/polybar/scripts/wifi-signal.sh +exec = ~/.config/bspwm/polybar/scripts/wifi-signal.sh interval = 3 [module/keyboard] diff --git a/config/polybar/scripts/updates-pacman-aur.sh b/config/bspwm/polybar/scripts/updates-pacman-aur.sh similarity index 100% rename from config/polybar/scripts/updates-pacman-aur.sh rename to config/bspwm/polybar/scripts/updates-pacman-aur.sh diff --git a/config/polybar/scripts/weather.py b/config/bspwm/polybar/scripts/weather.py similarity index 100% rename from config/polybar/scripts/weather.py rename to config/bspwm/polybar/scripts/weather.py diff --git a/config/polybar/scripts/wifi-signal.sh b/config/bspwm/polybar/scripts/wifi-signal.sh similarity index 100% rename from config/polybar/scripts/wifi-signal.sh rename to config/bspwm/polybar/scripts/wifi-signal.sh diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd index 95b7ca2..ab91bdd 100644 --- a/config/bspwm/sxhkd +++ b/config/bspwm/sxhkd @@ -6,15 +6,13 @@ super + {_,shift} Return {kitty, \ rofi -show drun -theme ntenV2} -super + shift + {w, f, e, c, v, s, z, q} - {google-chrome-stable, \ - kitty --class ranger -e ranger, \ - kitty --class nvim -e nvim, \ - code, \ - veracrypt, \ - .applications/simplenote.appimage, \ - betterlockscreen --off 180 -t "Computer is locked" -l, \ - xkill } +super + shift + {w, f, e, c, s, q} + {google-chrome-stable, \ + kitty --class ranger -e ranger, \ + kitty --class nvim -e nvim, \ + code, \ + .applications/simplenote.appimage, \ + xkill } super + {_,shift} Print {scrot -s, \ @@ -24,8 +22,8 @@ super + {equal, minus, shift+minus} amixer sset Master {2%+,2%-,toggle} super + {Escape, ctrl+i} - {./.script/dmenu/dmenu-power.sh, \ - ./.script/dmenu/dmenu-pass.sh } + {.config/rofi/script/powermenu.sh, \ + .config/rofi/script/passmenu.sh } ### == BSPWM keys super + q diff --git a/config/castero/castero.conf b/config/castero/castero.conf deleted file mode 100644 index 3e61ba6..0000000 --- a/config/castero/castero.conf +++ /dev/null @@ -1,74 +0,0 @@ -[client] -delete_feed_confirmation = True -reload_feeds_threshold = 10 -max_episodes = -1 -retain_absent_episodes = False -disable_vertical_borders = False -clean_html_descriptions = True -refresh_delay = 30 -player = #mpv -execute_command = -proxy_http = -proxy_https = - -[feeds] -reload_on_start = False - -[downloads] -custom_download_dir = -request_timeout = 3 - - -[colors] -color_foreground = white -color_background = default -color_foreground_alt = black -color_background_alt = white -color_foreground_dim = blue -color_foreground_status = white -color_foreground_heading = blue -color_foreground_dividers = white - - -[playback] -seek_distance_forward = 30 -seek_distance_backward = 10 -default_playback_speed = 1.0 -default_volume = 80 -volume_adjust_distance = 5 - - -[keys] -key_help = ? -key_exit = q -key_add_feed = A -key_remove = O -key_reload = r -key_reload_selected = R -key_save = d -key_delete = D -key_up = UP -key_right = RIGHT -key_down = DOWN -key_left = LEFT -key_scroll_up = UP -key_scroll_down = DOWN -key_play_selected = ENTER -key_add_selected = SPACE -key_clear = c -key_next = n -key_execute = e -key_invert = i -key_filter = / -key_mark_played = m -key_pause_play = p -key_pause_play_alt = o -key_seek_forward = f -key_seek_forward_alt = F -key_seek_backward = b -key_seek_backward_alt = B -key_rate_increase = ] -key_rate_decrease = [ -key_volume_increase = = -key_volume_decrease = - -key_show_url = u diff --git a/config/i3/README.md b/config/i3/README.md deleted file mode 100644 index 9b716c8..0000000 --- a/config/i3/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# [i3](https://i3wm.org) - -![Seceenshot](screen.png) -------------------------- - -### Install ------------ -~~~bash -sudo pacman -S i3-gaps polybar -~~~ diff --git a/config/i3/config b/config/i3/config deleted file mode 100644 index 6cd7e63..0000000 --- a/config/i3/config +++ /dev/null @@ -1,180 +0,0 @@ -############# General ############# -# Bind $MOD(super) key -set $mod Mod4 -set $alt Mod1 -floating_modifier $mod - -# Set font -font monospace 10 -font pango:JetBrains Mono 10 - -# Disable window title -default_border pixel -new_float pixel - -# Borders -hide_edge_borders smart - -############ Autostart ############ -exec_always --no-startup-id exec setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" -exec_always --no-startup-id exec feh --randomize --bg-scale ~/Pictures/wallp -exec --no-startup-id exec picom -b - -############ Variables ########### -set $terminal kitty -set $browser google-chrome-stable -set $filemanager kitty --class ranger -e ranger -set $codeeditor kitty --class nvim -e nvim -set $guicode code - -############## WM keys ############ - -# Kill window -bindsym $mod+q kill -bindsym --release $mod+Shift+q exec xkill - -# Restart i3wm -bindsym $mod+Control+r restart - -# Layout -bindsym $mod+Control+w layout tabbed -bindsym $mod+Control+e layout toggle split -bindsym $mod+Shift+Tab floating toggle - -# Split mode -bindsym $mod+$alt+h split h -bindsym $mod+$alt+v split v - -# Scratchpad -bindsym $mod+Shift+grave move scratchpad -bindsym $mod+grave scratchpad show, floating disable - -############## User key ########### - -# Applications -bindsym $mod+Return exec $terminal -bindsym $mod+Shift+w exec $browser -bindsym $mod+Shift+f exec $filemanager -bindsym $mod+Shift+e exec $codeeditor -bindsym $mod+Shift+c exec $guicode -bindsym $mod+Shift+v exec veracrypt -bindsym $mod+Shift+s exec ~/.applications/simplenote.appimage - -# Menu -bindsym $mod+Shift+Return exec rofi -show drun -theme ntenV2 -bindsym $mod+Escape exec ~/.script/dmenu/dmenu-power.sh -bindsym $mod+Control+i exec ~/.script/dmenu/dmenu-pass.sh - -# Screenhot -bindsym --release Print exec scrot -s /home/${USER}/$(date +%Y-%m-%d-%H-%M-%S).png -bindsym Shift+Print exec scrot /home/${USER}/$(date +%Y-%m-%d-%H-%M-%S).png - -# Volume -bindsym $mod+plus exec amixer sset Master 2%+ -bindsym $mod+minus exec amixer sset Master 2%- -bindsym $mod+Shift+minus exec amixer sset Master toggle - -############## GAPS ############### -smart_gaps on -gaps inner 3 -gaps outer 4 - -######### Window preferens ######## -assign [class="(?i)alacritty|kitty"] $ws1 -assign [class="(?i)google-chrome-stable|firefox"] $ws2 -assign [class="Code|nvim"] $ws3 -assign [class="Thunar|ranger"] $ws4 -assign [class="Joplin|Simplenote"] $ws5 -assign [class="TelegramDesktop|discord"] $ws6 -for_window [class="TelegramDesktop|discord"] layout tabbed -assign [class="KeePassX"] $ws7 -assign [class="Spotify"] $ws9 -for_window [title="Google Tasks"] floating enable -focus_on_window_activation focus - -########## Change focus ########### -bindsym $mod+h focus left -bindsym $mod+Left focus left -bindsym $mod+j focus down -bindsym $mod+Down focus down -bindsym $mod+k focus up -bindsym $mod+Up focus up -bindsym $mod+l focus right -bindsym $mod+Right focus right - -########## Move window ############ -bindsym $mod+Shift+h move left -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+j move down -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+k move up -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+l move right -bindsym $mod+Shift+Right move right - -########## Resize window ########## -bindsym $mod+Control+h resize shrink width 5 px or 5 ppt -bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt -bindsym $mod+Control+j resize grow height 5 px or 5 ppt -bindsym $mod+Control+Down resize grow height 5 px or 5 ppt -bindsym $mod+Control+k resize shrink height 5 px or 5 ppt -bindsym $mod+Control+Up resize shrink height 5 px or 5 ppt -bindsym $mod+Control+l resize grow width 5 px or 5 ppt -bindsym $mod+Control+Right resize grow width 5 px or 5 ppt - -############ Workspaces ########### -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" - -bindsym $mod+1 workspace $ws1 -bindsym $mod+2 workspace $ws2 -bindsym $mod+3 workspace $ws3 -bindsym $mod+4 workspace $ws4 -bindsym $mod+5 workspace $ws5 -bindsym $mod+6 workspace $ws6 -bindsym $mod+7 workspace $ws7 -bindsym $mod+8 workspace $ws8 -bindsym $mod+9 workspace $ws9 - -bindsym $mod+Shift+1 move container to workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4 -bindsym $mod+Shift+5 move container to workspace $ws5 -bindsym $mod+Shift+6 move container to workspace $ws6 -bindsym $mod+Shift+7 move container to workspace $ws7 -bindsym $mod+Shift+8 move container to workspace $ws8 -bindsym $mod+Shift+9 move container to workspace $ws9 - -############### Bar ############### -bar { - status_command i3status-rs ~/.config/i3/i3status-rs.toml - font pango:JetBrains Mono 10 - position top - colors { - background #262A2B - statusline #DFDFDF - separator #CED4DA - focused_workspace #008DCD #008DCD #DFDFDF - active_workspace #262A2B #262A2B #DFDFDF - inactive_workspace #262A2B #262A2B #DFDFDF - urgent_workspace #FF6C6B #FF6C6B #DFDFDF - binding_mode #2F343A #900000 #DFDFDF - } -} -############## Colors ############# -client.focused #008DCD #008DCD #FFFFFF #008DCD #008DCD -client.focused_inactive #008DCD #002b36 #DFDFDF #002b36 #002b36 -client.unfocused #262A2B #262A2B #DFDFDF #262A2B #262A2B -client.urgent #002b36 #262A2B #FFFFFF #262A2B #262A2B -client.placeholder #000000 #000000 #FFFFFF #000000 #000000 -client.background #FFFFFF - -# vim: ft=i3config diff --git a/config/i3/i3status b/config/i3/i3status deleted file mode 100644 index dc8c7f8..0000000 --- a/config/i3/i3status +++ /dev/null @@ -1,40 +0,0 @@ -# vim: ft=conf -general { - colors = false - interval = 1 - output_format = "i3bar" -} - -order += "volume master" -order += "wireless _first_" -#order += "battery all" -order += "tztime local" - -volume master { - format = " %volume" - format_muted = " %volume" - device = "default" - mixer = "Master" - mixer_idx = 2 -} - -wireless _first_ { - format_up = "%quality" - format_down = "W: down" -} - -battery all { - format = "%status %percentage" - last_full_capacity = true - format_down = "No battery" - status_chr = "" - status_bat = "" - status_unk = "? UNK" - status_full = "" - path = "/sys/class/power_supply/BAT%d/uevent" - low_threshold = 10 -} - -tztime local { - format = " %d %b  %H:%M" -} diff --git a/config/i3/i3status-rs.toml b/config/i3/i3status-rs.toml deleted file mode 100644 index d3cb8f3..0000000 --- a/config/i3/i3status-rs.toml +++ /dev/null @@ -1,22 +0,0 @@ -theme = "native" -icons = "awesome5" - -[[block]] -block = "custom" -command = "~/.script/kblayout" -interval = 0 - -[[block]] -block = "sound" -step_width = 2 - -[[block]] -block = "net" -device = "wlp3s0" -format = "{signal_strength}" -interval = 4 - -[[block]] -block = "time" -format = "%R" -interval = 60 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf new file mode 100644 index 0000000..d4d1626 --- /dev/null +++ b/config/kitty/kitty.conf @@ -0,0 +1,48 @@ +font_family Jetbrains Mono +repaint_delay 10 + +# Cursor +cursor #dfdfdf +cursor_text_color #7d7d7d +cursor_shape underline +cursor_underline_thickness 1.3 +cursor_blink_interval 0 + +# Bell +enable_audio_bell no +window_alert_on_bell no +bell_on_tab no + +# Keyboard Shortcuts +clear_all_shortcuts yes +open_url_modifiers alt +map ctrl+shift+c copy_to_clipboard +map ctrl+shift+v paste_from_clipboard +map ctrl+shift+u kitten unicode_input +map alt+k scroll_line_up +map alt+j scroll_line_down +map ctrl+equal change_font_size all +2.0 +map ctrl+minus change_font_size all -2.0 +map ctrl+backspace change_font_size all 0 + +# Theming +background_opacity 0.85 +background #262a2b +foreground #ffffff +selection_background #1F2324 +color0 #002731 +color8 #001e26 +color1 #d01b24 +color9 #bd3612 +color2 #728905 +color10 #465a61 +color3 #a57705 +color11 #52676f +color4 #2075c7 +color12 #708183 +color5 #c61b6e +color13 #5856b9 +color6 #0fbcf9 +color14 #4bcffa +color7 #e9e2cb +color15 #fcf4dc diff --git a/config/nvim/init.vim b/config/nvim/init.vim index b3edcf2..60f3227 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -1,9 +1,8 @@ call plug#begin('~/.vim/plugged') Plug 'Smirnov-O/nten16.vim' - Plug 'jiangmiao/auto-pairs' - Plug 'maxboisvert/vim-simple-complete' Plug 'sheerun/vim-polyglot' - Plug 'tpope/vim-surround' + Plug 'maxboisvert/vim-simple-complete' + Plug 'jiangmiao/auto-pairs' call plug#end() "== General @@ -15,7 +14,8 @@ colorscheme nten16 set nu rnu " Line wrap -set nowrap nolinebreak +set nolinebreak +set nowrap " Tabs set tabstop=4 @@ -27,7 +27,6 @@ set autoindent " Status line set laststatus=0 -set showmode showcmd set ruler " Scroll @@ -66,6 +65,7 @@ set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space:· " Disable sound set visualbell t_vb= + "== Settings for specific files autocmd BufWritePre *.py normal m`:%s/\s\+$//e ` autocmd FileType python,go,json setlocal expandtab shiftwidth=4 tabstop=4 @@ -73,23 +73,25 @@ autocmd FileType html,css,javascript,javascriptreact,yaml setlocal expandtab shi "== Aliases -command! W :w +command! W :w command! WQ :wq command! Wq :wq command! Wiki :e ~/doc/index.md -command! Prettier :!prettier --write % -command! ESlint :!eslint % -command! Flake8 :!flake8 % -command! Black :!black % -command! AutoPep8 :!autopep8 --in-place % +command! Prettier :!prettier % --write +command! ESlint :!eslint % +command! Flake8 :!flake8 % +command! Black :!black % +command! AutoPep8 :!autopep8 % --in-place "== Mapping let mapleader="'" " Alternative keys -noremap :w -noremap :tabnew +noremap :w +noremap :tabnew +noremap :find +noremap :nohl " Window noremap :wincmd h @@ -104,8 +106,8 @@ noremap spk :wincmd K noremap spl :wincmd L " Tab -noremap tn :tabnew -noremap tc :tabclose +noremap tn :tabnew +noremap tc :tabclose noremap :tabn 1 noremap :tabn 2 noremap :tabn 3 @@ -121,5 +123,5 @@ noremap j :bnext noremap k :bprev " Work with system clipboard -noremap y "*yy -noremap p "+p +noremap c "*yy +noremap v "+p diff --git a/config/openbox/autostart b/config/openbox/autostart index 85ec0da..1df2036 100755 --- a/config/openbox/autostart +++ b/config/openbox/autostart @@ -1,6 +1,4 @@ #!/bin/sh -setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" & feh --randomize --bg-scale ~/Pictures/wallp & -lxsession & -picom -b & tint2 -c ~/.config/openbox/tint2rc & +picom -b & diff --git a/script/volume b/config/openbox/script/volume similarity index 100% rename from script/volume rename to config/openbox/script/volume diff --git a/script/wifi-signal b/config/openbox/script/wifi-signal similarity index 100% rename from script/wifi-signal rename to config/openbox/script/wifi-signal diff --git a/config/openbox/tint2rc b/config/openbox/tint2rc index e5e28d8..45dbd1f 100644 --- a/config/openbox/tint2rc +++ b/config/openbox/tint2rc @@ -224,11 +224,11 @@ execp_has_icon = 0 execp_cache_icon = 1 execp_continuous = 0 execp_markup = 1 -execp_lclick_command = $HOME/.script/volume mute +execp_lclick_command = $HOME/.config/openbox/script/volume mute execp_rclick_command = execp_mclick_command = -execp_uwheel_command = $HOME/.script/volume up -execp_dwheel_command = $HOME/.script/volume down +execp_uwheel_command = $HOME/.config/openbox/.script/volume up +execp_dwheel_command = $HOME/.config/openbox/.script/volume down execp_font = Droid Sans Bold 8 execp_font_color = #d1d1d1 100 execp_padding = 8 0 @@ -240,7 +240,7 @@ execp_icon_h = 0 #------------------------------------- # Executor 2 execp = new -execp_command = $HOME/.script/wifi-signal +execp_command = $HOME/.config/openbox/script/wifi-signal execp_interval = 5 execp_has_icon = 0 execp_cache_icon = 1 diff --git a/config/picom.conf b/config/picom.conf index 22aadad..328b940 100644 --- a/config/picom.conf +++ b/config/picom.conf @@ -24,7 +24,6 @@ inactive-opacity = 1; active-opacity = 1; frame-opacity = 1; inactive-opacity-override = false; -opacity-rule = [ "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" ]; no-fading-openclose = true diff --git a/config/polybar/config b/config/polybar/config deleted file mode 100644 index b9b1d7c..0000000 --- a/config/polybar/config +++ /dev/null @@ -1,117 +0,0 @@ -# vim: ft=dosini - -[settings] -enable-ipc = true -screenchange-reload = true -pseudo-transparency = true - -[colors] -background = #262A2B -foreground = #DFDFDF -secondary = #008DCD -alert = #FF6C6B - -[bar/bar] -monitor = ${env:MONITOR_MIDDLE} -width = 100% -height = 24 -fixed-center = true -wm-restack = i3 -background = ${colors.background} -foreground = ${colors.foreground} -module-margin-left = 1 -module-margin-right = 1 -font-0 = Iosevka Nerd Font:style=Medium:size=8;3 -font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5 -modules-left = i3 pacman-up window-name -modules-right = pulseaudio weather wifi-signal keyboard time date -tray-position = right - -[module/i3] -type = internal/i3 -format = -card = intel_backlight -index-sort = false -wrapping-scroll = false -label-mode-padding = 1 -label-mode-background = ${colors.alert} - -label-focused = %icon% -label-focused-background = ${colors.secondary} -label-focused-foreground = ${colors.foreground} -label-focused-padding = 1 -label-focused-underline = ${colors.alert} - -label-unfocused = %icon% -label-unfocused-foreground = ${colors.foreground} -label-unfocused-padding = 1 - -label-urgent = %icon% -label-urgent-background = ${colors.alert} -label-urgent-foreground = ${colors.foreground} -label-urgent-padding = 1 -label-urgent-underline = ${colors.alert} - -label-visible = %icon% -label-visible-background = ${colors.background} -label-visible-foreground = ${colors.foreground} -label-visible-padding = 1 -label-visible-underline = ${colors.background} - -ws-icon-0 = "1;1 " -ws-icon-1 = "2;2 " -ws-icon-2 = "3;3 " -ws-icon-3 = "4;4 " -ws-icon-4 = "5;5 " -ws-icon-5 = "6;6 " -ws-icon-6 = "7;7 " -ws-icon-7 = "8;8 " -ws-icon-8 = "9;9 " - -[module/wifi-signal] -type = custom/script -label =  %output:%% -exec = ~/.config/polybar/scripts/wifi-signal.sh -interval = 3 - -[module/pulseaudio] -type = internal/pulseaudio -interval = 2 -format-volume = -label-volume = %percentage%% -label-volume-foreground = ${root.foreground} -label-muted =  -ramp-volume-0 =  - -[module/weather] -type = custom/script -exec = python3 ~/.config/polybar/scripts/weather.py -interval = 60 - -[module/pacman-up] -type = custom/script -exec = ~/.config/polybar/scripts/updates-pacman-aur.sh -interval = 15 - -[module/window-name] -type = internal/xwindow -label-maxlen = 100 - -[module/keyboard] -type = internal/xkeyboard -format-prefix = "" -label-layout =  %layout% -blacklist-0 = num lock -blacklist-1 = scroll lock -blacklist-2= caps lock - -[module/date] -type = internal/date -interval = 600 -date = %d.%m.%Y -label =  %date% - -[module/time] -type = internal/date -time = %H:%M -label =  %time% diff --git a/config/polybar/launch.sh b/config/polybar/launch.sh deleted file mode 100755 index 5ef8304..0000000 --- a/config/polybar/launch.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -killall -q polybar -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -polybar i3bar & diff --git a/script/dmenu/dmenu-pass.sh b/config/rofi/script/passmenu.sh similarity index 100% rename from script/dmenu/dmenu-pass.sh rename to config/rofi/script/passmenu.sh diff --git a/script/dmenu/dmenu-power.sh b/config/rofi/script/powermenu.sh similarity index 100% rename from script/dmenu/dmenu-power.sh rename to config/rofi/script/powermenu.sh diff --git a/gitconfig b/gitconfig index 6506b85..ad5b77e 100644 --- a/gitconfig +++ b/gitconfig @@ -3,30 +3,16 @@ name = Smirnov Alexandr email = ss2316544@gmail.com -[init] - defaultBranch = master - [web] - #browser = firefox browser = google-chrome-stable [core] editor = nvim - excludesfile = ~/.gitignore_global [alias] ada = add -A - com = commit -am cmm = commit -m - ch = checkout st = status - br = branch - -[color] - ui = true - interactive = true - branch = true - status = true [credential] helper = cache --timeout=1800 diff --git a/gitignore_global b/gitignore_global deleted file mode 100644 index 17c9a95..0000000 --- a/gitignore_global +++ /dev/null @@ -1,7 +0,0 @@ -.idea -.vscode -*.log -*.db -*.pyc -__pycache__ -node_modules diff --git a/script/kblayout b/script/kblayout deleted file mode 100755 index 88f9c5f..0000000 --- a/script/kblayout +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -case "$(xkblayout)" in - Eng) echo "en" ;; - Ukr) echo "ua" ;; - *) echo " " ;; -esac diff --git a/script/random-wallpaper.sh b/script/random-wallpaper.sh deleted file mode 100644 index 19f5f9c..0000000 --- a/script/random-wallpaper.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -WALLPATH="~/Pictures/wallp" - -while true; do - feh --randomize --bg-scale $WALLPATH - sleep 900 -done diff --git a/tmux.conf b/tmux.conf index 625d360..9f0b54f 100644 --- a/tmux.conf +++ b/tmux.conf @@ -8,9 +8,6 @@ set -g prefix C-a set -g base-index 1 set -g pane-base-index 1 -## History -set -g history-limit 1000 - ## Mouse support set -g mouse on setw -g mouse on @@ -24,13 +21,12 @@ set-option -sa terminal-overrides ",*:Tc" ## HOME/END key support bind-key -n End send-key C-e bind-key -n Home send-key C-a -bind-key -n Home send Escape "OH" -bind-key -n End send Escape "OF" +#bind-key -n Home send Escape "OH" +#bind-key -n End send Escape "OF" ## Reload config -bind r source-file ~/.tmux.conf \; - display 'Reloaded tmux config' +bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config' ## Vim keys for change/resize window bind -r h select-pane -L @@ -44,8 +40,8 @@ bind -r K resize-pane -U 2 bind -r L resize-pane -R 2 ## Alternative keys for create window -bind _ split-window -h -bind - split-window -v +bind _ split-window -v +bind - split-window -h ## Change focus on last panel bind Tab last-window diff --git a/zshrc b/zshrc index e572ebe..f2fdb85 100644 --- a/zshrc +++ b/zshrc @@ -1,12 +1,12 @@ export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.applications:$HOME/.local/bin:$PATH" +export EDITOR="nvim" ### Oh my zsh -export ZSH="$HOME/.oh-my-zsh" +export OMH="$HOME/.oh-my-zsh" ZSH_THEME="simple" -DISABLE_UPDATE_PROMPT="true" DISABLE_AUTO_TITLE="true" plugins=(yarn nvm) -source $ZSH/oh-my-zsh.sh +source $OMH/oh-my-zsh.sh ### Aliases alias cls="clear"