commit 6b792b2797ab2110fa03cd3ec8ef30f14355c616
parent 195edcabcae6040c0f3e1a4a17e569982a35c4d5
Author: Ashymad <czilukim@o2.pl>
Date: Mon, 2 Jul 2018 18:56:51 +0200
Merge branch 'master' into notwobug
Diffstat:
8 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/astroid/.config/astroid/config b/astroid/.config/astroid/config
@@ -13,13 +13,13 @@
},
"terminal": {
"height": "10",
- "font_description": "Monofur Nerd Font"
+ "font_description": "Overpass"
},
"thread_index": {
"page_jump_rows": "6",
"sort_order": "newest",
"cell": {
- "font_description": "Monofur Nerd Font 14",
+ "font_description": "Overpass 14",
"line_spacing": "2",
"date_length": "10",
"message_count_length": "4",
@@ -96,7 +96,8 @@
"crypto": {
"gpg": {
"path": "gpg2",
- "always_trust": "true"
+ "always_trust": "true",
+ "enabled": "true"
}
},
"saved_searches": {
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
@@ -1,7 +1,7 @@
;; (package-initialize)
;; Sane amount of scroll
-(setq mouse-wheel-scroll-amount '(1))
+(setq mouse-wheel-scroll-amount '(3))
(setq mouse-wheel-progressive-speed nil)
;; Setup package.el
@@ -134,7 +134,7 @@
'(ansi-color-faces-vector
[default default default italic underline success warning error])
'(ansi-color-names-vector
- ["#242424" "#e5786d" "#95e454" "#cae682" "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"])
+ ["#282c34" "#ff6c6b" "#98be65" "#da8548" "#61afef" "#c678dd" "#1f5582" "#abb2bf"])
'(custom-enabled-themes (quote (zerodark)))
'(custom-safe-themes
(quote
@@ -149,4 +149,4 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(default ((t (:family "Monofur Nerd Font Mono" :foundry "unci" :slant normal :weight normal :height 158 :width normal)))))
+ '(default ((t (:family "Fira Code" :foundry "CTDB" :slant normal :weight normal :height 143 :width normal)))))
diff --git a/fish/.config/fish/functions/aur.fish b/fish/.config/fish/functions/aur.fish
@@ -1,8 +1,8 @@
function aur --wraps 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/aur-$argv[1]"
- bash -- "/usr/share/aurutils/contrib/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
@@ -137,6 +137,7 @@ client.urgent #383a3b #383a3b #ee0000 #383a3b
for_window [instance="polybar"] gaps inner 0
for_window [instance="mpv"] pixel 0
+for_window [instance="^r_x11$"] floating enable
exec --no-startup-id redshift-gtk
exec --no-startup-id ~/.fehbg
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
@@ -11,13 +11,13 @@
#
# You can get a list of full family names available on your computer by running
# kitty list-fonts
-font_family monofur Nerd Font Complete Mono
-italic_font monofur italic Nerd Font Complete Mono
-bold_font monofur bold Nerd Font Complete Mono
+font_family Fira Code
+#italic_font monofur italic
+#bold_font spacefurs-mono
bold_italic_font auto
# Font size (in pts)
-font_size 16.0
+font_size 14.0
# The amount the font size is changed by (in pts) when increasing/decreasing
# the font size in a running terminal.
@@ -392,7 +392,3 @@ macos_hide_titlebar no
# break any Alt+key keyboard shortcuts in your terminal programs, but you
# can use the macOS unicode input technique.
macos_option_as_alt yes
-
-# The number is a percentage of maximum volume.
-# See man XBell for details.
-x11_bell_volume 80
diff --git a/nvim/.config/nvim/ginit.vim b/nvim/.config/nvim/ginit.vim
@@ -1,5 +1,5 @@
if exists('g:GtkGuiLoaded')
- call rpcnotify(1, 'Gui', 'Font', 'FuraCode Nerd Font 13')
+ call rpcnotify(1, 'Gui', 'Font', 'Fira Code 13')
elseif exists('g:GuiLoaded')
- Guifont FuraCode Nerd Font Mono:h13
+ Guifont Fira Code:h13
endif
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -12,7 +12,7 @@ Plug 'joshdick/onedark.vim'
Plug 'itchyny/lightline.vim'
" Syntax highlighting
-Plug 'sheerun/vim-polyglot'
+" Plug 'sheerun/vim-polyglot'
" Filesystem
Plug 'scrooloose/nerdtree'
@@ -51,6 +51,9 @@ Plug 'tpope/vim-fugitive'
" Camel/Snake case movement
Plug 'bkad/CamelCaseMotion'
+" Pweave
+Plug 'coyotebush/vim-pweave'
+
call plug#end()
" Enable CamelCaseMotion
@@ -118,7 +121,7 @@ if !exists('g:deoplete#omni#input_patterns')
endif
let g:deoplete#omni#input_patterns.tex = g:vimtex#re#deoplete
-map <C-l> :NERDTreeToggle<CR>
+map <C-k> :NERDTreeToggle<CR>
set hidden
@@ -132,12 +135,13 @@ nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
-let R_latexcmd = ['latexmk','-pdf','-pdflatex="xelatex -synctex=1 -interaction=nonstopmode"']
+" let R_latexcmd = ['latexmk','-pdf','-pdflatex="lualatex -synctex=1 -interaction=nonstopmode"']
syntax on
colorscheme onedark
set noshowmode
set nu
+set mouse=a
set tabstop=8
set softtabstop=4
diff --git a/trackma/.trackma/ui-qt.json b/trackma/.trackma/ui-qt.json
@@ -13,7 +13,13 @@
"progress_sub_fg": "#5187B1"
},
"columns_per_api": false,
- "columns_state": {},
+ "columns_state": {
+ "COMPLETED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAAGZQAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAUgAAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
+ "CURRENT": "AAAA/wAAAAAAAAABAAAAAQAAAAYBAAAACwAAAAAAAAABAAAAAgAAAAMAAAAFAAAABAAAAAYAAAAHAAAACAAAAAkAAAAKAAAACwAAAAAAAAABAAAAAgAAAAMAAAAFAAAABAAAAAYAAAAHAAAACAAAAAkAAAAKAAAAC5EHAAAABgAAAAkAAABkAAAACgAAAGQAAAAAAAAAZAAAAAUAAABkAAAABwAAAGQAAAAIAAAAZAAABnMAAAALAQEAAAAAAAABAAAAAAAAAGT/////AAAAhAAAAAAAAAALAAAAAAAAAAEAAAAAAAAFIAAAAAEAAAABAAAARgAAAAEAAAACAAAANwAAAAEAAAACAAAAAAAAAAEAAAAAAAAAcgAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAAAA",
+ "DROPPED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
+ "PAUSED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
+ "PLANNING": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA="
+ },
"episodebar_style": 1,
"episodebar_text": false,
"filter_bar_position": 2,
@@ -23,9 +29,11 @@
"last_x": 0,
"last_y": 0,
"notifications": true,
- "remember_columns": false,
+ "remember_columns": true,
"remember_geometry": false,
"show_tray": true,
+ "sort_index": 6,
+ "sort_order": 1,
"start_in_tray": false,
"tray_api_icon": false,
"visible_columns": [
