diff --git a/.vimrc b/.vimrc index a8f1690..7a9919a 100644 --- a/.vimrc +++ b/.vimrc @@ -97,6 +97,7 @@ nnoremap h :set hlsearch! hlsearch? nnoremap he :help nnoremap vhe :vert help nnoremap m :call cursor(0, len(getline('.'))/2) +nnoremap nw :set nowrap nnoremap pli :PlugInstall nnoremap plc :PlugClean nnoremap plu :PlugUpdate diff --git a/aliases/.bash_aliases b/aliases/.bash_aliases index 040ab51..86ad4c6 100644 --- a/aliases/.bash_aliases +++ b/aliases/.bash_aliases @@ -42,6 +42,7 @@ alias r=". ~/.bashrc" alias vag="vi $alias_folder/.git_aliases" alias vap="vi $alias_folder/.pc_aliases" alias v3="vi ~/.config/i3/config" + alias v3b="vi ~/.config/i3blocks/i3blocks.conf" # }}} Config # # redshift diff --git a/aliases/.school_aliases b/aliases/.school_aliases index 5df5cea..f42208e 100644 --- a/aliases/.school_aliases +++ b/aliases/.school_aliases @@ -76,7 +76,9 @@ run() { } # temp alias mkt="make test_print && ./test_print.out" - alias mka="make all && ./print_ptree.out 4463" + alias mka="make all && ./print_ptree.out -d 0 31589" + alias ppt="./print_ptree.out 31589" + alias pptd="./print_ptree.out -d 2 31589" # alias db="gdb ./print_ptree.out < gdb.txt" deb() { gdb ./print_ptree.out < "$1" diff --git a/i3.conf b/i3.conf index 21adab2..f02b0ee 100644 --- a/i3.conf +++ b/i3.conf @@ -7,15 +7,17 @@ exec terminator exec google-chrome # }}} startup # -bindsym control+x kill bindsym $mod+control+Return exec i3-sensible-terminal bindsym Mod4+c exec google-chrome +bindsym Mod4+d exec discord # redshift {{{ # +bindsym $mod+Mod4+1 exec redshift -O 1500 bindsym $mod+Mod4+2 exec redshift -O 2000 bindsym $mod+Mod4+3 exec redshift -O 3000 bindsym $mod+Mod4+4 exec redshift -O 4000 bindsym $mod+Mod4+5 exec redshift -O 5000 +bindsym $mod+Mod4+0 exec redshift -x # }}} redshift # # menu {{{ # @@ -64,6 +66,8 @@ bindsym $mod+b split h # split in vertical orientation bindsym $mod+v split v + +bindsym control+Shift+x kill # }}} changing/focusing/moving windows # # container display {{{ # @@ -89,38 +93,59 @@ bindsym $mod+a focus parent # }}} container display # # workspace {{{ # -# switch to workspace -set $ws1 "1: " -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" +# ws names {{{ # +set $ws1 "1 " +set $ws2 "2 " +set $ws3 "3 " +set $ws4 "4 " +set $ws5 "5 " +set $ws6 "6 " +set $ws7 "7 " +set $ws8 "8 " +set $ws9 "9 " +set $ws0 "0 " +assign [class="discord"] $ws5 +# }}} ws names # # ws bindings {{{ # +# switch to workspace +bindsym $mod+plus workspace next +bindsym $mod+minus workspace prev + bindsym $mod+1 workspace $ws1 bindsym $mod+2 workspace $ws2 bindsym $mod+3 workspace $ws3 bindsym $mod+4 workspace $ws4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 +bindsym $mod+5 workspace $ws5 +bindsym $mod+6 workspace $ws6 +bindsym $mod+7 workspace $ws7 +bindsym $mod+8 workspace $ws8 +bindsym $mod+9 workspace $ws9 +bindsym $mod+0 workspace $ws10 # }}} ws bindings # # move container to ws {{{ # # move focused container to workspace -bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1 -bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 -bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 -bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 7 -bindsym $mod+Shift+8 move container to workspace 8 -bindsym $mod+Shift+9 move container to workspace 9 -bindsym $mod+Shift+0 move container to workspace 10 +bindsym $mod+control+1 move container to workspace $ws1 +bindsym $mod+control+2 move container to workspace $ws2 +bindsym $mod+control+3 move container to workspace $ws3 +bindsym $mod+control+4 move container to workspace $ws4 +# bindsym $mod+control+1 move container to workspace $ws1; workspace $ws1 +# bindsym $mod+control+2 move container to workspace $ws2; workspace $ws2 +# bindsym $mod+control+3 move container to workspace $ws3; workspace $ws3 +# bindsym $mod+control+4 move container to workspace $ws4; workspace $ws4 +bindsym $mod+control+5 move container to workspace $ws5 +bindsym $mod+control+6 move container to workspace $ws6 +bindsym $mod+control+7 move container to workspace $ws7 +bindsym $mod+control+8 move container to workspace $ws8 +bindsym $mod+control+9 move container to workspace $ws9 +bindsym $mod+control+0 move container to workspace $ws10 # }}} move container to ws # + +# gaps {{{ # +# gaps inner 10 +# gaps outer 20 +# }}} gaps # # }}} workspace # # reload config/computer {{{ # @@ -134,39 +159,27 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu # }}} reload config # # resizing windows {{{ # -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym h resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym j resize shrink height 10 px or 10 ppt - bindsym l resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym control+r mode "resize" +bindsym $mod+control+h resize shrink width 10 px or 10 ppt +bindsym $mod+control+k resize grow height 10 px or 10 ppt +bindsym $mod+control+j resize shrink height 10 px or 10 ppt +bindsym $mod+control+l resize grow width 10 px or 10 ppt # }}} resizing windows # # status bar {{{ # # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) +set $sb_font Hack Bold 16 bar { - font pango:System San Francisco Display 12 + font pango:$sb_font + tray_output HDMI_0 status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf - tray_output primary + output HDMI-0 +} + +bar { + output DVI-I-1 + tray_output HDMI_0 + font pango:$sb_font } # }}} status bar # @@ -175,7 +188,7 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:System San Francisco Display 10 +font pango:Hack 11 # 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 @@ -189,10 +202,9 @@ font pango:System San Francisco Display 10 # }}} mod key/font # # media keys {{{ # -# Pulse Audio controls -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound +bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 1 sset Master 5%+ +bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 1 sset Master 5%- +bindsym XF86AudioMute exec --no-startup-id amixer -c 1 amixer -D pulse set Master 1+ toggle # Media player controls bindsym XF86AudioPlay exec playerctl play diff --git a/i3blocks.conf b/i3blocks.conf index f89b7c0..282c7eb 100644 --- a/i3blocks.conf +++ b/i3blocks.conf @@ -1,3 +1,4 @@ +# properties {{{ # # i3blocks config file # # Please see man i3blocks for a complete reference! @@ -19,57 +20,53 @@ # short_text # signal # urgent +# }}} properties # -# Global properties -# +# Global properties {{{ # # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. +align=center command=/usr/share/i3blocks/$BLOCK_NAME -separator_block_width=15 -markup=none +separator=true +separator_block_width=20 +interval=5 +markup=pango +# }}} Global properties # -# Volume indicator -# -# The first parameter sets the step (and units to display) -# The second parameter overrides the mixer selection -# See the script for details. -[volume] -label=VOL -#label=♪ -instance=Master -#instance=PCM -interval=once -signal=10 - -# Date Time -# [time] -label= -command=date '+%H:%M.%m-%d' -interval=5 +command=date '+%H:%M.%a-%m-%d' +interval=30 [load_average] label= -interval=5 +color=#990000 +# font=Hack 14 + +[name] +color=#D1EEEE + +# unused blocks {{{ # +# [memory] +# label= +# color=#006600 -# CPU usage -# -# The script may be called with -w and -c switches to specify thresholds, -# see the script for details. -[cpu_usage] # [cpu_usage -w 50 -c 80] -label= -interval=5 -min_width=CPU: 100.00% -#separator=false +# label= +# min_width=CPU: 100.00% +# color=#adeaea -# Memory usage +# Volume indicator # -# The type defaults to "mem" if the instance is not specified. -[memory] -label= -separator=false -interval=30 +# The first parameter sets the step (and units to display) +# The second parameter overrides the mixer selection +# See the script for details. +# [volume] +# label=VOL +# #label=♪ +# instance=Master +# #instance=PCM +# interval=once +# signal=10 # [memory] # label=SWAP @@ -109,11 +106,11 @@ interval=30 # Battery indicator # # The battery instance defaults to 0. -[battery] -label=BAT -#label=⚡ -#instance=1 -interval=30 +# [battery] +# label=BAT +# #label=⚡ +# #instance=1 +# interval=30 # Generic media player support # @@ -154,3 +151,4 @@ interval=30 #instance=NUM #interval=once #signal=11 +# }}} unused blocks #