From eb3f5d35652f5935ed6291a98de474adb660e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 8 Jul 2016 13:43:49 +0200 Subject: [PATCH 01/50] use new cargo's switch to install or update packages when present --- common/configure_fresh_system | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index d949971a..c018ac1e 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -89,12 +89,8 @@ else git pull fi -set +e -cargo uninstall rustfmt -cargo uninstall racer -set -e -cargo install rustfmt -cargo install racer +cargo install -f rustfmt +cargo install -f racer # go export GOPATH="$HOME/go" From 185f6d0f54d6f42742c7e9bc2088b2f3d69e9d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:32:18 +0200 Subject: [PATCH 02/50] YCM update --- .vim/bundle/YouCompleteMe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index 94ec3ed9..c4a410b2 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472 +Subproject commit c4a410b2ca3a6222c7e196c10f258f6e672f31a9 From a1f99954bb35851ec6b05231fe249125f51e4dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:33:37 +0200 Subject: [PATCH 03/50] racer-vim update --- .vim/bundle/racer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/racer b/.vim/bundle/racer index 063094b9..f877a066 160000 --- a/.vim/bundle/racer +++ b/.vim/bundle/racer @@ -1 +1 @@ -Subproject commit 063094b977ce6c415f91e939626f334982c0a0a3 +Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb From ac3fb7598c0ce7509efb69ed02e4700093a94e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:36:05 +0200 Subject: [PATCH 04/50] syntastic update --- .vim/bundle/vim-syntastic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic index 64cce208..87f3e80b 160000 --- a/.vim/bundle/vim-syntastic +++ b/.vim/bundle/vim-syntastic @@ -1 +1 @@ -Subproject commit 64cce208388c10debd5b150de08d9be371bd0e86 +Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2 From d9eaceb27729045ef357e92c232b08d84ad3148f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 09:28:30 +0200 Subject: [PATCH 05/50] do a recursive fetch for rust sources --- common/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index c018ac1e..6cc8ed2c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -v echo echo "configuring settings common among OSes" sudo true @@ -83,10 +82,11 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib cd "$DIR/../" echo "getting rust sources..." if [[ ! -d rust ]]; then - git clone https://github.com/rust-lang/rust.git + git clone https://github.com/rust-lang/rust.git --recursive else cd rust git pull + git submodule update --init --recursive fi cargo install -f rustfmt From 3c7cdce9e7a4dcc0455e02ceb470494931908a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 10:47:51 +0200 Subject: [PATCH 06/50] benice alias added --- .zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zshrc b/.zshrc index 924388c3..d5eba57f 100644 --- a/.zshrc +++ b/.zshrc @@ -45,6 +45,8 @@ else alias tscp="torsocks scp" fi +alias benice="ionice -c3 nice -n20" + # env vars source ~/.setenv From b3939dd8111f52506b05a28209cd2e24500b1a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:15:30 +0200 Subject: [PATCH 07/50] build all compelters for YCM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 6cc8ed2c..5dd0105f 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -45,7 +45,7 @@ source ~/.setenv cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive -python install.py --clang-completer +./install.py --all # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file From f8d88d67a64e0af6e822f0884018e8a494d506c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:18:06 +0200 Subject: [PATCH 08/50] enable clang and racer explicitely for YCM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5dd0105f..a4dd094a 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -45,7 +45,7 @@ source ~/.setenv cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive -./install.py --all +./install.py --racer-completer --clang-completer # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file From 80d45b604346452e7b9fad012d7727945cfc5260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:21:52 +0200 Subject: [PATCH 09/50] move YCM to be built after rust and racer are already installed --- common/configure_fresh_system | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index a4dd094a..4f778453 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -43,10 +43,6 @@ ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf source ~/.setenv -cd "$DIR/.vim/bundle/YouCompleteMe/" -git submodule update --init --recursive -./install.py --racer-completer --clang-completer - # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file if [[ ! -f /usr/bin/node ]]; then @@ -92,6 +88,10 @@ fi cargo install -f rustfmt cargo install -f racer +cd "$DIR/.vim/bundle/YouCompleteMe/" +git submodule update --init --recursive +./install.py --racer-completer --clang-completer + # go export GOPATH="$HOME/go" mkdir -p "$GOPATH" From 6033245203f35096f1f31da50324d76a4c140ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:35:41 +0200 Subject: [PATCH 10/50] do not use vim-racer nor install racer globally anymore, use YCM for completion solely --- .gitmodules | 3 --- .vim/bundle/racer | 1 - common/configure_fresh_system | 1 - fedora/configure_fresh_system | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 160000 .vim/bundle/racer diff --git a/.gitmodules b/.gitmodules index 7799fb56..51cc99c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -53,9 +53,6 @@ [submodule ".vim/bundle/rust.vim"] path = .vim/bundle/rust.vim url = https://github.com/rust-lang/rust.vim.git -[submodule ".vim/bundle/racer"] - path = .vim/bundle/racer - url = https://github.com/phildawes/racer.git [submodule ".vim/bundle/YouCompleteMe"] path = .vim/bundle/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe.git diff --git a/.vim/bundle/racer b/.vim/bundle/racer deleted file mode 160000 index f877a066..00000000 --- a/.vim/bundle/racer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4f778453..f7e48c1d 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -86,7 +86,6 @@ else fi cargo install -f rustfmt -cargo install -f racer cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index fed9f69b..421decfa 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm -sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs sudo dnf -y groupinstall "C Development Tools and Libraries" if [[ -z $DONT_START_TOR ]]; then From 042eb6f308e41afba9c7285e7f8b13b4d6b9961a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 12:27:33 +0200 Subject: [PATCH 11/50] map ycm-goto to `,g` --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 7284ed47..28b29041 100755 --- a/.vimrc +++ b/.vimrc @@ -20,6 +20,9 @@ nmap t :wa :Make test " navigate buffers by ctrl-b nmap :bprevious +" YCM +nnoremap g :YcmCompleter GoTo + nnoremap ; : " no cheating ! From b9b9ec18fa3233d289fa366da709478b823fe158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 12:57:56 +0200 Subject: [PATCH 12/50] Vundle used to install Vundle --- .gitignore | 3 +- .gitmodules | 7 +- .vim/autoload/pathogen.vim | 326 ------------------------------- .vim/bundle/Vundle.vim | 1 + .vim/bundle/vim-colors-solarized | 1 - .vimrc | 17 +- common/configure_fresh_system | 2 + 7 files changed, 23 insertions(+), 334 deletions(-) delete mode 100644 .vim/autoload/pathogen.vim create mode 160000 .vim/bundle/Vundle.vim delete mode 160000 .vim/bundle/vim-colors-solarized diff --git a/.gitignore b/.gitignore index d2907491..d3ddc045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vim/undo/ .vim/.netrwhist - +.vim/bundle/* +!.vim/bundle/Vundle.vim diff --git a/.gitmodules b/.gitmodules index 51cc99c1..0e19dc7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,10 +22,6 @@ [submodule ".vim/bundle/vim-gitgutter"] path = .vim/bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter -[submodule ".vim/bundle/vim-colors-solarized"] - path = .vim/bundle/vim-colors-solarized - url = https://github.com/cyplo/vim-colors-solarized.git - [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git @@ -65,3 +61,6 @@ [submodule ".vim/bundle/vim-dispatch"] path = .vim/bundle/vim-dispatch url = https://github.com/tpope/vim-dispatch.git +[submodule ".vim/bundle/Vundle.vim"] + path = .vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index 7b89ccaf..00000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,326 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.2 - -" 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. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -function! s:warn(msg) - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). For backwards compatibility purposes, a full path that -" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories() -" instead. -function! pathogen#infect(...) abort " {{{1 - for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}'] - if path =~# '^[^\\/]\+$' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#incubate(path . '/{}') - elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$' - call pathogen#incubate(path) - elseif path =~# '[\\/]\%({}\|\*\)$' - call pathogen#surround(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - return '' -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir.'/doc') - endif - endfor - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort " {{{1 - for command in a:000 - execute command - endfor - return '' -endfunction " }}}1 - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 - 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 " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2: diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim new file mode 160000 index 00000000..49847675 --- /dev/null +++ b/.vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45 diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized deleted file mode 160000 index b1f234b8..00000000 --- a/.vim/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b1f234b8aa879a8276fc2c73c99ec68d7635de96 diff --git a/.vimrc b/.vimrc index 28b29041..1c24ac65 100755 --- a/.vimrc +++ b/.vimrc @@ -48,8 +48,21 @@ set shiftwidth=4 set expandtab " plugins -execute pathogen#infect() -filetype plugin indent on + +filetype off + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +" let Vundle manage Vundle, required +Plugin 'VundleVim/Vundle.vim' + +Plugin 'https://github.com/cyplo/vim-colors-solarized.git' + +call vundle#end() " required +filetype plugin indent on " required + " colours [need pathogen] set t_Co=256 diff --git a/common/configure_fresh_system b/common/configure_fresh_system index f7e48c1d..4fc49505 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -87,6 +87,8 @@ fi cargo install -f rustfmt +echo "\n" | vim +PluginInstall +qa + cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive ./install.py --racer-completer --clang-completer From 1c8547ab2d5e03c477a91fd2395d8a42984028ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:21:42 +0200 Subject: [PATCH 13/50] moved all plugins to vundle --- .gitmodules | 42 --------------------------------------- .vim/bundle/ack.vim | 1 - .vim/bundle/nerdtree | 1 - .vim/bundle/rust.vim | 1 - .vim/bundle/salt-vim | 1 - .vim/bundle/splice | 1 - .vim/bundle/vim-airline | 1 - .vim/bundle/vim-cargo | 1 - .vim/bundle/vim-ctrlp | 1 - .vim/bundle/vim-dirdiff | 1 - .vim/bundle/vim-dispatch | 1 - .vim/bundle/vim-fugitive | 1 - .vim/bundle/vim-gitgutter | 1 - .vim/bundle/vim-markdown | 1 - .vim/bundle/vim-syntastic | 1 - .vimrc | 23 +++++++++++++++------ 16 files changed, 17 insertions(+), 62 deletions(-) delete mode 160000 .vim/bundle/ack.vim delete mode 160000 .vim/bundle/nerdtree delete mode 160000 .vim/bundle/rust.vim delete mode 160000 .vim/bundle/salt-vim delete mode 160000 .vim/bundle/splice delete mode 160000 .vim/bundle/vim-airline delete mode 160000 .vim/bundle/vim-cargo delete mode 160000 .vim/bundle/vim-ctrlp delete mode 160000 .vim/bundle/vim-dirdiff delete mode 160000 .vim/bundle/vim-dispatch delete mode 160000 .vim/bundle/vim-fugitive delete mode 160000 .vim/bundle/vim-gitgutter delete mode 160000 .vim/bundle/vim-markdown delete mode 160000 .vim/bundle/vim-syntastic diff --git a/.gitmodules b/.gitmodules index 0e19dc7a..9af3214b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,24 @@ -[submodule ".vim/bundle/vim-fugitive"] - path = .vim/bundle/vim-fugitive - url = http://github.com/tpope/vim-fugitive -[submodule ".vim/bundle/vim-markdown"] - path = .vim/bundle/vim-markdown - url = https://github.com/plasticboy/vim-markdown.git [submodule ".vim/bundle/vim-powerline"] path = .vim/bundle/vim-powerline url = https://github.com/Lokaltog/vim-powerline.git -[submodule ".vim/bundle/vim-syntastic"] - path = .vim/bundle/vim-syntastic - url = https://github.com/scrooloose/syntastic [submodule "cygwin/mintty-colors-solarized"] path = cygwin/mintty-colors-solarized url = https://github.com/mavnn/mintty-colors-solarized.git -[submodule ".vim/bundle/salt-vim"] - path = .vim/bundle/salt-vim - url = https://github.com/saltstack/salt-vim.git -[submodule ".vim/bundle/vim-airline"] - path = .vim/bundle/vim-airline - url = https://github.com/bling/vim-airline -[submodule ".vim/bundle/vim-gitgutter"] - path = .vim/bundle/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git -[submodule ".vim/bundle/nerdtree"] - path = .vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree -[submodule ".vim/bundle/vim-ctrlp"] - path = .vim/bundle/vim-ctrlp - url = https://github.com/kien/ctrlp.vim.git [submodule "tools/icdiff.git"] path = tools/icdiff.git url = https://github.com/jeffkaufman/icdiff.git -[submodule ".vim/bundle/splice"] - path = .vim/bundle/splice - url = https://github.com/sjl/splice.vim.git -[submodule ".vim/bundle/vim-dirdiff"] - path = .vim/bundle/vim-dirdiff - url = git://github.com/will133/vim-dirdiff [submodule "tools/subuser"] path = tools/subuser url = https://github.com/subuser-security/subuser [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] path = .oh-my-zsh-plugins/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule ".vim/bundle/rust.vim"] - path = .vim/bundle/rust.vim - url = https://github.com/rust-lang/rust.vim.git [submodule ".vim/bundle/YouCompleteMe"] path = .vim/bundle/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe.git -[submodule ".vim/bundle/ack.vim"] - path = .vim/bundle/ack.vim - url = https://github.com/mileszs/ack.vim.git -[submodule ".vim/bundle/vim-cargo"] - path = .vim/bundle/vim-cargo - url = https://github.com/timonv/vim-cargo.git -[submodule ".vim/bundle/vim-dispatch"] - path = .vim/bundle/vim-dispatch - url = https://github.com/tpope/vim-dispatch.git [submodule ".vim/bundle/Vundle.vim"] path = .vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim deleted file mode 160000 index 0a7d28bf..00000000 --- a/.vim/bundle/ack.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a7d28bfb130696f73d122cac99d8903e066c896 diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree deleted file mode 160000 index f8fd2ecc..00000000 --- a/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8fd2ecce20f5005e6313ce57d6d2a209890c946 diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim deleted file mode 160000 index 115d321d..00000000 --- a/.vim/bundle/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa diff --git a/.vim/bundle/salt-vim b/.vim/bundle/salt-vim deleted file mode 160000 index bdfd0a55..00000000 --- a/.vim/bundle/salt-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bdfd0a558898df77aa8fc4c7b142062fdee3b2f7 diff --git a/.vim/bundle/splice b/.vim/bundle/splice deleted file mode 160000 index 4d322d82..00000000 --- a/.vim/bundle/splice +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d322d823563f6fd2d72c129b1e99f5a98060fa8 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline deleted file mode 160000 index 246c2175..00000000 --- a/.vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 246c217562dfd8541ee0d64600a628daa4195dd2 diff --git a/.vim/bundle/vim-cargo b/.vim/bundle/vim-cargo deleted file mode 160000 index fbf907c3..00000000 --- a/.vim/bundle/vim-cargo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f diff --git a/.vim/bundle/vim-ctrlp b/.vim/bundle/vim-ctrlp deleted file mode 160000 index b5d3fe66..00000000 --- a/.vim/bundle/vim-ctrlp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/.vim/bundle/vim-dirdiff b/.vim/bundle/vim-dirdiff deleted file mode 160000 index 779185c3..00000000 --- a/.vim/bundle/vim-dirdiff +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4 diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch deleted file mode 160000 index 5f5c22c9..00000000 --- a/.vim/bundle/vim-dispatch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive deleted file mode 160000 index 0374322b..00000000 --- a/.vim/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter deleted file mode 160000 index 39f01190..00000000 --- a/.vim/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39f011909620e0c7ae555efdace20c3963ac88af diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown deleted file mode 160000 index 74c9c607..00000000 --- a/.vim/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74c9c60796ef10284ba26aaf38ffb39beae5f62c diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic deleted file mode 160000 index 87f3e80b..00000000 --- a/.vim/bundle/vim-syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2 diff --git a/.vimrc b/.vimrc index 1c24ac65..446283a4 100755 --- a/.vimrc +++ b/.vimrc @@ -51,20 +51,31 @@ set expandtab filetype off -" set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() -" let Vundle manage Vundle, required Plugin 'VundleVim/Vundle.vim' Plugin 'https://github.com/cyplo/vim-colors-solarized.git' +Plugin 'mileszs/ack.vim' +Plugin 'scrooloose/nerdtree.git' +Plugin 'scrooloose/syntastic.git' +Plugin 'wting/rust.vim' +Plugin 'sjl/splice.vim.git' +Plugin 'vim-airline/vim-airline' +Plugin 'timonv/vim-cargo' +Plugin 'kien/ctrlp.vim' +Plugin 'will133/vim-dirdiff' +Plugin 'tpope/vim-dispatch.git' +Plugin 'tpope/vim-fugitive.git' +Plugin 'airblade/vim-gitgutter.git' +Plugin 'godlygeek/tabular' +Plugin 'plasticboy/vim-markdown' -call vundle#end() " required -filetype plugin indent on " required +call vundle#end() +filetype plugin indent on - -" colours [need pathogen] +" colours set t_Co=256 syntax enable set background=dark From b7faa66544068afba09dd548e6ff48fc2ae0be04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:25:48 +0200 Subject: [PATCH 14/50] remove obsolete gitmodules --- .gitmodules | 6 ------ .vim/bundle/YouCompleteMe | 1 - 2 files changed, 7 deletions(-) delete mode 160000 .vim/bundle/YouCompleteMe diff --git a/.gitmodules b/.gitmodules index 9af3214b..b7900e0e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule ".vim/bundle/vim-powerline"] - path = .vim/bundle/vim-powerline - url = https://github.com/Lokaltog/vim-powerline.git [submodule "cygwin/mintty-colors-solarized"] path = cygwin/mintty-colors-solarized url = https://github.com/mavnn/mintty-colors-solarized.git @@ -16,9 +13,6 @@ [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] path = .oh-my-zsh-plugins/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule ".vim/bundle/YouCompleteMe"] - path = .vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git [submodule ".vim/bundle/Vundle.vim"] path = .vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe deleted file mode 160000 index c4a410b2..00000000 --- a/.vim/bundle/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4a410b2ca3a6222c7e196c10f258f6e672f31a9 From 64ff907affcda815d527dc99ef3de6769ae1447a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:49:54 +0200 Subject: [PATCH 15/50] added missing YCM to vundle --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 446283a4..8aaec1e5 100755 --- a/.vimrc +++ b/.vimrc @@ -71,6 +71,7 @@ Plugin 'tpope/vim-fugitive.git' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' +Plugin 'Valloric/YouCompleteMe' call vundle#end() filetype plugin indent on From 0a0150e196d0afdf9406360fb966cf4171608545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:15:53 +0200 Subject: [PATCH 16/50] install vim before invoking the main script on bunsen --- bunsen/configure_fresh_system | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index a792e7cb..c4e9bc8d 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -v sudo apt-get update sudo apt-get -y upgrade @@ -20,10 +19,6 @@ if [[ -z $DONT_START_TOR ]]; then sudo systemctl start tor fi -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -DIR="$DIR/../" -DIR="$DIR" $DIR/common/configure_fresh_system - # install vim from sources VIM_BUILD_DIR=/tmp cd "$VIM_BUILD_DIR" @@ -42,3 +37,8 @@ sudo make install cd rm -fvr "$VIM_BUILD_DIR/vim" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$DIR/../" +DIR="$DIR" $DIR/common/configure_fresh_system + + From 1c446c781533f65c3f6e6b957f7792566f72f128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:37:59 +0200 Subject: [PATCH 17/50] install vim on ubuntu --- ubuntu/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index 713b12bc..06a7e31a 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -5,7 +5,7 @@ set -v sudo apt-get update sudo apt-get -y upgrade -install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs thunderbird thunderbird-enigmail thunderbird-ublock-origin gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3 gnupg2 realpath apt-file" +install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs thunderbird thunderbird-enigmail thunderbird-ublock-origin gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3 gnupg2 realpath apt-file vim" set +e for i in `seq 1 3`; do From 7d220708bb8b35525fc3796163ee4bec9bdb33f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:47:45 +0200 Subject: [PATCH 18/50] added airline themes to make better use of solarized colours --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 8aaec1e5..fef8f1c3 100755 --- a/.vimrc +++ b/.vimrc @@ -63,6 +63,7 @@ Plugin 'scrooloose/syntastic.git' Plugin 'wting/rust.vim' Plugin 'sjl/splice.vim.git' Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' Plugin 'timonv/vim-cargo' Plugin 'kien/ctrlp.vim' Plugin 'will133/vim-dirdiff' From bd519dd8c1c1483f12050c15fab96fd1530d9cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:56:07 +0200 Subject: [PATCH 19/50] added tpope's sensible vim --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index fef8f1c3..912ef225 100755 --- a/.vimrc +++ b/.vimrc @@ -69,6 +69,7 @@ Plugin 'kien/ctrlp.vim' Plugin 'will133/vim-dirdiff' Plugin 'tpope/vim-dispatch.git' Plugin 'tpope/vim-fugitive.git' +Plugin 'tpope/vim-sensible' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' From ee4700cc7563b2e2da6a21b6edef3f5786e2c56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 12 Jul 2016 15:35:12 +0200 Subject: [PATCH 20/50] Added P4Merge and WinMerge as git diff tools on cygwin --- .gitconfig_includes.cygwin | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin index cb3e6e39..2aa43a69 100644 --- a/.gitconfig_includes.cygwin +++ b/.gitconfig_includes.cygwin @@ -1,3 +1,9 @@ +[difftool "winmerge"] + cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" + trustExitCode = false +[difftool "p4merge"] + cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" + trustExitCode = false [mergetool "p4merge"] cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" trustExitCode = false From 0127d2b89ae4b5230e1a0b466bf58a3b0001a4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 19 Jul 2016 16:55:07 +0200 Subject: [PATCH 21/50] add kicad to default fedora installation --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 421decfa..956dd758 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm -sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad sudo dnf -y groupinstall "C Development Tools and Libraries" if [[ -z $DONT_START_TOR ]]; then From 3838c2216fb4ce43ab1c148655aa470571aaf4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 19 Jul 2016 17:50:43 +0200 Subject: [PATCH 22/50] refresh dependencies for freecad on fedora --- fedora/install_freecad_dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/install_freecad_dependencies b/fedora/install_freecad_dependencies index 8ec3a001..4292f342 100755 --- a/fedora/install_freecad_dependencies +++ b/fedora/install_freecad_dependencies @@ -1,2 +1,2 @@ #!/bin/bash -sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel +sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel vtk-devel med-devel From ed72708959ebd468acba951e6578dd7b1b4b1d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 24 Jul 2016 16:06:59 +0200 Subject: [PATCH 23/50] Add Virtualbox as the default provider in vagrant --- .setenv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.setenv b/.setenv index c5b25623..706c22bb 100644 --- a/.setenv +++ b/.setenv @@ -11,3 +11,5 @@ export PATH=$HOME/.cargo/bin:$PATH export RUST_SRC_PATH=$HOME/dev/rust/src export EDITOR="vim" export KEYTIMEOUT=1 +export VAGRANT_DEFAULT_PROVIDER=virtualbox + From d4c126b43352df6331ca3c771f04c78af3263481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:09:53 +0200 Subject: [PATCH 24/50] add basic scaffolding around automatic build for windows on appveyor --- appveyor.yml | 1 + windows_cygwin/build.bat | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 appveyor.yml create mode 100644 windows_cygwin/build.bat diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..2297bbeb --- /dev/null +++ b/appveyor.yml @@ -0,0 +1 @@ +build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat new file mode 100644 index 00000000..82aa5b37 --- /dev/null +++ b/windows_cygwin/build.bat @@ -0,0 +1,3 @@ +REM install Chocolatey +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin + From f38b526e5175ce483f52c6b7de6857548675b010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:17:16 +0200 Subject: [PATCH 25/50] add browsers and cygwin to the default windows installation --- windows_cygwin/build.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 82aa5b37..b53e4231 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,3 +1,9 @@ REM install Chocolatey @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin +REM install base tools +choco install firefox +choco install googlechrome + +REM install cygwin and all things inside +choco install cygwin cyg-get From b0d4ac689efddb32db20e91967897ea348dd3688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:19:05 +0200 Subject: [PATCH 26/50] drive powershell script in appveyor --- windows_cygwin/build.bat | 9 --------- windows_cygwin/build.ps1 | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 windows_cygwin/build.bat create mode 100755 windows_cygwin/build.ps1 diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat deleted file mode 100644 index b53e4231..00000000 --- a/windows_cygwin/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM install Chocolatey -@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin - -REM install base tools -choco install firefox -choco install googlechrome - -REM install cygwin and all things inside -choco install cygwin cyg-get diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 new file mode 100755 index 00000000..2ee0a98a --- /dev/null +++ b/windows_cygwin/build.ps1 @@ -0,0 +1,9 @@ +# install Chocolatey +iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex + +# install base tools +choco install firefox +choco install googlechrome + +# install cygwin and all things inside +choco install cygwin cyg-get From db810ad2b23e25a8f25a3df4c4bb7b9342572771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:30:17 +0200 Subject: [PATCH 27/50] do not ask for confirmation when installing via choco --- windows_cygwin/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 index 2ee0a98a..715ba0d6 100755 --- a/windows_cygwin/build.ps1 +++ b/windows_cygwin/build.ps1 @@ -2,8 +2,8 @@ iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex # install base tools -choco install firefox -choco install googlechrome +choco install -y firefox +choco install -y googlechrome # install cygwin and all things inside -choco install cygwin cyg-get +choco install -y cygwin cyg-get From b70f3ad95de31aa62d05fb57d714eb375e6fecdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:30:46 +0200 Subject: [PATCH 28/50] add missing .bat wrapper for appveyor --- windows_cygwin/build.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 windows_cygwin/build.bat diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat new file mode 100644 index 00000000..86839a21 --- /dev/null +++ b/windows_cygwin/build.bat @@ -0,0 +1 @@ +powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\build.ps1" From 9dad4b01ef1de5af4d9d0247705840819e45a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:44:07 +0200 Subject: [PATCH 29/50] add cygwin git package --- windows_cygwin/build.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 index 715ba0d6..434d75c9 100755 --- a/windows_cygwin/build.ps1 +++ b/windows_cygwin/build.ps1 @@ -7,3 +7,6 @@ choco install -y googlechrome # install cygwin and all things inside choco install -y cygwin cyg-get + +cyg-get git + From fd4a8a7f94a6e266804a560ff3eea2ab77938bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 16:18:32 +0200 Subject: [PATCH 30/50] add retext to fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 956dd758..a379a25e 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm -sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad retext sudo dnf -y groupinstall "C Development Tools and Libraries" if [[ -z $DONT_START_TOR ]]; then From 5521c5f9ea2eda1205af08a2fb41998a1f9a3226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 10:37:20 +0200 Subject: [PATCH 31/50] add initial bootstrap for windows scripts --- appveyor.yml | 1 + windows_cygwin/README.md | 3 +++ windows_cygwin/bootstrap.bat | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 windows_cygwin/README.md create mode 100644 windows_cygwin/bootstrap.bat diff --git a/appveyor.yml b/appveyor.yml index 2297bbeb..8d000890 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1 +1,2 @@ +install: windows_cygwin\bootstrap.bat build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md new file mode 100644 index 00000000..f94dfc59 --- /dev/null +++ b/windows_cygwin/README.md @@ -0,0 +1,3 @@ +Bootstrap from cmd.exe: + + diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat new file mode 100644 index 00000000..6d75c9dc --- /dev/null +++ b/windows_cygwin/bootstrap.bat @@ -0,0 +1,4 @@ +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin +refreshenv +choco install -y git win32-openssh + From 0eac6c5a624f91c0b4361c70ef08afe13b13db8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 10:53:09 +0200 Subject: [PATCH 32/50] echo commands on screen in windows bootstrap --- windows_cygwin/bootstrap.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat index 6d75c9dc..fb41e542 100644 --- a/windows_cygwin/bootstrap.bat +++ b/windows_cygwin/bootstrap.bat @@ -1,4 +1,4 @@ +echo on @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin -refreshenv choco install -y git win32-openssh From 944234bf6b20d3e7f8e8a5c4e8b670a7bd6d5d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:00:14 +0200 Subject: [PATCH 33/50] do not use powershell script to build windows env --- windows_cygwin/build.bat | 4 +++- windows_cygwin/build.ps1 | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100755 windows_cygwin/build.ps1 diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 86839a21..ecf14db8 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1 +1,3 @@ -powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\build.ps1" +choco install -y firefox googlechrome cygwin +refreshenv + diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 deleted file mode 100755 index 434d75c9..00000000 --- a/windows_cygwin/build.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -# install Chocolatey -iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex - -# install base tools -choco install -y firefox -choco install -y googlechrome - -# install cygwin and all things inside -choco install -y cygwin cyg-get - -cyg-get git - From ebe14081fece6d2b2768b067e4da4cefdfd6a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:12:05 +0200 Subject: [PATCH 34/50] try to make bootstrap executable remotely --- appveyor.yml | 2 +- windows_cygwin/README.md | 5 +++-- windows_cygwin/bootstrap.bat | 4 ---- windows_cygwin/bootstrap.ps1 | 3 +++ 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 windows_cygwin/bootstrap.bat create mode 100644 windows_cygwin/bootstrap.ps1 diff --git a/appveyor.yml b/appveyor.yml index 8d000890..6800ec75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: windows_cygwin\bootstrap.bat +install: windows_cygwin\bootstrap.ps1 build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md index f94dfc59..818bb7e2 100644 --- a/windows_cygwin/README.md +++ b/windows_cygwin/README.md @@ -1,3 +1,4 @@ -Bootstrap from cmd.exe: +Bootstrap from cmd.exe running as Administrator: - + bootstrap.bat + ssh-keygen -b 8192 diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat deleted file mode 100644 index fb41e542..00000000 --- a/windows_cygwin/bootstrap.bat +++ /dev/null @@ -1,4 +0,0 @@ -echo on -@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin -choco install -y git win32-openssh - diff --git a/windows_cygwin/bootstrap.ps1 b/windows_cygwin/bootstrap.ps1 new file mode 100644 index 00000000..dbec7a91 --- /dev/null +++ b/windows_cygwin/bootstrap.ps1 @@ -0,0 +1,3 @@ +iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex +choco install -y git win32-openssh + From 1a1860c8775654dc8644a6e983970be8c32a4dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:43:48 +0200 Subject: [PATCH 35/50] add all initial steps to readme for windows --- windows_cygwin/README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md index 818bb7e2..cc3c8bb3 100644 --- a/windows_cygwin/README.md +++ b/windows_cygwin/README.md @@ -1,4 +1,19 @@ Bootstrap from cmd.exe running as Administrator: - bootstrap.bat + @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cyplo/dotfiles/master/windows_cygwin/bootstrap.ps1'))" + +launch a normal user's cmd.exe and: + + refreshenv ssh-keygen -b 8192 + type .ssh\id_rsa.pub + # add this key to github + mkdir dev + cd dev + git clone git@github.com:cyplo/dotfiles.git + +launch new cmd.exe as Administrator and: + + cd %HOMEPATH%\dev\dotfiles + windows_cygwin\build.bat + From 3498e18f8c03bfa1055909b6650736c1151e4fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:04:14 +0200 Subject: [PATCH 36/50] make cygwin install packages from the list --- windows_cygwin/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index ecf14db8..2eec30fe 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,3 +1,4 @@ -choco install -y firefox googlechrome cygwin +choco install -y firefox googlechrome +choco install -fy cygwin --installargs "-P curl,zsh,git,vim,wget" refreshenv From 8e11bc295760f85175bd69bffda53d1d90efc773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:07:13 +0200 Subject: [PATCH 37/50] launch powershell explicitely on appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6800ec75..42493a1c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: windows_cygwin\bootstrap.ps1 +install: @powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" build_script: windows_cygwin\build.bat From 08188050eaee93efa373a5ae8c9f8faf82f70220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:07:49 +0200 Subject: [PATCH 38/50] launch powershell explicitely on appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 42493a1c..58c4c013 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: @powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" +install: powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" build_script: windows_cygwin\build.bat From 2ff4617ed8392935f92109b523d30970c48876cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:13:36 +0200 Subject: [PATCH 39/50] also upgrade cygwin packages if possible --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 2eec30fe..9b31957b 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,4 +1,4 @@ choco install -y firefox googlechrome -choco install -fy cygwin --installargs "-P curl,zsh,git,vim,wget" +choco install -fy cygwin --installargs "-Pg curl,zsh,git,vim,wget" refreshenv From 71224ec4e4269cea7cc74fd9317eea455aa0aabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:28:40 +0200 Subject: [PATCH 40/50] do not use cygwin from chocolatey, have more control --- windows_cygwin/build.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 9b31957b..8453e5a5 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,4 +1,6 @@ -choco install -y firefox googlechrome -choco install -fy cygwin --installargs "-Pg curl,zsh,git,vim,wget" +choco install -y firefox googlechrome wget refreshenv +wget https://cygwin.com/setup-x86_64.exe +REM cygwin installation +setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget From 9b5232110ed11de9f9e8267e652177b6d097b908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:35:39 +0200 Subject: [PATCH 41/50] do not refreshenv as it exits the current batch file --- windows_cygwin/build.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 8453e5a5..a9dcbf90 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,4 @@ choco install -y firefox googlechrome wget -refreshenv wget https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget From bbbfa246ff5da9e689fe71ed39055236e7bd9bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:37:35 +0200 Subject: [PATCH 42/50] fix passing installation directory to cygwin's installer --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index a9dcbf90..d6618fd7 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget +setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget From b612a5a5b038e8301b01a3bbd02f11c8e1dd7001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:38:29 +0200 Subject: [PATCH 43/50] continue downloading cygwin's setup if interrupted or running once again --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index d6618fd7..38399adf 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget -wget https://cygwin.com/setup-x86_64.exe +wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget From b0cc712beb19d65a3c6fcee16cae0d1b5d605097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:50:53 +0200 Subject: [PATCH 44/50] fix cygwin isntaller to be noninteractive --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 38399adf..7c65121e 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget From 687cbb86cc50c445028e84fc78c4cc89caab6c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:53:24 +0200 Subject: [PATCH 45/50] install cygwin to cygwin64 by default --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 7c65121e..804c1e46 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64.exe -R "C:\cygwin" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget From efaf1b81e66bb159a248a73331ab6b97864b7430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 13:07:01 +0200 Subject: [PATCH 46/50] add archival tools to cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 804c1e46..94f1c10f 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion From 018fcce82c6b10f20dd950425e8751cb29a4c4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:07:58 +0200 Subject: [PATCH 47/50] add support for automatic security updates for fedora --- fedora/configure_fresh_system | 13 ++++++++-- fedora/etc/dnf/automatic.conf | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 fedora/etc/dnf/automatic.conf diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index a379a25e..09dbefa7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,19 +4,28 @@ set -e #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop +sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad retext sudo dnf -y groupinstall "C Development Tools and Libraries" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak +cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf + +sudo systemctl enable dnf-automatic.timer +sudo systemctl start dnf-automatic.timer +sudo systemctl list-timers "*dnf-*" + if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor sudo systemctl start tor fi -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" DIR="$DIR" $DIR/common/configure_fresh_system diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf new file mode 100644 index 00000000..848f2c09 --- /dev/null +++ b/fedora/etc/dnf/automatic.conf @@ -0,0 +1,46 @@ +[commands] +# What kind of upgrade to perform: +# default = all available upgrades +# security = only the security upgrades +upgrade_type = security +random_sleep = 300 + +# Whether updates should be downloaded when they are available. +download_updates = yes + +# Whether updates should be applied when they are available. +# Note that if this is set to no, downloaded packages will be left in the +# cache regardless of the keepcache setting. +apply_updates = yes + + +[emitters] +# Name to use for this system in messages that are emitted. Default is the +# hostname. +# system_name = my-host + +# How to send messages. Valid options are stdio, email and motd. If +# emit_via includes stdio, messages will be sent to stdout; this is useful +# to have cron send the messages. If emit_via includes email, this +# program will send email itself according to the configured options. +# If emit_via includes motd, /etc/motd file will have the messages. +# Default is email,stdio. +emit_via = stdio,email + + +[email] +# The address to send email messages from. +email_from = root@skinnyv + +# List of addresses to send messages to. +email_to = admin@cyplo.net + +# Name of the host to connect to to send email messages. +email_host = localhost + + +[base] +# This section overrides dnf.conf + +# Use this to filter DNF core messages +debuglevel = 1 From 2d5c36d3546be95d6ec295b523a711010e79eefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:22:07 +0200 Subject: [PATCH 48/50] do not faild the script when non-zero diff on dnf settings --- fedora/configure_fresh_system | 2 ++ fedora/etc/dnf/automatic.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 09dbefa7..af4b474e 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -15,7 +15,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +set +e diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf +set -e sudo systemctl enable dnf-automatic.timer sudo systemctl start dnf-automatic.timer diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf index 848f2c09..d5bed173 100644 --- a/fedora/etc/dnf/automatic.conf +++ b/fedora/etc/dnf/automatic.conf @@ -30,7 +30,7 @@ emit_via = stdio,email [email] # The address to send email messages from. -email_from = root@skinnyv +email_from = root # List of addresses to send messages to. email_to = admin@cyplo.net From 4e7faebe2bfa519aaa0ddf79db3f2e9d2eb420c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:29:33 +0200 Subject: [PATCH 49/50] use sudo to copy config files --- fedora/configure_fresh_system | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index af4b474e..0fdee57a 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -13,10 +13,10 @@ sudo dnf -y groupinstall "C Development Tools and Libraries" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak -cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +sudo cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak +sudo cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf set +e -diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf +sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf set -e sudo systemctl enable dnf-automatic.timer From 6016fc5ecc79c3f0c87909a10be26636825a0cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:37:34 +0200 Subject: [PATCH 50/50] introduce NO_SYSTEMCTL flag --- bunsen/configure_fresh_system | 2 +- bunsen/test_insider | 2 +- fedora/configure_fresh_system | 8 ++++---- fedora/test_insider | 2 +- ubuntu/configure_fresh_system | 2 +- ubuntu/test_insider | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index c4e9bc8d..60820f23 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -14,7 +14,7 @@ done set -e eval $install_packages -if [[ -z $DONT_START_TOR ]]; then +if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl enable tor sudo systemctl start tor fi diff --git a/bunsen/test_insider b/bunsen/test_insider index d1612fb6..8e653f4d 100755 --- a/bunsen/test_insider +++ b/bunsen/test_insider @@ -4,7 +4,7 @@ set -e export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 0fdee57a..b7089cd7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -19,11 +19,11 @@ set +e sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf set -e -sudo systemctl enable dnf-automatic.timer -sudo systemctl start dnf-automatic.timer -sudo systemctl list-timers "*dnf-*" +if [[ -z $NO_SYSTEMCTL ]]; then + sudo systemctl enable dnf-automatic.timer + sudo systemctl start dnf-automatic.timer + sudo systemctl list-timers "*dnf-*" -if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor sudo systemctl start tor fi diff --git a/fedora/test_insider b/fedora/test_insider index 496329b8..e31efca7 100755 --- a/fedora/test_insider +++ b/fedora/test_insider @@ -3,7 +3,7 @@ set -e export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true dnf -y install sudo diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index 06a7e31a..ec8b0a9b 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -15,7 +15,7 @@ done set -e eval $install_packages -if [[ -z $DONT_START_TOR ]]; then +if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl enable tor sudo systemctl start tor fi diff --git a/ubuntu/test_insider b/ubuntu/test_insider index 55aa9929..1234fce0 100755 --- a/ubuntu/test_insider +++ b/ubuntu/test_insider @@ -4,7 +4,7 @@ set -e export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries