diff --git a/.bashrc b/.bashrc index 042f8c6..dbe9837 100644 --- a/.bashrc +++ b/.bashrc @@ -39,14 +39,14 @@ man() { command man "$@" } -alias ls='ls --color=auto' +alias ls='ls --color=always' alias l='ls' alias la='ls -A' alias ll='ls -lah' alias tree='tree -CL 2' -#alias vim='nvim' alias nv='nvim' -export EDITOR=vim +export EDITOR=nvim +export VISUAL=wm_spawn alias feh='feh --scale-down' #alias xclip="xclip -selection clipboard" diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 076b6d6..096da00 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,6 +1,7 @@ [Settings] gtk-icon-theme-name = Arc -gtk-theme-name = Arc-Dark-solid +gtk-theme-name = Arc +# gtk-theme-name = Arc-Dark-solid gtk-font-name = Noto Sans 11 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=0 @@ -15,4 +16,4 @@ gtk-xft-hinting=1 gtk-xft-hintstyle=hintfull gtk-xft-rgba=rgb gtk-decoration-layout=menu:close -gtk-application-prefer-dark-theme=1 +#gtk-application-prefer-dark-theme=0 diff --git a/.config/sway/config b/.config/sway/config index 57b3316..09998f3 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -21,6 +21,7 @@ set $term alacritty # # Your preferred application launcher # set $menu dmenu_run +# set $menu bemenu-run # Note: it's recommended that you pass the final command to sway set $menu dmenu_path | dmenu | xargs swaymsg exec -- @@ -33,9 +34,9 @@ bindsym $mod+Shift+z exec "date --iso-8601='seconds' | tr -d '\n' | wl-copy" # bindsym $mod+Shift+z exec "date --iso-8601='seconds' | tr -d '\n' | xclip -selection clipboard" #audio output kbd control- pulse audio -bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% -bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% -bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle #audio output kbd control- alsa utils #bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute #bindsym XF86AudioRaiseVolume exec amixer -q set Master 2dB+ unmute @@ -191,7 +192,7 @@ bindsym $mod+Shift+r restart # Exit sway (logs you out of your Wayland session) bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' -# resize windowfigures/2020-02-25-021616.png" (you can also use the mouse for that) +# resize window (you can also use the mouse for that) mode "resize" { # These bindings trigger as soon as you enter the resize mode @@ -313,3 +314,4 @@ include /etc/sway/config.d/* # exec xrdb -load ~/.Xresources # exec mako exec dunst +exec_always "systemctl --user import-environment; systemctl --user start sway-session.target" diff --git a/.config/systemd/user/check-battery.service b/.config/systemd/user/check-battery.service index 272f49f..62afb99 100644 --- a/.config/systemd/user/check-battery.service +++ b/.config/systemd/user/check-battery.service @@ -2,6 +2,5 @@ Description=check-battery [Service] -Type=oneshot ExecStart=%h/bin/check-battery.sh diff --git a/.cups/lpoptions b/.cups/lpoptions index 68c0089..5759973 100644 --- a/.cups/lpoptions +++ b/.cups/lpoptions @@ -1 +1 @@ -Default HP402 +Default HP402dn diff --git a/.vimrc b/.vimrc index e1a4ebb..13119e2 100644 --- a/.vimrc +++ b/.vimrc @@ -94,7 +94,7 @@ Plug 'tpope/vim-surround' " Plug 'rhysd/vim-grammarous' "cmd :GrammarousCheck, req java "todo.txt: https://github.com/freitass/todo.txt-vim -Plug 'freitass/todo.txt-vim' +" Plug 'freitass/todo.txt-vim' " if localleader is '\' then for todo.txt files: " s sort " s+ sort on projects @@ -193,6 +193,7 @@ let g:jupyter_cell_separators = ['##', '#%%', '# %%', '# ', '```'] nnoremap r :JupyterSendCell " execute lines in visual mode: e " buffer local var for kernel can be python, ir, javascript, julia, rust +" :JupyterConnect " b:jupyter_kernel_type = "JupyterSendRange @@ -227,6 +228,9 @@ nnoremap r :JupyterSendCell "call neomake#configure#automake('nrwi', 500) "General vim config +set title +set noshowmode +"set cmdheight=0 set tabstop=8 set softtabstop=4 set shiftwidth=4 @@ -269,6 +273,7 @@ set mouse=n "Quick save config imap ;s :update nmap ;s :update +nmap ;q :quit " imap jjw :update " vs and running code @@ -306,8 +311,6 @@ augroup resCur autocmd BufReadPost * call setpos(".", getpos("'\"")) augroup END -set title - " Triger `autoread` when files changes on disk " https://unix.stackexchange.com/questions/149209/refresh-changed-content-of-file-opened-in-vim/383044#383044 " https://vi.stackexchange.com/questions/13692/prevent-focusgained-autocmd-running-in-command-line-editing-mode @@ -365,13 +368,37 @@ let g:NERDSpaceDelims = 1 "Use compact syntax for prettified multi-line comments let g:NERDCompactSexyComs = 1 -" set background=dark +" Configure status bar toggle +let s:hidden_all = 0 +function! ToggleHiddenAll() + if s:hidden_all == 0 + let s:hidden_all = 1 + set noshowmode + set noruler + set laststatus=0 + set noshowcmd + "set cmdheight=0 + else + let s:hidden_all = 0 + set showmode + set ruler + set laststatus=2 + set showcmd + endif +endfunction + +nnoremap :call ToggleHiddenAll() + +" Configure color +set background=dark if filereadable(expand("~/.vimrc_background")) let base16colorspace=256 source ~/.vimrc_background endif -colorscheme base16-gruvbox-dark-hard +" Set color manually +" colorscheme base16-gruvbox-dark-hard +colorscheme base16-atelier-dune-light "gvim options " if &t_Co > 2 || has("gui_running") @@ -384,10 +411,12 @@ if has("gui_running") " default is go=aegimrLtT set go=aegLt ":set go+=m or go-=m to toggle menu - colorscheme base16-atelier-dune + " colorscheme base16-atelier-dune-light + " colorscheme base16-gruvbox-dark-hard autocmd VimEnter * Goyo autocmd VimEnter * Limelight0.8 "Switch cursor blink rate to 0msec set guicursor+=a:blinkon0 + set noshowmode endif