From ab76262568c1787c97756d52215910cea4c39f85 Mon Sep 17 00:00:00 2001 From: Wiktor Zykubek Date: Sun, 8 Mar 2020 10:19:00 +0100 Subject: [PATCH] Migrate from GitLab to GitHub - switch i3wm to bspwm - lot of changes --- .config/i3/config | 188 - .../nvim/bundle/i3-vim-syntax/ftdetect/i3.vim | 4 - .../nvim/bundle/i3-vim-syntax/ftplugin/i3.vim | 1 - .../nvim/bundle/i3-vim-syntax/syntax/i3.vim | 134 - .config/nvim/init.vim | 262 - .config/polybar/config | 181 - .config/ranger/rc.conf | 4 - .zshrc | 40 - README.md | 40 +- .Xresources => botfiles/.Xresources | 0 botfiles/.aliases | 32 + botfiles/.config/autostart/autostart.sh | 55 + botfiles/.config/bspwm/bspwmrc | 34 + botfiles/.config/dunst/dunstrc | 162 + botfiles/.config/gtk-2.0/gtkfilechooser.ini | 11 + botfiles/.config/gtk-3.0/settings.ini | 16 + botfiles/.config/homepage/index.html | 17 + botfiles/.config/homepage/style.css | 32 + botfiles/.config/mpd/database | Bin 0 -> 44557 bytes botfiles/.config/mpd/mpd.conf | 34 + botfiles/.config/mpd/mpd.log | 1620 +++++ botfiles/.config/mpd/pid | 1 + botfiles/.config/mpd/state | 28 + botfiles/.config/mpd/sticker.sql | Bin 0 -> 12288 bytes botfiles/.config/ncmpcpp/bindings | 82 + botfiles/.config/ncmpcpp/config | 71 + botfiles/.config/ncmpcpp/error.log | 0 botfiles/.config/neofetch/config.conf | 764 +++ botfiles/.config/nvim/.netrwhist | 12 + botfiles/.config/nvim/autoload/plug.vim | 2597 +++++++ botfiles/.config/nvim/init.vim | 393 ++ botfiles/.config/picom/picom.conf | 223 + botfiles/.config/polybar/config | 363 + botfiles/.config/qutebrowser/autoconfig.yml | 12 + botfiles/.config/qutebrowser/bookmarks/urls | 0 .../.config}/qutebrowser/config.py | 10 +- botfiles/.config/qutebrowser/quickmarks | 0 botfiles/.config/ranger/rc.conf | 10 + botfiles/.config/rofi/config | 7 + botfiles/.config/rofi/theme.rasi | 151 + botfiles/.config/sxhkd/sxhkdrc | 104 + botfiles/.config/transmission/dht.dat | Bin 0 -> 436 bytes ..._current_5.4.12.7z.02136ce83d490500.resume | Bin 0 -> 888 bytes ...「Fantastic future」／田村ゆかり (FLAC+BK).c14c42660d7920f3.resume | Bin 0 -> 991 bytes ...0.01.01-x86_64.iso.3f70b98c6162c029.resume | Bin 0 -> 1665 bytes ...0.02.01-x86_64.iso.661b2365e2226122.resume | Bin 0 -> 5881 bytes ....0-amd64-DVD-1.iso.a6b69431743f085d.resume | Bin 0 -> 3166 bytes ...2.0-amd64-lxde.iso.2b74bd269ec0b571.resume | Bin 0 -> 7601 bytes ...amd64-standard.iso.63b08ba72e958d72.resume | Bin 0 -> 2157 bytes ...2.0-amd64-xfce.iso.8ec276f14fa643b4.resume | Bin 0 -> 749 bytes ...0-1-live-amd64-iso.5112e6ce31a3a98f.resume | Bin 0 -> 1591 bytes botfiles/.config/transmission/settings.json | 68 + botfiles/.config/transmission/stats.json | 7 + ...current_5.4.12.7z.02136ce83d490500.torrent | Bin 0 -> 24714 bytes ...Fantastic future」／田村ゆかり (FLAC+BK).c14c42660d7920f3.torrent | Bin 0 -> 12302 bytes ....01.01-x86_64.iso.3f70b98c6162c029.torrent | Bin 0 -> 42631 bytes ....02.01-x86_64.iso.661b2365e2226122.torrent | Bin 0 -> 42475 bytes ...0-amd64-DVD-1.iso.a6b69431743f085d.torrent | Bin 0 -> 75284 bytes ....0-amd64-lxde.iso.2b74bd269ec0b571.torrent | Bin 0 -> 45870 bytes ...md64-standard.iso.63b08ba72e958d72.torrent | Bin 0 -> 34440 bytes ....0-amd64-xfce.iso.8ec276f14fa643b4.torrent | Bin 0 -> 45430 bytes ...-1-live-amd64-iso.5112e6ce31a3a98f.torrent | Bin 0 -> 225532 bytes botfiles/.config/vifm/colors/Default.vifm | 85 + botfiles/.config/vifm/scripts/README | 6 + botfiles/.config/vifm/vifm-help.txt | 6103 +++++++++++++++++ botfiles/.config/vifm/vifminfo | 68 + botfiles/.config/vifm/vifmrc | 483 ++ botfiles/.config/vlc/vlc-qt-interface.conf | 20 + botfiles/.config/vlc/vlcrc | 4711 +++++++++++++ .../.config/wallpapers/1366x768/wall1.png | Bin 0 -> 2453846 bytes .../.config/wallpapers/1366x768/wall2.png | Bin 0 -> 1286317 bytes .../.config/wallpapers/1366x768/wall3.png | Bin 0 -> 947585 bytes .../.config/wallpapers/1366x768/wall4.png | Bin 0 -> 879414 bytes .../.config/wallpapers/1366x768/wall5.png | Bin 0 -> 2686484 bytes .../.config/wallpapers/1920x1080/wall1.png | Bin 0 -> 1281201 bytes botfiles/.config/zsh/history | 2806 ++++++++ botfiles/.scripts/get-local-wificard-ip.sh | 1 + botfiles/.scripts/lockscreen.sh | 3 + botfiles/.scripts/powermenu.sh | 11 + botfiles/.scripts/scr | 6 + botfiles/.scripts/screenshot.sh | 25 + botfiles/.scripts/showcolors | 9 + botfiles/.scripts/update-check.sh | 11 + botfiles/.scripts/updater.sh | 9 + botfiles/.scripts/wificheck.sh | 11 + botfiles/.xinitrc | 2 + botfiles/.zprofile | 0 botfiles/.zshrc | 101 + botfiles/shortcuts-custom.json | 102 + installer/dotman | 63 + 90 files changed, 21572 insertions(+), 834 deletions(-) delete mode 100644 .config/i3/config delete mode 100644 .config/nvim/bundle/i3-vim-syntax/ftdetect/i3.vim delete mode 100644 .config/nvim/bundle/i3-vim-syntax/ftplugin/i3.vim delete mode 100644 .config/nvim/bundle/i3-vim-syntax/syntax/i3.vim delete mode 100644 .config/nvim/init.vim delete mode 100644 .config/polybar/config delete mode 100644 .config/ranger/rc.conf delete mode 100644 .zshrc rename .Xresources => botfiles/.Xresources (100%) create mode 100644 botfiles/.aliases create mode 100755 botfiles/.config/autostart/autostart.sh create mode 100755 botfiles/.config/bspwm/bspwmrc create mode 100644 botfiles/.config/dunst/dunstrc create mode 100644 botfiles/.config/gtk-2.0/gtkfilechooser.ini create mode 100644 botfiles/.config/gtk-3.0/settings.ini create mode 100644 botfiles/.config/homepage/index.html create mode 100644 botfiles/.config/homepage/style.css create mode 100644 botfiles/.config/mpd/database create mode 100644 botfiles/.config/mpd/mpd.conf create mode 100644 botfiles/.config/mpd/mpd.log create mode 100644 botfiles/.config/mpd/pid create mode 100644 botfiles/.config/mpd/state create mode 100644 botfiles/.config/mpd/sticker.sql create mode 100644 botfiles/.config/ncmpcpp/bindings create mode 100644 botfiles/.config/ncmpcpp/config create mode 100644 botfiles/.config/ncmpcpp/error.log create mode 100644 botfiles/.config/neofetch/config.conf create mode 100644 botfiles/.config/nvim/.netrwhist create mode 100644 botfiles/.config/nvim/autoload/plug.vim create mode 100644 botfiles/.config/nvim/init.vim create mode 100644 botfiles/.config/picom/picom.conf create mode 100644 botfiles/.config/polybar/config create mode 100644 botfiles/.config/qutebrowser/autoconfig.yml create mode 100644 botfiles/.config/qutebrowser/bookmarks/urls rename {.config => botfiles/.config}/qutebrowser/config.py (84%) create mode 100644 botfiles/.config/qutebrowser/quickmarks create mode 100644 botfiles/.config/ranger/rc.conf create mode 100644 botfiles/.config/rofi/config create mode 100644 botfiles/.config/rofi/theme.rasi create mode 100644 botfiles/.config/sxhkd/sxhkdrc create mode 100644 botfiles/.config/transmission/dht.dat create mode 100644 botfiles/.config/transmission/resume/Armbian_20.02.0-rc0_Bananapi_buster_current_5.4.12.7z.02136ce83d490500.resume create mode 100644 botfiles/.config/transmission/resume/[얼티메이트] [130417] TVアニメ「変態王子と笑わない猫。」OPテーマ -「Fantastic future」／田村ゆかり (FLAC+BK).c14c42660d7920f3.resume create mode 100644 botfiles/.config/transmission/resume/archlinux-2020.01.01-x86_64.iso.3f70b98c6162c029.resume create mode 100644 botfiles/.config/transmission/resume/archlinux-2020.02.01-x86_64.iso.661b2365e2226122.resume create mode 100644 botfiles/.config/transmission/resume/debian-10.2.0-amd64-DVD-1.iso.a6b69431743f085d.resume create mode 100644 botfiles/.config/transmission/resume/debian-live-10.2.0-amd64-lxde.iso.2b74bd269ec0b571.resume create mode 100644 botfiles/.config/transmission/resume/debian-live-10.2.0-amd64-standard.iso.63b08ba72e958d72.resume create mode 100644 botfiles/.config/transmission/resume/debian-live-10.2.0-amd64-xfce.iso.8ec276f14fa643b4.resume create mode 100644 botfiles/.config/transmission/resume/kali-linux-2020-1-live-amd64-iso.5112e6ce31a3a98f.resume create mode 100644 botfiles/.config/transmission/settings.json create mode 100644 botfiles/.config/transmission/stats.json create mode 100644 botfiles/.config/transmission/torrents/Armbian_20.02.0-rc0_Bananapi_buster_current_5.4.12.7z.02136ce83d490500.torrent create mode 100644 botfiles/.config/transmission/torrents/[얼티메이트] [130417] TVアニメ「変態王子と笑わない猫。」OPテーマ -「Fantastic future」／田村ゆかり (FLAC+BK).c14c42660d7920f3.torrent create mode 100644 botfiles/.config/transmission/torrents/archlinux-2020.01.01-x86_64.iso.3f70b98c6162c029.torrent create mode 100644 botfiles/.config/transmission/torrents/archlinux-2020.02.01-x86_64.iso.661b2365e2226122.torrent create mode 100644 botfiles/.config/transmission/torrents/debian-10.2.0-amd64-DVD-1.iso.a6b69431743f085d.torrent create mode 100644 botfiles/.config/transmission/torrents/debian-live-10.2.0-amd64-lxde.iso.2b74bd269ec0b571.torrent create mode 100644 botfiles/.config/transmission/torrents/debian-live-10.2.0-amd64-standard.iso.63b08ba72e958d72.torrent create mode 100644 botfiles/.config/transmission/torrents/debian-live-10.2.0-amd64-xfce.iso.8ec276f14fa643b4.torrent create mode 100644 botfiles/.config/transmission/torrents/kali-linux-2020-1-live-amd64-iso.5112e6ce31a3a98f.torrent create mode 100644 botfiles/.config/vifm/colors/Default.vifm create mode 100644 botfiles/.config/vifm/scripts/README create mode 100644 botfiles/.config/vifm/vifm-help.txt create mode 100644 botfiles/.config/vifm/vifminfo create mode 100644 botfiles/.config/vifm/vifmrc create mode 100644 botfiles/.config/vlc/vlc-qt-interface.conf create mode 100644 botfiles/.config/vlc/vlcrc create mode 100644 botfiles/.config/wallpapers/1366x768/wall1.png create mode 100644 botfiles/.config/wallpapers/1366x768/wall2.png create mode 100644 botfiles/.config/wallpapers/1366x768/wall3.png create mode 100644 botfiles/.config/wallpapers/1366x768/wall4.png create mode 100644 botfiles/.config/wallpapers/1366x768/wall5.png create mode 100644 botfiles/.config/wallpapers/1920x1080/wall1.png create mode 100644 botfiles/.config/zsh/history create mode 100755 botfiles/.scripts/get-local-wificard-ip.sh create mode 100644 botfiles/.scripts/lockscreen.sh create mode 100755 botfiles/.scripts/powermenu.sh create mode 100644 botfiles/.scripts/scr create mode 100755 botfiles/.scripts/screenshot.sh create mode 100644 botfiles/.scripts/showcolors create mode 100755 botfiles/.scripts/update-check.sh create mode 100755 botfiles/.scripts/updater.sh create mode 100755 botfiles/.scripts/wificheck.sh create mode 100644 botfiles/.xinitrc create mode 100644 botfiles/.zprofile create mode 100644 botfiles/.zshrc create mode 100644 botfiles/shortcuts-custom.json create mode 100644 installer/dotman diff --git a/.config/i3/config b/.config/i3/config deleted file mode 100644 index b148634..0000000 --- a/.config/i3/config +++ /dev/null @@ -1,188 +0,0 @@ -# _ _____ -# (_)|___ / -# | | |_ \ -# | | ___) | -# |_||____/ - -#~~~~~~~~~~~~ -# Xresources -#~~~~~~~~~~~~ -set_from_resource $border border_unfocused -set_from_resource $border_f border_focused - -#~~~~~~~~~ -# mod key -#~~~~~~~~~ -set $mod Mod4 - -#~~~~~~~~~ -# borders -#~~~~~~~~~ -new_window pixel 1 -new_float normal -hide_edge_borders none -# change borders -bindsym $mod+u border none -bindsym $mod+y border pixel 1 -font xft:URWGothic-Book 11 -# border active color -client.unfocused $border $border $border $border -client.focused $border_f $border_f $border_f $border_f - -#~~~~~~~ -# other -#~~~~~~ -# Use Mouse+$mod to drag floating windows -floating_modifier $mod -# kill focused window -bindsym $mod+Shift+q kill - -#~~~~~~~~~~~~~~~ -# bindings apps -#~~~~~~~~~~~~~~~ -bindsym $mod+Return exec --no-startup-id st -bindsym $mod+d exec --no-startup-id dmenu_run -bindsym $mod+F2 exec qutebrowser -bindsym $mod+F3 exec st -e ranger -bindsym $mod+s exec ~/.scripts/screenshot.sh -bindsym $mod+c exec st -e nvim - -# Screen brightness controls -#bindsym XF86MonBrightnessUp exec "xbacklight -inc 10; notify-send 'brightness up'" -#bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'" - -#~~~~~~~~~~~~~~ -# change focus -#~~~~~~~~~~~~~~ -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right -focus_follows_mouse no -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 -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right -# workspace back and forth (with/without active container) -workspace_auto_back_and_forth yes -bindsym $mod+b workspace back_and_forth -bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth - -#~~~~~~~~~~~~~~~~~~~ -# split orientation -#~~~~~~~~~~~~~~~~~~~ -bindsym $mod+Ctrl+h split h -bindsym $mod+Ctrl+v split v -bindsym $mod+q split toggle -# toggle fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle -# move the currently focused window to the scratchpad -bindsym $mod+Shift+minus move scratchpad -# Show the next scratchpad window or hide the focused scratchpad window. -# If there are multiple scratchpad windows, this command cycles through them. -bindsym $mod+minus scratchpad show -#navigate workspaces next / previous -bindsym $mod+Ctrl+Right workspace next -bindsym $mod+Ctrl+Left workspace prev - -#~~~~~~~~~~~~ -# workspaces -#~~~~~~~~~~~~ -# names -set $ws1 "1: " -set $ws2 "2: " -set $ws3 "3: " -set $ws4 "4: " -set $ws5 "5: " -set $ws6 "6: " -set $ws7 "7: " -set $ws8 "8: " -# switch to workspace -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 -# Move focused container to workspace -bindsym $mod+Ctrl+1 move container to workspace $ws1 -bindsym $mod+Ctrl+2 move container to workspace $ws2 -bindsym $mod+Ctrl+3 move container to workspace $ws3 -bindsym $mod+Ctrl+4 move container to workspace $ws4 -bindsym $mod+Ctrl+5 move container to workspace $ws5 -bindsym $mod+Ctrl+6 move container to workspace $ws6 -bindsym $mod+Ctrl+7 move container to workspace $ws7 -bindsym $mod+Ctrl+8 move container to workspace $ws8 -# Move to workspace with focused container -bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 -bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5 -bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6 -bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7 -bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 - -#~~~~~~ -# i3wm -#~~~~~~ -# 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) -bindsym $mod+r mode "resize" -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 5 px or 5 ppt - bindsym j resize grow height 5 px or 5 ppt - bindsym k resize shrink height 5 px or 5 ppt - bindsym l resize grow width 5 px or 5 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 - - # exit resize mode: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} -# Lock screen -bindsym $mod+9 exec --no-startup-id blurlock - -#~~~~~~~~~~~ -# autostart -#~~~~~~~~~~~ -exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec --no-startup-id syncthing -no-browser -exec --no-startup-id nm-applet -exec --no-startup-id xfce4-power-manager -# exec --no-startup-id clipit -# exec --no-startup-id blueman-applet -exec --no-startup-id polybar polybarexe -# exec_always --no-startup-id mopidy -exec_always --no-startup-id feh --bg-fill --randomize ~/Pictures/Wallpapers -exec --no-startup-id lxsession - -# vim: filetype=i3 diff --git a/.config/nvim/bundle/i3-vim-syntax/ftdetect/i3.vim b/.config/nvim/bundle/i3-vim-syntax/ftdetect/i3.vim deleted file mode 100644 index 21603c5..0000000 --- a/.config/nvim/bundle/i3-vim-syntax/ftdetect/i3.vim +++ /dev/null @@ -1,4 +0,0 @@ -augroup i3_ftdetect - au! - au BufRead,BufNewFile *i3/config,*sway/config set ft=i3 -augroup END diff --git a/.config/nvim/bundle/i3-vim-syntax/ftplugin/i3.vim b/.config/nvim/bundle/i3-vim-syntax/ftplugin/i3.vim deleted file mode 100644 index 463eea9..0000000 --- a/.config/nvim/bundle/i3-vim-syntax/ftplugin/i3.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal commentstring=#\ %s diff --git a/.config/nvim/bundle/i3-vim-syntax/syntax/i3.vim b/.config/nvim/bundle/i3-vim-syntax/syntax/i3.vim deleted file mode 100644 index 7de599d..0000000 --- a/.config/nvim/bundle/i3-vim-syntax/syntax/i3.vim +++ /dev/null @@ -1,134 +0,0 @@ -" Vim syntax file -" Language: i3-wm config file -" Maintainer: Emanuel Guével -" Latest Revision: 16 October 2012 - -if exists("b:current_syntax") - finish -endif - -" Symbols -syn match i3Operators "+\|→" -syn match i3ChainDelimiter ";" - -syn match i3Var "\$\w\+" - -" Key modifiers -syn keyword i3KeyModifier Shift Control Ctrl Mod1 Mod2 Mod3 Mod4 Mod5 Mode_switch - -" Strings -syn region i3SimpleString keepend start='[^ \t]' end='$\|;' contained contains=i3ChainDelimiter,i3Var -syn match i3QuotedString '"[^"]\+"' contained -syn cluster i3String contains=i3SimpleString,i3QuotedString - -" Config commands -syn keyword i3ConfigCommand bind bindcode bindsym assign new_window popup_during_fullscreen font floating_modifier default_orientation workspace_layout for_window focus_follows_mouse bar position colors output tray_output workspace_buttons workspace_auto_back_and_forth binding_mode_indicator debuglog floating_minimum_size floating_maximum_size force_focus_wrapping force_xinerama force_display_urgency_hint hidden_state modifier new_float shmlog socket_path verbose mouse_warping strip_workspace_numbers focus_on_window_activation no_focus -syn match i3IpcSocket "ipc[-_]socket" nextgroup=@i3String skipwhite - -" Command keywords -syn keyword i3Command exit reload restart kill fullscreen global layout border focus move open split append_layout mark unmark resize grow shrink show nop rename title_format sticky -syn keyword i3Param 1pixel default stacked tabbed normal none tiling stacking floating enable disable up down horizontal vertical auto up down left right parent child px or ppt leave_fullscreen toggle mode_toggle scratchpad width height top bottom client hide primary yes all active window container to absolute center on off x ms h v smart ignore pixel splith splitv output true -syn match i3DashedParam '--\(release\|border\|whole-window\|toggle\)' skipwhite -syn match i3NoStartupId '--no-startup-id' contained -syn keyword i3WsSpecialParam next prev next_on_output prev_on_output back_and_forth current number -syn keyword i3BordersSpecialParam none vertical horizontal both -syn keyword i3ModeParam dock hide invisible skipwhite -syn keyword i3GapsCommand gaps smart_gaps smart_borders -syn keyword i3GapsParam inner outer current all set plus minus no_gaps - -" these are not keywords but we add them for consistency -syn keyword i3PseudoParam no false inactive - -" Exec commands -syn region i3ExecCommand keepend start='[^ \t]' end='$\|;' contained contains=i3ChainDelimiter,i3Var,i3NoStartupId -syn match i3QuotedExecCommand '"[^"]\+"' contained -syn keyword i3ExecKeyword exec exec_always i3bar_command nextgroup=i3QuotedExecCommand,i3ExecCommand skipwhite - -" Status command -syn match i3StatusCommand ".*$" contained -syn keyword i3StatusCommandKeyword status_command nextgroup=i3StatusCommand skipwhite - -" Font statement -syn keyword i3FontStatement font nextgroup=@i3String skipwhite - -" Separator symbol -syn keyword i3SeparatorSymbol separator_symbol nextgroup=@i3String skipwhite - -" Set statement -syn match i3SetVar "\$\w\+" contained nextgroup=@i3String skipwhite -syn keyword i3SetKeyword set set_from_resource nextgroup=i3SetVar skipwhite - -" Workspaces -syn keyword i3WsKeyword workspace nextgroup=i3WsSpecialParam,@i3String skipwhite - -" Hide edge borders -syn keyword i3BordersConfigCommand hide_edge_borders nextgroup=i3BordersSpecialParam skipwhite - -" Mode -syn keyword i3ModeKeyword mode nextgroup=i3ModeParam,@i3String skipwhite - -" Comments -syn keyword i3Todo contained TODO FIXME XXX NOTE -syn match i3Comment "^\s*#.*$" contains=i3Todo - -" Error (at end of line) -syn match i3Error ".*$" contained - -" Hex color code -syn match i3ColorLast "#[0-9a-fA-F]\{6\}" contained nextgroup=i3Error skipwhite -syn match i3Color2nd "#[0-9a-fA-F]\{6\}" contained nextgroup=i3ColorLast skipwhite -syn match i3Color1st "#[0-9a-fA-F]\{6\}" contained nextgroup=i3Color2nd skipwhite - -syn match i3ColorDef1 "client\.background\|statusline\|background\|separator\|statusline" nextgroup=i3ColorLast skipwhite -syn match i3ColorDef3 "client\.\(focused_inactive\|focused\|unfocused\|urgent\)\|inactive_workspace\|urgent_workspace\|focused_workspace\|active_workspace" nextgroup=i3Color1st skipwhite - -highlight link i3ChainDelimiter Operator -highlight link i3Operators Operator - -highlight link i3ExecCommand Special -highlight link i3QuotedExecCommand Special -highlight link i3StatusCommand Special - -highlight link i3Param Constant -highlight link i3PseudoParam Constant -highlight link i3DashedParam Constant -highlight link i3NoStartupId Constant -highlight link i3Color1st Constant -highlight link i3Color2nd Constant -highlight link i3ColorLast Constant -highlight link i3WsSpecialParam Constant -highlight link i3BordersSpecialParam Constant -highlight link i3ModeParam Constant -highlight link i3GapsParam Constant - -highlight link i3Var Identifier -highlight link i3SetVar Identifier - -highlight link i3KeyModifier Function - -highlight link i3SimpleString String -highlight link i3QuotedString String -highlight link i3WsName String -highlight link i3QuotedWsName String -highlight link i3SetValue String -highlight link i3Font String - -highlight link i3ExecKeyword Keyword -highlight link i3Command Keyword -highlight link i3WsKeyword Keyword -highlight link i3GapsCommand Keyword - -highlight link i3ColorDef1 Define -highlight link i3ColorDef3 Define -highlight link i3ConfigCommand Define -highlight link i3IpcSocket Define -highlight link i3SetKeyword Define -highlight link i3ModeKeyword Define -highlight link i3FontStatement Define -highlight link i3SeparatorSymbol Define -highlight link i3StatusCommandKeyword Define -highlight link i3BordersConfigCommand Define - -highlight link i3Todo Todo -highlight link i3Comment Comment -highlight link i3Error Error diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index e62a824..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,262 +0,0 @@ -" -" _ -" _ __ ___ _____ _(_)_ __ ___ -" | '_ \ / _ \/ _ \ \ / / | '_ ` _ \ -" | | | | __/ (_) \ V /| | | | | | | -" |_| |_|\___|\___/ \_/ |_|_| |_| |_| -" - -""""""""""" -" Plugins " -""""""""""" -call plug#begin('~/.config/nvim/bundle') - Plug 'vbe0201/vimdiscord' - Plug 'https://github.com/w0rp/ale' - Plug 'https://github.com/captbaritone/better-indent-support-for-php-with-html' - Plug 'https://github.com/Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } - Plug 'https://github.com/Shougo/deoplete-clangx' - Plug 'https://github.com/deoplete-plugins/deoplete-go', { 'do': 'make'} - Plug 'https://github.com/deoplete-plugins/deoplete-jedi' - Plug 'https://github.com/padawan-php/deoplete-padawan', { 'do': 'composer install' } - Plug 'https://github.com/carlitux/deoplete-ternjs' - Plug 'https://github.com/deoplete-plugins/deoplete-zsh' - Plug 'https://github.com/Shougo/neco-vim' - Plug 'https://github.com/Shougo/neoinclude.vim' - Plug 'https://github.com/editorconfig/editorconfig-vim' - Plug 'https://github.com/junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } - Plug 'https://github.com/junegunn/fzf.vim' - Plug 'https://github.com/scrooloose/nerdtree' - Plug 'https://github.com/junegunn/goyo.vim' - Plug '~/.config/nvim/bundle/i3-vim-syntax' - Plug 'https://github.com/itchyny/lightline.vim' - Plug 'https://github.com/vim-python/python-syntax' - Plug 'https://github.com/rafaqz/ranger.vim' - Plug '~/.config/nvim/bundle/lightline-biual' - Plug 'https://github.com/cakebaker/scss-syntax.vim' - Plug 'https://github.com/SirVer/ultisnips' - Plug 'https://github.com/honza/vim-snippets' - Plug 'https://github.com/romainl/vim-cool' - Plug 'https://github.com/tpope/vim-commentary' - Plug 'https://github.com/bfrg/vim-cpp-modern' - Plug 'https://github.com/tpope/vim-fugitive' - Plug 'https://github.com/shumphrey/fugitive-gitlab.vim' - Plug 'https://github.com/tpope/vim-rhubarb' - Plug 'https://github.com/itchyny/vim-gitbranch' - Plug 'https://github.com/fatih/vim-go', { 'do': ':GoUpdateBinaries' } - Plug 'https://github.com/jelera/vim-javascript-syntax' - Plug 'https://github.com/matze/vim-meson' - Plug 'https://github.com/tpope/vim-surround' - Plug 'https://github.com/tpope/vim-repeat' - Plug 'https://github.com/reedes/vim-pencil' - Plug 'https://github.com/tpope/vim-speeddating' - Plug 'https://github.com/cespare/vim-toml' - Plug 'raimondi/delimitmate' - Plug 'https://github.com/bronson/vim-trailing-whitespace' - -call plug#end() - - -" Basic stuff -syntax on -filetype plugin indent on -set autoindent -set smarttab -set number number -set clipboard=unnamedplus -set inccommand=nosplit -set tabstop=4 -set shiftwidth=4 -set ignorecase -set smartcase -set undofile -set background=light - -" Python paths, needed for virtualenvs -let g:python3_host_prog = '/usr/bin/python3' -let g:python_host_prog = '/usr/bin/python2' - -" Colorscheme -hi LineNr ctermfg=3 -hi CursorLineNr ctermfg=3 -hi Statement ctermfg=3 -hi Visual ctermbg=8 -hi Search ctermbg=8 -hi SpellBad ctermfg=0 ctermbg=1 cterm=underline -hi SpellCap ctermfg=0 ctermbg=2 cterm=underline -hi SpellRare ctermfg=0 ctermbg=3 cterm=underline -hi SpellLocal ctermfg=0 ctermbg=5 cterm=underline -hi Pmenu ctermbg=0 ctermfg=4 -hi PmenuSel ctermbg=8 ctermfg=4 -hi PmenuSbar ctermbg=0 -hi DiffAdd ctermbg=2 ctermfg=0 -hi DiffChange ctermbg=4 ctermfg=0 -hi DiffDelete ctermbg=1 ctermfg=0 -hi Folded ctermbg=8 -hi FoldColumn ctermbg=8 -hi SignColumn ctermbg=0 ctermfg=7 -hi ALEWarning ctermbg=1 ctermfg=0 -hi ALEErrorSign ctermbg=1 ctermfg=0 - -"================ -" Plugin configs -"================ - -" Lightline - statusline -set noshowmode -let g:lightline = { - \ 'colorscheme': 'powerlineish', - \ 'active': { - \ 'left': [ [ 'mode' ], - \ [ 'readonly', 'filename', 'gitbranch' ], - \ [ 'modified' ] ], - \ 'right': [ [ 'filetype', 'fileencoding' ], - \ [ 'percent' ] ] - \ }, - \ 'component_function': { - \ 'gitbranch': 'gitbranch#name' - \ }, - \ } - -" Deoplete - autocompletion -let g:deoplete#enable_at_startup = 1 -if !exists('g:deoplete#omni#input_patterns') - let g:deoplete#omni#input_patterns = {} -endif -" deoplete-go -let g:deoplete#sources#go#gocode_binary = $GOPATH.'/bin/gocode' -" UltiSnips -call deoplete#custom#source('ultisnips', 'rank', 1000) - -" ALE - Asynchronous Lint Engine -let g:ale_linters = { -\ 'c': ['ccls', 'clang'], -\ 'cpp': ['clang'], -\ 'javascript': ['eslint'], -\ 'php': ['php'], -\ 'python': ['pyls', 'flake8'], -\ 'sh': ['shellcheck'], -\ 'vim': ['vint'], -\} -let g:ale_fixers = { -\ '*': ['remove_trailing_lines', 'trim_whitespace'], -\ 'c': ['clang-format'], -\ 'cpp': ['clang-format'], -\ 'css': ['prettier'], -\ 'go': ['gofmt'], -\ 'html': ['prettier'], -\ 'javascript': ['prettier'], -\ 'json': ['prettier'], -\ 'php': ['prettier'], -\ 'python': ['black'], -\ 'scss': ['prettier'], -\ 'yaml': ['prettier'], -\} -" let g:ale_lint_on_text_changed = 'never' - -" vim-go -let g:go_fmt_autosave = 0 "We use ALE for formatting - -" Syntax highlighting -let g:python_highlight_all = 1 - -" vim-plug - plugin manager -" Fix https://github.com/junegunn/vim-plug/issues/502 -let g:plug_threads = 1 - -" vim-pencil -let g:pencil#textwidth = 88 -let g:pencil#wrapModeDefault = 'soft' - - -"=================== -" Language-specific -"=================== - -augroup langindentation - autocmd Filetype c setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype cpp setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype css setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype javascript setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype html setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype json setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype scss setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype php setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 - autocmd Filetype yaml setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2 -augroup END - -augroup pencil - autocmd! - autocmd FileType markdown call pencil#init({'wrap': 'soft', 'autoformat': 1}) - autocmd FileType tex call pencil#init({'wrap': 'soft', 'autoformat': 1}) -augroup END - - -"============== -" Key Bindings -"============== - -" Leader key -let mapleader = ' ' - -" When line overflows, it will go -" one _visual_ line and not actual -map j gj -map k gk - -" gv reselects last selection -" so now you can indent with >>>>… -" without selecting again -xnoremap < >gv - -" Tab Managment -map :tabnew -map :tabclose -nnoremap k gT -nnoremap j gt - -" Complete with -inoremap pumvisible() ? "\" : -\ check_back_space() ? "\" : -\ deoplete#mappings#manual_complete() -function! s:check_back_space() abort "{{{ - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~? '\s' -endfunction"}}} - -" Open Ranger, file manager -map :RangerEdit - -" ALE - Asynchronous Lint Engine -map :ALEFix -map g :ALEGoToDefinitionInSplit -map G :ALEGoToDefinition - -" Spell-check (English US and Polish) -map :setlocal spell! spelllang=en_us -map :setlocal spell! spelllang=pl - -" Toggle Goyo, distraction free mode -map :Goyo - -" Toggle Pencil, wrapping text -map :PencilToggle - -" fzf, fuzzy finder -nnoremap :Files -nnoremap :GFiles -let g:fzf_action = { - \ 'ctrl-t': 'tab split', - \ 'ctrl-x': 'split', - \ 'ctrl-v': 'vsplit' } - -" UltiSnips -let g:UltiSnipsExpandTrigger='' -let g:UltiSnipsJumpForwardTrigger='' -let g:UltiSnipsJumpBackwardTrigger='' - -" nerdtree -map :NERDTreeToggle - -"==Encoding== -scriptencoding utf-8 diff --git a/.config/polybar/config b/.config/polybar/config deleted file mode 100644 index e7f9b95..0000000 --- a/.config/polybar/config +++ /dev/null @@ -1,181 +0,0 @@ -; _ _ -; _ __ ___ | | _ _ | |__ __ _ _ __ -; | '_ \ / _ \ | || | | || '_ \ / _` || '__| -; | |_) || (_) || || |_| || |_) || (_| || | -; | .__/ \___/ |_| \__, ||_.__/ \__,_||_| -; |_| |___/ - -;~~~~~~~~ -; colors -;~~~~~~~~ -[colors] -background = ${xrdb:background} -foreground = ${xrdb:foreground} -border = ${xrdb:border_unfocused} - -;~~~~~ -; bar -;~~~~~ -[bar/polybarexe] -width = 100% -height = 23 -fixed-center = true - -font-0 = "DejaVu Sans Mono:pixelsize=10:antialias=true;3" -font-1 = "Font Awesome 5 Brands:pixelsize=13:antialias=true;3" -font-2 = "Font Awesome 5 Free:style=Solid:pixelsize=12:antialias=true;3" - -background = ${colors.background} -foreground = ${colors.foreground} - -line-size = 3 -line-color = #f00 - -border-size = 0 -border-top-size = 0 -border-bottom-size = 1 -border-color = ${colors.border} - -padding-left = 0 -padding-right = 2 - -module-margin-left = 1 -module-margin-right = 2 - -modules-left = i3 -;modules-center = clock -modules-right = wireless-network battery clock - -cursor-click = pointer -cursor-scroll = ns-resize - -;~~~~~~~~~~~~ -; workspaces -;~~~~~~~~~~~~ -[module/i3] -type = internal/i3 -pin-workspaces = true -strip-wsnumbers = true -index-sort = true -enable-click = true -fuzzy-match = true -format = -label-mode = %mode% -label-mode-padding = 2 - -label-focused = %index% %name% -label-focused-padding = 1 -label-focused-background = ${colors.border} -label-focused-overline = ${colors.foreground} - -label-unfocused = %index% %name% -label-unfocused-padding = 1 - -label-visible = %index% %name% -label-visible-padding = 1 - -label-urgent = %index% %name% -label-urgent-padding = 1 - -;~~~~~~ -; WiFI -;~~~~~~ -[module/wireless-network] -type = internal/network -interface = wlp8s0 - -format-connected = -format-packetloss = -label-connected = %{A1:nm-connection-editor:}%essid%%{A} -label-disconnected = %{A1:networkmanager_dmenu& disown:}%{A3:networkmanager_dmenu& disown:} disconnected%{A}%{A} - -ramp-signal-0 =  -ramp-signal-1 =  -ramp-signal-2 =  -ramp-signal-3 =  -ramp-signal-4 =  -ramp-signal-5 =  -animation-packetloss-0 =  -animation-packetloss-1 =  -animation-packetloss-0-foreground = #fff -animation-packetloss-1-foreground = #000000 -animation-packetloss-framerate = 500 - -;~~~~~~~ -; clock -;~~~~~~~ -[module/clock] -type = internal/date -format =