diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 4d31599..c9760ab 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -1,7 +1,4 @@ #!/bin/sh -# Smirnov-O -# BSPWM config file - ###== Function Run() { if ! pgrep $1 @@ -37,7 +34,7 @@ bspc config focused_border_color "#008DCD" bspc config presel_feedback_color "#51AFEF" bspc config urgent_border_color "#FF6C6B" -# Rules +###== 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 @@ -46,10 +43,10 @@ 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 google-tasks-desktop state=floating diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd index c000989..ba2f3db 100644 --- a/config/bspwm/sxhkd +++ b/config/bspwm/sxhkd @@ -6,7 +6,7 @@ super + {_,shift} Return {kitty, \ rofi -show drun -theme ntenV2} -super + shift + {w,f,e,c,v,s,z,q} +super + shift + {w, f, e, c, v, s, z, q} {google-chrome-stable, \ kitty --class ranger -e ranger, \ kitty --class nvim -e nvim, \ @@ -19,9 +19,8 @@ super + shift + {w,f,e,c,v,s,z,q} super + {equal, minus, shift+minus} amixer sset Master {2%+,2%-,toggle} -super + {Escape, ctrl + u, ctrl + i} +super + {Escape, ctrl+i} {./.script/dmenu/dmenu-power.sh, \ - ./.script/dmenu/dmenu-config-edit.sh, \ ./.script/dmenu/dmenu-pass.sh } ### == BSPWM keys diff --git a/config/i3/config b/config/i3/config index 0c0d628..e6354a1 100644 --- a/config/i3/config +++ b/config/i3/config @@ -15,6 +15,12 @@ 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 +exec --no-startup-id exec lxsession + ############ Variables ########### set $terminal kitty set $browser google-chrome-stable @@ -22,12 +28,6 @@ set $filemanager kitty --class ranger -e ranger set $codeeditor kitty --class nvim -e nvim set $guicode code -############ Autostart ############ -exec_always --no-startup-id exec setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" -exec --no-startup-id exec picom -b -exec --no-startup-id exec nitrogen --restore -exec --no-startup-id exec lxsession - ############## WM keys ############ # Kill window @@ -59,7 +59,6 @@ bindsym $mod+grave scratchpad show, floating disable # Menus bindsym $mod+Shift+Return exec rofi -show drun -theme ntenV2 bindsym $mod+Escape exec ~/.script/dmenu/dmenu-power.sh -bindsym $mod+Control+u exec ~/.script/dmenu/dmenu-config-edit.sh bindsym $mod+Control+i exec ~/.script/dmenu/dmenu-pass.sh # Apps @@ -159,7 +158,6 @@ bindsym $mod+Shift+9 move container to workspace $ws9 ############### Bar ############### bar { - # status_command i3status -c ~/.config/i3/i3status status_command i3status-rs ~/.config/i3/i3status-rs.toml font pango:JetBrains Mono 10 position top diff --git a/config/i3/i3status-rs.toml b/config/i3/i3status-rs.toml index af7b501..45dff01 100644 --- a/config/i3/i3status-rs.toml +++ b/config/i3/i3status-rs.toml @@ -1,5 +1,5 @@ theme = "native" -#icons = "awesome5" +icons = "none" [[block]] block = "custom" @@ -8,6 +8,7 @@ interval = 0 [[block]] block = "sound" +step_width = 2 [[block]] block = "net" @@ -17,5 +18,5 @@ interval = 4 [[block]] block = "time" -interval = 60 format = "%R" +interval = 60 diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 5591542..b489c26 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -4,6 +4,7 @@ call plug#begin('~/.vim/plugged') Plug 'jiangmiao/auto-pairs' Plug 'maxboisvert/vim-simple-complete' Plug 'sheerun/vim-polyglot' + Plug 'ap/vim-css-color' call plug#end() "== General @@ -82,6 +83,7 @@ command! W :w command! Q :q command! Wq :wq command! WQ :wq +command! Term :vsplit | vertical resize 45 | terminal command! Wiki :e ~/doc/index.md command! Prettier :!prettier --write % command! ESlint :!eslint % diff --git a/config/openbox/autostart b/config/openbox/autostart new file mode 100755 index 0000000..02c8927 --- /dev/null +++ b/config/openbox/autostart @@ -0,0 +1,7 @@ +#!/bin/sh +setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps" & +feh --randomize --bg-scale ~/Pictures/wallp & +volumeicon & +lxsession & +picom -b & +tint2 & diff --git a/config/openbox/menu.xml b/config/openbox/menu.xml new file mode 100644 index 0000000..322d1ad --- /dev/null +++ b/config/openbox/menu.xml @@ -0,0 +1,148 @@ + + + + + + code + + + + + kitty -e nvim + + yes + nvim + + + + + + + + + alacritty + + + + + kitty + + + + + + + + firefox + + + + + google-chrome-stable + + + + + discord + + + + + telegram-desktop + + + + + dropbox + + + + + + + + ~/.applications/simplenote.appimage + + + + + ~/.applications/todoist.appimage + + + + + ~/.applications/todoist.appimage + + + + + zathura + + + + + + + + kitty -e ranger + + yes + Ranger + + + + + + Thunar + + + + + + + + obconf + + + + + lxapperance + + + + + tint2conf + + + + + + + + + + + yes + + + yes + + + yes + + + + + + + + + + + rofi -show drun -theme ntenV2 + + + + + + diff --git a/config/openbox/rc.xml b/config/openbox/rc.xml new file mode 100644 index 0000000..9559aff --- /dev/null +++ b/config/openbox/rc.xml @@ -0,0 +1,414 @@ + + + + 10 + 20 + + + yes + no + yes + no + 70 + no + + + Smart +
yes
+ Primary + 1 + + + nten + NLIMC + yes + yes + + sans + 8 + bold + normal + + + sans + 8 + bold + normal + + + sans + 9 + normal + normal + + + sans + 9 + normal + normal + + + sans + 9 + bold + normal + + + sans + 9 + bold + normal + + + + 1 + 1 + + Desktop + + 0 + + + yes + Nonpixel + Center + + 10 + 10 + + + + 0 + 0 + 0 + 0 + + + BottomLeft + 0 + 0 + no + Above + Vertical + no + 300 + 300 + Middle + + + C-g + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + kitty + + + + + google-chrome-stable + + + + + 1 + 500 + 400 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + root-menu + + + + + + + previous + + + + + + menu.xml + 200 + no + 100 + 400 + yes + yes + + + \ No newline at end of file diff --git a/config/picom.conf b/config/picom.conf index 982acdc..f79a22a 100644 --- a/config/picom.conf +++ b/config/picom.conf @@ -21,7 +21,7 @@ fade-delta = 0; ##### Transparency/Opacity #### inactive-opacity = 1; active-opacity = 1; -frame-opacity = 0.8; +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/gitconfig b/gitconfig index 3bb6605..6506b85 100644 --- a/gitconfig +++ b/gitconfig @@ -1,13 +1,14 @@ [user] username = Smirnov-O - name = Smirnov Olexandr + name = Smirnov Alexandr email = ss2316544@gmail.com [init] defaultBranch = master [web] - browser = firefox + #browser = firefox + browser = google-chrome-stable [core] editor = nvim diff --git a/script/dmenu/dmenu-config-edit.sh b/script/dmenu/dmenu-config-edit.sh deleted file mode 100755 index 5f3e3ca..0000000 --- a/script/dmenu/dmenu-config-edit.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -declare options=("exit -i3 -qtile -bspwm -alacritty -kitty -picom -ranger -qutebrowser -nvim -tmux -dunst -castero -redshift -rofi") - -menucmd="rofi -location 2 -dmenu" -choice=$(echo -e "${options[@]}"|${menucmd} -p "Config edit" $@) -case "$choice" in - exit) exit 0 ;; - i3) - case "$(echo -e "config\npolybar"|${menucmd} -p "I3wm" $@)" in - config) choice="$HOME/.config/i3/config" ;; - polybar) choice="$HOME/.config/polybar/config" ;; - esac - ;; - qtile) - case "$(echo -e "config\nautostart"|${menucmd} -p "Qtile" $@)" in - config) choice="$HOME/.config/qtile/config.py" ;; - autostart) choice="$HOME/.config/qtile/autostart.sh" ;; - esac - ;; - bspwm) - case "$(echo -e "config\nsxhkd\npolybar"|${menucmd} -p "Bspwm" $@)" in - config) choice="$HOME/.config/bspwm/config" ;; - sxhkd) choice="$HOME/.config/bspwm/sxhkd" ;; - polybar) choice="$HOME/.config/bspwm/polybar" ;; - esac - ;; - alacritty) choice="$HOME/.config/alacritty.yml" ;; - kitty) choice="$HOME/.config/kitty/kitty.conf" ;; - picom) choice="$HOME/.config/picom.conf" ;; - ranger) choice="$HOME/.config/ranger/rc.conf" ;; - qutebrowser) - case "$(echo -e "config\nquickmarks"|${menucmd} -p "Qutebrowser" $@)" in - config) choice="$HOME/.config/qutebrowser/config.py" ;; - quickmarks) choice="$HOME/.config/qutebrowser/quickmarks" ;; - esac - ;; - nvim) choice="$HOME/.config/nvim/init.vim" ;; - tmux) choice="$HOME/.tmux.conf" ;; - dunst) choice="$HOME/.config/dunst/dunstrc" ;; - zsh) choice="$HOME/.zshrc" ;; - castero) choice="$HOME/.config/castero/castero.conf" ;; - redshift) choice="$HOME/.config/redshift.conf" ;; - rofi) - case "$(echo -e "config\nnten-dmenu"|${menucmd} -p "Rofi" $@)" in - config) choice="$HOME/.config/rofi/config" ;; - nten-dmenu) choice="$HOME/.config/rofi/themes/nten-dmenu.rasi" ;; - esac - ;; -esac -alacritty -e nvim "$choice" diff --git a/zshrc b/zshrc index 6eda9df..4d6ef34 100644 --- a/zshrc +++ b/zshrc @@ -37,6 +37,7 @@ alias cp="cp -r" alias du="du -sh" alias vim="nvim" alias vi="vim" +alias tl="tmuxp load" alias d="docker" alias wiki="vi +Wiki" alias tmux="tmux -2"