commit 431c30117a55d6241dace8ad16d30920bb6374e5
parent acd5870999bffe571bccb35371287d93b2b1ee83
Author: Ashymad <czilukim@o2.pl>
Date: Wed, 19 Dec 2018 15:17:35 +0100
Merge remote-tracking branch 'origin/master' into notwobug
Diffstat:
6 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
@@ -17,7 +17,7 @@ env:
# Window dimensions in character columns and lines
# Falls back to size specified by window manager if set to 0x0.
# (changes require restart)
-dimensions:
+window.dimensions:
columns: 80
lines: 24
@@ -29,15 +29,15 @@ scrollback:
# Adds this many blank pixels of padding around the window
# Units are physical pixels; this is not DPI aware.
# (change requires restart)
-padding:
- x: 2
- y: 2
+window.padding:
+ x: 0
+ y: 0
# Display tabs using this many cells (changes require restart)
tabspaces: 8
# When true, bold text is drawn using the bright variant of colors.
-draw_bold_text_with_bright_colors: true
+draw_bold_text_with_bright_colors: false
# Font configuration (changes require restart)
#
@@ -61,37 +61,37 @@ draw_bold_text_with_bright_colors: true
font:
# The normal (roman) font face to use.
normal:
- family: Monofur # should be "Menlo" or something on macOS.
+ family: Code New Roman # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
style: Regular
# The bold font face
bold:
- family: Monofur # # should be "Menlo" or something on macOS.
+ family: Code New Roman # # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
style: Bold
# The italic font face
italic:
- family: Monofur # should be "Menlo" or something on macOS.
+ family: Code New Roman # should be "Menlo" or something on macOS.
# Style can be specified to pick a specific face.
style: Italic
# Point size of the font
- size: 16.0
+ size: 9.0
# Offset is the extra space around each character. offset.y can be thought of
# as modifying the linespacing, and offset.x as modifying the letter spacing.
offset:
- x: -1.0
- y: 0.0
+ x: 0
+ y: -2
# Glyph offset determines the locations of the glyphs within their cells with
# the default being at the bottom. Increase the x offset to move the glyph to
# the right, increase the y offset to move the glyph upward.
glyph_offset:
- x: 0.0
- y: 0.0
+ x: 0
+ y: 0
# OS X only: use thin stroke font rendering. Thin strokes are suitable
# for retina displays, but for non-retina you probably want this set to
@@ -101,10 +101,6 @@ font:
# Should display the render timer
render_timer: false
-# Use custom cursor colors. If true, display the cursor in the cursor.foreground
-# and cursor.background colors, otherwise invert the colors of the cursor.
-custom_cursor_colors: false
-
# Colors (Tomorrow Night Bright)
colors:
# Default colors
@@ -204,7 +200,7 @@ mouse:
selection:
semantic_escape_chars: ",│`|:\"' ()[]{}<>"
-hide_cursor_when_typing: false
+mouse.hide_when_typing: false
# Style of the cursor
#
@@ -212,7 +208,7 @@ hide_cursor_when_typing: false
# - Block
# - Underline
# - Beam
-cursor_style: Block
+cursor.style: Block
# Live config reload (changes require restart)
live_config_reload: true
@@ -272,10 +268,10 @@ key_bindings:
- { key: Key0, mods: Control, action: ResetFontSize }
- { key: Equals, mods: Control, action: IncreaseFontSize }
- { key: Subtract, mods: Control, action: DecreaseFontSize }
- - { key: Up, mods: Control|Shift, action: ScrollUp }
- - { key: Down, mods: Control|Shift, action: ScrollDown }
- - { key: PageUp, mods: Shift, action: PageUp }
- - { key: PageDown, mods: Shift, action: PageDown }
+ - { key: Up, mods: Control|Shift, action: ScrollToTop }
+ - { key: Down, mods: Control|Shift, action: ScrollToBottom }
+ - { key: PageUp, mods: Shift, action: ScrollPageUp }
+ - { key: PageDown, mods: Shift, action: ScrollPageDown }
- { key: Home, chars: "\x1bOH", mode: AppCursor }
- { key: Home, chars: "\x1b[H", mode: ~AppCursor }
- { key: End, chars: "\x1bOF", mode: AppCursor }
diff --git a/fish/.config/fish/functions/aur-resync-devel.fish b/fish/.config/fish/functions/aur-resync-devel.fish
@@ -1,4 +1,5 @@
function aur-resync-devel
- aur sync --list | cut -f2 | grep -E -- "-$AURVCS" | xargs aur sync --no-ver --print
+ set packages (aur repo --list | cut -f1 | grep -E "$AURVCS")
+ aur sync $packages --no-ver --print
end
diff --git a/fish/.config/fish/functions/aur-update-devel.fish b/fish/.config/fish/functions/aur-update-devel.fish
@@ -1,4 +1,6 @@
function aur-update-devel
- aur vercmp-devel | cut -d: -f1 >/tmp/vcs.txt
- xargs -a /tmp/vcs.txt aur sync --no-ver-shallow
+ set packages (aur vercmp-devel | cut -d: -f1)
+ if not test -z "$packages"
+ aur sync $packages --no-ver-shallow
+ end
end
diff --git a/fish/.config/fish/functions/aur.fish b/fish/.config/fish/functions/aur.fish
@@ -2,8 +2,6 @@
function aur
if test -f "$HOME/.config/fish/functions/aur-$argv[1].fish"
eval "aur-$argv[1]" $argv[2..-1]
- else if test -f "/usr/share/aurutils/contrib/$argv[1]"
- bash -- "/usr/share/aurutils/contrib/$argv[1]" $argv[2..-1]
else
/usr/bin/aur $argv
end
diff --git a/i3/.i3/config b/i3/.i3/config
@@ -132,6 +132,9 @@ bindsym XF86TouchpadToggle exec --no-startup-id ~/.i3/toggle_touchpad.sh 'SynPS/
# Change wallpaper
bindsym $mod+p exec --no-startup-id ~/.fehbg
+# Take screenshot
+bindsym $mod+Shift+s exec --no-startup-id flameshot gui
+
# class border backgr. text indicator
client.focused #4f4f4f #4f4f4f #ffffff #4f4f4f
client.unfocused #323232 #323232 #aaaaaa #323232
@@ -142,6 +145,7 @@ for_window [instance="polybar"] gaps inner 0
for_window [instance="mpv"] pixel 0
for_window [instance="^r_x11$"] floating enable
for_window [instance="^octave\-gui$"] floating enable
+for_window [instance="^matplotlib$"] floating enable
exec --no-startup-id /usr/lib/geoclue-2.0/demos/agent
exec --no-startup-id redshift-gtk
diff --git a/whipper/.config/whipper/whipper.conf b/whipper/.config/whipper/whipper.conf
@@ -4,7 +4,15 @@ model = CD-RW SOHR-5238S
release = 4S09
defeats_cache = True
read_offset = 6
+
[whipper.cd.rip]
output_directory = ~/ripped/
track_template = %%A - %%d (%%y)/%%t. %%a - %%n
disc_template = %%A - %%d (%%y)/%%A - %%d (%%y)
+
+[drive:TSSTcorp%3ACDDVDW%20SU-208GB%20%3ATM00]
+vendor = TSSTcorp
+model = CDDVDW SU-208GB
+release = TM00
+read_offset = 6
+