Lots of changes to dotfiles

master
Jonathan Hodgson 6 years ago
parent e21ef89341
commit 08650c1fa5
  1. 113
      i3/config
  2. 177
      i3/configWork
  3. 13
      qutebrowser/autoconfig.yml
  4. 0
      qutebrowser/bookmarks/urls
  5. 55
      qutebrowser/config.py
  6. 0
      qutebrowser/quickmarks
  7. 15
      symlinks.sh
  8. 2
      vim

@ -3,6 +3,7 @@
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod4
set $alt Mod1
set $base00 #101218
set $base01 #1f222d
@ -28,7 +29,7 @@ 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
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
@ -69,6 +70,16 @@ bindsym $mod+u exec ~/.dotfiles/rofi/scripts/rofi-emoji
#kill i3
bindsym $mod+Shift+x exec killall i3
# Man page lookup
bindsym $mod+m exec man -k . | awk '{ print $1 " " $2 }' | rofi -dmenu -p man -matching regex | awk '{ print $2 " " $1 }' | tr -d '()' | xargs man -t | ps2pdf - - | zathura -
# TLDR page lookup
bindsym $mod+Shift+m exec "/usr/bin/tldr --list-all | sed 's/, /\\n/g' | rofi -dmenu -p ';TLDR' -matching regex | xargs tldr -m | pandoc -f markdown -t ms | groff -ms - -T pdf | zathura -"
# WP Lookup
bindsym $mod+Shift+w exec wpLookup
# Send signals to i3 blocks and zsh to tell them that capslock has been pushed
# The message to zsh is technically a "window change" which causes zsh to re-draw the prompt
@ -82,10 +93,6 @@ bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks
for_window [class="xfce4-appfinder"] floating enable
# There also is the (new) i3-dmenu-desktop which only displays applications
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed.
@ -179,11 +186,11 @@ bindsym $mod+Shift+9 move container to workspace $workspace9, workspace $worksp
bindsym $mod+Shift+0 move container to workspace $workspace10, workspace $workspace10
#assign programs to workspaces
assign [class="chromium"] $workspace1
assign [instance="crx_knipolnnllmklapflnccelgolnpehhpl"] to $workspace10
#assign [class="chromium"] $workspace1
#assign [instance="crx_knipolnnllmklapflnccelgolnpehhpl"] to $workspace10
for_window [window_role="gimp-toolbox"] floating disable; move left; move left;
for_window [window_role="gimp-dock"] floating disable; move right; move right;
#for_window [window_role="gimp-toolbox"] floating disable; move left; move left;
#for_window [window_role="gimp-dock"] floating disable; move right; move right;
#make applications open in floating mode
for_window [class="Galculator"] floating enable
@ -240,8 +247,8 @@ bindsym $mod+r mode "resize"
# finds out, if available)
bar {
#status_command i3status
#status_command i3blocks -c ./i3blocks-secondary.conf
status_command i3blocks
#status_command i3blocks -c $HOME/.dotfiles/i3/i3blocks-secondary.conf
status_command i3blocks -c $HOME/.dotfiles/i3/i3blocks.conf
#tray_output primary
colors {
separator $base03
@ -274,7 +281,7 @@ bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
# Touchpad controls
bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
#bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
# Media player controls
bindsym XF86AudioPlay exec playerctl play-pause
@ -291,22 +298,8 @@ bindsym Shift+Print exec xfce4-screenshooter -r
bindsym $mod+x exec --no-startup-id ~/.dotfiles/i3/i3exit logout
set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
mode "$mode_system" {
bindsym l exec --no-startup-id ~/.dotfiles/i3/i3exit lock, mode "default"
bindsym e exec --no-startup-id ~/.dotfiles/i3/i3exit logout, mode "default"
bindsym s exec --no-startup-id ~/.dotfiles/i3/i3exit suspend, mode "default"
bindsym h exec --no-startup-id ~/.dotfiles/i3/i3exit hibernate, mode "default"
bindsym r exec --no-startup-id ~/.dotfiles/i3/i3exit reboot, mode "default"
bindsym Shift+s exec --no-startup-id ~/.dotfiles/i3/i3exit shutdown, mode "default"
# back to normal: Enter or Escape
bindsym Return mode "default"
bindsym Escape mode "default"
}
bindsym ctrl+Shift+l mode "$mode_system"
#bindsym ctrl+l exec "/home/jonathan/.bin/i3exit lock"
bindsym ctrl+shift+l exec --no-startup-id ~/.config/rofi/scripts/rofi-shutdown
##################################################
# #
@ -322,49 +315,49 @@ smart_gaps on
set $mode_gaps Gaps: (o) outer, (i) inner, (d) default
set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
bindsym $mod+Shift+g mode "$mode_gaps"
mode "$mode_gaps" {
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
bindsym d gaps inner current set 10; gaps outer current set 0
bindsym Shift+d gaps inner all set 10; gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
bindsym d gaps inner current set 10; gaps outer current set 0
bindsym Shift+d gaps inner all set 10; gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_inner" {
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
bindsym 0 gaps inner current set 0
bindsym d gaps inner current set 10
bindsym Shift+plus gaps inner all plus 5
bindsym Shift+minus gaps inner all minus 5
bindsym Shift+0 gaps inner all set 0
bindsym Shift+d gaps inner all set 10
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
bindsym 0 gaps inner current set 0
bindsym d gaps inner current set 10
bindsym Shift+plus gaps inner all plus 5
bindsym Shift+minus gaps inner all minus 5
bindsym Shift+0 gaps inner all set 0
bindsym Shift+d gaps inner all set 10
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_outer" {
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
bindsym 0 gaps outer current set 0
bindsym d gaps outer current set 0
bindsym Shift+plus gaps outer all plus 5
bindsym Shift+minus gaps outer all minus 5
bindsym Shift+0 gaps outer all set 0
bindsym Shift+d gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
bindsym 0 gaps outer current set 0
bindsym d gaps outer current set 0
bindsym Shift+plus gaps outer all plus 5
bindsym Shift+minus gaps outer all minus 5
bindsym Shift+0 gaps outer all set 0
bindsym Shift+d gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
exec_always --no-startup-id setbackground
exec --no-startup-id compton -f -i 0.95
#exec_always --no-startup-id albert

@ -140,7 +140,7 @@ bindsym $mod+space focus mode_toggle
bindsym $mod+a focus parent
# focus the child container
bindsym $mod+Shift+a focus child
#bindsym $mod+Shift+a focus child
#set workspace names
@ -201,30 +201,30 @@ bindsym $mod+Shift+r restart
# 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 j resize grow height 10 px or 10 ppt
bindsym k resize shrink height 10 px or 10 ppt
bindsym l resize grow width 10 px or 10 ppt
bindsym $mod+h resize shrink width 2 px or 2 ppt
bindsym $mod+j resize grow height 2 px or 2 ppt
bindsym $mod+k resize shrink height 2 px or 2 ppt
bindsym $mod+l resize grow width 2 px or 2 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"
# 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 j resize grow height 10 px or 10 ppt
bindsym k resize shrink height 10 px or 10 ppt
bindsym l resize grow width 10 px or 10 ppt
bindsym $mod+h resize shrink width 2 px or 2 ppt
bindsym $mod+j resize grow height 2 px or 2 ppt
bindsym $mod+k resize shrink height 2 px or 2 ppt
bindsym $mod+l resize grow width 2 px or 2 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 $mod+r mode "resize"
@ -241,39 +241,39 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
bar {
#status_command i3status
status_command i3blocks
output primary
tray_output primary
position top
colors {
separator $base03
background $base01
statusline $base05
# border background text
focused_workspace $base01 $base01 $base07
active_workspace $base01 $base02 $base03
inactive_workspace $base01 $base01 $base03
urgent_workspace $base01 $base01 $base08
}
#status_command i3status
status_command i3blocks
output primary
tray_output primary
position top
colors {
separator $base03
background $base01
statusline $base05
# border background text
focused_workspace $base01 $base01 $base07
active_workspace $base01 $base02 $base03
inactive_workspace $base01 $base01 $base03
urgent_workspace $base01 $base01 $base08
}
}
bar {
#status_command i3status
status_command i3blocks -c ~/.dotfiles/i3/i3blocks-secondary.conf
output HDMI-1
tray_output none
position top
colors {
separator $base03
background $base01
statusline $base05
# border background text
focused_workspace $base01 $base01 $base07
active_workspace $base01 $base02 $base03
inactive_workspace $base01 $base01 $base03
urgent_workspace $base01 $base01 $base08
}
#status_command i3status
status_command i3blocks -c ~/.dotfiles/i3/i3blocks-secondary.conf
output HDMI-1
tray_output none
position top
colors {
separator $base03
background $base01
statusline $base05
# border background text
focused_workspace $base01 $base01 $base07
active_workspace $base01 $base02 $base03
inactive_workspace $base01 $base01 $base03
urgent_workspace $base01 $base01 $base08
}
}
bindsym $mod+c exec chromium-snapshot-bin, workspace $workspace1
@ -289,6 +289,7 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% &
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -SIGRTMIN+10 i3blocks #decrease sound volume
bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle && pkill -SIGRTMIN+10 i3blocks # mute sound
#Alt + scroll for volume
bindsym --whole-window $alt+button4 exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -SIGRTMIN+10 i3blocks #decrease sound volume
bindsym --whole-window $alt+button5 exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -SIGRTMIN+10 i3blocks #increase sound volume
@ -297,9 +298,9 @@ bindsym --whole-window $alt+button5 exec --no-startup-id pactl set-sink-volume 0
# Media player controls
bindsym XF86AudioPlay exec playerctl play-pause
#bindsym XF86AudioPause exec playerctl pause
#bindsym XF86AudioNext exec playerctl next
#bindsym XF86AudioPrev exec playerctl previous
bindsym XF86AudioPause exec playerctl pause
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
#calculator button
bindsym XF86Calculator exec galculator
@ -332,41 +333,41 @@ set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
bindsym $mod+Shift+g mode "$mode_gaps"
mode "$mode_gaps" {
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
bindsym d gaps inner current set 10; gaps outer current set 0
bindsym Shift+d gaps inner all set 10; gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym o mode "$mode_gaps_outer"
bindsym i mode "$mode_gaps_inner"
bindsym d gaps inner current set 10; gaps outer current set 0
bindsym Shift+d gaps inner all set 10; gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_inner" {
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
bindsym 0 gaps inner current set 0
bindsym d gaps inner current set 10
bindsym Shift+plus gaps inner all plus 5
bindsym Shift+minus gaps inner all minus 5
bindsym Shift+0 gaps inner all set 0
bindsym Shift+d gaps inner all set 10
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym plus gaps inner current plus 5
bindsym minus gaps inner current minus 5
bindsym 0 gaps inner current set 0
bindsym d gaps inner current set 10
bindsym Shift+plus gaps inner all plus 5
bindsym Shift+minus gaps inner all minus 5
bindsym Shift+0 gaps inner all set 0
bindsym Shift+d gaps inner all set 10
bindsym Return mode "default"
bindsym Escape mode "default"
}
mode "$mode_gaps_outer" {
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
bindsym 0 gaps outer current set 0
bindsym d gaps outer current set 0
bindsym Shift+plus gaps outer all plus 5
bindsym Shift+minus gaps outer all minus 5
bindsym Shift+0 gaps outer all set 0
bindsym Shift+d gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
bindsym plus gaps outer current plus 5
bindsym minus gaps outer current minus 5
bindsym 0 gaps outer current set 0
bindsym d gaps outer current set 0
bindsym Shift+plus gaps outer all plus 5
bindsym Shift+minus gaps outer all minus 5
bindsym Shift+0 gaps outer all set 0
bindsym Shift+d gaps outer all set 0
bindsym Return mode "default"
bindsym Escape mode "default"
}
exec --no-startup-id redshift

@ -0,0 +1,13 @@
# DO NOT edit this file by hand, qutebrowser will overwrite it.
# Instead, create a config.py - see :help for details.
config_version: 2
settings:
fonts.tabs:
global: 8pt monospace
tabs.max_width:
global: 20
tabs.position:
global: left
tabs.width:
global: 7%

@ -0,0 +1,55 @@
# Autogenerated config.py
# Documentation:
# qute://help/configuring.html
# qute://help/settings.html
# Uncomment this to still load settings configured via autoconfig.yml
# config.load_autoconfig()
# Enable JavaScript.
# Type: Bool
config.set('content.javascript.enabled', True, 'file://*')
# Enable JavaScript.
# Type: Bool
config.set('content.javascript.enabled', True, 'chrome://*/*')
# Enable JavaScript.
# Type: Bool
config.set('content.javascript.enabled', True, 'qute://*/*')
# ,m opens page with mpv
config.bind(',m', 'spawn --detach mpv {url}')
# ,M hints and oens choice with mpv
config.bind(',M', 'hint links spawn --detach mpv {hint-url}')
# Position of the tab bar.
# Type: Position
# Valid values:
# - top
# - bottom
# - left
# - right
c.tabs.position = 'left'
# Width (in pixels or as percentage of the window) of the tab bar if
# it's vertical.
# Type: PercOrInt
c.tabs.width = '7%'
# Maximum width (in pixels) of tabs (-1 for no maximum). This setting
# only applies when tabs are horizontal. This setting does not apply to
# pinned tabs, unless `tabs.pinned.shrink` is False. This setting may
# not apply properly if max_width is smaller than the minimum size of
# tab contents, or smaller than tabs.min_width.
# Type: Int
c.tabs.max_width = 20
# Font used in the tab bar.
# Type: QtFont
c.fonts.tabs = '8pt monospace'
c.url.searchengines['goog'] = 'https://google.com/search?q={}'
c.url.searchengines['aur'] = 'https://aur.archlinux.org/packages/?O=0&K={}'
c.url.searchengines['aw'] = 'https://wiki.archlinux.org/?search={}'

@ -13,20 +13,23 @@ if [[ "$answer" == "y" || "$answer" == "Y" ]]; then
force=true
fi
echo ""
# A wrapper around ln which will force if necesary
function myLink(){
if $force; then
/usr/bin/ln -sf "$1" "$2"
echo "forced $2 -> $1"
else
/usr/bin/ln -s "$1" "$2"
if [ ! -e "$2" ]; then
echo "${1} -> ${2}"
/usr/bin/ln -s "$1" "$2"
fi
fi
}
#ZSH
myLink $HOME/.dotfiles/shells/zsh/zprofile $HOME/.zprofile
myLink $HOME/.dotfiles/shells/zsh/zshrc $HOME/.zshrc
myLink $HOME/.dotfiles/shells/zsh/zshrc $HOME/.zshrc.pre-oh-my-zsh
#bash
myLink $HOME/.dotfiles/shells/bash/bash_profile $HOME/.bash_profile
@ -34,7 +37,7 @@ myLink $HOME/.dotfiles/shells/bash/bashrc $HOME/.bashrc
#X
myLink $HOME/.dotfiles/x/xinitrc $HOME/.xinitrc
myLink /home/jonathan/.dotfiles/x/xmodmap $HOME/.Xmodmap
myLink $HOME/.dotfiles/x/xmodmap $HOME/.Xmodmap
#Git
myLink $HOME/.dotfiles/git/gitconfig $HOME/.gitconfig
@ -42,9 +45,7 @@ myLink $HOME/.dotfiles/git/gitconfig $HOME/.gitconfig
#i3
mkdir -p $HOME/.config/i3
myLink $HOME/.dotfiles/i3/config $HOME/.config/i3/config
#i3blocks
myLink $HOME/.dotfiles/i3/i3blocks.conf $HOME/.i3blocks.conf
myLink /home/jonathan/.dotfiles/i3/i3exit $HOME/.config/i3/i3exit
#dunst
myLink $HOME/.dotfiles/dunst $HOME/.config/dunst
@ -62,3 +63,5 @@ myLink $HOME/.dotfiles/Templates $HOME/Templates
#Pandoc
myLink $HOME/.dotfiles/pandoc $HOME/.pandoc
#Qutebrowser
myLink $HOME/.dotfiles/qutebrowser $HOME/.config/qutebrowser

2
vim

@ -1 +1 @@
Subproject commit 319b2b33b86414ec4a3ca18d0b6cf543f5443726
Subproject commit 4a1f1fcdd83aa219a431c0a8d7a18ec7a7458cb5
Loading…
Cancel
Save