small changes

direnv/.config/direnv/direnvrc

@@ -1,5 +1 @@
-use_flake() {
+source /run/current-system/sw/share/nix-direnv/direnvrc
-  watch_file flake.nix
-  watch_file flake.lock
-  eval "$(nix print-dev-env --profile "$(direnv_layout_dir)/flake-profile")"
-}

nvim/.config/nvim/init.vim

@@ -22,35 +22,26 @@ Plug 'godlygeek/tabular'
 Plug 'preservim/vim-markdown'
 
 " pretty bits
-Plug 'bluz71/vim-moonfly-colors'
+Plug 'jeffkreeftmeijer/vim-dim'
-"Plug 'jeffkreeftmeijer/vim-dim'
-Plug 'vim-airline/vim-airline'
-"Plug 'vim-airline/vim-airline-themes'
-Plug 'luochen1990/rainbow'
 
-" navigating files
+" complete
-Plug 'junegunn/fzf.vim'
+Plug 'Shougo/deoplete.nvim'
-Plug 'junegunn/fzf'
 
 call plug#end()
 
 " filetype magic
 autocmd BufRead,BufNewFile *.nasm set filetype=nasm
 
-" Theme
+colorscheme dim
-set termguicolors
+" bug in neovim 0.8.0
-let g:airline#extensions#tabline#enabled = 1
+hi NormalFloat ctermfg=LightGrey
-set noshowmode " airline shows it for us
-let g:airline#extensions#tabline#buffer_min_count = 2
-let g:airline_theme = 'moonfly'
-colorscheme moonfly
 
 " langmap russian
 set langmap=ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz
 
 " Incrementally show effects of :s, :smagic, :snomagic
 set icm=split
-set signcolumn=yes
+"set signcolumn=yes
 
 " insert images into markdown automagically
 autocmd FileType markdown nmap <buffer><silent> <localleader>p :call mdip#MarkdownClipboardImage()<CR>
@@ -128,14 +119,9 @@ match RedundantSpaces /\s\+\%#\@<!$/
 " TeX
 let g:tex_conceal = ''
 
-" fzf
-nnoremap <leader>f <cmd>GFiles<cr>
-nnoremap <leader>g <cmd>Rg<cr>
-nnoremap <leader>b <cmd>Buffers<cr>
-nnoremap <leader>F <cmd>Files<cr>
-
 " highlight yanked text
 augroup highlight_yank
     autocmd!
     au TextYankPost * silent! lua vim.highlight.on_yank { higroup='IncSearch', timeout=200 }
 augroup END
+

tmux/.tmux.conf

@@ -4,8 +4,8 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 
 unbind C-b
 set -g prefix C-a
-bind a send-prefix
+bind C-a send-prefix
-bind C-a last-window
+#bind C-a last-window
 
 # fix esc problems in vim
 set -s escape-time 0
@@ -25,10 +25,10 @@ setw -g mode-keys vi
 set -g status-keys emacs
 
 # Move between panes with vi keys
-bind h select-pane -L
+#bind h select-pane -L
-bind j select-pane -D
+#bind j select-pane -D
-bind k select-pane -U
+#bind k select-pane -U
-bind l select-pane -R
+#bind l select-pane -R
 
 # set focus events
 set-option -g focus-events on
@@ -48,14 +48,14 @@ setw -g clock-mode-colour white
 set -g pane-border-style 'fg=colour244'
 set -g pane-active-border-style 'fg=colour03'
 
-bind b break-pane -d
+#bind b break-pane -d
 
 # statusbar
 set -g status-position bottom
-set -g status-justify left
+set -g status-justify centre
 set -g status-style 'bg=colour0 fg=colour15'
-#set -g status-right '#[bg=colour0] '
+set -g status-right '[%H:%M][%Y-%m-%d]'
-set -g status-left '[#S]@#H (^_^) [%H:%M] '
+set -g status-left '[#S]@#H (^_^)'
 #set -g status-right-length 50
 set -g status-left-length 40
 setw -g window-status-current-style 'fg=brightgreen bg=colour0 bold'