Going forward

This commit is contained in:
Tristaan
2018-01-20 21:38:04 +01:00
parent 03870463e6
commit 2480ba453b
4 changed files with 27 additions and 11 deletions

View File

@@ -62,7 +62,7 @@ font-1 = FontAwesome:pixelsize=16;1
modules-left = i3 modules-left = i3
modules-center = xwindow modules-center = xwindow
modules-right = network filesystem volume battery xkeyboard cpu memory date powermenu modules-right = filesystem network volume battery xkeyboard cpu memory date powermenu
tray-position = right tray-position = right
tray-padding = 2 tray-padding = 2

View File

@@ -14,3 +14,11 @@
prompt = true prompt = true
[mergetool "nvimdiff"] [mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[alias]
ch = checkout
co = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p

View File

@@ -2,6 +2,7 @@
#exec --no-stratup-id xrandr --output eDP1 --primary --auto #exec --no-stratup-id xrandr --output eDP1 --primary --auto
exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary exec --no-startup-id xrandr --output HDMI-0 --auto --mode 2048x1152 --primary
exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh exec_always --no-startup-id $HOME/.i3/scripts/polybar_launch.sh
exec_always --no-startup-id compton -G -b --config $HOME/.config/compton/compton.conf
exec --no-startup-id mplayer -fs ~/.i3/boot.mp4 exec --no-startup-id mplayer -fs ~/.i3/boot.mp4
exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360 exec --no-startup-id xset -dpms && xset s noblank && xset s noexpose && xset dpms 600 1800 360
exec --no-startup-id xautolock -time 10 -locker ~/.i3/scripts/locker.sh exec --no-startup-id xautolock -time 10 -locker ~/.i3/scripts/locker.sh
@@ -10,7 +11,6 @@ exec --no-startup-id xautolock -locknow
#exec --no-startup-id urxvtd -q #exec --no-startup-id urxvtd -q
exec --no-startup-id udiskie -t exec --no-startup-id udiskie -t
exec --no-startup-id nitrogen --restore exec --no-startup-id nitrogen --restore
exec --no-startup-id compton -G -b
exec --no-startup-id dunst exec --no-startup-id dunst
#exec --no-startup-id mpd #exec --no-startup-id mpd
exec --no-startup-id megasync exec --no-startup-id megasync
@@ -42,7 +42,7 @@ client.urgent #2f343a #900000 #ffffff #900000
client.placeholder #000000 #0c0c0c #ffffff #000000 client.placeholder #000000 #0c0c0c #ffffff #000000
client.background #ffffff client.background #ffffff
new_window pixel 1 new_window pixel 2
new_float normal 3 new_float normal 3
hide_edge_borders smart hide_edge_borders smart
#//APPEARANCE//# #//APPEARANCE//#
@@ -91,6 +91,7 @@ bindsym $mod+Shift+l move right
bindsym $mod+p focus parent bindsym $mod+p focus parent
bindsym $mod+a layout toggle split bindsym $mod+a layout toggle split
bindsym $mod+s layout stacking bindsym $mod+s layout stacking
bindsym $mod+v layout tabbed
bindsym $mod+x split h bindsym $mod+x split h
bindsym $mod+c split v bindsym $mod+c split v
@@ -191,6 +192,11 @@ bindsym $m+Shift+F2 move container to workspace $WSW2
bindsym $m+Shift+F3 move container to workspace $WSW3 bindsym $m+Shift+F3 move container to workspace $WSW3
bindsym $m+Shift+F4 move container to workspace $WSW4 bindsym $m+Shift+F4 move container to workspace $WSW4
#GAPS
gaps inner 5
gaps outer 2
workspace $ws2 gaps outer 0
workspace $ws2 gaps inner 0
#Multiple screens #Multiple screens
bindsym $mod+Left move container to output left bindsym $mod+Left move container to output left
bindsym $mod+Right move container to output right bindsym $mod+Right move container to output right

2
.zshrc
View File

@@ -53,3 +53,5 @@ alias ccat="source-highlight --out-format=esc -i"
alias lal="ls -la" alias lal="ls -la"
alias lh="ls -lh" alias lh="ls -lh"
alias ip="ip -c" alias ip="ip -c"
alias be="bundle exec"
alias ber="bundle exec rails"