diff options
-rw-r--r-- | src/bin/mount-bbcStik | 9 | ||||
-rw-r--r-- | src/bin/mount-gibb-ftp | 4 | ||||
-rw-r--r-- | src/bin/mount-gibbix | 9 | ||||
-rw-r--r-- | src/bin/umount-bbcStik | 4 | ||||
-rw-r--r-- | src/bin/umount-gibbix | 4 | ||||
-rw-r--r-- | src/bin/wallpaper-set.sh | 2 | ||||
-rw-r--r-- | src/firewall/README.md | 13 | ||||
-rw-r--r-- | src/firewall/src-default | 16 | ||||
-rw-r--r-- | src/git/_gitconfig | 27 | ||||
-rw-r--r-- | src/java-loggers/simplelogger.properties | 10 | ||||
-rw-r--r-- | src/vi/_vimrc | 29 |
11 files changed, 46 insertions, 81 deletions
diff --git a/src/bin/mount-bbcStik b/src/bin/mount-bbcStik deleted file mode 100644 index 36f9fdb..0000000 --- a/src/bin/mount-bbcStik +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [[ $# -lt 1 ]] ; then - echo -e "usage:\t$(basename $0) deviceToMount" -else - echo sudo mount -o gid=`id -g`,uid=`id -u` $1 /mnt/bbcStik/ - sudo mount -o gid=`id -g`,uid=`id -u` $1 /mnt/bbcStik/ -fi - diff --git a/src/bin/mount-gibb-ftp b/src/bin/mount-gibb-ftp deleted file mode 100644 index 2cab490..0000000 --- a/src/bin/mount-gibb-ftp +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -sshfs andreas.fankhauser@sftp.iet-gibb.ch:/ ~/mnt/gibb-ftp - diff --git a/src/bin/mount-gibbix b/src/bin/mount-gibbix deleted file mode 100644 index 15a1196..0000000 --- a/src/bin/mount-gibbix +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [[ $# -lt 1 ]] ; then - echo -e "usage:\t$(basename $0) deviceToMount" -else - echo sudo mount -o gid=`id -g`,uid=`id -u` $1 /mnt/gibbix - sudo mount -o gid=`id -g`,uid=`id -u` $1 /mnt/gibbix -fi - diff --git a/src/bin/umount-bbcStik b/src/bin/umount-bbcStik deleted file mode 100644 index b77d700..0000000 --- a/src/bin/umount-bbcStik +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -sudo umount /mnt/bbcStik - diff --git a/src/bin/umount-gibbix b/src/bin/umount-gibbix deleted file mode 100644 index add63fa..0000000 --- a/src/bin/umount-gibbix +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -sudo umount /mnt/gibbix - diff --git a/src/bin/wallpaper-set.sh b/src/bin/wallpaper-set.sh index f963db9..1e9d1cc 100644 --- a/src/bin/wallpaper-set.sh +++ b/src/bin/wallpaper-set.sh @@ -1,4 +1,4 @@ #!/bin/sh -feh --randomize --bg-fill ~/.wallpaper/* +feh --randomize --bg-fill ~/.config/wallpapers/* diff --git a/src/firewall/README.md b/src/firewall/README.md index 702f7d4..2be2b8c 100644 --- a/src/firewall/README.md +++ b/src/firewall/README.md @@ -1,9 +1,18 @@ # Firewall Configuration +## Initial Setup + + cp src-default /etc/iptables/src-default + aptitude install iptables-persistent + + ## ipv4 activate for session. -cat /etc/iptables/src-yourFile | sudo iptables-restore + + cat /etc/iptables/src-default | sudo iptables-restore + ## ipv4 store current session as default. -sudo iptables-save | sudo tee /etc/iptables/rules.v4 + + sudo iptables-save | sudo tee /etc/iptables/rules.v4 diff --git a/src/firewall/src-default b/src/firewall/src-default index 28c1f38..c1cbd1c 100644 --- a/src/firewall/src-default +++ b/src/firewall/src-default @@ -1,14 +1,4 @@ -############################################################################### -# Setup env: -# cp rules.v4.source /etc/iptables/rules.v4.source -# aptitude install iptables-persistent -# Load rules: -# cat /etc/iptables/rules.v4.source | sudo iptables-restore -# Persist currently loaded config: -# sudo iptables-save | sudo tee /etc/iptables/rules.v4 -############################################################################### - *filter # Loopback @@ -120,11 +110,11 @@ #-A OUTPUT -o vboxnet1 -j ACCEPT #-A INPUT -i vboxnet1 -m state --state ESTABLISHED,RELATED -j ACCEPT -# Misc client ports for tmp experiments. +# Some client ports for debugging. #-A OUTPUT -p tcp -m tcp --match multiport --dports 1230:1239 -j ACCEPT #-A INPUT -p tcp -m state --state ESTABLISHED,RELATED --match multiport --sports 1230:1239 -j ACCEPT -# Misc server ports for tmp experiments. +# Some server ports for debugging. #-A INPUT -p tcp --match multiport --dports 1230:1239 -j ACCEPT #-A OUTPUT -p tcp -m tcp --match multiport --sports 1230:1239 -m state --state RELATED,ESTABLISHED -j ACCEPT @@ -133,7 +123,7 @@ -A FORWARD -j LOG --log-prefix "fwBadFwd: " --log-level 6 -A OUTPUT -j LOG --log-prefix "fwBadOut: " --log-level 6 -# Disallow any non-whitelisted packets (Use either DROP or REJECT. Your choise) +# Disallow any non-whitelisted packets (Use either DROP or REJECT. Your choice) -A INPUT -j DROP -A FORWARD -j DROP -A OUTPUT -j REJECT diff --git a/src/git/_gitconfig b/src/git/_gitconfig index 48d1bbe..4a7fa3e 100644 --- a/src/git/_gitconfig +++ b/src/git/_gitconfig @@ -1,20 +1,25 @@ + [user] - email = andyfankhauser@gmx.ch - name = user@host +email = andyfankhauser@gmx.ch +name = user@host + [merge] - tool = meld +tool = meld + [push] - default = simple +default = simple + [alias] - mylog = log --graph --decorate - diffc = diff --cache - diffh = diff HEAD - s = status - co = checkout +mylog = log --graph --decorate +diffc = diff --cache +diffh = diff HEAD +s = status +co = checkout + [color] - ui = always +ui = always # Helpful to get mouse scrollable diff #[core] -# pager = less -R -+X +#pager = less -R -+X diff --git a/src/java-loggers/simplelogger.properties b/src/java-loggers/simplelogger.properties index 7d89cf4..cad6e07 100644 --- a/src/java-loggers/simplelogger.properties +++ b/src/java-loggers/simplelogger.properties @@ -25,7 +25,7 @@ # <version>1.7.25</version> <!-- TODO: Remove --> # </dependency> <!-- TODO: Remove --> -# Base config +# Base Config org.slf4j.simpleLogger.logFile=System.out org.slf4j.simpleLogger.showDateTime=true org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS @@ -33,9 +33,11 @@ org.slf4j.simpleLogger.showLogName=true org.slf4j.simpleLogger.showShortLogName=true org.slf4j.simpleLogger.showThreadName=false -# Log levels +# Log Levels org.slf4j.simpleLogger.defaultLogLevel=WARN -org.slf4j.simpleLogger.log.org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping=INFO -org.slf4j.simpleLogger.log.io.vertx.core.impl.BlockedThreadChecker=ERROR #org.slf4j.simpleLogger.log. +# Misc +#org.slf4j.simpleLogger.log.org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping=INFO +#org.slf4j.simpleLogger.log.io.vertx.core.impl.BlockedThreadChecker=ERROR + diff --git a/src/vi/_vimrc b/src/vi/_vimrc index 05387bc..7aa3278 100644 --- a/src/vi/_vimrc +++ b/src/vi/_vimrc @@ -106,11 +106,11 @@ set nosmartindent set shiftwidth=4 set tabstop=4 set expandtab -vmap > >gv -vmap <Tab> >gv -vmap < <gv -vmap <S-Tab> <gv -imap <S-Tab> <Esc><<i +vnoremap > >gv +vnoremap <Tab> >gv +vnoremap < <gv +vnoremap <S-Tab> <gv +inoremap <S-Tab> <Esc><<i function Indenting(indent, what, cols) let spccol = repeat(' ', a:cols) @@ -154,23 +154,13 @@ nmap * *N " save with ctrl-s (useless if term emu catches keymapping) nnoremap <C-s> :up<CR> -" commenting -autocmd FileType c,cpp,java,php,javascript,html let b:comment_leader = '//' -autocmd FileType sh,ruby,python let b:comment_leader = '#' -autocmd FileType conf,fstab let b:comment_leader = '#' -autocmd FileType tex let b:comment_leader = '% ' -autocmd FileType mail let b:comment_leader = '> ' -autocmd FileType vim let b:comment_leader = '"' -map <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR> -map <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR> - -" NERDTree config ------------------------------------------------------------- +" NERDTree -------------------------------------------------------------------- nnoremap ° :NERDTreeToggle<CR> -" YCM config ------------------------------------------------------------------ +" YouCompleteMe --------------------------------------------------------------- command YcmEnable call YcmEnable() function YcmEnable() @@ -213,10 +203,9 @@ endif " filetype specific ----------------------------------------------------------- -autocmd FileType html setlocal shiftwidth=2 tabstop=2 -autocmd FileType xml setlocal shiftwidth=2 tabstop=2 +autocmd FileType html setl shiftwidth=2 tabstop=2 +autocmd FileType xml setl shiftwidth=2 tabstop=2 autocmd FileType Makefile setl noexpandtab -" typescript autocmd BufNewFile,BufRead *.ts setlocal ft=javascript |