diff options
107 files changed, 2 insertions, 5111 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c6c3c77..0000000 --- a/.gitmodules +++ /dev/null @@ -1,51 +0,0 @@ -[submodule "vim/bundle/YouCompleteMe"] - path = vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git -[submodule "vim/bundle/lightline.vim"] - path = vim/bundle/lightline.vim - url = https://github.com/itchyny/lightline.vim.git -[submodule "vim/bundle/syntastic"] - path = vim/bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "vim/bundle/tlib_vim"] - path = vim/bundle/tlib_vim - url = https://github.com/tomtom/tlib_vim.git -[submodule "vim/bundle/tagbar"] - path = vim/bundle/tagbar - url = https://github.com/majutsushi/tagbar.git -[submodule "vim/bundle/vim-addon-mw-utils"] - path = vim/bundle/vim-addon-mw-utils - url = https://github.com/MarcWeber/vim-addon-mw-utils.git -[submodule "vim/bundle/vim-gitgutter"] - path = vim/bundle/vim-gitgutter - url = git://github.com/airblade/vim-gitgutter.git -[submodule "vim/bundle/vim-snippets"] - path = vim/bundle/vim-snippets - url = https://github.com/honza/vim-snippets.git -[submodule "vim/bundle/vim-table-mode"] - path = vim/bundle/vim-table-mode - url = https://github.com/dhruvasagar/vim-table-mode.git -[submodule "vim/3rdparty/vim-pathogen"] - path = vim/3rdparty/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git -[submodule "private"] - path = private - url = git@cynerd.cz:myconfigs-private -[submodule "vim/bundle/vim-autotag"] - path = vim/bundle/vim-autotag - url = https://github.com/craigemery/vim-autotag.git -[submodule "vim/bundle/ultisnips"] - path = vim/bundle/ultisnips - url = https://github.com/SirVer/ultisnips.git -[submodule "vim/bundle/nerdcommenter"] - path = vim/bundle/nerdcommenter - url = https://github.com/scrooloose/nerdcommenter.git -[submodule "vim/bundle/vim-indent-guides"] - path = vim/bundle/vim-indent-guides - url = git://github.com/nathanaelkane/vim-indent-guides.git -[submodule "vim/bundle/vim-surround"] - path = vim/bundle/vim-surround - url = git://github.com/tpope/vim-surround.git -[submodule "vim/bundle/vim-repeat"] - path = vim/bundle/vim-repeat - url = https://github.com/tpope/vim-repeat.git diff --git a/Xresources b/Xresources deleted file mode 100644 index a18aea3..0000000 --- a/Xresources +++ /dev/null @@ -1,60 +0,0 @@ -Xcursor.size: 8 -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight -Xft.autohint: false -Xft.lcdfilter: lcddefault -! XTerm ## -XTerm*metaSendsEscape: true -XTerm*locale: true -Xterm*saveLines: 4096 -XTerm*reverseVideo: on -Xterm*faceName: Liberation Mono:size=10:antialias=true -Xterm*borderWidth: 0 -! unicode rxvt ## -URxvt*background: black -URxvt*foreground: white -URxvt*color0: black -URxvt*color1: red3 -URxvt*color2: green3 -URxvt*color3: yellow3 -URxvt*color4: blue2 -URxvt*color5: magenta3 -URxvt*color6: cyan3 -URxvt*color7: gray90 -URxvt*color8: grey50 -URxvt*color9: red -URxvt*color10: green -URxvt*color11: yellow -!URxvt*color12: blue -URxvt*color12: rgb:5c/5c/ff -URxvt*color13: magenta -URxvt*color14: cyan -URxvt*color15: white -URxvt*saveLines: 4096 -! scrollbar style - rxvt (default), plain (most compact), next, or xterm -!URxvt.scrollstyle: plain -URxvt.scrollBar: false -! do not scroll with output -URxvt*scrollTtyOutput: false -! scroll in relation to buffer (with mouse scroll or Shift+Page Up) -URxvt*scrollWithBuffer: true -! scroll back to the bottom on keypress -URxvt*scrollTtyKeypress: true -! Disable scrollback for secondary screens -URxvt*secondaryScreen: 1 -URxvt*secondaryScroll: 0 -! Font -URxvt*font: xft:DejaVu Sans Mono:size=9 -URxvt.letterSpace: -1 -URxvt*perl-ext-common: default,clipboard,font-size -URxvt.keysym.C-Up: perl:font-size:increase -URxvt.keysym.C-Down: perl:font-size:decrease - -URxvt*iso14755: False -URxvt*keysym*Shift-Control-C: perl:clipboard:copy -URxvt*keysym*Shift-Control-V: perl:clipboard:paste -URxvt*clipboard*copycmd: xsel -ib -URxvt*clipboard*pastecmd: xsel -ob diff --git a/abook/abookrc b/abook/abookrc deleted file mode 100644 index 5c19eae..0000000 --- a/abook/abookrc +++ /dev/null @@ -1,11 +0,0 @@ -#view Groups = Groups - -set index_format = " {name:22} {email:40} {phone:18|workphone|mobile} {groups:20}" -set autosave = true -set www_command = xdg-open -set address_style = eu -set add_email_prevent_duplicates = true - -set use_colors = true -set color_header_fg = white -set color_header_bg = black diff --git a/archlinux.pkgs b/archlinux.pkgs deleted file mode 100644 index 206aadc..0000000 --- a/archlinux.pkgs +++ /dev/null @@ -1,64 +0,0 @@ -dnl vim:ft=m4 -dnl File containing names of explicitly installed packages on system -esyscmd(`echo define\(HOSTNAME,$(hostname)\)') -sinclude(HOSTNAME) - -dnl Archlinux packages management -pacaur -pkgfile -agetpkg-git -pkgstats - -dnl Various essential console programs -ifdef(`DESKTOP',gvim,vim) -vim-spell-cs -vim-spell-en -screen -htop -openssh -ncdu -rsync -wget -sshfs -zsh -zsh-completions -bash-completion -bc -pv -sysstat - -dnl System stuff -ifdef(`OPENRC',dhcpcd-openrc,dhcpcd) -ifdef(`OPENRC',fuse-openrc,fuse2) -ifdef(`OPENRC',ntp-openrc,ntp) -ufw -sudo -lsof -hdparm -smartmontools - -dnl File systems -btrfs-progs -exfat-utils -dosfstools -parted - -dnl network -bind-tools -nmap -net-tools -nethogs -tcpdump -tcping - -dnl archive -unzip -zip -rar -p7zip - -dnl Color highlight of less -source-highlight - -dnl Base group -syscmd(`pacman -Qg base | awk "{print \$2}"') diff --git a/archlinux.pkgs.d/avr b/archlinux.pkgs.d/avr deleted file mode 100644 index aa83119..0000000 --- a/archlinux.pkgs.d/avr +++ /dev/null @@ -1,7 +0,0 @@ -dnl vim:ft=m4 - -avrdude -avr-gcc -avr-gdb -avr-libc -simavr diff --git a/archlinux.pkgs.d/desktop b/archlinux.pkgs.d/desktop deleted file mode 100644 index 5521678..0000000 --- a/archlinux.pkgs.d/desktop +++ /dev/null @@ -1,120 +0,0 @@ -dnl vim:ft=m4 -define(DESKTOP) - -dnl Some system level stuff -ifdef(`OPENRC',gpm-openrc,gpm) -ifdef(`OPENRC',alsa-utils-openrc, alsa-utils) -ifdef(`OPENRC',lm_sensors-openrc,lm_sensors) -pulseaudio -pulseaudio-alsa -fuseiso - -dnl Some command line tools -lynx -abook -pass -ifdef(`OPENRC',syncthing-openrc,syncthing) -ttysterm -dnl Stardict -sdcv -stardict-cz -stardict-en-cz - -dnl Various graphic programs -gimp -inkscape -audacity -pitivi -vlc -mpv -conkeror -surf-webkit2gtk-git -feh -okular -llpp -graphviz -mesa-demos - -dnl Pidgin -purple-facebook -purple-hangouts-hg -pidgin-encryption -pidgin-gpg-git -pidgin-hotkeys -pidgin-latex -pidgin-libnotify -pidgin-window_merge - -dnl Chromium -ifdef(`NETFLIX',chromium-widevine,chromium) -pepper-flash - -dnl Music player daemon -mpc -mpd -ncmpcpp - -dnl Mail -neomutt -msmtp -offlineimap -python2-daemon -urlview - -dnl My desktop -i3-wm -i3blocks -i3lock -dmenu -dunst -xzoom -ifdef(`OPENRC',xorg-server-nosystemd,xorg-server) -xorg-server-utils -xorg-xinit -xorg-xev -rxvt-unicode-pixbuf -urxvt-perls -urxvt-resize-font-git -urxvt-vtwheel -numlockx -xdotool -inotify-tools -pulsemixer -qt5-styleplugins -numix-frost-themes -faenza-icon-theme -xorg-setxkbmap -xorg-xprop -dnl For app .desktop management -perl-file-mimeinfo - -dnl Fonts -terminus-font -font-mathematica -ttf-hack -ttf-symbola -noto-fonts-emoji -emojione-color-font -twemoji-color-font -texlive-fontsextra -ttf-ms-fonts -ttf-dejavu -ttf-droid -ttf-freefont -ttf-liberation -ttf-linux-libertine - -dnl Codecs -x264 -mpg123 -lib32-mpg123 -gst-libav -lib32-gst-plugins-base-libs - -dnl Matlab fix -ncurses5-compat-libs - -dnl Java blee -jre8-openjdk - -libva-mesa-driver diff --git a/archlinux.pkgs.d/devel b/archlinux.pkgs.d/devel deleted file mode 100644 index 86ca5cd..0000000 --- a/archlinux.pkgs.d/devel +++ /dev/null @@ -1,55 +0,0 @@ -dnl vim:ft=m4 -define(DEVEL) - -dnl devel group -syscmd(`pacman -Qg base-devel | awk "{print \$2}"') - -dnl yep ansible -ansible -dnl I sometimes use busybox for testing scripts -busybox - -dnl Stuff used durring development -tig -dash -mkdocs -asciidoc -cppcheck -ctags -valgrind -texlive-latexextra -git -cgdb -cscope -gcovr -strace -dnl Web -ruby -ruby-jekyll - -dnl Python -twine -flake8 -ipython -python-pypandoc -python-xattr -python2-xattr -python-daemon - -dnl Perl -perl-common-sense - -dnl Rust -rust -cargo - -dnl Building stuff -clang -cmake -patch -ccache -clang-tools-extra - -dnl work devel -lua51 -lcov diff --git a/archlinux.pkgs.d/kicad b/archlinux.pkgs.d/kicad deleted file mode 100644 index b500a6e..0000000 --- a/archlinux.pkgs.d/kicad +++ /dev/null @@ -1,5 +0,0 @@ -dnl vim:ft=m4 - -kicad -kicad-library -kicad-library-3d diff --git a/archlinux.pkgs.d/koci b/archlinux.pkgs.d/koci deleted file mode 100644 index 26bf94c..0000000 --- a/archlinux.pkgs.d/koci +++ /dev/null @@ -1,42 +0,0 @@ -dnl vim:ft=m4 -dnl My work pc -include(desktop) -include(devel) -include(latex) - -intel-ucode - -openvpn -easy-rsa -qemu-arch-extra -octave -ndisc6 -indent -sig2dot -strace -traceroute - -dnl TODO why the hack I need this? -xinetd - -python-numpy -python-scipy -python-pip -swig - -dnl OpenWRT build -vagrant -dnl for testing -stress - -dnl Something for lxc -lxc -arch-install-scripts -debootstrap -dhcp - -docker -gnu-netcat -doxygen -massif-visualizer -linux-headers diff --git a/archlinux.pkgs.d/laptop b/archlinux.pkgs.d/laptop deleted file mode 100644 index 55dd88c..0000000 --- a/archlinux.pkgs.d/laptop +++ /dev/null @@ -1,30 +0,0 @@ -dnl vim:ft=m4 -define(LAPTOP) -include(desktop) - -dnl System essentials -syslinux -efibootmgr -acpid-openrc -xf86-input-synaptics -xf86-video-intel - -dnl Network -wpa_supplicant-openrc -iw -wireless_tools -rfkill - -dnl Also system but not exactly essential for me -cpupower-openrc -powertop -pm-utils -acpi - -dnl bluetooth -bluez -bluez-utils -bluez-hid2hci -obexfs -obextool -pulseaudio-bluetooth diff --git a/archlinux.pkgs.d/latex b/archlinux.pkgs.d/latex deleted file mode 100644 index 376eecc..0000000 --- a/archlinux.pkgs.d/latex +++ /dev/null @@ -1,7 +0,0 @@ -dnl vim:ft=m4 -define(LATEX) - -dnl texlive-most and texlive-lang groups -syscmd(`pacman -Qg texlive-most | awk "{print \$2}"') -syscmd(`pacman -Qg texlive-lang | awk "{print \$2}"') - diff --git a/archlinux.pkgs.d/openrc b/archlinux.pkgs.d/openrc deleted file mode 100644 index bd8d991..0000000 --- a/archlinux.pkgs.d/openrc +++ /dev/null @@ -1,10 +0,0 @@ -dnl vim:ft=m4 -define(OPENRC) - -syscmd(`pacman -Qg base-openrc | awk "{print \$2}"') -syslog-ng-openrc -cronie-openrc -bluez-openrc -consolekit-openrc -libpulse-nosystemd -systemd-dummy diff --git a/archlinux.pkgs.d/ranger b/archlinux.pkgs.d/ranger deleted file mode 100644 index d4aee2e..0000000 --- a/archlinux.pkgs.d/ranger +++ /dev/null @@ -1,12 +0,0 @@ -dnl vim:ft=m4 -dnl Prety good files browser -ranger - -dnl Optional dependencies -atool -highlight -mediainfo -perl-image-exiftool -w3m -catdoc -fbida diff --git a/archlinux.pkgs.d/steam b/archlinux.pkgs.d/steam deleted file mode 100644 index db6ed40..0000000 --- a/archlinux.pkgs.d/steam +++ /dev/null @@ -1,4 +0,0 @@ -dnl vim:ft=m4 - -steam -steam-native-runtime diff --git a/archlinux.pkgs.d/wine b/archlinux.pkgs.d/wine deleted file mode 100644 index ae6c153..0000000 --- a/archlinux.pkgs.d/wine +++ /dev/null @@ -1,6 +0,0 @@ -dnl vim:ft=m4 - -wine -wine_gecko -wine-mono -winetricks diff --git a/config/Trolltech.conf b/config/Trolltech.conf deleted file mode 100644 index e148896..0000000 --- a/config/Trolltech.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Qt] -style=GTK+ diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc deleted file mode 100644 index f8721c2..0000000 --- a/config/dunst/dunstrc +++ /dev/null @@ -1,76 +0,0 @@ -[global] - font = "Monospace 8" - allow_markup = yes - format = "<b>%s %p</b>\n%b" - sort = yes - indicate_hidden = true - # geometry = "x5" - idle_threshold = 0 - geometry = "280x5-0+19" - alignment = center - show_age_threshold = 60 - sticky_history = yes - follow = mouse - word_wrap = yes - separator_height = 1 - padding = 3 - horizontal_padding = 3 - separator_color = frame - startup_notification = false - dmenu = "/usr/bin/dmenu -p dunst: -nb #FFFFFF -nf #000000 -sb #94DBFF -sf #000000" - browser = conkeror - - -[frame] - width = 1 - color = "#4c7899" - -[shortcuts] - close = ctrl+space - close_all = ctrl+shift+space - history = ctrl+grave - context = ctrl+shift+period - -[urgency_low] - background = "#000000" - foreground = "#ffffff" - timeout = 30 - -[urgency_normal] - background = "#000000" - foreground = "#94DBFF" - timeout = 45 - -[urgency_critical] - background = "#000000" - foreground = "#ff9999" - timeout = 0 - - -[libpurple_signed] - appname = libpurple - summary = *igned* - urgency = low - timeout = 3 - background = "#ccff33" - -[libpurple_came_back] - appname = libpurple - summary = "*came*" - format = "" - -[libpurple_went_away] - appname = libpurple - summary = "*went*" - format = "" - -[libpurple_says] - appname = libpurple - summary = *ays* - urgency = critical - background = "#ccff33" - -[libpurple] - appname = libpurple - urgency = critical - background = "#ccff33" diff --git a/config/i3/config b/config/i3/config deleted file mode 100644 index 430993e..0000000 --- a/config/i3/config +++ /dev/null @@ -1,239 +0,0 @@ -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:monospace 8 - -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# Before i3 v4.8, we used to recommend this one as the default: -# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 -# The font above is very space-efficient, that is, it looks good, sharp and -# clear in small sizes. However, its unicode glyph coverage is limited, the old -# X core fonts rendering does not support right-to-left and this being a bitmap -# font, it doesn’t scale on retina/hidpi displays. - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec urxvt -bindsym $mod+Shift+Return exec conkeror & pidgin - -# kill focused window -bindsym $mod+q kill - -# start dmenu (a program launcher) -#bindsym $mod+d exec dmenu_run -# There also is the (new) i3-dmenu-desktop which only displays applications -# shipping a .desktop file. It is a wrapper around dmenu, so you need that -# installed. -bindsym $mod+d exec --no-startup-id i3-dmenu-desktop --entry-type=name - -# bar toggle, hide or show -bindsym $mod+m bar mode toggle - -# 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 -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 - -# Scratchpad -bindsym $mod+Tab scratchpad show -bindsym $mod+Shift+Tab move scratchpad - -# 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+Shift+a focus child - -# Output moving -bindsym $mod+x move container to output right -bindsym $mod+z move container to output left -bindsym $mod+Shift+x move workspace to output right -bindsym $mod+Shift+z move workspace to output left - -# switch to workspace -bindsym $mod+1 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 -bindsym $mod+grave workspace web -bindsym $mod+underscore workspace t - -# move focused container 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 -bindsym $mod+Shift+4 move container to workspace 4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 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 -bindsym $mod+Shift+grave move container to workspace web -bindsym $mod+Shift+underscore move container to workspace t - -#assign [class="Firefox"] web -for_window [class="Pidgin"] move scratchpad - -# 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 - -set $mode_system System (l) lock, (e) logout, (s) suspend, (r) reboot, (Shift+s) shutdown -mode "$mode_system" { - bindsym l exec --no-startup-id i3lock -c 000000 && sleep 1 && xset dpms force off, mode "default" - bindsym e exec --no-startup-id i3-msg exit, mode "default" - bindsym s exec --no-startup-id sudo pm-suspend, mode "default" - bindsym r exec --no-startup-id sudo reboot, mode "default" - bindsym Shift+s exec --no-startup-id ~/.config/i3/scripts/shutdown, mode "default" - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+Shift+q mode "$mode_system" - -set $displays (d)efault, toggle: 1:eDP 2:HDMI 3:VGA -mode "$displays" { - bindsym d exec --no-startup-id mxrandr, mode "default" - bindsym 1 exec --no-startup-id mxrandr toggle eDP1, mode "default" - bindsym 2 exec --no-startup-id mxrandr toggle HDMI1, mode "default" - bindsym 3 exec --no-startup-id mxrandr toggle VGA1, mode "default" - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+Shift+w mode "$displays" - -set $asus-fan fan: (f)ull, (a)uto -mode "$asus-fan" { - bindsym f exec --no-startup-id sudo asus-fan full, mode "default" - bindsym a exec --no-startup-id sudo asus-fan auto, mode "default" - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+Shift+f mode "$asus-fan" - -# 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 - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym $mod+r mode "resize" - -# Switch keyboard -bindsym Mod1+space exec --no-startup-id ~/.config/i3/scripts/keyboard_switch - -# Pulse audio control -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -RTMIN+10 i3blocks -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -RTMIN+10 i3blocks -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle && pkill -RTMIN+10 i3blocks - -# Sreen brightness controls -bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 20 # increase screen brightness -bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 20 # decrease screen brightness - -# Keyboard backlight -bindsym XF86KbdBrightnessUp exec --no-startup-id asus-kbd-backlight up -bindsym XF86KbdBrightnessDown exec --no-startup-id asus-kbd-backlight down - -# Media player controls -bindsym XF86AudioPlay exec --no-startup-id mpc toggle && pkill -RTMIN+12 i3blocks -bindsym XF86AudioStop exec --no-startup-id mpc stop && pkill -RTMIN+12 i3blocks -bindsym XF86AudioNext exec --no-startup-id mpc next && pkill -RTMIN+12 i3blocks -bindsym XF86AudioPrev exec --no-startup-id mpc prev && pkill -RTMIN+12 i3blocks - -# Mouse bindings -# TODO fillter windows -bindsym --whole-window button11 exec --no-startup-id xdotool key ctrl+t -bindsym --whole-window button12 exec --no-startup-id xdotool key ctrl+w -bindsym --whole-window button13 exec --no-startup-id xdotool key ctrl+Tab -bindsym --whole-window button14 exec --no-startup-id xdotool key ctrl+shift+Tab - - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - position top - status_command i3blocks - #status_command i3status - tray_output primary -} - -# Start daemons -exec --no-startup-id dunst diff --git a/config/i3/scripts/keyboard_layout b/config/i3/scripts/keyboard_layout deleted file mode 100755 index 90b82e4..0000000 --- a/config/i3/scripts/keyboard_layout +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -setxkbmap -query | awk '/layout/{print $2}' diff --git a/config/i3/scripts/keyboard_switch b/config/i3/scripts/keyboard_switch deleted file mode 100755 index 7ba27f8..0000000 --- a/config/i3/scripts/keyboard_switch +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -active=`~/.config/i3/scripts/keyboard_layout` - -case "$active" in - us) - setxkbmap cz_qwerty - ;; - cz_qwerty) - setxkbmap us - ;; -esac - -# Send update to i3blocks -pkill -RTMIN+11 i3blocks diff --git a/config/i3/scripts/shutdown b/config/i3/scripts/shutdown deleted file mode 100755 index 62f6ae1..0000000 --- a/config/i3/scripts/shutdown +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -export SUDO_ASKPASS=/tmp/shutdown-askpass.sh - - -echo '#!/bin/sh -echo "SETDESC Please enter password to shutdown system -SETPROMPT Password: -SETTITLE Sudo password for system shutdown -GETPIN" | pinentry | grep -E "^D " | sed "s/^D //"' > $SUDO_ASKPASS -chmod +x $SUDO_ASKPASS - -sudo -A shutdown -h now diff --git a/config/i3blocks/config b/config/i3blocks/config deleted file mode 100644 index 8ae24c8..0000000 --- a/config/i3blocks/config +++ /dev/null @@ -1,132 +0,0 @@ -# i3blocks config file -# -# Please see man i3blocks for a complete reference! -# The man page is also hosted at http://vivien.github.io/i3blocks -# -# List of valid properties: -# -# align -# color -# command -# full_text -# instance -# interval -# label -# min_width -# name -# separator -# separator_block_width -# short_text -# signal -# urgent - -# Global properties -# -# The top properties below are applied to every block, but can be overridden. -# Each block command defaults to the script name to avoid boilerplate. -command=/usr/libexec/i3blocks/$BLOCK_NAME -separator_block_width=15 -markup=none - -[mpd] -command=~/.config/i3blocks/scripts/mpd -interval=5 -signal=12 - -[keymap] -command=~/.config/i3/scripts/keyboard_layout -interval=once -signal=11 - -[backup] -command=~/.config/i3blocks/scripts/backup -interval=86400 -signal=13 - -# Volume indicator -# -# The first parameter sets the step (and units to display) -# The second parameter overrides the mixer selection -# See the script for details. -[volume] -label=♪ -instance=Master -interval=once -signal=10 - -# CPU usage -# -# The script may be called with -w and -c switches to specify thresholds, -# see the script for details. -[cpu_usage] -label=cpu -interval=10 -separator=false - -# Memory usage -# -# The type defaults to "mem" if the instance is not specified. -# You can specify "swap". -[memory] -label=mem -interval=30 - -[bbswitch] -command=~/.config/i3blocks/scripts/bbswitch -interval=5 - -# Disk usage -# -# The directory defaults to $HOME if the instance is not specified. -# The script may be called with a optional argument to set the alert -# (defaults to 10 for 10%). -[disk] -label=/ -instance=/ -interval=30 -separator=false -[disk] -label=/home_hdd -instance=/home_hdd -interval=30 - -# Network interface monitoring -# -# If the instance is not specified, use the interface used for default route. -# The address can be forced to IPv4 or IPv6 with -4 or -6 switches. -[iface] -command=~/.config/i3blocks/scripts/iface -interval=2 -separator=false - -[bandwidth] -command=~/.config/i3blocks/scripts/bandwidth -interval=2 - -[wifi] -command=~/.config/i3blocks/scripts/wifi -interval=2 - -# Temperature -# -# Support multiple chips, though lm-sensors. -# The script may be called with -w and -c switches to specify thresholds, -# see the script for details. -[temperature] -interval=10 - -# Battery indicator -# -# The battery instance defaults to 0. -[battery] -command=~/.config/i3blocks/scripts/battery -interval=30 - -[email] -command=~/.config/i3blocks/scripts/email -interval=30 - -# Date Time -[time] -command=date '+%Y-%m-%d %H:%M:%S' -interval=1 diff --git a/config/i3blocks/scripts/backup b/config/i3blocks/scripts/backup deleted file mode 100755 index bfa3d39..0000000 --- a/config/i3blocks/scripts/backup +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -if [[ -n "$BLOCK_BUTTON" ]]; then - nohup urxvt -title "System backup" -hold -e sudo system-backup 2>&1 >/dev/null & -fi - -state=5 -if [[ -e ~/.backup_date ]]; then - now=$(date +"%s") - prev=$(cat ~/.backup_date) - dif=$(expr $now - $prev) - # 15 days - if [[ $dif -ge 648000 ]]; then - state=4 - # 12 days - elif [[ $dif -ge 518400 ]]; then - state=3 - # 5 days - elif [[ $dif -ge 216000 ]]; then - state=2 - # 2 days - elif [[ $dif -ge 86400 ]]; then - state=1 - else - state=0 - fi -fi - -if [[ $state -eq 0 ]]; then - exit 0 -fi - -echo "Do backup" -echo "Backup" -case $state in - 1) - echo - ;; - 2) - echo "#ffff00" - ;; - 3) - echo "#ff8a00" - ;; - 4) - echo "#ff5000" - ;; - 5) - echo "#ff0000" - ;; -esac diff --git a/config/i3blocks/scripts/bandwidth b/config/i3blocks/scripts/bandwidth deleted file mode 100755 index 93023c7..0000000 --- a/config/i3blocks/scripts/bandwidth +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash -# Copyright (C) 2012 Stefan Breunig <stefan+measure-net-speed@mathphys.fsk.uni-heidelberg.de> -# Copyright (C) 2014 kaueraal -# Copyright (C) 2015 Thiago Perrotta <perrotta dot thiago at poli dot ufrj dot br> - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -INTERFACE=$(ip route | awk '/^default .* (wlp|enp)/ { print $5 ; exit }') - -# Issue #36 compliant. -if ! [ -e "/sys/class/net/${INTERFACE}/operstate" ]; then - ST="`cat /sys/class/net/${INTERFACE}/operstate`" - # Note: usb telephone network is reported as unknown state - if [ "$ST" = "up" -o "$ST" = "unknown" ]; then - echo down # full text - echo down # short text - echo \#FF0000 # color - exit 0 - fi -fi - -# path to store the old results in -path="/dev/shm/$(basename $0)-${INTERFACE}" - -# grabbing data for each adapter. -read rx < "/sys/class/net/${INTERFACE}/statistics/rx_bytes" -read tx < "/sys/class/net/${INTERFACE}/statistics/tx_bytes" - -# get time -time=$(date +%s) - -# write current data if file does not exist. Do not exit, this will cause -# problems if this file is sourced instead of executed as another process. -if ! [[ -f "${path}" ]]; then - echo "${time} ${rx} ${tx}" > "${path}" - chmod 0666 "${path}" -fi - -# read previous state and update data storage -read old < "${path}" -echo "${time} ${rx} ${tx}" > "${path}" - -# parse old data and calc time passed -old=(${old//;/ }) -time_diff=$(( $time - ${old[0]} )) - -# sanity check: has a positive amount of time passed -[[ "${time_diff}" -gt 0 ]] || exit - -# calc bytes transferred, and their rate in byte/s -rx_diff=$(( $rx - ${old[1]} )) -tx_diff=$(( $tx - ${old[2]} )) -rx_rate=$(( $rx_diff / $time_diff )) -tx_rate=$(( $tx_diff / $time_diff )) - -# shift by 10 bytes to get KiB/s. If the value is larger than -# 1024^2 = 1048576, then display MiB/s instead - -# incoming -echo -n "IN " -rx_kib=$(( $rx_rate >> 10 )) -if [[ "$rx_rate" -gt 1048576 ]]; then - printf '%sM' "`echo "scale=1; $rx_kib / 1024" | bc`" -else - echo -n "${rx_kib}K" -fi - -echo -n " " - -# outgoing -echo -n "OUT " -tx_kib=$(( $tx_rate >> 10 )) -if [[ "$tx_rate" -gt 1048576 ]]; then - printf '%sM' "`echo "scale=1; $tx_kib / 1024" | bc`" -else - echo -n "${tx_kib}K" -fi diff --git a/config/i3blocks/scripts/battery b/config/i3blocks/scripts/battery deleted file mode 100755 index 7a5563a..0000000 --- a/config/i3blocks/scripts/battery +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/perl -# -# Copyright 2014 Pierre Mavro <deimos@deimos.fr> -# Copyright 2014 Vivien Didelot <vivien@didelot.org> -# -# Licensed under the terms of the GNU GPL v3, or any later version. -# -# This script is meant to use with i3blocks. It parses the output of the "acpi" -# command (often provided by a package of the same name) to read the status of -# the battery, and eventually its remaining time (to full charge or discharge). -# -# The color will gradually change for a percentage below 85%, and the urgency -# (exit code 33) is set if there is less that 5% remaining. - -use strict; -use warnings; -use utf8; - -my $acpi; -my $status; -my $percent; -my $full_text; -my $short_text; -my $bat_number = $ENV{BLOCK_INSTANCE} || 0; - -# read the first line of the "acpi" command output -open (ACPI, "acpi -b | grep 'Battery $bat_number' |") or die; -$acpi = <ACPI>; -close(ACPI); - -# fail on unexpected output -if ($acpi !~ /: (\w+), (\d+)%/) { - die "$acpi\n"; -} - -$status = $1; -$percent = $2; - -if ($status eq 'Discharging') { - $full_text = '🔋 '; -} elsif ($status eq 'Charging') { - $full_text = '🔌 '; -} - -$full_text .= "$percent%"; - -$short_text = $full_text; - -if ($acpi =~ /(\d\d:\d\d):/) { - $full_text .= " ($1)"; -} - -# print text -print "$full_text\n"; -print "$short_text\n"; - -# consider color and urgent flag only on discharge -if ($status eq 'Discharging') { - - if ($percent < 20) { - print "#FF0000\n"; - } elsif ($percent < 40) { - print "#FFAE00\n"; - } elsif ($percent < 60) { - print "#FFF600\n"; - } elsif ($percent < 85) { - print "#A8FF00\n"; - } - - if ($percent < 5) { - exit(33); - } -} - -exit(0); diff --git a/config/i3blocks/scripts/bbswitch b/config/i3blocks/scripts/bbswitch deleted file mode 100755 index a6ad24c..0000000 --- a/config/i3blocks/scripts/bbswitch +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ -e /proc/acpi/bbswitch ]; then - if [ -n "`cat /proc/acpi/bbswitch | grep ON`" ]; then - echo OPTIMUS - echo OP - echo '#ffff00' - fi -fi diff --git a/config/i3blocks/scripts/email b/config/i3blocks/scripts/email deleted file mode 100755 index 2d26280..0000000 --- a/config/i3blocks/scripts/email +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Note: we cut last character because output ends with new line -OUT="$(email-unread -s | tr "\n" " " | sed 's/ $//')" -echo "$OUT" -echo "$OUT" -echo "#ffff00" diff --git a/config/i3blocks/scripts/iface b/config/i3blocks/scripts/iface deleted file mode 100755 index dc82438..0000000 --- a/config/i3blocks/scripts/iface +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# Copyright (C) 2014 Julien Bonjean <julien@bonjean.info> -# Copyright (C) 2014 Alexander Keller <github@nycroth.com> - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -#------------------------------------------------------------------------ - -# Locate current default interface, but use only wlp (wifi) or enp (ethernet) -# TODO probably also add connection over phone -IF=$(ip route | awk '/^default .* (wlp|enp)/ { print $5 ; exit }') - -#------------------------------------------------------------------------ - -# As per #36 -- It is transparent: e.g. if the machine has no battery or wireless -# connection (think desktop), the corresponding block should not be displayed. -[[ ! -d /sys/class/net/${IF} ]] && exit -# Note this passes if IF is empty! - -#------------------------------------------------------------------------ - -# If no IF is selected then we want see down, not anything else. -if [ -z "$IF" ] || [[ "$(cat /sys/class/net/$IF/operstate)" = 'down' ]]; then - exit -fi - -case $1 in - -4) - AF=inet ;; - -6) - AF=inet6 ;; - *) - AF=inet6? ;; -esac - -# Use the first global scope address -IPADDR=$(ip addr show $IF | perl -n -e "/$AF ([^\/]+).* scope global/ && print \$1 and exit") - -case $BLOCK_BUTTON in - 3) echo -n "$IPADDR" | xclip -q -se c ;; -esac - -#------------------------------------------------------------------------ - -echo "$IPADDR" # full text -echo "$IPADDR" # short text - -#------------------------------------------------------------------------ -# Use ping to check if we have connection - -# We ping only once and wait for one second -PINGV="-c 1 -w 1" -# Ping nic.cz -if ping $PINGV nic.cz >/dev/null 2>&1; then - echo \#00FF00 # color -else - # Ping nic.cz by ip - if ping $PINGV 217.31.205.50 >/dev/null 2>&1; then - # No DNS - echo \#FFFF00 # color - else - # Ping default gateway of this interface - if ping $PINGV $(ip route show dev $IF | awk '/^default via/ {print $3}') >/dev/null 2>&1; then - # No internet connection but gateway accessible - echo \#FF9000 # color - else - # No internet connection - echo \#FF0000 # color - fi - fi -fi diff --git a/config/i3blocks/scripts/mpd b/config/i3blocks/scripts/mpd deleted file mode 100755 index 637623e..0000000 --- a/config/i3blocks/scripts/mpd +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -case "$BLOCK_BUTTON" in - 1) - mpc toggle >/dev/null - ;; - 2) - mpc stop >/dev/null - ;; - 3) - nohup urxvt -title "Music player daemon client" -e ncmpcpp 2>&1 >/dev/null & - ;; - 4) - mpc prev >/dev/null - ;; - 5) - mpc next >/dev/null - ;; -esac - -if [ -n "`mpc status | grep -E "(playing|paused)"`" ]; then - echo `mpc -f "♫ %artist%, %album%, %title%" status | head -1` - echo - if [ -n `mpc status | grep playing` ]; then - echo "#ffff00" - elif [ -n `mpc status | grep paused` ]; then - echo "#00ff00" - fi -else - echo "♫" -fi diff --git a/config/i3blocks/scripts/wifi b/config/i3blocks/scripts/wifi deleted file mode 100755 index d549b10..0000000 --- a/config/i3blocks/scripts/wifi +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright (C) 2014 Alexander Keller <github@nycroth.com> - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -#------------------------------------------------------------------------ - -INTERFACE="$(ip link | awk '/wlp.*/ {print substr($2, 1, length($2)-1); exit}')" - -#------------------------------------------------------------------------ - -# As per #36 -- It is transparent: e.g. if the machine has no battery or wireless -# connection (think desktop), the corresponding block should not be displayed. -[[ ! -d /sys/class/net/${INTERFACE}/wireless ]] || - [[ "$(cat /sys/class/net/$INTERFACE/operstate)" = 'down' ]] && exit - -#------------------------------------------------------------------------ - -QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }') -SSID=$(iwgetid $INTERFACE | sed 's/.*ESSID:"\([^"]*\)"/\1/') - -#------------------------------------------------------------------------ - -echo $SSID $QUALITY% # full text -echo $SSID # short text - -# color -if [[ $QUALITY -ge 80 ]]; then - echo "#00FF00" -elif [[ $QUALITY -lt 80 ]]; then - echo "#FFF600" -elif [[ $QUALITY -lt 60 ]]; then - echo "#FFAE00" -elif [[ $QUALITY -lt 40 ]]; then - echo "#FF0000" -fi diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf deleted file mode 100644 index 28d387c..0000000 --- a/config/mpd/mpd.conf +++ /dev/null @@ -1,416 +0,0 @@ -# An example configuration file for MPD. -# Read the user manual for documentation: http://www.musicpd.org/doc/user/ - - -# Probably not supported -#mpd_crossfade_time = "3" - -# Files and directories ####################################################### -# -# This setting controls the top directory which MPD will search to discover the -# available audio files and add them to the daemon's online database. This -# setting defaults to the XDG directory, otherwise the music directory will be -# be disabled and audio files will only be accepted over ipc socket (using -# file:// protocol) or streaming files over an accepted protocol. -# -music_directory "~/music" -# -# This setting sets the MPD internal playlist directory. The purpose of this -# directory is storage for playlists created by MPD. The server will use -# playlist files not created by the server but only if they are in the MPD -# format. This setting defaults to playlist saving being disabled. -# -playlist_directory "~/.config/mpd/playlists" -# -# This setting sets the location of the MPD database. This file is used to -# load the database at server start up and store the database while the -# server is not up. This setting defaults to disabled which will allow -# MPD to accept files over ipc socket (using file:// protocol) or streaming -# files over an accepted protocol. -# -db_file "~/.config/mpd/database" -# -# These settings are the locations for the daemon log files for the daemon. -# These logs are great for troubleshooting, depending on your log_level -# settings. -# -# The special value "syslog" makes MPD use the local syslog daemon. This -# setting defaults to logging to syslog, otherwise logging is disabled. -# -log_file "~/.config/mpd/log" -# -# This setting sets the location of the file which stores the process ID -# for use of mpd --kill and some init scripts. This setting is disabled by -# default and the pid file will not be stored. -# -pid_file "~/.config/mpd/pid" -# -# This setting sets the location of the file which contains information about -# most variables to get MPD back into the same general shape it was in before -# it was brought down. This setting is disabled by default and the server -# state will be reset on server start up. -# -state_file "~/.config/mpd/state" -# -# The location of the sticker database. This is a database which -# manages dynamic information attached to songs. -# -sticker_file "~/.config/mpd/sticker.sql" -# -############################################################################### - - -# General music daemon options ################################################ -# -# This setting specifies the user that MPD will run as. MPD should never run as -# root and you may use this setting to make MPD change its user ID after -# initialization. This setting is disabled by default and MPD is run as the -# current user. -# -#user "nobody" -# -# This setting specifies the group that MPD will run as. If not specified -# primary group of user specified with "user" setting will be used (if set). -# This is useful if MPD needs to be a member of group such as "audio" to -# have permission to use sound card. -# -#group "nogroup" -# -# This setting sets the address for the daemon to listen on. Careful attention -# should be paid if this is assigned to anything other then the default, any. -# This setting can deny access to control of the daemon. -# -# For network -#bind_to_address "any" -# -# And for Unix Socket -#bind_to_address "~/.mpd/socket" -# -# This setting is the TCP port that is desired for the daemon to get assigned -# to. -# -#port "6600" -# -# This setting controls the type of information which is logged. Available -# setting arguments are "default", "secure" or "verbose". The "verbose" setting -# argument is recommended for troubleshooting, though can quickly stretch -# available resources on limited hardware storage. -# -#log_level "default" -# -# If you have a problem with your MP3s ending abruptly it is recommended that -# you set this argument to "no" to attempt to fix the problem. If this solves -# the problem, it is highly recommended to fix the MP3 files with vbrfix -# (available from <http://www.willwap.co.uk/Programs/vbrfix.php>), at which -# point gapless MP3 playback can be enabled. -# -#gapless_mp3_playback "yes" -# -# Setting "restore_paused" to "yes" puts MPD into pause mode instead -# of starting playback after startup. -# -#restore_paused "no" -# -# This setting enables MPD to create playlists in a format usable by other -# music players. -# -#save_absolute_paths_in_playlists "no" -# -# This setting defines a list of tag types that will be extracted during the -# audio file discovery process. The complete list of possible values can be -# found in the mpd.conf man page. -#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" -# -# This setting enables automatic update of MPD's database when files in -# music_directory are changed. -# -#auto_update "yes" -# -# Limit the depth of the directories being watched, 0 means only watch -# the music directory itself. There is no limit by default. -# -#auto_update_depth "3" -# -############################################################################### - - -# Symbolic link behavior ###################################################### -# -# If this setting is set to "yes", MPD will discover audio files by following -# symbolic links outside of the configured music_directory. -# -#follow_outside_symlinks "yes" -# -# If this setting is set to "yes", MPD will discover audio files by following -# symbolic links inside of the configured music_directory. -# -#follow_inside_symlinks "yes" -# -############################################################################### - - -# Zeroconf / Avahi Service Discovery ########################################## -# -# If this setting is set to "yes", service information will be published with -# Zeroconf / Avahi. -# -#zeroconf_enabled "yes" -# -# The argument to this setting will be the Zeroconf / Avahi unique name for -# this MPD server on the network. -# -#zeroconf_name "Music Player" -# -############################################################################### - - -# Permissions ################################################################# -# -# If this setting is set, MPD will require password authorization. The password -# can setting can be specified multiple times for different password profiles. -# -#password "password@read,add,control,admin" -# -# This setting specifies the permissions a user has who has not yet logged in. -# -#default_permissions "read,add,control,admin" -# -############################################################################### - - -# Database ####################################################################### -# - -#database { -# plugin "proxy" -# host "other.mpd.host" -# port "6600" -#} - -# Input ####################################################################### -# - -input { - plugin "curl" -# proxy "proxy.isp.com:8080" -# proxy_user "user" -# proxy_password "password" -} - -# -############################################################################### - -# Audio Output ################################################################ -# -# MPD supports various audio output types, as well as playing through multiple -# audio outputs at the same time, through multiple audio_output settings -# blocks. Setting this block is optional, though the server will only attempt -# autodetection for one sound card. -# -# An example of an ALSA output: -# -#audio_output { -# type "alsa" -# name "My ALSA Device" -## device "hw:0,0" # optional -## mixer_type "hardware" # optional -## mixer_device "default" # optional -## mixer_control "PCM" # optional -## mixer_index "0" # optional -#} -# -# An example of an OSS output: -# -#audio_output { -# type "oss" -# name "My OSS Device" -## device "/dev/dsp" # optional -## mixer_type "hardware" # optional -## mixer_device "/dev/mixer" # optional -## mixer_control "PCM" # optional -#} -# -# An example of a shout output (for streaming to Icecast): -# -#audio_output { -# type "shout" -# encoding "ogg" # optional -# name "My Shout Stream" -# host "localhost" -# port "8000" -# mount "/mpd.ogg" -# password "hackme" -# quality "5.0" -# bitrate "128" -# format "44100:16:1" -## protocol "icecast2" # optional -## user "source" # optional -## description "My Stream Description" # optional -## url "http://example.com" # optional -## genre "jazz" # optional -## public "no" # optional -## timeout "2" # optional -## mixer_type "software" # optional -#} -# -# An example of a recorder output: -# -#audio_output { -# type "recorder" -# name "My recorder" -# encoder "vorbis" # optional, vorbis or lame -# path "/var/lib/mpd/recorder/mpd.ogg" -## quality "5.0" # do not define if bitrate is defined -# bitrate "128" # do not define if quality is defined -# format "44100:16:1" -#} -# -# An example of a httpd output (built-in HTTP streaming server): -# -#audio_output { -# type "httpd" -# name "My HTTP Stream" -# encoder "vorbis" # optional, vorbis or lame -# port "8000" -# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6 -## quality "5.0" # do not define if bitrate is defined -# bitrate "128" # do not define if quality is defined -# format "44100:16:1" -# max_clients "0" # optional 0=no limit -#} -# -# An example of a pulseaudio output (streaming to a remote pulseaudio server) -# -audio_output { - type "pulse" - name "pulse audio" -## server "remote_server" # optional -## sink "remote_server_sink" # optional -} -# -# An example of a winmm output (Windows multimedia API). -# -#audio_output { -# type "winmm" -# name "My WinMM output" -## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional -# or -## device "0" # optional -## mixer_type "hardware" # optional -#} -# -# An example of an openal output. -# -#audio_output { -# type "openal" -# name "My OpenAL output" -## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional -#} -# -## Example "pipe" output: -# -#audio_output { -# type "pipe" -# name "my pipe" -# command "aplay -f cd 2>/dev/null" -## Or if you're want to use AudioCompress -# command "AudioCompress -m | aplay -f cd 2>/dev/null" -## Or to send raw PCM stream through PCM: -# command "nc example.org 8765" -# format "44100:16:2" -#} -# -## An example of a null output (for no audio output): -# -#audio_output { -# type "null" -# name "My Null Output" -# mixer_type "none" # optional -#} -# -# If MPD has been compiled with libsamplerate support, this setting specifies -# the sample rate converter to use. Possible values can be found in the -# mpd.conf man page or the libsamplerate documentation. By default, this is -# setting is disabled. -# -#samplerate_converter "Fastest Sinc Interpolator" -# -############################################################################### - - -# Normalization automatic volume adjustments ################################## -# -# This setting specifies the type of ReplayGain to use. This setting can have -# the argument "off", "album", "track" or "auto". "auto" is a special mode that -# chooses between "track" and "album" depending on the current state of -# random playback. If random playback is enabled then "track" mode is used. -# See <http://www.replaygain.org> for more details about ReplayGain. -# This setting is off by default. -# -#replaygain "album" -# -# This setting sets the pre-amp used for files that have ReplayGain tags. By -# default this setting is disabled. -# -#replaygain_preamp "0" -# -# This setting sets the pre-amp used for files that do NOT have ReplayGain tags. -# By default this setting is disabled. -# -#replaygain_missing_preamp "0" -# -# This setting enables or disables ReplayGain limiting. -# MPD calculates actual amplification based on the ReplayGain tags -# and replaygain_preamp / replaygain_missing_preamp setting. -# If replaygain_limit is enabled MPD will never amplify audio signal -# above its original level. If replaygain_limit is disabled such amplification -# might occur. By default this setting is enabled. -# -#replaygain_limit "yes" -# -# This setting enables on-the-fly normalization volume adjustment. This will -# result in the volume of all playing audio to be adjusted so the output has -# equal "loudness". This setting is disabled by default. -# -#volume_normalization "no" -# -############################################################################### - -# Character Encoding ########################################################## -# -# If file or directory names do not display correctly for your locale then you -# may need to modify this setting. -# -#filesystem_charset "UTF-8" -# -# This setting controls the encoding that ID3v1 tags should be converted from. -# -#id3v1_encoding "ISO-8859-1" -# -############################################################################### - - -# SIDPlay decoder ############################################################# -# -# songlength_database: -# Location of your songlengths file, as distributed with the HVSC. -# The sidplay plugin checks this for matching MD5 fingerprints. -# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq -# -# default_songlength: -# This is the default playing time in seconds for songs not in the -# songlength database, or in case you're not using a database. -# A value of 0 means play indefinitely. -# -# filter: -# Turns the SID filter emulation on or off. -# -#decoder { -# plugin "sidplay" -# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt" -# default_songlength "120" -# filter "true" -#} -# -############################################################################### - diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config deleted file mode 100644 index 9e44fa3..0000000 --- a/config/ncmpcpp/config +++ /dev/null @@ -1,3 +0,0 @@ -mpd_connection_timeout = 3000 -system_encoding = utf-8 -mpd_music_dir = /home_hdd/cynerd/music diff --git a/config/offlineimap/config b/config/offlineimap/config deleted file mode 100755 index 6853963..0000000 --- a/config/offlineimap/config +++ /dev/null @@ -1,22 +0,0 @@ -# vim: set ft=config: -[general] -accounts = email -maxsyncaccounts = 4 - -[Repository email-remote] -type = IMAP -remotehost = imap.seznam.cz -remoteuser = cynerd@email.cz -ssl = yes -sslcacertfile = /etc/ssl/certs/ca-certificates.crt - -[Repository email-local] -type = Maildir -localfolders = ~/.mail/email - -[Account email] -localrepository = email-local -remoterepository = email-remote -autorefresh = 1 -postsynchook = ~/.local/sbin/newmail-notify - diff --git a/config/user-dirs.dirs b/config/user-dirs.dirs deleted file mode 100644 index 0363a56..0000000 --- a/config/user-dirs.dirs +++ /dev/null @@ -1,8 +0,0 @@ -XDG_DESKTOP_DIR="~" -XDG_DOWNLOAD_DIR="~/downloads" -XDG_TEMPLATES_DIR="~/templates" -XDG_PUBLICSHARE_DIR="~/share" -XDG_DOCUMENTS_DIR="~/documents" -XDG_MUSIC_DIR="~/music" -XDG_PICTURES_DIR="~/pictures" -XDG_VIDEOS_DIR="~/movies" diff --git a/conkeror/theme/content-buffer-input.css b/conkeror/theme/content-buffer-input.css deleted file mode 100644 index 82acb9e..0000000 --- a/conkeror/theme/content-buffer-input.css +++ /dev/null @@ -1,13 +0,0 @@ -/** - * (C) Copyright 2007-2008 Jeremy Maitin-Shepard - * - * Use, modification, and distribution are subject to the terms specified in the - * COPYING file. -**/ - -@namespace url("http://www.w3.org/1999/xhtml"); - -.__conkeror_textbox_edited_externally { - background-color: #bbbbbb; - -moz-appearance: none; -} diff --git a/conkeror/theme/eye-guide.css b/conkeror/theme/eye-guide.css deleted file mode 100644 index 502049b..0000000 --- a/conkeror/theme/eye-guide.css +++ /dev/null @@ -1,22 +0,0 @@ - -@namespace url("http://www.w3.org/1999/xhtml"); - -#__conkeror_eye_guide { - position: fixed; - left: 0px; - top: 0px; - width: 100%; - background: black; - opacity: 0.1; - z-index: 100000; -} - -/* - * Note, the following selectors can be styled with a - * border-top and border-bottom respectively to achieve - * the effect of a single line scroll-guide: - * - * #__conkeror_eye_guide.__conkeror_eye_guide_scroll_down - * #__conkeror_eye_guide.__conkeror_eye_guide_scroll_up - * - */ diff --git a/conkeror/theme/minibuffer.css b/conkeror/theme/minibuffer.css deleted file mode 100644 index a184564..0000000 --- a/conkeror/theme/minibuffer.css +++ /dev/null @@ -1,94 +0,0 @@ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -#minibuffer { - color: white; - background: #333333; - border-top: 1px solid #285577; - -moz-box-align: baseline; -} - -#minibuffer-input { - background-color: -moz-field !important; -} - -#minibuffer-input .textbox-input-box { - width: 5em; -} - -#minibuffer-input [anonid="annotation"] { - font-style: oblique; -} - -#minibuffer-input [anonid="strut"] { - padding-right: 1em !important; -} - -/* mode text widgets */ - -#minibuffer .mode-text-widget { - display: none; -} - -#minibuffer[minibuffermode="message"] .mode-text-widget { - display: block; - border-left: 1px solid threedshadow; - padding-left: 4px !important; - padding-right: 4px !important; - margin-left: 0px !important; - margin-right: 0px !important; -} - -#minibuffer[minibuffermode="message"] .mode-text-widget[value=""] { - display: none; -} - - -/* minibuffer highlighting */ - -#minibuffer.highlight { - background-color: Highlight; - color: HighlightText; -} - -#minibuffer.highlight[minibuffermode="message"] .mode-text-widget { - border-left: 1px solid highlighttext; -} - - -/* Completions display */ - -tree.completions { margin: 0px !important; } - -tree.completions treechildren { border: none !important; } - -tree.completions treecol { -moz-binding: none !important; } -tree.completions { - -moz-appearance: none !important; - border: 0px none !important; - border-top: 1px solid -moz-Dialog !important; - -moz-border-top-colors: -moz-initial !important; -} - -tree.completions treechildren::-moz-tree-row { - border: none; -} - -tree.completions treechildren::-moz-tree-row(current) { - background-color: Highlight !important; - color: HighlightText !important; -} - -tree.completions treechildren::-moz-tree-cell-text(completion-description) { - font-weight: bold !important; -} - -tree.completions treechildren::-moz-tree-cell-text(current) { - color: HighlightText !important; -} - -tree.completions[hasicons="true"] treechildren::-moz-tree-image { - width: 16px; - height: 16px; - margin-right: 6px; -} diff --git a/conkeror/theme/mode-line.css b/conkeror/theme/mode-line.css deleted file mode 100644 index cec5771..0000000 --- a/conkeror/theme/mode-line.css +++ /dev/null @@ -1,14 +0,0 @@ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -.mode-line { - color: white; - padding: 2px; - background: #595959; - border-top: 3px solid #285577; - -moz-box-align: center; - overflow: hidden; -} - -.mode-line label[value=""] { - display: none; -} diff --git a/conkeror/theme/new-tabs.css b/conkeror/theme/new-tabs.css deleted file mode 100644 index 0dac555..0000000 --- a/conkeror/theme/new-tabs.css +++ /dev/null @@ -1,41 +0,0 @@ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -#tab2-bar { - color: white; - background: #595959; - border-bottom: 3px solid #285577; -} - -.tab2 { - -moz-box-align: center; - border-right: 3px solid #285577; - min-width: 10em; - max-width: 15em; -} - -.tab2[selected=true] { - background: #333333; -} - -.tab2:hover { - background: #999; -} - -.tab2-label { - -moz-box-flex: 100; - margin-left: 4pt; - padding-top: 1pt; -} - -.tab2-index { - padding: 0pt 2pt 0pt 3pt; - font-weight: 900; - text-align: center; -} - -.tab2-icon { - width: 16px; - height: 16px; - -moz-margin-start: 4pt; - -moz-margin-end: 3pt; -} diff --git a/conkeror/theme/theme.json b/conkeror/theme/theme.json deleted file mode 100644 index 905b804..0000000 --- a/conkeror/theme/theme.json +++ /dev/null @@ -1,10 +0,0 @@ -{ "sheets": [ - "content-buffer-input.css", - "minibuffer.css", - "mode-line.css", - "tab-bar.css", - "new-tabs.css", - "window--panel.css", - "eye-guide.css" - ] -} diff --git a/conkeror/theme/window--panel.css b/conkeror/theme/window--panel.css deleted file mode 100644 index 6009000..0000000 --- a/conkeror/theme/window--panel.css +++ /dev/null @@ -1,5 +0,0 @@ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -.panel .panel-row-label { - font-weight: bold; -} diff --git a/conkerorrc b/conkerorrc deleted file mode 100644 index 5e85572..0000000 --- a/conkerorrc +++ /dev/null @@ -1,207 +0,0 @@ -// vim:ft=javascript -require("theme.js"); -theme_load_paths.unshift("~/.conkeror/"); -theme_unload("default"); -theme_load("theme"); - -require("session.js"); -session_auto_save_auto_load = true; - -require("favicon.js"); -require("new-tabs.js"); -tab_bar_show_icon = true; -tab_bar_show_index = false; - -require("clicks-in-new-buffer.js"); - -require("opensearch.js"); -define_opensearch_webjump("?", "duckduckgo.xml"); -define_opensearch_webjump("?g", "google.xml"); -define_opensearch_webjump("?w", "wikipedia.xml"); -define_opensearch_webjump("?e", "eBay.xml"); - -external_content_handlers.set("application/pdf", "llpp"); -external_content_handlers.set("video/*", "vlc"); -editor_shell_command = "urxvt -e vim"; - -url_completion_use_history = true; -url_remoting_fn = load_url_in_new_buffer; -download_buffer_automatic_open_target = OPEN_NEW_BUFFER_BACKGROUND; - -require("adblockplus.js"); - -// Set zoom to 90% -session_pref("layout.css.devPixelsPerPx", "0.9"); - -// Just key-kill all websites. I can use quote mode (ctrl+q) -require("key-kill"); -key_kill_mode.test.push(/\/\/.*\//); //regexp matches all sites - -view_source_use_external_editor = true; - -// Set cwd to ~/downloads so that downloads are saved there -cwd = get_home_directory(); -cwd.append("downloads"); - -///////////////////////////////////////////////////////////////////////////////// -// reopening closed buffers -define_key(default_global_keymap, "A-W", "revive-buffer"); - -// Save origin kill_buffer command -var kill_buffer_original = kill_buffer_original || kill_buffer; - -var killed_buffer_urls = []; -var killed_buffer_histories = []; - -// remember_killed_buffer -kill_buffer = function (buffer, force) { - var hist = buffer.web_navigation.sessionHistory; - - if (buffer.display_uri_string && hist) { - killed_buffer_histories.push(hist); - killed_buffer_urls.push(buffer.display_uri_string); - } - - kill_buffer_original(buffer,force); -}; - -interactive("revive-buffer", - "Loads url from a previously killed buffer", - function restore_killed_buffer (I) { - if (killed_buffer_urls.length !== 0) { - var url = yield I.minibuffer.read( - $prompt = "Restore killed url:", - $completer = new all_word_completer($completions = killed_buffer_urls), - $default_completion = killed_buffer_urls[killed_buffer_urls.length - 1], - $auto_complete = "url", - $auto_complete_initial = true, - $auto_complete_delay = 0, - $require_match = true); - - var window = I.window; - var creator = buffer_creator(content_buffer); - var idx = killed_buffer_urls.indexOf(url); - - // Create the buffer - var buf = creator(window, null); - - // Recover the history - buf.web_navigation.sessionHistory = killed_buffer_histories[idx]; - - // This line may seem redundant, but it's necessary. - var original_index = buf.web_navigation.sessionHistory.index; - buf.web_navigation.gotoIndex(original_index); - - // Focus the new tab - window.buffers.current = buf; - - // Remove revived from cemitery - killed_buffer_urls.splice(idx,1); - killed_buffer_histories.splice(idx,1); - } else { - I.window.minibuffer.message("No killed buffer urls"); - } - }); -///////////////////////////////////////////////////////////////////////////////// -// pass password management -define_key(default_global_keymap, "C-j", "pass-get-name"); -define_key(default_global_keymap, "C-J", "pass-get-password"); - -// Extract first and second domain by this hack -function get_domain(I) { - var domain = I.buffer.document.location.href; - var tmp_a = I.buffer.document.createElement('a'); - tmp_a.href = domain; - domain = tmp_a.hostname.match(/[^.]+\.[^.]+$/); - yield co_return(domain); -} - -function shell(cmd, input) { - var res = { - stdout: "", - stderr: "", - result: 0 - }; - res.result = yield shell_command(cmd, - $fds = [{ output: async_binary_string_writer(input) }, - { input: async_binary_reader(function (s) res.stdout+=s||"") }, - { input: async_binary_reader(function (s) res.stderr+=s||"") } - ] - ); - yield co_return(res); -}; - -var pass_domain = ""; -var pass_account = ""; - -function pass_chose_account(I) { - pass_domain = yield get_domain(I); - var res = yield shell("cd ~/.password-store && find -path '*" + pass_domain + "*' -type f", ""); - var accs = res.stdout.split('\n'); - if (accs.length == 0 || accs.length == 1) { - I.window.minibuffer.message("pass: No accounts detected for domain: " + pass_domain); - pass_account = ""; - return; - // Note that accs has empty line at end so all this is bumped by one - } else if (accs.length == 2) { - pass_account = accs[0].replace(/\.\//, '').replace(/\.gpg$/, ''); - } else { - var accs_list = []; - for (i = 0; i < accs.length - 1; i++) { - accs_list.push(accs[i].replace(/\.\//, '').replace(/\.gpg$/, '')); - } - pass_account = yield I.minibuffer.read( - $prompt = "Chose account for " + pass_domain + ":", - $completer = new all_word_completer($completions = accs_list), - $default_completion = accs_list[accs_list.length - 1], - $auto_complete = "url", - $auto_complete_initial = true, - $auto_complete_delay = 0, - $require_match = true); - } -} - -function pass_get_password(I) { - var domain = yield get_domain(I); - if (pass_account == "" || String(pass_domain) != String(domain)) { - yield pass_chose_account(I); - } - if (pass_account != "" && I.buffer.focused_element) { - var res = yield shell("pass " + pass_account, ""); - dumpln(res.stdout); - I.buffer.focused_element.value = res.stdout; - I.window.minibuffer.message("pass: Inserted password for account: " + pass_account); - pass_account = ""; // remove selected account so we can select new one - } -}; - -function pass_get_name(I) { - yield pass_chose_account(I); - I.window.minibuffer.message("pass: Chosen account: " + pass_account); - if (I.buffer.focused_element){ - var regexp = /[^\/]*$/; - I.buffer.focused_element.value = regexp.exec(pass_account)[0]; - } -}; - -interactive("pass-get-name", "Choses account for to be loged as. As result name of account is outputed.", pass_get_name); -interactive("pass-get-password", "Receives password from pass for currently selected account.", pass_get_password); -///////////////////////////////////////////////////////////////////////////////// -// Local SOCKS5 proxy -var proxy_session_enabled = false; -interactive("proxy-session-toggle", - "Toggle the SOCKS proxy server", - function (I) { - if (proxy_session_enabled) { - session_pref('network.proxy.type', 0); //direct connection - I.window.minibuffer.message("SOCKS5 proxy is now disabled."); - proxy_session_enabled = false; - } else { - session_pref('network.proxy.socks', '127.0.0.1'); - session_pref('network.proxy.socks_port', 8123); - session_pref('network.proxy.type', 1); - I.window.minibuffer.message("SOCKS5 proxy 127.0.0.1:8123 is now enabled."); - proxy_session_enabled = true; - } - }); -///////////////////////////////////////////////////////////////////////////////// diff --git a/eaglerc b/eaglerc deleted file mode 100644 index 4804ffa..0000000 --- a/eaglerc +++ /dev/null @@ -1,164 +0,0 @@ -# EAGLE Parameter File (generated by EAGLE Version 7.5.0 - DO NOT EDIT!) - -Brd.LargeCursor = "0" -Brd.Palette = "0" -Brd.WhiteBackground = "0" -CheckForUpdate.AdvPanelNumber = "7" -CheckForUpdate.AdvSplashNumber = "7" -CheckForUpdate.Auto = "1" -CheckForUpdate.Beta = "0" -CheckForUpdate.LastTimeChecked = "1456155178" -Cmd.Copy.ClassicEagleMode = "0" -Cmd.Delete.WireJointsWithoutCtrl = "0" -Cmd.Name.RenameEntireNetByDefault = "0" -Cmd.Name.RenameEntireSignalByDefault = "0" -Cmd.Wire.IgnoreCtrlForRadiusMode = "0" -ControlPanel.Header1 = "1 0:185 1:20 2:100" -ControlPanel.View.AutoOpenProjectFolder = "1" -ControlPanel.View.Extended = "1" -ControlPanel.View.Sort = "0" -Dialog.Add.Sch.Header1 = "1 0:100 1:297" -Dialog.Add.Sch.Size = "835 644" -Dialog.Add.Sch.Splitter1.Sizes = "413 396" -Dialog.Add.Sch.Splitter2.Sizes = "199 381" -Dialog.Add.Sch.Splitter3.Sizes = "196 196" -Dialog.Add.Sch.Splitter4.Sizes = "189 188" -Dialog.Assign.Size = "446 252" -Dialog.CheckForUpdate.Size = "278 252" -Directories.Cam = "$EAGLEDIR/cam" -Directories.Doc = "$EAGLEDIR/doc" -Directories.Dru = "$EAGLEDIR/dru" -Directories.Epf = "$HOME/Documents/eagle:$EAGLEDIR/projects/examples" -Directories.IgnoreNonExisting = "0" -Directories.Lbr = "$EAGLEDIR/lbr:$HOME/Documents/eagle/lbr/" -Directories.Scr = "$EAGLEDIR/scr" -Directories.Ulp = "$EAGLEDIR/ulp" -EAGLE.Version = "7.5" -Erc.AllowUserOverrideConsistencyCheck = "0" -Interface.ActionToolbar = "1" -Interface.BubbleHelp = "1" -Interface.ClassicIcons = "0" -Interface.CommandButtons = "1" -Interface.CommandTexts = "1" -Interface.ExternalTextEditor = "" -Interface.IconSize = "16" -Interface.LimitZoomFactor = "1" -Interface.MouseButtonReleaseTimeout = "500" -Interface.MouseWheelZoom = "1.2" -Interface.ParameterToolbar = "1" -Interface.PreferredUnit = "0" -Interface.PulldownMenu = "1" -Interface.SheetThumbnails = "1" -Interface.UseCtrlForPanning = "0" -Interface.UserGuidance = "1" -Interface.VectorFont = "0" -Interface.VerticalText = "0" -Lbr.CommandPopup.Add.1 = "ATMEGA328P-AU;" -Lbr.CommandPopup.EditDev.1 = "ATMEGA328P-AU;" -Lbr.CommandPopup.EditPac.1 = "QFP80P900X900X120-32N;" -Lbr.CommandPopup.EditSym.1 = "ATMEGA328P-AU;" -Lbr.DeviceEditor.SplitterH.Sizes = "#0 0 839 838 839 0 #1 0 839 838 839 0 #2 1238 0 0 0 1258" -Lbr.DeviceEditor.SplitterVL.Sizes = "#0 0 1271 #1 0 1271 #2 331 936" -Lbr.DeviceEditor.SplitterVR.Sizes = "605 580" -Lbr.MenuText.01 = "[designlink.png] Search and order : Run designlink-order.ulp -general;" -Lbr.ToolBar.Action = "2 0 1 0 2" -Lbr.ToolBar.CommandButtons = "5 0 1 0 5" -Lbr.ToolBar.CommandTexts = "2 1 0 0 2" -Lbr.ToolBar.Parameters = "2 2 1 0 2" -Option.ActivateItemOnSingleClick = "0" -Option.AlphaBlendingOnBlackBackground = "1" -Option.AutoBackupInterval = "5" -Option.AutoJunction = "1" -Option.AutoLoadMatchingDrawingFile = "0" -Option.Beep = "1" -Option.BusWireWidth = "7620" -Option.CatchFactor = "0.05" -Option.Codec = "System" -Option.DisplayMode = "1" -Option.DrawUnprocessedPolygonEdgesContinuous = "0" -Option.DrcFillStyle = "3" -Option.Drill.Symbol.Diameter = "20320" -Option.Drill.Symbol.Nr.0 = "5000" -Option.Drill.Symbol.Nr.1 = "6000" -Option.Drill.Symbol.Nr.2 = "7000" -Option.Drill.Symbol.Nr.3 = "8000" -Option.Drill.Symbol.Nr.4 = "9000" -Option.Drill.Symbol.Nr.5 = "10000" -Option.Drill.Symbol.Nr.6 = "11000" -Option.Drill.Symbol.Nr.7 = "12000" -Option.Drill.Symbol.Nr.8 = "13000" -Option.Drill.Symbol.Nr.9 = "14000" -Option.Drill.Symbol.Nr.10 = "15000" -Option.Drill.Symbol.Nr.11 = "16000" -Option.Drill.Symbol.Nr.12 = "20000" -Option.Drill.Symbol.Nr.13 = "22000" -Option.Drill.Symbol.Nr.14 = "28000" -Option.Drill.Symbol.Nr.15 = "32000" -Option.Drill.Symbol.Nr.16 = "0" -Option.Drill.Symbol.Nr.17 = "0" -Option.Drill.Symbol.Width = "254" -Option.FileLocking = "1" -Option.GridColorBlackBgDots = "7" -Option.GridColorBlackBgLines = "8" -Option.GridColorColoredBgDots = "7" -Option.GridColorColoredBgLines = "8" -Option.GridColorWhiteBgDots = "7" -Option.GridColorWhiteBgLines = "8" -Option.LayerSequence = "" -Option.MaxBackupLevel = "9" -Option.MinGridSize = "5" -Option.MinTextSize = "3" -Option.NetWireWidth = "1524" -Option.Optimizing = "1" -Option.PadNames = "0" -Option.RatsnestLimit = "0" -Option.RepositionMouseCursorAfterContextMenu = "0" -Option.SelectFactor = "0.02" -Option.ShowPartOrigins = "1" -Option.ShowTextOrigins = "1" -Option.SnapLength = "5080" -Option.ToggleCtrlForGroupSelectionAndContextMenu = "0" -Option.XrefLabelFormat = "%F%N/%S.%C%R" -Option.XrefPartFormat = "/%S.%C%R" -Project.Dir = "/home/cynerd/Documents/eagle/oh-avr" -Recent.Epf.1 = "/home/cynerd/Documents/eagle/oh-avr" -Recent.Lbr.1 = "/home/cynerd/Documents/eagle/lbr/AVR.lbr" -Recent.Sch.1 = "/home/cynerd/Documents/eagle/oh-avr/avrunit.sch" -Recent.Scr.1 = "/home/cynerd/Downloads/Atmel-ATMEGA328P-AU@E/Atmel-ATMEGA328P-AU.scr" -Sch.Cmd.Add.AlwaysUseDeviceNameAsValue = "0" -Sch.CommandPopup.Add.1 = "+5V (supply1.lbr);'+5V@/home/cynerd/.eagle/lbr/supply1.lbr'" -Sch.CommandPopup.Add.2 = "GND (supply1.lbr);'GND@/home/cynerd/.eagle/lbr/supply1.lbr'" -Sch.CommandPopup.Add.3 = "MA04-2 (con-lstb.lbr);'MA04-2@/home/cynerd/.eagle/lbr/con-lstb.lbr'" -Sch.CommandPopup.Add.4 = "MA05-2 (con-lstb.lbr);'MA05-2@/home/cynerd/.eagle/lbr/con-lstb.lbr'" -Sch.CommandPopup.Add.5 = "MA03-2 (con-lstb.lbr);'MA03-2@/home/cynerd/.eagle/lbr/con-lstb.lbr'" -Sch.CommandPopup.Add.6 = "MA03-1 (con-lstb.lbr);'MA03-1@/home/cynerd/.eagle/lbr/con-lstb.lbr'" -Sch.CommandPopup.Add.7 = "ATMEGA328P-AU (AVR.lbr);'ATMEGA328P-AU@/home/cynerd/Documents/eagle/lbr/AVR.lbr'" -Sch.DockWidget.Thumbnails = "1 -1 -1 -1 70 -1 0" -Sch.Key.A+A = "Add" -Sch.Key.A+C = "Copy" -Sch.Key.A+D = "Delete" -Sch.Key.A+F = "Mirror" -Sch.Key.A+F2 = "Window fit" -Sch.Key.A+G = "Group" -Sch.Key.A+L = "Label" -Sch.Key.A+M = "Move" -Sch.Key.A+N = "Name" -Sch.Key.A+R = "Rotate" -Sch.Key.A+S = "Smash" -Sch.Key.A+V = "Value" -Sch.Key.A+W = "Wire" -Sch.Key.F2 = "Window;" -Sch.Key.F3 = "Window 2" -Sch.Key.F4 = "Window 0.5" -Sch.Key.F5 = "Window (@);" -Sch.Key.F6 = "Grid;" -Sch.LargeCursor = "0" -Sch.MenuText.01 = "[designlink.png] Search and order { General : Run designlink-order.ulp -general; | Schematic : Run designlink-order.ulp; }" -Sch.Palette = "1" -Sch.ToolBar.Action = "2 0 1 0 2" -Sch.ToolBar.CommandButtons = "5 0 1 0 5" -Sch.ToolBar.CommandTexts = "2 1 0 0 2" -Sch.ToolBar.Parameters = "2 2 1 0 2" -Sch.WhiteBackground = "1" -Warning.PartHasNoUserDefinableValue = "1" -Warning.SupplyPinAutoOverwriteGeneratedNetName = "0" @@ -1,13 +1,10 @@ [user] name = Karel Kočí email = cynerd@email.cz - signingkey = A6BC8B8CEB31659B [push] default = simple [core] editor = vim -[commit] - gpgsign = true [merge] tool = vimdiff [alias] diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc deleted file mode 100644 index bc3c212..0000000 --- a/gtk-2.0/gtkrc +++ /dev/null @@ -1,4 +0,0 @@ -include "/usr/share/themes/Numix-Frost/gtk-2.0/gtkrc" -gtk-font-name = "DejaVu Sans 8" -gtk-icon-theme-name = "Faenza" -gtk-key-theme-name = "Emacs" diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini deleted file mode 100644 index a85b9ba..0000000 --- a/gtk-3.0/settings.ini +++ /dev/null @@ -1,6 +0,0 @@ -[Settings] -gtk-theme-name=Numix-Frost -gtk-font-name=DejaVu Sans 8 -gtk-cursor-theme-size=12 -gtk-icon-theme-name=Faenza -gtk-key-theme-name = Emacs @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cd `dirname $0` @@ -11,8 +11,6 @@ git submodule update --init --recursive || (echo "Submodule update failed!"; exi [ "$1" = "-f" ] && FORCE=true || FORCE=false ################################################################################# -source private/install # private files, sorry but some privacy is required. - if [ -e /etc/arch-release ] && ask "Archlinux software"; then source utils/arch archlinux_inst @@ -21,13 +19,11 @@ fi if ask "Install Bashrc"; then inst bashrc ~/.bashrc inst shellrc ~/.shellrc - inst profile ~/.profile fi if ask "Install zshrc"; then inst zshrc ~/.zshrc inst shellrc ~/.shellrc - inst zprofile ~/.zprofile fi if ask "Install GIT configuration"; then @@ -39,77 +35,8 @@ if ask "Install configurations for various utility tools"; then inst screenrc ~/.screenrc fi -if ask "Install user services"; then - inst local/sbin/user-service.sh ~/.local/sbin/user-service.sh - inst service/ ~/.service/ -fi - -YCM_PATH=~/.vim/bundle/YouCompleteMe -if ask "Install VIM scripts"; then - # See if we have anything different from what we have in repository - YCM_REV="$(cd $YCM_PATH && git --work-tree=. diff --exit-code -s && echo y)" +if ask "Install vim scripts"; then inst vimrc ~/.vimrc - inst vim/ ~/.vim - inst local/bin/vim-project-gen ~/.local/bin/vim-project-gen mkdir -p ~/.cache/vim # directory for *.swp files mkdir -p ~/.cache/vim-undo # directory for undo files - if [ "$YCM_REV" != "y" ]; then ( - cd $YCM_PATH - ./install.py --clang-completer --system-libclang - ); else - echo "YouCompleteMe is not required to be recompiled" - fi -fi - -if ask "Install email synchronization"; then - inst local/bin/email-unread ~/.local/bin/email-unread - inst local/sbin/newmail-notify ~/.local/sbin/newmail-notify - inst_email_sync - # Contains: - # inst local/sbin/syncemail ~/.local/sbin/ - # inst config/offlineimap/ ~/.config/offlineimap -fi - -if ask "Install mutt configuration"; then - inst urlview ~/.urlview - inst mutt/mailcap ~/.mutt/ - inst mutt/gpg.rc ~/.mutt/ - inst mutt/color ~/.mutt/ - inst_mutt_conf - # Contains: - # inst mutt/ ~/.mutt - # inst msmtprc ~/.msmtprc - mkdir -p ~/.cache/mutt # directory for temporaly html files -fi - -if ask "Install desktop (i3..)"; then - inst xinitrc ~/.xinitrc - inst Xresources ~/.Xresources - inst config/i3/ ~/.config/i3 - inst config/i3blocks/ ~/.config/i3blocks - inst config/dunst/ ~/.config/dunst - inst local/bin/mxrandr ~/.local/bin/ - # Theme - inst gtk-2.0/gtkrc ~/.gtkrc-2.0 - inst gtk-3.0/ ~/.config/gtk-3.0/ - inst config/Trolltech.conf ~/.config/Trolltech.conf - # User directories - inst config/user-dirs.dirs ~/.config/user-dirs.dirs -fi - -if ask "Install Conkeror configuration"; then - inst conkerorrc ~/.conkerorrc - inst conkeror/ ~/.conkeror -fi - -if ask "Install MPD configuration"; then - inst config/mpd/ ~/.config/mpd -fi - -if ask "Install backup script"; then - inst local/bin/system-backup ~/.local/bin/system-backup -fi - -if ask "Install lxc-net script"; then - inst local/bin/lxc-net ~/.local/bin/lxc-net fi diff --git a/local/bin/asus-fan b/local/bin/asus-fan deleted file mode 100755 index 09e54f1..0000000 --- a/local/bin/asus-fan +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# TODO this probably should be auto detected, because hwmon number can change -HWMON=/sys/devices/platform/asus-nb-wmi/hwmon/hwmon1 - -if [ "$(whoami)" != "root" ]; then - echo "Run $0 only with root privileges" - exit -1 -fi - -case "$1" in - -h|--help) - echo "Usage: $0 -h|full|auto" - echo "This script controls asus hwmon" - echo " full - Full throttle" - echo " auto - Automatic hardware control" - ;; - full) - echo 1 > $HWMON/pwm1_enable - echo 255 > $HWMON/pwm1 - ;; - auto) - echo 0 > $HWMON/pwm1_enable - ;; - *) - echo "Unknown or no option given!" - exit -2 - ;; -esac diff --git a/local/bin/email-unread b/local/bin/email-unread deleted file mode 100755 index dec7d04..0000000 --- a/local/bin/email-unread +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env perl -use strict; -use warnings; -use File::Find; - -use constant EMAIL => glob("~/.mail"); -my $IGNORE = "(Spam|trash|Important)"; - -my $V = (shift || "") eq "-s"; - -opendir(EDIR, EMAIL) or die $!; -while (readdir EDIR) { - next if /^\./ or not (-d EMAIL."/$_"); - our $count = 0; - - sub new_dir { - my $path = substr $File::Find::name, 1 + length EMAIL; - $path =~ s/\/new$//; - return if $_ ne "new" or $path =~ /$IGNORE/; - my $cnt = 0; - opendir(NDIR, "$File::Find::name") or die $!; - while (readdir NDIR) { - $cnt += 1 unless /^\./; - } - closedir(NDIR); - print "$path: $cnt\n" if not $V and $cnt > 0; - $count += $cnt; - } - find(\&new_dir, EMAIL."/$_"); - - print "$_: $count\n" if $V and $count > 0; -} -closedir(EDIR); diff --git a/local/bin/lxc-net b/local/bin/lxc-net deleted file mode 100755 index 53ccb50..0000000 --- a/local/bin/lxc-net +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -if [ "$(id -u)" -ne 0 ]; then - echo "Root required for execution" >&2 - exit 1 -fi - -# What if we want to clean -if [ "$1" = "clean" ]; then - kill $(cat /tmp/lxc-dhcpd.pid) - rm -f /tmp/lxc-dhcpd.pid /tmp/lxc-dhcpd.conf - ip link del dev vbr0 - exit -fi - -# Setup bridge -ip link add name vbr0 type bridge -ip link set vbr0 up -ip addr add 192.168.30.1/24 dev vbr0 - -# Start dhcp server - -# This just takes first dns nameserver configured. Maybe we might want to be -# little bit more clever. -DNS_SERVER=$(cat /etc/resolv.conf |grep -i nameserver|head -n1|cut -d ' ' -f2) -echo "# DHCPD configuration generated by lxc-net script -authoritative; -default-lease-time 600; -max-lease-time 7200; -option subnet-mask 255.255.255.0; -option broadcast-address 192.168.30.255; -option routers 192.168.30.1; -option domain-name-servers $DNS_SERVER; -subnet 192.168.30.0 netmask 255.255.255.0 { - range 192.168.30.10 192.168.30.100; -}" > /tmp/lxc-dhcpd.conf -dhcpd -4 -pf /tmp/lxc-dhcpd.pid -cf /tmp/lxc-dhcpd.conf vbr0 - -# Setup network forwarding (TODO add -o ethX to iptable command) -sysctl -w net.ipv4.ip_forward=1 -iptables -t nat -A POSTROUTING -j MASQUERADE diff --git a/local/bin/mxrandr b/local/bin/mxrandr deleted file mode 100755 index 7c51128..0000000 --- a/local/bin/mxrandr +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# get info from xrandr -connectedOutputs=$(xrandr | grep " connected" | sed -e "s/\([A-Z0-9]\+\) connected.*/\1/") -activeOutput=$(xrandr | grep -E " connected (primary )?[1-9]+" | sed -e "s/\([A-Z0-9]\+\) connected.*/\1/") -disconnectedOutputs=$(xrandr | grep -E " disconnected (primary )?[1-9]+" | awk '{print $1}') - -cmd="xrandr " -cmd_def=$cmd - -INTERNAL=eDP1 -HDMI=HDMI1 -VGA=VGA1 - -for device in "$disconnectedOutputs"; do - if [ -n "$defice" ]; then - if [[ "$activeOutput" == *"$device"* ]]; then - cmd=$cmd" --output $device --off" - fi - fi -done - -function only_internal { - cmd=$cmd" --output $INTERNAL --auto --primary" - cmd=$cmd" --output $HDMI --off" - cmd=$cmd" --output $VGA --off" -} - -function internal_vga { - cmd=$cmd" --output $INTERNAL --auto --primary" - cmd=$cmd" --output $HDMI --off" - cmd=$cmd" --output $VGA --auto --right-of $INTERNAL" -} - -function internal_hdmi { - cmd=$cmd" --output $INTERNAL --auto --right-of $HDMI" - cmd=$cmd" --output $HDMI --auto --primary" - cmd=$cmd" --output $VGA --off" -} - -function internal_hdmi_vga { - cmd=$cmd" --output $INTERNAL --auto --right-of $HDMI" - cmd=$cmd" --output $HDMI --auto --primary" - cmd=$cmd" --output $VGA --auto --left-of $HDMI" -} - -function cmd_exec { - if [ "$cmd" != "$cmd_def" ]; then - echo $cmd - `$cmd` - fi -} - - -if [ $# -le 1 ]; then - if [[ "$connectedOutputs" == *"$HDMI"* ]]; then - if [[ "$connectedOutputs" == *"$VGA"* ]]; then - internal_hdmi_vga - else - internal_hdmi - fi - else - if [[ "$connectedOutputs" == *"$VGA"* ]]; then - internal_vga - else - only_internal - fi - fi - cmd_exec - exit -fi - -if [ "$2" != "mode" ]; then - if [[ "$connectedOutputs" != *"$2"* ]]; then - echo No $2 display known - exit - fi -fi - -case "$1" in - toggle) - case "$2" in - $INTERNAL) - if [[ "$activeOutput" == *"$INTERNAL"* ]]; then - cmd=$cmd" --output $INTERNAL --off" - else - if [[ "$activeOutput" == *"$HDMI"* ]]; then - cmd=$cmd" --output $INTERNAL --auto --right-of $HDMI" - else - cmd=$cmd" --output $INTERNAL --auto --primary" - fi - fi - ;; - $HDMI) - if [[ "$activeOutput" == *"$HDMI"* ]]; then - cmd=$cmd" --output $HDMI --off" - else - if [[ "$activeOutput" == *"$VGA"* ]]; then - cmd=$cmd" --output $HDMI --auto --primary" - else - cmd=$cmd" --output $HDMI --auto --right-of $INTERNAL" - fi - fi - ;; - $VGA) - if [[ "$activeOutput" == *"$VGA"* ]]; then - cmd=$cmd" --output $VGA --off" - else - if [[ "$activeOutput" == *"$HDMI"* ]]; then - cmd=$cmd" --output $VGA --auto --left-of $HDMI" - else - cmd=$cmd" --output $VGA --auto --right-of $INTERNAL" - fi - fi - ;; - esac - ;; -esac -cmd_exec diff --git a/local/bin/steam b/local/bin/steam deleted file mode 100755 index b573daf..0000000 --- a/local/bin/steam +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -#export STEAM_RUNTIME=0 -export STEAM_RUNTIME_PREFER_HOST_LIBRARIES=0 -# Workaround for dbus fatal termination related coredumps (SIGABRT) -# https://github.com/ValveSoftware/steam-for-linux/issues/4464 -export DBUS_FATAL_WARNINGS=0 -# Override some libraries as these are what games linked against. -export LD_LIBRARY_PATH="/usr/lib/steam:/usr/lib32/steam" -#export LD_PRELOAD="/usr/lib/steam:/usr/lib32/steam /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.4/libstdc++.so.6 /usr/lib64/gcc/x86_64-pc-linux-gnu/4.9.4/libgcc_s.so.1 /usr/lib64/libxcb.so.1 /usr/lib64/libgpg-error.so" -exec /usr/bin/steam "$@" diff --git a/local/bin/system-backup b/local/bin/system-backup deleted file mode 100755 index dfa2c09..0000000 --- a/local/bin/system-backup +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# vim:ft=sh -# New line separated list of all directories to backup -DIRS="/etc -/home -/home_hdd" -# Name of the machine used in backup subvolumes -MNAME=asus -# Path where backup will be mounted -MPATH=/media/backup -# UUID of disk -UUID=b162ea95-38bb-42c6-b36a-1be98c65392c -# Mount additional arguments -MARGS="-o compress=lzo" -# If disk is encrypted -CRYPT=true -#################################################################### -# Check if running as root -if [ `id -u` -ne "0" ]; then - echo Please run this as root. - exit 1 -fi -set -e - -# Mount disk -PART=$(lsblk -fpl | grep "$UUID" | awk '{print $1}') -if [ -z "$PART" ]; then - echo Disk not detected. Exiting - exit -1 -fi -if $CRYPT; then - echo -e "\e[1;33mDecrypting filesystem\e[0m" - # TODO what if already opened - cryptsetup open "$PART" backup || (echo Decryption failed && exit -2) - PART=/dev/mapper/backup - echo $PART -fi -echo -e "\e[1;33mMounting\e[0m" -mkdir -p "$MPATH" -mount $MARGS "$PART" "$MPATH" || (echo Mount failed && exit -3) - -[ -d "$MPATH"/@"$MNAME" ] || (echo There seems to be no subvolume $MNAME && exit -4) - -# Do backup -while read -r DIR; do - echo -e "\e[1;33mBacking up: $DIR\e[0m" - rsync -aAxXS --delete --progress "$DIR" "$MPATH"/@"$MNAME"/ || [ $? -eq 24 ] - # We ignore exit code if rsync detects vanished source file -done <<< "$DIRS" - -# Do snapshot (read only) -(cd "$MPATH"; btrfs subvolume snapshot -r @asus @asus-$(date -u +%y%m%d)) - -# Remove snapshots older than 2 months -# TODO ensure that at least five stays -(cd "$MPATH" -for s in @"$MNAME"-*; do - if [ $(expr $(date +%s) - $(stat -c %Y "$s")) -gt 5529600 ]; then - btrfs subvolume delete "$s" - fi -done) - -# Unmount disk -sync -f "$MPATH"/@"$MNAME" -umount "$MPATH" || (echo Unmount failed. Unmount by hand. && exit -5) -if $CRYPT; then - cryptsetup close backup || (echo Encryption close failed. Do by hand. && exit -6) -fi - -# Store when we did last backup and update i3blocks status -date +"%s" > /home/cynerd/.backup_date -pkill -RTMIN+13 i3blocks - -echo -echo -e "\e[1;34mBackup finished\e[0m" diff --git a/local/bin/vim-project-gen b/local/bin/vim-project-gen deleted file mode 100755 index 6a50ba5..0000000 --- a/local/bin/vim-project-gen +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# Generates ctags and cscope files for project. -ctags -R -f .tags -#cscope -Rbq -f .cscope.out diff --git a/local/sbin/newmail-notify b/local/sbin/newmail-notify deleted file mode 100755 index 7c6b803..0000000 --- a/local/sbin/newmail-notify +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -cd ~/.mail - -if [ -f notify-notified ]; then - NOTIFIED=`cat notify-notified` - rm notify-notified -fi - -for account in `ls`; do - if cd "$account"/INBOX/new; then - for m in `ls`; do - echo $m - echo $m >> ~/.mail/notify-notified - if echo "$NOTIFIED" | grep "$m" >/dev/null; then continue; fi - FROM=`grep -E "^From: " "$m" | sed 's/^From: //' | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)'` - TO=`grep -E "^To: " "$m" | sed 's/^To: //' | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)'` - SUBJECT=`grep -E "^Subject: " "$m" | sed 's/^Subject: //' | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)'` - notify-send "$TO: $FROM" "$SUBJECT" - done - fi - cd ~/.mail -done diff --git a/local/sbin/syncemail b/local/sbin/syncemail deleted file mode 100755 index 3cb56a4..0000000 --- a/local/sbin/syncemail +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python2 -# This starts offlineimap, but first it requests passwords from pass -import os -import sys -import subprocess -import daemon -import lockfile -import syslog -from offlineimap import OfflineImap - -pidfile = '/tmp/syncemail-%d.pid' % os.getuid() - -# Check if not already running -def check_running(): - if os.access(pidfile, os.F_OK): - with open(pidfile, "r") as f: - pid = f.readline() - if os.path.exists('/proc/%s' % pid): - sys.exit(0) -check_running() - - -accounts = [ - ["email", "mail/cynerd@email.cz"], - ] - -for acc in accounts: - pproc = subprocess.Popen("pass " + acc[1], - stdout=subprocess.PIPE, shell=True) - output = pproc.stdout.read().rstrip() - if pproc.wait() != 0: - print("Password receive failed.") - sys.exit(1) - sys.argv.append('-k') - sys.argv.append('Repository_' + acc[0] + '-remote:remotepass=' + output) - -# Define out logger and redirect stdout and stderr to it -class logstd: - def write(self, data): - syslog.syslog(data) - -with daemon.DaemonContext(): - check_running() - with open(pidfile, "w") as f: - f.write("%s" % os.getpid()) - syslog.openlog('syncemail') - sys.stderr = sys.stdout = logstd() - OfflineImap().run() diff --git a/local/sbin/user-service.sh b/local/sbin/user-service.sh deleted file mode 100755 index 632272c..0000000 --- a/local/sbin/user-service.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -set -e - -[ -z "$1" ] && {echo "Run this script only from user-service file!" && exit 1} - -# Name of service -NAME="$(basename "$1")" -SERVICE="$1" - -# Source input file -. "$1" -shift - -OP="status" -Q=true -# Parse arguments -while [ -n "$1" ]; do - case "$1" in - -h|--help) - echo "User service: $NAME" - echo " $description" - echo "$SERVICE [OPTION]... OPERATION" - echo " Options:" - echo " -q - be quiet" - echo " Operations:" - echo " status - show status of service" - echo " start - start service" - echo " stop - stop service" - echo " restart - restart service" - echo " ifrestart - restart service if it's running" - ;; - -q) - Q=false - ;; - status|start|stop|restart) - OP="$1" - ;; - *) - echo "Unknown argument: $1" - exit 1 - ;; - esac - shift -done - -case "$OP" in - status) - if status; then - $Q && echo "Service $NAME is running" - exit 0 - else - $Q && echo "Service $NAME is not running" - exit 1 - fi - ;; - start) - $Q && echo -n "Starting service $NAME..." - if start; then - $Q && echo " ok" - else - $Q && echo " fail" - exit 1 - fi - ;; - stop) - $Q && echo -n "Stopping service $NAME..." - if stop; then - $Q && echo " ok" - else - $Q && echo " fail" - exit 1 - fi - ;; - restart) - $Q && echo "Restarting service $NAME..." - if ! stop; then - $Q && echo " stop failed" - exit 1 - fi - if start; then - $Q && echo " ok" - else - $Q && echo " start failed" - exit 1 - fi - ;; - ifrestart) - $Q && echo "Restarting service $NAME..." - if status; then - if ! stop; then - $Q && echo " stop failed" - exit 1 - fi - if start; then - $Q && echo " ok" - else - $Q && echo " start failed" - exit 1 - fi - fi - ;; - *) - echo "Invalid operation!" - exit 3 - ;; -esac @@ -1 +0,0 @@ -character_set=UNICODE (UTF-8) diff --git a/mutt/color b/mutt/color deleted file mode 100644 index b603f9e..0000000 --- a/mutt/color +++ /dev/null @@ -1,88 +0,0 @@ -## Theme kindly inspired from -## http://nongeekshandbook.blogspot.ie/2009/03/mutt-color-configuration.html - -## Colours for items in the index -color index brightcyan black ~N -color index brightred black ~O -color index brightyellow black ~F -color index black green ~T -color index brightred black ~D -mono index bold ~N -mono index bold ~F -mono index bold ~T -mono index bold ~D - -## Highlights inside the body of a message. - -## URLs -color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" -mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" - -## Email addresses. -color body brightgreen black "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" - -## Header -color header green black "^from:" -color header green black "^to:" -color header green black "^cc:" -color header green black "^date:" -color header yellow black "^newsgroups:" -color header yellow black "^reply-to:" -color header brightcyan black "^subject:" -color header red black "^x-spam-rule:" -color header green black "^x-mailer:" -color header yellow black "^message-id:" -color header yellow black "^Organization:" -color header yellow black "^Organisation:" -color header yellow black "^User-Agent:" -color header yellow black "^message-id: .*pine" -color header yellow black "^X-Fnord:" -color header yellow black "^X-WebTV-Stationery:" - -color header red black "^x-spam-rule:" -color header green black "^x-mailer:" -color header yellow black "^message-id:" -color header yellow black "^Organization:" -color header yellow black "^Organisation:" -color header yellow black "^User-Agent:" -color header yellow black "^message-id: .*pine" -color header yellow black "^X-Fnord:" -color header yellow black "^X-WebTV-Stationery:" -color header yellow black "^X-Message-Flag:" -color header yellow black "^X-Spam-Status:" -color header yellow black "^X-SpamProbe:" -color header red black "^X-SpamProbe: SPAM" - -## Coloring quoted text - coloring the first 7 levels: -color quoted cyan black -color quoted1 yellow black -color quoted2 red black -color quoted3 green black -color quoted4 cyan black -color quoted5 yellow black -color quoted6 red black -color quoted7 green black - -## Default color definitions -#color hdrdefault white green -color signature brightmagenta black -color indicator black cyan -color attachment black green -color error red black -color message white black -color search brightwhite magenta -color status brightyellow blue -color tree brightblue black -color normal white black -color tilde green black -color bold brightyellow black -#color underline magenta black -color markers brightcyan black - -## Colour definitions when on a mono screen -mono bold bold -mono underline underline -mono indicator reverse - diff --git a/mutt/gpg.rc b/mutt/gpg.rc deleted file mode 100644 index 20e7fc4..0000000 --- a/mutt/gpg.rc +++ /dev/null @@ -1,88 +0,0 @@ -# vim: set ft=muttrc: -# -# Command formats for gpg. -# -# This version uses gpg-2comp from -# http://70t.de/download/gpg-2comp.tar.gz -# -# $Id$ -# -# %p The empty string when no passphrase is needed, -# the string "PGPPASSFD=0" if one is needed. -# -# This is mostly used in conditional % sequences. -# -# %f Most PGP commands operate on a single file or a file -# containing a message. %f expands to this file's name. -# -# %s When verifying signatures, there is another temporary file -# containing the detached signature. %s expands to this -# file's name. -# -# %a In "signing" contexts, this expands to the value of the -# configuration variable $pgp_sign_as. You probably need to -# use this within a conditional % sequence. -# -# %r In many contexts, mutt passes key IDs to pgp. %r expands to -# a list of key IDs. - -# Note that we explicitly set the comment armor header since GnuPG, when used -# in some localiaztion environments, generates 8bit data in that header, thereby -# breaking PGP/MIME. - -# decode application/pgp -set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - -# verify a pgp/mime signature -set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f" - -# decrypt a pgp/mime attachment -set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - -# create a pgp/mime signed attachment -# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" -set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" - -# create a application/pgp signed (old-style) message -# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" -set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" - -# create a pgp/mime encrypted attachment -# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" - -# create a pgp/mime encrypted and signed attachment -# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" - -# import a key into the public key ring -set pgp_import_command="gpg --no-verbose --import %f" - -# export a key from the public key ring -set pgp_export_command="gpg --no-verbose --export --armor %r" - -# verify a key -set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r" - -# read in the public key ring -set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r" - -# read in the secret key ring -set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r" - -# fetch keys -# set pgp_getkeys_command="pkspxycwrap %r" - -# pattern for good signature - may need to be adapted to locale! - -# set pgp_good_sign="^gpgv?: Good signature from " - -# OK, here's a version which uses gnupg's message catalog: -# set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`" - -# This version uses --status-fd messages -set pgp_good_sign="^\\[GNUPG:\\] GOODSIG" - -# pattern to verify a decryption occurred -set pgp_decryption_okay="^\\[GNUPG:\\] DECRYPTION_OKAY" - diff --git a/mutt/mailcap b/mutt/mailcap deleted file mode 100644 index 972681f..0000000 --- a/mutt/mailcap +++ /dev/null @@ -1,14 +0,0 @@ -##this is used when (v)iewing a text/html attachment: -##allowing you to browse and "click" links -##order matters the first entry which passes the test is used -#gui browser if $DISPLAY is set -text/html; conkeror %s &; test=test -n "$DISPLAY"; nametemplate=%s.html -#text browser otherwise -text/html; w3m -v -F -T text/html %s; nametemplate=%s.html; needsterminal - -##auto_view will use the entry with the copiousoutput part: -text/html; lynx -stdin -dump -force_html ; copiousoutput - -image/*; feh --magick-timeout 1 %s -application/pdf; okular %s - diff --git a/mutt/muttemail b/mutt/muttemail deleted file mode 100644 index 680ff9c..0000000 --- a/mutt/muttemail +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set filetype=muttrc: -color status green default -set folder = "~/.mail/email" -set spoolfile = "+INBOX" -set copy = no -#set record = "+sent" -set postponed = "+drafts" -set from = "Karel Kočí <cynerd@email.cz>" diff --git a/mutt/muttrc b/mutt/muttrc deleted file mode 100644 index 7fd15f1..0000000 --- a/mutt/muttrc +++ /dev/null @@ -1,55 +0,0 @@ -set editor="vim" -set my_name="Karel Kočí" -set edit_headers=yes -set askcc=yes - -hdr_order Date From To Cc #Sorting emails by the given criteria (from left to right) -set pager_index_lines= 5 -set sort=reverse-threads -set sort_aux=last-date-received -set mailcap_path = "~/.mutt/mailcap" -set sleep_time = 0 -set delete = yes -set include=yes -set ispell="aspell" - -auto_view text/html -alternative_order text/enriched text/plain text/html -macro attach 'V' "<pipe-entry>cat >~/.cache/mutt/mail.html && conkeror ~/.cache/mutt/mail.html && rm ~/.cache/mutt/mail.html<enter>" - -source ~/.mutt/gpg.rc -set pgp_use_gpg_agent = yes -set pgp_sign_as = 0xA6BC8B8CEB31659B -set pgp_timeout = 3600 -set crypt_autosign = yes -set crypt_replyencrypt = yes -set sendmail="/usr/bin/msmtp --read-envelope-from" - -set query_command= "abook --mutt-query '%s'" -bind editor <Tab> complete-query - -macro index S 's=archive<enter>' - -set sidebar_visible = yes -bind index,pager B sidebar-toggle-visible -# Ctrl-n, Ctrl-p to select next, previous folder. -# Ctrl-o to open selected folder. -bind index,pager \CP sidebar-prev -bind index,pager \CN sidebar-next -bind index,pager \CO sidebar-open - -bind pager j next-line -bind pager k previous-line -bind attach,index,pager \CD next-page -bind attach,index,pager \CU previous-page -bind pager g top -bind pager G bottom -bind attach,index g first-entry -bind attach,index G last-entry - -macro index <F3> ':source ~/.mutt/muttemail<enter>c~/.mail/email/INBOX<enter>' - -source ~/.mutt/color - -# As default open email -source ~/.mutt/muttemail diff --git a/private b/private deleted file mode 160000 -Subproject 487d3bdb532360a5259df27ccdc339b66b26e97 diff --git a/profile b/profile deleted file mode 100644 index 76a201c..0000000 --- a/profile +++ /dev/null @@ -1,22 +0,0 @@ -# First global user configuration -export PATH=~/.local/bin:$PATH:$(ruby -e "print Gem.user_dir")/bin -export EDITOR=vim - -# Rest of the profile run only if login is from linux console -[[ "$(tty)" != /dev/tty* ]] && return - -# Start music player daemon -~/.service/mpd -q status || ~/.service/mpd start -# Start email synchronization -~/.local/sbin/syncemail -# Start syncthing -~/.service/syncthing -q status || ~/.service/syncthing start - -# And if we are on first terminal also automatically start x server -if [ "$(tty)" = "/dev/tty1" ]; then - if which annoyme >/dev/null 2>&1; then # Check if we are using annoyme - sleep 1 # just little bit of time to give systemd to start tasks - ls ~/.annoyme/*.pid 2>/dev/null >&2 && annoyme - fi - exec startx -- vt1 -fi diff --git a/service/mpd b/service/mpd deleted file mode 100755 index f55722a..0000000 --- a/service/mpd +++ /dev/null @@ -1,18 +0,0 @@ -#!/home/cynerd/.local/sbin/user-service.sh -# vim: ft=sh - -description="Music player daemon" -pidfile=".config/mpd/pid" - -status() { - [ -f $pidfile ] || return 1 - kill -0 "$(cat $pidfile)" || return 1 -} - -start() { - mpd ~/.config/mpd/mpd.conf -} - -stop() { - mpd --kill ~/.config/mpd/mpd.conf -} diff --git a/service/syncemail b/service/syncemail deleted file mode 100755 index a42e380..0000000 --- a/service/syncemail +++ /dev/null @@ -1,20 +0,0 @@ -#!/home/cynerd/.local/sbin/user-service.sh -# vim: ft=sh - -description="Mail synchronization tool" -pidfile="/tmp/syncemail-$(id -u).pid" - -status() { - [ -f $pidfile ] || return 1 - kill -0 "$(cat $pidfile)" || return 1 -} - -start() { - ~/.local/sbin/syncemail -} - -stop() { - PID="$(cat $pidfile)" - kill $PID 2>/dev/null - while kill -0 $PID 2>/dev/null; do sleep 1; done -} diff --git a/service/syncthing b/service/syncthing deleted file mode 100755 index 8d0e009..0000000 --- a/service/syncthing +++ /dev/null @@ -1,19 +0,0 @@ -#!/home/cynerd/.local/sbin/user-service.sh -# vim: ft=sh - -description="Syncthing is an open, trustworthy and decentralized cloud storage system" -pidfile="/tmp/syncthing-$USER.pid" -logfile="/var/log/syncthing-$USER.log" - -status() { - [ -f $pidfile ] || return 1 - kill -0 "$(cat $pidfile)" || return 1 -} - -start() { - start-stop-daemon -S -bmp $pidfile -1 $logfile -2 $logfile -- syncthing -no-browser -} - -stop() { - start-stop-daemon -K -p $pidfile -x syncthing -} @@ -55,21 +55,6 @@ genpasswd() { tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs } -# Clip stdin to clipboard -clip() { - xclip -selection clipboard -} - -# Clip current HEAD hash to clipboard -gitclip() { - git rev-parse HEAD | clip -} - -# Make screenshot -xshot() { - import -window "$(xdotool selectwindow)" ~/xshot_$(date +%F_%H%M%S_%N).png -} - # Run given command every second dorepeat() { while true; do diff --git a/system/etc/X11/xorg.conf.d/20-intel.conf b/system/etc/X11/xorg.conf.d/20-intel.conf deleted file mode 100644 index c448076..0000000 --- a/system/etc/X11/xorg.conf.d/20-intel.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "Device" - Identifier "Intel Graphics" - Driver "intel" - Option "DRI" "3" -EndSection diff --git a/system/etc/X11/xorg.conf.d/30-composite.conf b/system/etc/X11/xorg.conf.d/30-composite.conf deleted file mode 100644 index d5912cd..0000000 --- a/system/etc/X11/xorg.conf.d/30-composite.conf +++ /dev/null @@ -1,3 +0,0 @@ -Section "Extensions" - Option "Composite" "Enable" -EndSection diff --git a/system/etc/X11/xorg.conf.d/50-joystick.conf b/system/etc/X11/xorg.conf.d/50-joystick.conf deleted file mode 100644 index 1765eb8..0000000 --- a/system/etc/X11/xorg.conf.d/50-joystick.conf +++ /dev/null @@ -1,8 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" - Option "StartKeysEnabled" "False" #Disable mouse - Option "StartMouseEnabled" "False" #support -EndSection diff --git a/system/etc/X11/xorg.conf.d/50-synaptics.conf b/system/etc/X11/xorg.conf.d/50-synaptics.conf deleted file mode 100644 index 13f4571..0000000 --- a/system/etc/X11/xorg.conf.d/50-synaptics.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Example xorg.conf.d snippet that assigns the touchpad driver -# to all touchpads. See xorg.conf.d(5) for more information on -# InputClass. -# Additional options may be added in the form of -# Option "OptionName" "value" -# -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - Option "TapButton1" "1" - Option "TapButton2" "3" - Option "TapButton3" "2" - Option "VertTwoFingerScroll" "on" - Option "HorizTwoFingerScroll" "on" - Option "synclient AccelFactor" "0.1" -# This option is recommend on all Linux systems using evdev, but cannot be -# enabled by default. See the following link for details: -# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html - MatchDevicePath "/dev/input/event*" -EndSection - -Section "InputClass" - Identifier "touchpad ignore duplicates" - MatchIsTouchpad "on" - MatchOS "Linux" - MatchDevicePath "/dev/input/mouse*" - Option "Ignore" "on" -EndSection - -# This option enables the bottom right corner to be a right button on clickpads -# and the right and middle top areas to be right / middle buttons on clickpads -# with a top button area. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Default clickpad buttons" - MatchDriver "synaptics" - Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" - Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%" -EndSection diff --git a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf b/system/etc/X11/xorg.conf.d/90-custom-kbd.conf deleted file mode 100644 index 72f1dba..0000000 --- a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "keyboard defaults" - MatchIsKeyboard "on" - - Option "XKbOptions" "caps:escape" -EndSection diff --git a/system_install b/system_install deleted file mode 100755 index 69dbac7..0000000 --- a/system_install +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -if [ "$UID" -ne 0 ]; then - echo "Please run this as root!" >&2 - exit 6 -fi - -cd `dirname $0` - -git submodule update --init || (echo "Submodule update failed!"; exit 5) - -# Source inst and diff function -. ./utils/inst - -# Load if we force changes (implies no interaction) -[ "$1" = "-f" ] && FORCE=true || FORCE=false - -################################################################################# - -if [ -e /etc/arch-release ]; then - . ./utils/arch - read -p "Check Archlinux packages? (Y/n) " - if [[ $REPLY =~ ^[Yy]?$ ]]; then - archlinux_inst - fi -fi - -if ask "Laptop ACPI and pm"; then - inst system/etc/acpi/handler.sh /etc/acpi/handler.sh - inst system/etc/pm/sleep.d/10lock /etc/pm/sleep.d/10lock -fi - -if ask "System PATH profile"; then - inst system/etc/profile.d/path.sh /etc/profile.d/path.sh -fi - -if ask "X11 configuration"; then - inst system/etc/X11/ /etc/X11/ -fi - -if ask "System-wide PulseAudio configuration"; then - inst system/etc/pulse/ /etc/pulse/ -fi - -if ask "Wpa supplicant"; then - # TODO - true -fi - -# As final step just ensure that correct user is owning system files -chown -R $(stat -c "%U:%G" "$0") system diff --git a/urlview b/urlview deleted file mode 100644 index 89684e4..0000000 --- a/urlview +++ /dev/null @@ -1 +0,0 @@ -COMMAND xdg-open %s & diff --git a/utils/vim_bundles_update b/utils/vim_bundles_update deleted file mode 100755 index eb502c6..0000000 --- a/utils/vim_bundles_update +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -[ -d vim/bundle ] || (echo Run in root of myconfigs only! && exit 1) - -for dir in vim/bundle/*; do - pushd $dir - git checkout master - git pull - git submodule update --init --recursive - popd -done diff --git a/vim/3rdparty/vim-pathogen b/vim/3rdparty/vim-pathogen deleted file mode 160000 -Subproject ddfb1f14d7597e6aedc749be06b559a673c437a diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 2ec30e1..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,266 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope <http://tpo.pe/> -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() or an absolute path to invoke pathogen#surround(). -" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all -" subdirectories inside "bundle" inside all directories in the runtime path. -" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}" -" on versions of Vim without native package support. -function! pathogen#infect(...) abort - if a:0 - let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")') - else - let paths = ['bundle/{}', 'pack/{}/start/{}'] - endif - if has('packages') - call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"') - endif - let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$' - for path in filter(copy(paths), 'v:val =~# static') - call pathogen#surround(path) - endfor - for path in filter(copy(paths), 'v:val !~# static') - if path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call pathogen#surround(path) - else - call pathogen#interpose(path) - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') - return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")') -endfunction - -" Convert a list to a path. -function! pathogen#join(...) abort - if type(a:1) == type(1) && a:1 - let i = 1 - let space = ' ' - else - let i = 0 - let space = '' - endif - let path = "" - while i < a:0 - if type(a:000[i]) == type([]) - let list = a:000[i] - let j = 0 - while j < len(list) - let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g') - let path .= ',' . escaped - let j += 1 - endwhile - else - let path .= "," . a:000[i] - endif - let i += 1 - endwhile - return substitute(path,'^,','','') -endfunction - -" Convert a list to a path with escaped spaces for 'path', 'tag', etc. -function! pathogen#legacyjoin(...) abort - return call('pathogen#join',[1] + a:000) -endfunction - -" Turn filetype detection off and back on again if it was already enabled. -function! pathogen#cycle_filetype() abort - if exists('g:did_load_filetypes') - filetype off - filetype on - endif -endfunction - -" Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_blacklist or the -" comma delimited environment variable $VIMBLACKLIST. -function! pathogen#is_disabled(path) abort - if a:path =~# '\~$' - return 1 - endif - let sep = pathogen#slash() - let blacklist = - \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST) - if !empty(blacklist) - call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') - endif - return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction - -" Prepend the given directory to the runtime path and append its corresponding -" after directory. Curly braces are expanded with pathogen#expand(). -function! pathogen#surround(path) abort - let sep = pathogen#slash() - let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':s?[\\/]\=$??') - let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') - call filter(rtp, 'index(before + after, v:val) == -1') - let &rtp = pathogen#join(before, rtp, after) - return &rtp -endfunction - -" For each directory in the runtime path, add a second entry with the given -" argument appended. Curly braces are expanded with pathogen#expand(). -function! pathogen#interpose(name) abort - let sep = pathogen#slash() - let name = a:name - if has_key(s:done_bundles, name) - return "" - endif - let s:done_bundles[name] = 1 - let list = [] - for dir in pathogen#split(&rtp) - if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] - else - let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') - endif - endfor - let &rtp = pathogen#join(pathogen#uniq(list)) - return 1 -endfunction - -let s:done_bundles = {} - -" Invoke :helptags on all non-$VIM doc directories in runtimepath. -function! pathogen#helptags() abort - let sep = pathogen#slash() - for glob in pathogen#split(&rtp) - for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep') - if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir) - endif - endfor - endfor -endfunction - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort - for command in a:000 - execute command - endfor - return '' -endfunction - -" Section: Unofficial - -function! pathogen#is_absolute(path) abort - return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]') -endfunction - -" Given a string, returns all possible permutations of comma delimited braced -" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields -" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard -" and globbed. Actual globs are preserved. -function! pathogen#expand(pattern, ...) abort - let after = a:0 ? a:1 : '' - let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '') - if pattern =~# '{[^{}]\+}' - let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) - let found = map(split(pat, ',', 1), 'pre.v:val.post') - let results = [] - for pattern in found - call extend(results, pathogen#expand(pattern)) - endfor - elseif pattern =~# '{}' - let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)') - let post = pattern[strlen(pat) : -1] - let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') - else - let results = [pattern] - endif - let vf = pathogen#slash() . 'vimfiles' - call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') - return filter(results, '!empty(v:val)') -endfunction - -" \ on Windows unless shellslash is set, / everywhere else. -function! pathogen#slash() abort - return !exists("+shellslash") || &shellslash ? '/' : '\' -endfunction - -function! pathogen#separator() abort - return pathogen#slash() -endfunction - -" Convenience wrapper around glob() which returns a list. -function! pathogen#glob(pattern) abort - let files = split(glob(a:pattern),"\n") - return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction - -" Like pathogen#glob(), only limit the results to directories. -function! pathogen#glob_directories(pattern) abort - return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction - -" Remove duplicates from a list. -function! pathogen#uniq(list) abort - let i = 0 - let seen = {} - while i < len(a:list) - if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i]) - call remove(a:list,i) - elseif a:list[i] ==# '' - let i += 1 - let empty = 1 - else - let seen[a:list[i]] = 1 - let i += 1 - endif - endwhile - return a:list -endfunction - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe deleted file mode 160000 -Subproject 369fdade93adf23ef3da3b5f8e9fcd14a2b3f09 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim deleted file mode 160000 -Subproject 08f9e22c9ae4b9ecce32e7a617ef82cd419a8ac diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter deleted file mode 160000 -Subproject 285902752f7ab2052ac700a6d29b263dd5788af diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic deleted file mode 160000 -Subproject 5e1b26c1724448c9d870b08dc93ce7152848933 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar deleted file mode 160000 -Subproject d880bcc333938ee1ed4a99fd89480eff9b6502a diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim deleted file mode 160000 -Subproject 6f9d75b54478bcaab722d33cbec69d8a1fe49f3 diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips deleted file mode 160000 -Subproject 423f264e753cec260b4f14455126e6db7ba429a diff --git a/vim/bundle/vim-addon-mw-utils b/vim/bundle/vim-addon-mw-utils deleted file mode 160000 -Subproject 0c5612fa31ee434ba055e21c76f456244b3b510 diff --git a/vim/bundle/vim-autotag b/vim/bundle/vim-autotag deleted file mode 160000 -Subproject 39f3790a307b663e228328513cb7a708be30466 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter deleted file mode 160000 -Subproject dc73a81bfe59a9de090b89a1312ded3c6f6a6f8 diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides deleted file mode 160000 -Subproject b40687195c01caf40f62d20093296590b48e3a7 diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat deleted file mode 160000 -Subproject 070ee903245999b2b79f7386631ffd29ce9b8e9 diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets deleted file mode 160000 -Subproject 9181f29981c0fe8d633f7dea6ce69338fe6b7a4 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround deleted file mode 160000 -Subproject e49d6c2459e0f5569ff2d533b4df995dd7f9831 diff --git a/vim/bundle/vim-table-mode b/vim/bundle/vim-table-mode deleted file mode 160000 -Subproject a646b4033ba86496ee0fff442ce854055104027 diff --git a/vim/ftdetect/c-co.vim b/vim/ftdetect/c-co.vim deleted file mode 100644 index b96a197..0000000 --- a/vim/ftdetect/c-co.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.c.co set filetype=c-co diff --git a/vim/ftdetect/conffile.vim b/vim/ftdetect/conffile.vim deleted file mode 100644 index 00feb56..0000000 --- a/vim/ftdetect/conffile.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *[cC]onffile,*.cf set filetype=conffile diff --git a/vim/ftdetect/make-co.vim b/vim/ftdetect/make-co.vim deleted file mode 100644 index dbaf43d..0000000 --- a/vim/ftdetect/make-co.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *[mM]akefile.co,*.mk.co,*.mak.co,*.dsp.co set filetype=make-co diff --git a/vim/ftplugin/python.vim b/vim/ftplugin/python.vim deleted file mode 100644 index 03b655f..0000000 --- a/vim/ftplugin/python.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal colorcolumn=79 -setlocal textwidth=79 diff --git a/vim/syntax/c-co.vim b/vim/syntax/c-co.vim deleted file mode 100644 index 0be5aa1..0000000 --- a/vim/syntax/c-co.vim +++ /dev/null @@ -1,475 +0,0 @@ -" Vim syntax file -" Language: C -" Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Jul 05 - -" Quit when a (custom) syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -let s:cpo_save = &cpo -set cpo&vim - -let s:ft = matchstr(&ft, '^\([^.]\)\+') - -" A bunch of useful C keywords -syn keyword cStatement goto break return continue asm -syn keyword cLabel case default -syn keyword cConditional if else switch -syn keyword cRepeat while for do - -syn keyword cTodo contained TODO FIXME XXX - -" It's easy to accidentally add a space after a backslash that was intended -" for line continuation. Some compilers allow it, which makes it -" unpredictable and should be avoided. -syn match cBadContinuation contained "\\\s\+$" - -" cCommentGroup allows adding matches for special things in comments -syn cluster cCommentGroup contains=cTodo,cBadContinuation - -" String and Character constants -" Highlight special characters (those which have a backslash) differently -syn match cSpecial display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)" -if !exists("c_no_utf") - syn match cSpecial display contained "\\\(u\x\{4}\|U\x\{8}\)" -endif -if exists("c_no_cformat") - syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend - " cCppString: same as cString, but ends at end of line - if !exists("cpp_no_cpp11") " ISO C++11 - syn region cCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell - else - syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell - endif - syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip - syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip -else - if !exists("c_no_c99") " ISO C99 - syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained - else - syn match cFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained - endif - syn match cFormat display "%%" contained - syn region cString start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend - " cCppString: same as cString, but ends at end of line - syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell -endif - -syn match cCharacter "L\='[^\\]'" -syn match cCharacter "L'[^']*'" contains=cSpecial -if exists("c_gnu") - syn match cSpecialError "L\='\\[^'\"?\\abefnrtv]'" - syn match cSpecialCharacter "L\='\\['\"?\\abefnrtv]'" -else - syn match cSpecialError "L\='\\[^'\"?\\abfnrtv]'" - syn match cSpecialCharacter "L\='\\['\"?\\abfnrtv]'" -endif -syn match cSpecialCharacter display "L\='\\\o\{1,3}'" -syn match cSpecialCharacter display "'\\x\x\{1,2}'" -syn match cSpecialCharacter display "L'\\x\x\+'" - -if !exists("c_no_c11") " ISO C11 - if exists("c_no_cformat") - syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend - else - syn region cString start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend - endif - syn match cCharacter "[Uu]'[^\\]'" - syn match cCharacter "[Uu]'[^']*'" contains=cSpecial - if exists("c_gnu") - syn match cSpecialError "[Uu]'\\[^'\"?\\abefnrtv]'" - syn match cSpecialCharacter "[Uu]'\\['\"?\\abefnrtv]'" - else - syn match cSpecialError "[Uu]'\\[^'\"?\\abfnrtv]'" - syn match cSpecialCharacter "[Uu]'\\['\"?\\abfnrtv]'" - endif - syn match cSpecialCharacter display "[Uu]'\\\o\{1,3}'" - syn match cSpecialCharacter display "[Uu]'\\x\x\+'" -endif - -"when wanted, highlight trailing white space -if exists("c_space_errors") - if !exists("c_no_trail_space_error") - syn match cSpaceError display excludenl "\s\+$" - endif - if !exists("c_no_tab_space_error") - syn match cSpaceError display " \+\t"me=e-1 - endif -endif - -" This should be before cErrInParen to avoid problems with #define ({ xxx }) -if exists("c_curly_error") - syn match cCurlyError "}" - syn region cBlock start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold -else - syn region cBlock start="{" end="}" transparent fold -endif - -"catch errors caused by wrong parenthesis and brackets -" also accept <% for {, %> for }, <: for [ and :> for ] (C99) -" But avoid matching <::. -syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom -if exists("c_no_curly_error") - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell - syn match cParenError display ")" - syn match cErrInParen display contained "^^<%\|^%>" - else - syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell - syn match cParenError display ")" - syn match cErrInParen display contained "^[{}]\|^<%\|^%>" - endif -elseif exists("c_no_bracket_error") - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell - syn match cParenError display ")" - syn match cErrInParen display contained "<%\|%>" - else - syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell - syn match cParenError display ")" - syn match cErrInParen display contained "[{}]\|<%\|%>" - endif -else - if s:ft ==# 'cpp' && !exists("cpp_no_cpp11") - syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell - syn match cParenError display "[\])]" - syn match cErrInParen display contained "<%\|%>" - syn region cBracket transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell - else - syn region cParen transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell - " cCppParen: same as cParen but ends at end-of-line; used in cDefine - syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell - syn match cParenError display "[\])]" - syn match cErrInParen display contained "[\]{}]\|<%\|%>" - syn region cBracket transparent start='\[\|<::\@!' end=']\|:>' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell - endif - " cCppBracket: same as cParen but ends at end-of-line; used in cDefine - syn region cCppBracket transparent start='\[\|<::\@!' skip='\\$' excludenl end=']\|:>' end='$' contained contains=ALLBUT,@cParenGroup,cErrInParen,cParen,cBracket,cString,@Spell - syn match cErrInBracket display contained "[);{}]\|<%\|%>" -endif - -if s:ft ==# 'c' || exists("cpp_no_cpp11") - syn region cBadBlock keepend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold -endif - -"integer number, or floating point number without a dot and with "f". -syn case ignore -syn match cNumbers display transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOctalError,cOctal -" Same, but without octal error (for comments) -syn match cNumbersCom display contained transparent "\<\d\|\.\d" contains=cNumber,cFloat,cOctal -syn match cNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>" -"hex number -syn match cNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" -" Flag the first zero of an octal number as something special -syn match cOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=cOctalZero -syn match cOctalZero display contained "\<0" -syn match cFloat display contained "\d\+f" -"floating point number, with dot, optional exponent -syn match cFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" -"floating point number, starting with a dot, optional exponent -syn match cFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" -"floating point number, without dot, with exponent -syn match cFloat display contained "\d\+e[-+]\=\d\+[fl]\=\>" -if !exists("c_no_c99") - "hexadecimal floating point number, optional leading digits, with dot, with exponent - syn match cFloat display contained "0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>" - "hexadecimal floating point number, with leading digits, optional dot, with exponent - syn match cFloat display contained "0x\x\+\.\=p[-+]\=\d\+[fl]\=\>" -endif - -" flag an octal number with wrong digits -syn match cOctalError display contained "0\o*[89]\d*" -syn case match - -if exists("c_comment_strings") - " A comment can contain cString, cCharacter and cNumber. - " But a "*/" inside a cString in a cComment DOES end the comment! So we - " need to use a special type of cString: cCommentString, which also ends on - " "*/", and sees a "*" at the start of the line as comment again. - " Unfortunately this doesn't very well work for // type of comments :-( - syn match cCommentSkip contained "^\s*\*\($\|\s\+\)" - syn region cCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=cSpecial,cCommentSkip - syn region cComment2String contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=cSpecial - syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,@Spell - if exists("c_no_comment_fold") - " Use "extend" here to have preprocessor lines not terminate halfway a - " comment. - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cCommentString,cCharacter,cNumbersCom,cSpaceError,@Spell extend - else - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cCommentString,cCharacter,cNumbersCom,cSpaceError,@Spell fold extend - endif -else - syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cSpaceError,@Spell - if exists("c_no_comment_fold") - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell extend - else - syn region cComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@cCommentGroup,cCommentStartError,cSpaceError,@Spell fold extend - endif -endif -" keep a // comment separately, it terminates a preproc. conditional -syn match cCommentError display "\*/" -syn match cCommentStartError display "/\*"me=e-1 contained - -syn keyword cOperator sizeof -if exists("c_gnu") - syn keyword cStatement __asm__ - syn keyword cOperator typeof __real__ __imag__ -endif -syn keyword cType int long short char void -syn keyword cType signed unsigned float double -if !exists("c_no_ansi") || exists("c_ansi_typedefs") - syn keyword cType size_t ssize_t off_t wchar_t ptrdiff_t sig_atomic_t fpos_t - syn keyword cType clock_t time_t va_list jmp_buf FILE DIR div_t ldiv_t - syn keyword cType mbstate_t wctrans_t wint_t wctype_t -endif -if !exists("c_no_c99") " ISO C99 - syn keyword cType _Bool bool _Complex complex _Imaginary imaginary - syn keyword cType int8_t int16_t int32_t int64_t - syn keyword cType uint8_t uint16_t uint32_t uint64_t - syn keyword cType int_least8_t int_least16_t int_least32_t int_least64_t - syn keyword cType uint_least8_t uint_least16_t uint_least32_t uint_least64_t - syn keyword cType int_fast8_t int_fast16_t int_fast32_t int_fast64_t - syn keyword cType uint_fast8_t uint_fast16_t uint_fast32_t uint_fast64_t - syn keyword cType intptr_t uintptr_t - syn keyword cType intmax_t uintmax_t -endif -if exists("c_gnu") - syn keyword cType __label__ __complex__ __volatile__ -endif - -syn keyword cStructure struct union enum typedef -syn keyword cStorageClass static register auto volatile extern const -if exists("c_gnu") - syn keyword cStorageClass inline __attribute__ -endif -if !exists("c_no_c99") - syn keyword cStorageClass inline restrict -endif -if !exists("c_no_c11") - syn keyword cStorageClass _Alignas alignas - syn keyword cOperator _Alignof alignof - syn keyword cStorageClass _Atomic - syn keyword cOperator _Generic - syn keyword cStorageClass _Noreturn noreturn - syn keyword cOperator _Static_assert static_assert - syn keyword cStorageClass _Thread_local thread_local - syn keyword cType char16_t char32_t -endif - -if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu") - if exists("c_gnu") - syn keyword cConstant __GNUC__ __FUNCTION__ __PRETTY_FUNCTION__ __func__ - endif - syn keyword cConstant __LINE__ __FILE__ __DATE__ __TIME__ __STDC__ - syn keyword cConstant __STDC_VERSION__ - syn keyword cConstant CHAR_BIT MB_LEN_MAX MB_CUR_MAX - syn keyword cConstant UCHAR_MAX UINT_MAX ULONG_MAX USHRT_MAX - syn keyword cConstant CHAR_MIN INT_MIN LONG_MIN SHRT_MIN - syn keyword cConstant CHAR_MAX INT_MAX LONG_MAX SHRT_MAX - syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN - syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX - if !exists("c_no_c99") - syn keyword cConstant __func__ - syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX - syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN - syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX - syn keyword cConstant UINT8_MAX UINT16_MAX UINT32_MAX UINT64_MAX - syn keyword cConstant INT_LEAST8_MIN INT_LEAST16_MIN INT_LEAST32_MIN INT_LEAST64_MIN - syn keyword cConstant INT_LEAST8_MAX INT_LEAST16_MAX INT_LEAST32_MAX INT_LEAST64_MAX - syn keyword cConstant UINT_LEAST8_MAX UINT_LEAST16_MAX UINT_LEAST32_MAX UINT_LEAST64_MAX - syn keyword cConstant INT_FAST8_MIN INT_FAST16_MIN INT_FAST32_MIN INT_FAST64_MIN - syn keyword cConstant INT_FAST8_MAX INT_FAST16_MAX INT_FAST32_MAX INT_FAST64_MAX - syn keyword cConstant UINT_FAST8_MAX UINT_FAST16_MAX UINT_FAST32_MAX UINT_FAST64_MAX - syn keyword cConstant INTPTR_MIN INTPTR_MAX UINTPTR_MAX - syn keyword cConstant INTMAX_MIN INTMAX_MAX UINTMAX_MAX - syn keyword cConstant PTRDIFF_MIN PTRDIFF_MAX SIG_ATOMIC_MIN SIG_ATOMIC_MAX - syn keyword cConstant SIZE_MAX WCHAR_MIN WCHAR_MAX WINT_MIN WINT_MAX - endif - syn keyword cConstant FLT_RADIX FLT_ROUNDS - syn keyword cConstant FLT_DIG FLT_MANT_DIG FLT_EPSILON - syn keyword cConstant DBL_DIG DBL_MANT_DIG DBL_EPSILON - syn keyword cConstant LDBL_DIG LDBL_MANT_DIG LDBL_EPSILON - syn keyword cConstant FLT_MIN FLT_MAX FLT_MIN_EXP FLT_MAX_EXP - syn keyword cConstant FLT_MIN_10_EXP FLT_MAX_10_EXP - syn keyword cConstant DBL_MIN DBL_MAX DBL_MIN_EXP DBL_MAX_EXP - syn keyword cConstant DBL_MIN_10_EXP DBL_MAX_10_EXP - syn keyword cConstant LDBL_MIN LDBL_MAX LDBL_MIN_EXP LDBL_MAX_EXP - syn keyword cConstant LDBL_MIN_10_EXP LDBL_MAX_10_EXP - syn keyword cConstant HUGE_VAL CLOCKS_PER_SEC NULL - syn keyword cConstant LC_ALL LC_COLLATE LC_CTYPE LC_MONETARY - syn keyword cConstant LC_NUMERIC LC_TIME - syn keyword cConstant SIG_DFL SIG_ERR SIG_IGN - syn keyword cConstant SIGABRT SIGFPE SIGILL SIGHUP SIGINT SIGSEGV SIGTERM - " Add POSIX signals as well... - syn keyword cConstant SIGABRT SIGALRM SIGCHLD SIGCONT SIGFPE SIGHUP - syn keyword cConstant SIGILL SIGINT SIGKILL SIGPIPE SIGQUIT SIGSEGV - syn keyword cConstant SIGSTOP SIGTERM SIGTRAP SIGTSTP SIGTTIN SIGTTOU - syn keyword cConstant SIGUSR1 SIGUSR2 - syn keyword cConstant _IOFBF _IOLBF _IONBF BUFSIZ EOF WEOF - syn keyword cConstant FOPEN_MAX FILENAME_MAX L_tmpnam - syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET - syn keyword cConstant TMP_MAX stderr stdin stdout - syn keyword cConstant EXIT_FAILURE EXIT_SUCCESS RAND_MAX - " Add POSIX errors as well - syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY - syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT - syn keyword cConstant EFBIG EILSEQ EINPROGRESS EINTR EINVAL EIO EISDIR - syn keyword cConstant EMFILE EMLINK EMSGSIZE ENAMETOOLONG ENFILE ENODEV - syn keyword cConstant ENOENT ENOEXEC ENOLCK ENOMEM ENOSPC ENOSYS - syn keyword cConstant ENOTDIR ENOTEMPTY ENOTSUP ENOTTY ENXIO EPERM - syn keyword cConstant EPIPE ERANGE EROFS ESPIPE ESRCH ETIMEDOUT EXDEV - " math.h - syn keyword cConstant M_E M_LOG2E M_LOG10E M_LN2 M_LN10 M_PI M_PI_2 M_PI_4 - syn keyword cConstant M_1_PI M_2_PI M_2_SQRTPI M_SQRT2 M_SQRT1_2 -endif -if !exists("c_no_c99") " ISO C99 - syn keyword cConstant true false -endif - -" Accept %: for # (C99) -syn region cPreCondit start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError -syn match cPreConditMatch display "^\s*\(%:\|#\)\s*\(else\|endif\)\>" -if !exists("c_no_if0") - syn cluster cCppOutInGroup contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip - syn region cCppOutWrapper start="^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold - syn region cCppOutIf contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse - if !exists("c_no_if0_fold") - syn region cCppOutIf2 contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold - else - syn region cCppOutIf2 contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell - endif - syn region cCppOutElse contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit - syn region cCppInWrapper start="^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold - syn region cCppInIf contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit - if !exists("c_no_if0_fold") - syn region cCppInElse contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold - else - syn region cCppInElse contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 - endif - syn region cCppInElse2 contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell - syn region cCppOutSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip - syn region cCppInSkip contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc -endif -syn region cIncluded display contained start=+"+ skip=+\\\\\|\\"+ end=+"+ -syn match cIncluded display contained "<[^>]*>" -syn match cInclude display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded -"syn match cLineSkip "\\$" -syn cluster cPreProcGroup contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock -syn region cDefine start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell -syn region cPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell - -" Highlight User Labels -syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString -if s:ft ==# 'c' || exists("cpp_no_cpp11") - syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell -endif -" Avoid matching foo::bar() in C++ by requiring that the next char is not ':' -syn cluster cLabelGroup contains=cUserLabel -syn match cUserCont display "^\s*\I\i*\s*:$" contains=@cLabelGroup -syn match cUserCont display ";\s*\I\i*\s*:$" contains=@cLabelGroup -syn match cUserCont display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup -syn match cUserCont display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup - -syn match cUserLabel display "\I\i*" contained - -" Avoid recognizing most bitfields as labels -syn match cBitField display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType -syn match cBitField display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType - -if exists("c_minlines") - let b:c_minlines = c_minlines -else - if !exists("c_no_if0") - let b:c_minlines = 50 " #if 0 constructs can be long - else - let b:c_minlines = 15 " mostly for () constructs - endif -endif -if exists("c_curly_error") - syn sync fromstart -else - exec "syn sync ccomment cComment minlines=" . b:c_minlines -endif - -" config output file -syn match covariable "\$\w\+" -syn match cocommand "\$\(endif\|else\)" -syn region None matchgroup=coifcommand start=+\$if(+ end=+)+ contains=covariable - -" Define the default highlighting. -" Only used when an item doesn't have highlighting yet -hi def link cFormat cSpecial -hi def link cCppString cString -hi def link cCommentL cComment -hi def link cCommentStart cComment -hi def link cLabel Label -hi def link cUserLabel Label -hi def link cConditional Conditional -hi def link cRepeat Repeat -hi def link cCharacter Character -hi def link cSpecialCharacter cSpecial -hi def link cNumber Number -hi def link cOctal Number -hi def link cOctalZero PreProc " link this to Error if you want -hi def link cFloat Float -hi def link cOctalError cError -hi def link cParenError cError -hi def link cErrInParen cError -hi def link cErrInBracket cError -hi def link cCommentError cError -hi def link cCommentStartError cError -hi def link cSpaceError cError -hi def link cSpecialError cError -hi def link cCurlyError cError -hi def link cOperator Operator -hi def link cStructure Structure -hi def link cStorageClass StorageClass -hi def link cInclude Include -hi def link cPreProc PreProc -hi def link cDefine Macro -hi def link cIncluded cString -hi def link cError Error -hi def link cStatement Statement -hi def link cCppInWrapper cCppOutWrapper -hi def link cCppOutWrapper cPreCondit -hi def link cPreConditMatch cPreCondit -hi def link cPreCondit PreCondit -hi def link cType Type -hi def link cConstant Constant -hi def link cCommentString cString -hi def link cComment2String cString -hi def link cCommentSkip cComment -hi def link cString String -hi def link cComment Comment -hi def link cSpecial SpecialChar -hi def link cTodo Todo -hi def link cBadContinuation Error -hi def link cCppOutSkip cCppOutIf2 -hi def link cCppInElse2 cCppOutIf2 -hi def link cCppOutIf2 cCppOut2 " Old syntax group for #if 0 body -hi def link cCppOut2 cCppOut " Old syntax group for #if of #if 0 -hi def link cCppOut Comment - -hi def link cocommand Macro -hi def link coifcommand Macro -hi def link covariable Identifier - -let b:current_syntax = "c-co" - -unlet s:ft - -let &cpo = s:cpo_save -unlet s:cpo_save -" vim: ts=8 diff --git a/vim/syntax/conffile.vim b/vim/syntax/conffile.vim deleted file mode 100644 index 342d8b4..0000000 --- a/vim/syntax/conffile.vim +++ /dev/null @@ -1,37 +0,0 @@ -" Vim syntax file -" Language: C -" Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Jul 05 - -" Quit when a (custom) syntax file was already loaded -if exists("b:current_syntax") - finish -endif - -left s:ft = matchstr(&ft, '^\([^.]\)\+') - -syn match sComment "#.*$" -syn keyword sKeywords typedef menu group endmenu endgroup type menu default menu visible nodefault -syn keyword sKWCondition dependency default -syn keyword sTypes int bool string hex float -syn region sString start=+\"+ skip=+\\.+ end=+\"+ - -syn keyword sKeywords output nextgroup=sOutput -syn region sOutput start="\w\+ \+{" end="}" contains=covariable,cocommand,coifcommand,CoNone -syn match sOutput "\w\+ \+\w\+" -syn match covariable "\$\w\+" contained -syn match cocommand "\$\(endif\|else\)" contained -syn region CoNone matchgroup=coifcommand start=+\$\(if\|elif\|ifdep\)(+ end=+)+ contains=covariable,sKWCondition contained - - -hi def link sComment Comment -hi def link sKeywords Precondit -hi def link sKWCondition sKeywords -hi def link sTypes Statement -hi def link sString String - -hi def link cocommand Macro -hi def link coifcommand Macro -hi def link covariable Identifier - -let b:current_syntax = "conffile" diff --git a/vim/syntax/iptables.vim b/vim/syntax/iptables.vim deleted file mode 100644 index 0f65a61..0000000 --- a/vim/syntax/iptables.vim +++ /dev/null @@ -1,380 +0,0 @@ -"============================================================================ -" -" Source: https://raw.githubusercontent.com/vim-scripts/iptables/master/syntax/iptables.vim -" iptables-save/restore syntax highlighter -" -" Language: iptables-save/restore file -" Version: Not Specified -" Date: 07-Jun-2014 -" Maintainer: Eric Haarbauer <ehaar70{AT}gmail{DOT}com> -" License: This file is placed in the public domain. -" -"============================================================================ -" Section: Notes {{{1 -"============================================================================ -" -" This vim syntax script highlights files used by Harald Welte's iptables-save -" and iptables-restore utilities. Both utilities are part of the iptables -" application (http://www.netfilter.org/projects/iptables). -" -" Features: -" -" * Distinguishes commands, options, modules, targets and chains. -" * Distinguishes numeric IP addresses from net masks. -" * Highlights tokens that occur only in hand-edited files; for example, -" "--append" and "destination-unreachable". -" * Special handling for module names; for example, the tcp module is -" colored differently from the tcp protocol. -" -" Options: -" -" Customize the behavior of this script by setting values for the following -" options in your .vimrc file. (Type ":h vimrc" in vim for more information -" on the .vimrc file.) -" -" g:Iptables_SpecialDelimiters -" This variable, if set to a non-zero value, distinguishes numeric -" delimiters, including the dots in IP addresses, the slash that separates -" an IP address from a netmask, and the colon that separates the ends of a -" port range. If not set, this option defaults to off. -" -" Known Issues: -" -" * Some special argument tokens are highlighted whether or not they are -" used with the correct option. For example, "destination-unreachable" -" gets special highlighting whether or not is used as an argument to the -" --icmp-type option. In practice, this is rarely a problem. -" -" Reporting Issues: -" -" If you discover an iptables file that this script highlights incorrectly, -" please email the author (address at the top of the script) with the -" following information: -" -" * Problem iptables file WITH ANY SENSITIVE INFORMATION REMOVED -" * The release version of this script (see top of the script) -" * If possible, a patch to fix the problem -" -" Design Notes: -" -" Part of this script is autogenerated from the output of the iptables man -" page. The source code for generating the script is available from the -" author on request (see email address at the top of the script). The -" script should build from source on most Linux systems with iptables -" installed. -" -" The build system that generates this script strips special CVS tokens -" (like "Id:") so that CVS no longer recognizes them. This allows users to -" place the script in their own version control system without losing -" information. The author encourages other vim script developers to adopt a -" similar approach in their own scripts. -" -" Installation: -" -" Put this file in your user runtime syntax directory, usually ~/.vim/syntax -" in *NIX or C:\Program Files\vim\vimfiles\syntax in Windows. Type ":h -" syn-files" from within vim for more information. -" -" The iptables-save and iptables-restore applications do not specify a -" naming standard for the files they use. However, iptables-save places a -" comment in the first line of its output. Other applications, such as -" Fedora's system-config-securitylevel uses the iptables-save/restore -" format, but with a different leading comment. We can use these leading -" comments to identify the filetype by placing the following code in the -" scripts.vim file in your user runtime directory: -" -" if getline(1) =~ "^# Generated by iptables-save" || -" \ getline(1) =~ "^# Firewall configuration written by" -" setfiletype iptables -" set commentstring=#%s -" finish -" endif -" -" Setting the commentstring on line 4 allows Meikel Brandmeyer's -" EnhancedCommentify script (vimscript #23) to work with iptables files. -" (Advanced users may want to set the commentstring option in an ftplugin -" file or in autocommands defined in .vimrc.) -" -"============================================================================ -" Source File: Id: iptables.src.vim 43 2014-06-08 03:21:32Z ehaar -"============================================================================ -" Section: Initialization {{{1 -"============================================================================ - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") - finish - endif - let main_syntax = 'iptables' -endif - -" Don't use standard HiLink, it will not work with included syntax files -if version < 508 - command! -nargs=+ IptablesHiLink highlight link <args> -else - command! -nargs=+ IptablesHiLink highlight default link <args> -endif - -syntax case match - -if version < 600 - set iskeyword+=- -else - setlocal iskeyword+=- -endif - -" Initialize global public variables: {{{2 - -" Support deprecated variable name used prior to release 1.07. -if exists("g:iptablesSpecialDelimiters") && -\ !exists("g:Iptables_SpecialDelimiters") - - let g:Iptables_SpecialDelimiters = g:iptablesSpecialDelimiters - unlet g:iptablesSpecialDelimiters - " echohl WarningMsg | echo "Warning:" | echohl None - " echo "The g:iptablesSpecialDelimiters variable is deprecated." - " echo "Please use g:Iptables_SpecialDelimiters in your .vimrc instead" - -endif - -if exists("g:Iptables_SpecialDelimiters") - let s:Iptables_SpecialDelimiters = g:Iptables_SpecialDelimiters -else - let s:Iptables_SpecialDelimiters = 0 -endif - -"============================================================================ -" Section: Group Definitions {{{1 -"============================================================================ - -syntax keyword iptablesSaveDirective COMMIT -syntax match iptablesSaveOperation "^[:*]" - -syntax keyword iptablesTable filter nat mangle raw - -syntax keyword iptablesTarget - \ ACCEPT DROP QUEUE RETURN BALANCE CLASSIFY CLUSTERIP CONNMARK - \ CONNSECMARK CONNTRACK DNAT DSCP ECN IPMARK IPV4OPSSTRIP LOG - \ MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT - \ ROUTE SAME SECMARK SET SNAT TARPIT TCPMSS TOS TRACE TTL ULOG XOR - -syntax keyword iptablesBuiltinChain - \ INPUT OUTPUT FORWARD PREROUTING POSTROUTING - -syntax keyword iptablesCommand -A -D -I -R -L -F -Z -N -X -P -E - \ --append --delete --insert --replace --list --flush --zero - \ --new-chain --delete-chain --policy --rename-chain - -syntax keyword iptablesParam -p -s -d -j -i -o -f -c -t - -syntax match iptablesOperator "\s\zs!\ze\s" - -syntax keyword iptablesModuleName contained - \ account addrtype ah childlevel comment condition connbytes connlimit - \ connmark connrate conntrack dccp dscp dstlimit ecn esp fuzzy hashlimit - \ helper icmp iprange ipv4options length limit mac mark mport multiport - \ nth osf owner physdev pkttype policy psd quota random realm recent - \ sctp set state string tcp tcpmss time tos ttl u32 udp unclean - -syntax keyword iptablesModuleType - \ UNSPEC UNICAST LOCAL BROADCAST ANYCAST MULTICAST BLACKHOLE UNREACHABLE - \ PROHIBIT THROW NAT XRESOLVE INVALID ESTABLISHED NEW RELATED SYN ACK FIN - \ RST URG PSH ALL NONE - -" From --reject-with option -syntax keyword iptablesModuleType - \ icmp-net-unreachable - \ icmp-host-unreachable - \ icmp-port-unreachable - \ icmp-proto-unreachable - \ icmp-net-prohibited - \ icmp-host-prohibited - \ icmp-admin-prohibited - -" From --icmp-type option -syntax keyword iptablesModuleType - \ any - \ echo-reply - \ destination-unreachable - \ network-unreachable - \ host-unreachable - \ protocol-unreachable - \ port-unreachable - \ fragmentation-needed - \ source-route-failed - \ network-unknown - \ host-unknown - \ network-prohibited - \ host-prohibited - \ TOS-network-unreachable - \ TOS-host-unreachable - \ communication-prohibited - \ host-precedence-violation - \ precedence-cutoff - \ source-quench - \ redirect - \ network-redirect - \ host-redirect - \ TOS-network-redirect - \ TOS-host-redirect - \ echo-request - \ router-advertisement - \ router-solicitation - \ time-exceeded - \ ttl-zero-during-transit - \ ttl-zero-during-reassembly - \ parameter-problem - \ ip-header-bad - \ required-option-missing - \ timestamp-request - \ timestamp-reply - \ address-mask-request - \ address-mask-reply - -" If we used a keyword for this, port names would be colored the same -" as modules with the same name (e.g. tcp, udp, icmp). -syntax keyword iptablesParam -m --match skipwhite nextgroup=iptablesModuleName - -syntax region iptablesString start=+"+ skip=+\\"+ end=+"+ oneline - -syntax match iptablesComment "^#.*" contains=iptablesTodo -syntax match iptablesBadComment "^\s\+\zs#.*" " Pound must be in first column - -syntax keyword iptablesTodo contained TODO FIXME XXX NOT NOTE - -" Special Delimiters: {{{2 - -if s:Iptables_SpecialDelimiters != 0 - syntax match iptablesNumber "\<[0-9./:]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "[./:]" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -else " s:Iptables_SpecialDelimiters == 0 - syntax match iptablesNumber "\<[0-9./]\+\>" - \ contains=iptablesMask,iptablesDelimiter - syntax match iptablesDelimiter "/" contained - syntax match iptablesMask "/[0-9.]\+" contained - \ contains=iptablesDelimiter -endif - -"============================================================================ -" Section: Autogenerated Groups {{{2 -"============================================================================ - -" Begin autogenerated section. -" iptables2vim: "iptables2vim 43 2014-06-08 03:21:32Z ehaar" -" iptables: "iptables v1.4.19.1" - -syntax keyword iptablesLongParam - \ --zone --xor-tos --xor-mark --weekdays --vproto --vportctl --vport - \ --vmethod --verbose --vdir --validmark --vaddr --update - \ --ulog-qthreshold --ulog-prefix --ulog-nlgroup --ulog-cprange - \ --uid-owner --u --type --tunnel-src --tunnel-dst --ttl-set --ttl-lt - \ --ttl-inc --ttl-gt --ttl-eq --ttl-dec --ttl --transparent --tproxy-mark - \ --total-nodes --tos --to-source --to-ports --to-port --to-destination - \ --to --timestop --timestart --timeout --tcp-option --tcp-flags --table - \ --syn --strip-options --string --strict --state --src-type --src-range - \ --src-pfx --src-group --src --sports --sport --spi --source-ports - \ --source-port --source --soft --socket-exists --set-xmark --set-tos - \ --set-mss --set-mark --set-dscp-class --set-dscp --set-counters - \ --set-class --set --selctx --seconds --save-mark --save --rttl --rt-type - \ --rt-segsleft --rt-len --rt- --rsource --return--nomatch --restore-mark - \ --restore --reqid --remove --reject-with --reap --realm --rdest --rcheck - \ --rateest-pps --rateest-name --rateest-lt --rateest-interval - \ --rateest-gt --rateest-ewmalog --rateest-eq --rateest-delta - \ --rateest-bps --rateest --random --quota --queue-num --queue-bypass - \ --queue-balance --protocol --proto --probability --ports --pol - \ --pkt-type --physdev-out --physdev-is-out --physdev-is-in - \ --physdev-is-bridged --physdev-in --persistent --packet --out-interface - \ --or-tos --or-mark --on-port --on-ip --numeric --notrack --nodst - \ --nflog-threshold --nflog-range --nflog-prefix --nflog-group - \ --nfacct-name --next --new --name --mss --monthdays --modprobe --mode - \ --mh-type --mask --mark --mangle-mac-d --mac-source --loose --log-uid - \ --log-tcp-sequence --log-tcp-options --log-prefix --log-level - \ --log-ip-options --log --local-node --line-numbers --limit-iface-out - \ --limit-iface-in --limit-burst --limit --length --led-trigger-id - \ --led-delay --led-always-blink --label --kerneltz --jump --ipvs --ipv - \ --invert --in-interface --icmpv --icmp-type --hmark-tuple - \ --hmark-src-prefix --hmark-sport-mask --hmark-spi-mask --hmark-rnd - \ --hmark-proto-mask --hmark-offset --hmark-mod --hmark-dst-prefix - \ --hmark-dport-mask --hl-set --hl-lt --hl-inc --hl-gt --hl-eq --hl-dec - \ --hitcount --hex-string --helper --help --header --hbh-opts --hbh-len - \ --hashmode --hashlimit-upto --hashlimit-srcmask --hashlimit-src - \ --hashlimit-name --hashlimit-mode --hashlimit-mask - \ --hashlimit-htable-size --hashlimit-htable-max - \ --hashlimit-htable-gcinterval --hashlimit-htable-expire - \ --hashlimit-dstmask --hashlimit-burst --hashlimit-above --hashlimit - \ --hash-init --h-length --goto --gid-owner --genre --gateway --from - \ --fragres --fragmore --fragment --fraglen --fraglast --fragid - \ --fragfirst --expevents --exist --exact --every --espspi - \ --ecn-tcp-remove --ecn-tcp-ece --ecn-tcp-cwr --ecn-ip-ect --dst-type - \ --dst-range --dst-pfx --dst-opts --dst-len --dst-group --dst - \ --dscp-class --dscp --dports --dport --dir --destination-ports - \ --destination-port --destination --del-set --dccp-types --dccp-option - \ --datestop --datestart --ctstatus --ctstate --ctreplsrcport --ctreplsrc - \ --ctrepldstport --ctrepldst --ctproto --ctorigsrcport --ctorigsrc - \ --ctorigdstport --ctorigdst --ctexpire --ctevents --ctdir --cpu - \ --contiguous --connlimit-upto --connlimit-saddr --connlimit-mask - \ --connlimit-daddr --connlimit-above --connbytes-mode --connbytes-dir - \ --connbytes --comment --clustermac --cluster-total-nodes - \ --cluster-local-nodemask --cluster-local-node --cluster-hash-seed --clus - \ --clamp-mss-to-pmtu --chunk-types --checksum-fill --check --bytecode - \ --and-tos --and-mark --algo --ahspi --ahres --ahlen --add-set - \ --accept-local -" End autogenerated section. - -"============================================================================ -" Section: Group Linking {{{1 -"============================================================================ - -IptablesHiLink iptablesSaveDirective PreProc -IptablesHiLink iptablesSaveOperation PreProc - -IptablesHiLink iptablesTable Statement -IptablesHiLink iptablesTarget Statement -IptablesHiLink iptablesBuiltinChain Type - -IptablesHiLink iptablesCommand Operator - -IptablesHiLink iptablesModuleName Type -IptablesHiLink iptablesModuleType Type - -IptablesHiLink iptablesOperator Operator -IptablesHiLink iptablesParam Identifier -IptablesHiLink iptablesLongParam Identifier - -IptablesHiLink iptablesNumber Constant - -if s:Iptables_SpecialDelimiters != 0 - IptablesHiLink iptablesMask PreProc - IptablesHiLink iptablesDelimiter Delimiter -else " s:Iptables_SpecialDelimiters == 0 - IptablesHiLink iptablesMask Special - IptablesHiLink iptablesDelimiter None -endif - -IptablesHiLink iptablesString Constant - -IptablesHiLink iptablesComment Comment -IptablesHiLink iptablesBadComment Error -IptablesHiLink iptablesTodo Todo - -"============================================================================ -" Section: Clean Up {{{1 -"============================================================================ - -delcommand IptablesHiLink - -let b:current_syntax = "iptables" - -if main_syntax == 'iptables' - unlet main_syntax -endif - -" Autoconfigure vim indentation settings -" vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=- diff --git a/vim/syntax/make-co.vim b/vim/syntax/make-co.vim deleted file mode 100644 index 371944b..0000000 --- a/vim/syntax/make-co.vim +++ /dev/null @@ -1,153 +0,0 @@ -" Vim syntax file -" Language: Makefile -" Maintainer: Claudio Fleiner <claudio@fleiner.com> -" URL: http://www.fleiner.com/vim/syntax/make.vim -" Last Change: 2012 Oct 05 - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -let s:cpo_save = &cpo -set cpo&vim - - -" some special characters -syn match makeSpecial "^\s*[@+-]\+" -syn match makeNextLine "\\\n\s*" - -" some directives -syn match makePreCondit "^ *\(ifeq\>\|else\>\|endif\>\|ifneq\>\|ifdef\>\|ifndef\>\)" -syn match makeInclude "^ *[-s]\=include" -syn match makeStatement "^ *vpath" -syn match makeExport "^ *\(export\|unexport\)\>" -syn match makeOverride "^ *override" -hi link makeOverride makeStatement -hi link makeExport makeStatement - -" catch unmatched define/endef keywords. endef only matches it is by itself on a line, possibly followed by a commend -syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains=makeStatement,makeIdent,makePreCondit,makeDefine - -" Microsoft Makefile specials -syn case ignore -syn match makeInclude "^! *include" -syn match makePreCondit "! *\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|elseif\|else if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>" -syn case match - -" identifiers -syn region makeIdent start="\\\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeSString,makeDString -syn region makeIdent start="\\\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString -syn match makeIdent "\$\$\w*" -syn match makeIdent "\$[^({]" -syn match makeIdent "^ *\a\w*\s*[:+?!*]="me=e-2 -syn match makeIdent "^ *\a\w*\s*="me=e-1 -syn match makeIdent "%" - -" Makefile.in variables -syn match makeConfig "@[A-Za-z0-9_]\+@" - -" make targets -" syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>" -syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource -syn match makeImplicit "^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource - -syn region makeTarget transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeTarget "^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError - -syn region makeSpecTarget transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands -syn match makeSpecTarget "^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent skipnl nextgroup=makeCommands,makeCommandError - -syn match makeCommandError "^\s\+\S.*" contained -syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError -syn match makeCmdNextLine "\\\n."he=e-1 contained - - -" Statements / Functions (GNU make) -syn match makeStatement contained "(\(subst\|abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1 - -" Comment -if exists("make_microsoft") - syn match makeComment "#.*" contains=@Spell,makeTodo -elseif !exists("make_no_comments") - syn region makeComment start="#" end="^$" end="[^\\]$" keepend contains=@Spell,makeTodo - syn match makeComment "#$" contains=@Spell -endif -syn keyword makeTodo TODO FIXME XXX contained - -" match escaped quotes and any other escaped character -" except for $, as a backslash in front of a $ does -" not make it a standard character, but instead it will -" still act as the beginning of a variable -" The escaped char is not highlightet currently -syn match makeEscapedChar "\\[^$]" - - -syn region makeDString start=+\(\\\)\@<!"+ skip=+\\.+ end=+"+ contains=makeIdent -syn region makeSString start=+\(\\\)\@<!'+ skip=+\\.+ end=+'+ contains=makeIdent -syn region makeBString start=+\(\\\)\@<!`+ skip=+\\.+ end=+`+ contains=makeIdent,makeSString,makeDString,makeNextLine - -" Syncing -syn sync minlines=20 maxlines=200 - -" Sync on Make command block region: When searching backwards hits a line that -" can't be a command or a comment, use makeCommands if it looks like a target, -" NONE otherwise. -syn sync match makeCommandSync groupthere NONE "^[^\t#]" -syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]" -syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}\s*$" - -" config output file -syn match covariable "\$\w\+" -syn match cocommand "\$\(endif\|else\)" -syn region None matchgroup=coifcommand start=+\$if(+ end=+)+ contains=covariable - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_make_syn_inits") - if version < 508 - let did_make_syn_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - HiLink makeNextLine makeSpecial - HiLink makeCmdNextLine makeSpecial - HiLink makeSpecTarget Statement - if !exists("make_no_commands") - HiLink makeCommands Number - endif - HiLink makeImplicit Function - HiLink makeTarget Function - HiLink makeInclude Include - HiLink makePreCondit PreCondit - HiLink makeStatement Statement - HiLink makeIdent Identifier - HiLink makeSpecial Special - HiLink makeComment Comment - HiLink makeDString String - HiLink makeSString String - HiLink makeBString Function - HiLink makeError Error - HiLink makeTodo Todo - HiLink makeDefine Define - HiLink makeCommandError Error - HiLink makeConfig PreCondit - - HiLink cocommand Macro - HiLink coifcommand Macro - HiLink covariable Identifier - - delcommand HiLink -endif - -let b:current_syntax = "make-co" - -let &cpo = s:cpo_save -unlet s:cpo_save -" vim: ts=8 @@ -2,7 +2,6 @@ " :diffg RE " get from REMOTE " :diffg BA " get from BASE " :diffg LO " get from LOCAL -execute pathogen#infect() syntax on filetype plugin indent on @@ -48,14 +47,6 @@ function TabToogle() endfunction command TabToogle call TabToogle() -" Indent guides -let g:indent_guides_enable_on_vim_startup = 1 -let g:indent_guides_start_level=2 -let g:indent_guides_guide_size=8 -let g:indent_guides_auto_colors = 0 -autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd ctermbg=232 -autocmd VimEnter,Colorscheme * :hi IndentGuidesEven ctermbg=233 - " Write as root cmap w!! w !sudo tee >/dev/null % @@ -82,15 +73,6 @@ set tags=./.tags,.tags " Setup autotag to look for .tags file let g:autotagTagsFile=".tags" -" Enable mouse -set mouse=a -set ttymouse=urxvt -" We are always on fast tty (maybe remove this on servers?) -set ttyfast - -" Open tagbar with <F9> -nmap <F9> :TagbarOpen fc<cr> - " Spell checking map <F10> :setlocal spell!<cr> function LangToggle() @@ -104,11 +86,3 @@ function LangToggle() endfunction setlocal spelllang=en_us map <F11> :call LangToggle()<cr> - -" UltiSnips triggers -let g:UltiSnipsExpandTrigger="<c-h>" -let g:UltiSnipsJumpForwardTrigger="<c-j>" -let g:UltiSnipsJumpBackwardTrigger="<c-k>" - -let g:ycm_path_to_python_interpreter="/usr/bin/python3" -let g:ycm_global_ycm_extra_conf = ".ycm_conf.py" diff --git a/xinitrc b/xinitrc deleted file mode 100644 index 877c542..0000000 --- a/xinitrc +++ /dev/null @@ -1,15 +0,0 @@ -xrdb -merge -I$HOME ~/.Xresources -setxkbmap -option caps:escape -setxkbmap -option compose:menu -numlockx -xset -b # disable beeping - -export QT_STYLE_OVERRIDE='gtk2' -export GTK_IM_MODULE=xim -# Fix fullscreen game offscreen -export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0 - -mxrandr -start-pulseaudio-x11 - -exec i3 diff --git a/ycm_c_conf.py b/ycm_c_conf.py deleted file mode 100644 index 0bfadd1..0000000 --- a/ycm_c_conf.py +++ /dev/null @@ -1,136 +0,0 @@ -import os -import ycm_core - -# These are the compilation flags that will be used in case there's no -# compilation database set (by default, one is not set). -# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. -flags = [ -'-Wall', -'-Wextra', -'-pedantic', -'-Wshadow', -'-Wpointer-arith', -'-Wcast-align', -'-Wwrite-strings', -'-Wmissing-prototypes', -'-Wmissing-declarations', -'-Winline', -'-Wno-long-long', -'-Wuninitialized', -'-Wconversion', -'-Wstrict-prototypes', -'-Wno-long-long', -'-Wno-variadic-macros', -'-fexceptions', -'-DNDEBUG', -'-DUSE_CLANG_COMPLETER', -'-std=c11', -'-x', 'c', -'-I', '.', -'-isystem', '/usr/include', -'-isystem', '/usr/local/include', -] - - -# Set this to the absolute path to the folder (NOT the file!) containing the -# compile_commands.json file to use that instead of 'flags'. See here for -# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html -# -# You can get CMake to generate this file for you by adding: -# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 ) -# to your CMakeLists.txt file. -# -# Most projects will NOT need to set this to anything; you can just change the -# 'flags' list of compilation flags. Notice that YCM itself uses that approach. -compilation_database_folder = '' - -if os.path.exists( compilation_database_folder ): - database = ycm_core.CompilationDatabase( compilation_database_folder ) -else: - database = None - -SOURCE_EXTENSIONS = [ '.c' ] - -def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) - - -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return list( flags ) - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag - - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) - - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break - - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break - - if new_flag: - new_flags.append( new_flag ) - return new_flags - - -def IsHeaderFile( filename ): - extension = os.path.splitext( filename )[ 1 ] - return extension in [ '.h' ] - - -def GetCompilationInfoForFile( filename ): - # The compilation_commands.json file generated by CMake does not have entries - # for header files. So we do our best by asking the db for flags for a - # corresponding source file, if any. If one exists, the flags for that file - # should be good enough. - if IsHeaderFile( filename ): - basename = os.path.splitext( filename )[ 0 ] - for extension in SOURCE_EXTENSIONS: - replacement_file = basename + extension - if os.path.exists( replacement_file ): - compilation_info = database.GetCompilationInfoForFile( - replacement_file ) - if compilation_info.compiler_flags_: - return compilation_info - return None - return database.GetCompilationInfoForFile( filename ) - - -def FlagsForFile( filename, **kwargs ): - if database: - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = GetCompilationInfoForFile( filename ) - if not compilation_info: - return None - - final_flags = MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_ ) - - # NOTE: This is just for YouCompleteMe; it's highly likely that your project - # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR - # ycm_extra_conf IF YOU'RE NOT 100% SURE YOU NEED IT. - try: - final_flags.remove( '-stdlib=libc++' ) - except ValueError: - pass - else: - relative_to = DirectoryOfThisScript() - final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) - - return { - 'flags': final_flags, - 'do_cache': True - } diff --git a/ycm_cpp_conf.py b/ycm_cpp_conf.py deleted file mode 100644 index 15c44c1..0000000 --- a/ycm_cpp_conf.py +++ /dev/null @@ -1,196 +0,0 @@ -# This file is NOT licensed under the GPLv3, which is the license for the rest -# of YouCompleteMe. -# -# Here's the license text for this file: -# -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# For more information, please refer to <http://unlicense.org/> - -import os -import ycm_core - -# These are the compilation flags that will be used in case there's no -# compilation database set (by default, one is not set). -# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. -flags = [ -'-Wall', -'-Wextra', -'-Werror', -'-Wc++98-compat', -'-Wno-long-long', -'-Wno-variadic-macros', -'-fexceptions', -'-DNDEBUG', -# You 100% do NOT need -DUSE_CLANG_COMPLETER in your flags; only the YCM -# source code needs it. -'-DUSE_CLANG_COMPLETER', -# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which -# language to use when compiling headers. So it will guess. Badly. So C++ -# headers will be compiled as C headers. You don't want that so ALWAYS specify -# a "-std=<something>". -# For a C project, you would set this to something like 'c99' instead of -# 'c++11'. -'-std=c++11', -# ...and the same thing goes for the magic -x option which specifies the -# language that the files to be compiled are written in. This is mostly -# relevant for c++ headers. -# For a C project, you would set this to 'c' instead of 'c++'. -'-x', -'c++', -'-isystem', -'../BoostParts', -'-isystem', -# This path will only work on OS X, but extra paths that don't exist are not -# harmful -'/System/Library/Frameworks/Python.framework/Headers', -'-isystem', -'../llvm/include', -'-isystem', -'../llvm/tools/clang/include', -'-I', -'.', -'-I', -'./ClangCompleter', -'-isystem', -'./tests/gmock/gtest', -'-isystem', -'./tests/gmock/gtest/include', -'-isystem', -'./tests/gmock', -'-isystem', -'./tests/gmock/include', -'-isystem', -'/usr/include', -'-isystem', -'/usr/local/include', -'-isystem', -'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1', -'-isystem', -'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include', -] - - -# Set this to the absolute path to the folder (NOT the file!) containing the -# compile_commands.json file to use that instead of 'flags'. See here for -# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html -# -# You can get CMake to generate this file for you by adding: -# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 ) -# to your CMakeLists.txt file. -# -# Most projects will NOT need to set this to anything; you can just change the -# 'flags' list of compilation flags. Notice that YCM itself uses that approach. -compilation_database_folder = '' - -if os.path.exists( compilation_database_folder ): - database = ycm_core.CompilationDatabase( compilation_database_folder ) -else: - database = None - -SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ] - -def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) - - -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return list( flags ) - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag - - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) - - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break - - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break - - if new_flag: - new_flags.append( new_flag ) - return new_flags - - -def IsHeaderFile( filename ): - extension = os.path.splitext( filename )[ 1 ] - return extension in [ '.h', '.hxx', '.hpp', '.hh' ] - - -def GetCompilationInfoForFile( filename ): - # The compilation_commands.json file generated by CMake does not have entries - # for header files. So we do our best by asking the db for flags for a - # corresponding source file, if any. If one exists, the flags for that file - # should be good enough. - if IsHeaderFile( filename ): - basename = os.path.splitext( filename )[ 0 ] - for extension in SOURCE_EXTENSIONS: - replacement_file = basename + extension - if os.path.exists( replacement_file ): - compilation_info = database.GetCompilationInfoForFile( - replacement_file ) - if compilation_info.compiler_flags_: - return compilation_info - return None - return database.GetCompilationInfoForFile( filename ) - - -def FlagsForFile( filename, **kwargs ): - if database: - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = GetCompilationInfoForFile( filename ) - if not compilation_info: - return None - - final_flags = MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_ ) - - # NOTE: This is just for YouCompleteMe; it's highly likely that your project - # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR - # ycm_extra_conf IF YOU'RE NOT 100% SURE YOU NEED IT. - try: - final_flags.remove( '-stdlib=libc++' ) - except ValueError: - pass - else: - relative_to = DirectoryOfThisScript() - final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) - - return { - 'flags': final_flags, - 'do_cache': True - } diff --git a/zprofile b/zprofile deleted file mode 100644 index 5654659..0000000 --- a/zprofile +++ /dev/null @@ -1,3 +0,0 @@ -emulate sh -. ~/.profile -emulate zsh |