Ver Fonte

added script to setup just vim, added shebang to .sh files, updated/cleaned vimrc and re-added i3 config

Bananicorn há 6 anos atrás
pai
commit
2d72852bf4
5 ficheiros alterados com 390 adições e 17 exclusões
  1. 5 14
      .vimrc
  2. 188 0
      config
  3. 186 0
      i3
  4. 7 0
      setup-vim.sh
  5. 4 3
      setup.sh

+ 5 - 14
.vimrc

@@ -31,6 +31,7 @@ filetype indent plugin on
 
 "for indentating html - otherwise these tags are not recognized
 let g:html_indent_inctags = "html,body,head,tbody,table,td,tr,th,canvas"
+
 "whitespace
 set tabstop=4
 set shiftwidth=4
@@ -50,14 +51,13 @@ set rnu
 "colors
 syntax on
 colorscheme desert
-" colorscheme industry
 
 "send all backups to home/vimbackups
-set backupdir=./vimbackups,../vimbackups,~/vim/backups,.
-set directory=./vimbackups,../vimbackups,~/vim/backups,.
+set backupdir=~/.vim/backups,.
+set directory=~/.vim/swapfiles,.
 
 " Persistent undo
-set undodir=~/.vim/undofiles
+set undodir=~/.vim/undofiles,.
 set undofile
 
 "search and replace options ignore case, except if there's something uppercase
@@ -68,13 +68,6 @@ set smartcase
 "set the current working directory when entering a new file
 autocmd BufEnter * silent! :lcd%:p:h
 
-"update ctags for this file upon saving
-autocmd BufWritePost * silent! !ctags -a %
-set tags=./tags,tags;$HOME
-"trailing space is important
-nnoremap <C-f> :tag *
-
-
 "remove all trailing whitespace on lines with non-whitespace characters
 " autocmd BufEnter * silent! :call <SID>StripTrailingWhitespaces()
 
@@ -85,13 +78,12 @@ nmap <F1> <nop>
 
 "remap leader to space
 nnoremap <SPACE> <nop>
-"let mapleader = "\<SPACE>"
 let mapleader = " "
 
 "move screen
 nnoremap <C-h> 4zh
 nnoremap <C-l> 4zl
-nnoremap<C-j> 4<C-E>
+nnoremap <C-j> 4<C-E>
 nnoremap <C-k> 4<C-Y>
 
 "getting the next match of f or t, but more logical - at least on a german
@@ -106,7 +98,6 @@ nnoremap <silent> <C-v> "+p
 nnoremap <silent> <C-c> "+Y<esc>
 vnoremap <silent> <C-c> "+y<esc>
 vnoremap <silent> <C-v> "+p
-" nnoremap <silent> <C-a> <esc>ggVG
 
 "removes the highlighting after search
 "until I can fix the escape codes sent by the terminal, I'll have to press esc

+ 188 - 0
config

@@ -0,0 +1,188 @@
+# i3 config file (v4)
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+#
+# This config file uses keycodes (bindsym) and was written for the QWERTY
+# layout.
+#
+# To get a config file with the same key positions, but for your current
+# layout, use the i3-config-wizard
+#
+
+# 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 these keys for focus, movement, and resize directions when reaching for
+# the arrows is not convenient
+set $up k
+set $down j
+set $left h
+set $right l
+
+# use Mouse+Mod4 to drag floating windows to their wanted position
+floating_modifier Mod4
+
+# kill focused window
+bindsym Mod4+Shift+q kill
+bindsym Mod1+F4 kill
+
+# change focus
+bindsym Mod4+$left focus left
+bindsym Mod4+$down focus down
+bindsym Mod4+$up focus up
+bindsym Mod4+$right focus right
+
+# alternatively, you can use the cursor keys:
+bindsym Mod4+Left focus left
+bindsym Mod4+Down focus down
+bindsym Mod4+Up focus up
+bindsym Mod4+Right focus right
+
+# move focused window - yes, vim bindings.
+bindsym Mod4+Shift+$left move left
+bindsym Mod4+Shift+$down move down
+bindsym Mod4+Shift+$up move up
+bindsym Mod4+Shift+$right move right
+
+# alternatively, you can use the cursor keys:
+bindsym Mod4+Shift+Left move left
+bindsym Mod4+Shift+Down move down
+bindsym Mod4+Shift+Up move up
+bindsym Mod4+Shift+Right move right
+
+# split in horizontal orientation
+bindsym Mod4+shift+v split h
+
+# split in vertical orientation
+bindsym Mod4+v split v
+
+# enter fullscreen mode for the focused container
+bindsym Mod4+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym Mod4+s layout stacking
+bindsym Mod4+w layout tabbed
+bindsym Mod4+Shift+w layout toggle split
+
+# toggle tiling / floating
+bindsym Mod4+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym Mod4+space focus mode_toggle
+
+# focus the parent container
+bindsym Mod4+a focus parent
+
+# focus the child container
+bindsym Mod4+d focus child
+
+# move the currently focused window to the scratchpad
+bindsym Mod4+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym Mod4+minus scratchpad show
+
+# switch to workspace
+bindsym Mod4+1 workspace 1
+bindsym Mod4+2 workspace 2
+bindsym Mod4+3 workspace 3
+bindsym Mod4+4 workspace 4
+bindsym Mod4+5 workspace 5
+bindsym Mod4+6 workspace 6
+bindsym Mod4+7 workspace 7
+bindsym Mod4+8 workspace 8
+bindsym Mod4+9 workspace 9
+bindsym Mod4+0 workspace 10
+bindsym Mod4+Tab workspace next
+bindsym Mod4+Shift+Tab workspace prev
+
+# move focused container to workspace
+bindsym Mod4+Shift+1 move container to workspace 1
+bindsym Mod4+Shift+2 move container to workspace 2
+bindsym Mod4+Shift+3 move container to workspace 3
+bindsym Mod4+Shift+4 move container to workspace 4
+bindsym Mod4+Shift+5 move container to workspace 5
+bindsym Mod4+Shift+6 move container to workspace 6
+bindsym Mod4+Shift+7 move container to workspace 7
+bindsym Mod4+Shift+8 move container to workspace 8
+bindsym Mod4+Shift+9 move container to workspace 9
+bindsym Mod4+Shift+0 move container to workspace 10
+
+# 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 $left       resize shrink width 10 px or 10 ppt
+		bindsym $down       resize shrink height 10 px or 10 ppt
+		bindsym $up         resize grow height 10 px or 10 ppt
+		bindsym $right      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 shrink height 10 px or 10 ppt
+		bindsym Up          resize grow 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 Mod4+r mode "resize"
+# reload the configuration file
+bindsym Mod4+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym Mod4+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym Mod4+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# program shortcuts
+# bindsym Mod4+Return exec i3-sensible-terminal
+bindsym Mod4+Shift+Return exec xterm
+bindsym Mod4+Return exec st
+bindsym Mod4+Shift+f exec firefox
+bindsym Mod4+Shift+m exec midori
+bindsym Mod4+e exec thunar
+
+#I wonder how I could map this to other buttons
+#bindsym Mod3+Up exec --no-startup-id pactl set-sink-volume 0 +10%
+##bindsym Mod2+Up exec "pactl set-sink-volume 0 +10%"
+#bindsym Mod1+Up exec "pactl set-sink-volume 0 +10%"
+#bindsym Mod3+F9 exec "pactl set-sink-volume 0 +10%"
+#bindsym Mod3+Down exec "pactl set-sink-volume 0 -10%"
+#bindsym Mod3+F8 exec "pactl set-sink-volume 0 -10%"
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +10%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10%
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle
+
+new_window 1pixel
+
+# just some cosmetic options
+
+#class				border  backgr. text    indicator child_border
+client.background	#222222 #222222
+client.focused		#FFDD11 #222222 #FFFFFF #FFDD11 #FFDD11
+
+#toggle colors
+bindysm Mod4+c exec sed -En 's/^client.background	#[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6}/client.background	#222222 #222222/gp' ~/.i3/config | sed -Eni 's/client.focused		#[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} ##[A-Fa-f-1-9]{6}/client.focused		#FF1111 #222222 #FFFFFF #FF1111 #FF1111/gp'; reload
+bindysm Mod4+ctrl+c exec sed -En 's/^client.background	#[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6}/client.background	#FFFFFF #FFFFFF/gp' ~/.i3/config | sed -Eni 's/client.focused		#[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} #[A-Fa-f-1-9]{6} ##[A-Fa-f-1-9]{6}/client.focused		#001111 #222222 #000000 #001111 #001111/gp'; reload
+
+
+
+exec --no-startup-id feh --randomize --bg-fill ~Wallpapers/* &

+ 186 - 0
i3

@@ -0,0 +1,186 @@
+# i3 config file (v4)
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+#
+# This config file uses keycodes (bindsym) and was written for the QWERTY
+# layout.
+#
+# To get a config file with the same key positions, but for your current
+# layout, use the i3-config-wizard
+#
+
+# 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 these keys for focus, movement, and resize directions when reaching for
+# the arrows is not convenient
+set $up k
+set $down j
+set $left h
+set $right l
+
+# use Mouse+Mod4 to drag floating windows to their wanted position
+floating_modifier Mod4
+
+# kill focused window
+bindsym Mod4+Shift+q kill
+bindsym Mod1+F4 kill
+
+# change focus
+bindsym Mod4+$left focus left
+bindsym Mod4+$down focus down
+bindsym Mod4+$up focus up
+bindsym Mod4+$right focus right
+
+# alternatively, you can use the cursor keys:
+bindsym Mod4+Left focus left
+bindsym Mod4+Down focus down
+bindsym Mod4+Up focus up
+bindsym Mod4+Right focus right
+
+# move focused window - yes, vim bindings.
+bindsym Mod4+Shift+$left move left
+bindsym Mod4+Shift+$down move down
+bindsym Mod4+Shift+$up move up
+bindsym Mod4+Shift+$right move right
+
+# alternatively, you can use the cursor keys:
+bindsym Mod4+Shift+Left move left
+bindsym Mod4+Shift+Down move down
+bindsym Mod4+Shift+Up move up
+bindsym Mod4+Shift+Right move right
+
+# split in horizontal orientation
+bindsym Mod4+shift+v split h
+
+# split in vertical orientation
+bindsym Mod4+v split v
+
+# enter fullscreen mode for the focused container
+bindsym Mod4+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym Mod4+s layout stacking
+bindsym Mod4+w layout tabbed
+bindsym Mod4+Shift+w layout toggle split
+
+# toggle tiling / floating
+bindsym Mod4+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym Mod4+space focus mode_toggle
+
+# focus the parent container
+bindsym Mod4+a focus parent
+
+# focus the child container
+bindsym Mod4+d focus child
+
+# move the currently focused window to the scratchpad
+bindsym Mod4+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym Mod4+minus scratchpad show
+
+# switch to workspace
+bindsym Mod4+1 workspace 1
+bindsym Mod4+2 workspace 2
+bindsym Mod4+3 workspace 3
+bindsym Mod4+4 workspace 4
+bindsym Mod4+5 workspace 5
+bindsym Mod4+6 workspace 6
+bindsym Mod4+7 workspace 7
+bindsym Mod4+8 workspace 8
+bindsym Mod4+9 workspace 9
+bindsym Mod4+0 workspace 10
+bindsym Mod4+Tab workspace next
+bindsym Mod4+Shift+Tab workspace prev
+
+# move focused container to workspace
+bindsym Mod4+Shift+1 move container to workspace 1
+bindsym Mod4+Shift+2 move container to workspace 2
+bindsym Mod4+Shift+3 move container to workspace 3
+bindsym Mod4+Shift+4 move container to workspace 4
+bindsym Mod4+Shift+5 move container to workspace 5
+bindsym Mod4+Shift+6 move container to workspace 6
+bindsym Mod4+Shift+7 move container to workspace 7
+bindsym Mod4+Shift+8 move container to workspace 8
+bindsym Mod4+Shift+9 move container to workspace 9
+bindsym Mod4+Shift+0 move container to workspace 10
+
+# 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 $left       resize shrink width 10 px or 10 ppt
+		bindsym $down       resize shrink height 10 px or 10 ppt
+		bindsym $up         resize grow height 10 px or 10 ppt
+		bindsym $right      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 shrink height 10 px or 10 ppt
+		bindsym Up          resize grow 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 Mod4+r mode "resize"
+# reload the configuration file
+bindsym Mod4+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym Mod4+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym Mod4+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# program shortcuts
+# bindsym Mod4+Return exec i3-sensible-terminal
+bindsym Mod4+Shift+Return exec xterm
+bindsym Mod4+Return exec st
+bindsym Mod4+Shift+f exec firefox
+bindsym Mod4+Shift+m exec midori
+bindsym Mod4+e exec dolphin
+
+#volume
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +10%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10%
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle
+
+
+# just some cosmetic options
+
+new_window 1pixel
+#class				border  backgr. text    indicator child_border
+client.background	#222222 #222222
+client.focused		#FFDD11 #222222 #FFFFFF #FFDD11 #FFDD11
+
+#input devices
+exec setxkbmap de
+#pretty self-explanatory
+exec xinput set-prop 'AlpsPS/2 ALPS GlidePoint' 'Synaptics Tap Action' 1 1 1 1 1 1 1
+exec xinput set-prop 'AlpsPS/2 ALPS GlidePoint' 'Synaptics Two-Finger Scrolling' 1 1
+#had to about halve this value to allow for movement with the fingertip as well - what kinda fucking monster-fingers do I have according to you????
+exec xinput set-prop 'AlpsPS/2 ALPS GlidePoint' 'Synaptics Finger' 6 7 0 
+
+#exec --no-startup-id feh --randomize --bg-fill ~Wallpapers/* &
+#exec xinput set-prop 'AlpsPS/2 ALPS GlidePoint' 'Synaptics Move Speed' 2 2 2 2
+#exec xinput set-prop 'TOSHIBA Web Camera - HD: TOSHIB' 'Device Enabled' 0

+ 7 - 0
setup-vim.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+cp .vimrc ~/.vimrc
+mkdir ~/.vim
+mkdir ~/.vim/bundle #this is for Ctrl-P
+mkdir ~/.vim/plugin
+mkdir ~/.vim/undofiles
+mkdir ~/.vim/swapfiles

+ 4 - 3
setup.sh

@@ -1,7 +1,8 @@
-cp .vimrc ~/.vimrc
+#!/bin/bash
 cp .bashrc ~/.bashrc
 cp .bash_profile ~/.bash_profile
 cp .fishrc ~/.fishrc
 cp .xinitrc ~/.xinitrc
-mkdir -p .config
-cp -r i3 .config/i3
+./setup-vim.sh
+mkdir ~/.config
+cp -r i3 ~/.config/i3