Skip to content

Commit

Permalink
Merge pull request #80 from lucasvazq/develop
Browse files Browse the repository at this point in the history
Update master w develop
  • Loading branch information
lucasvazq authored Aug 17, 2020
2 parents 129769c + 38d8716 commit df9a8f7
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 7 deletions.
84 changes: 84 additions & 0 deletions .config/ranger/rc.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
###############################################################################
# Basic config
###############################################################################


set viewmode miller
set column_ratios 1,3,4
set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$
set show_hidden false
set confirm_on_delete never
set preview_script ~/.config/ranger/scope.sh
set use_preview_script true
set automatically_count_files true
set open_all_images true
set vcs_aware false
set vcs_backend_git enabled
set vcs_backend_hg disabled
set vcs_backend_bzr disabled
set preview_images true
set preview_images_method ueberzug
set unicode_ellipsis false
set show_hidden_bookmarks true
set colorscheme default
set preview_files true
set preview_directories true
set collapse_preview true
set save_console_history true
set status_bar_on_top false
set draw_progress_bar_in_status_bar true
set draw_borders true
set dirname_in_tabs false
set mouse_enabled true
set display_size_in_main_column true
set display_size_in_status_bar true
set display_tags_in_all_columns true
set update_title false
set update_tmux_title false
set shorten_title 3
set tilde_in_titlebar false
set max_history_size 20
set max_console_history_size 50
set scroll_offset 8
set flushinput true
set padding_right true
set autosave_bookmarks true
set autoupdate_cumulative_size false
set show_cursor false
set sort natural
set sort_reverse false
set sort_case_insensitive true
set sort_directories_first true
set sort_unicode false
set xterm_alt_key false
set cd_bookmarks true
set preview_max_size 0
set show_selection_in_titlebar true
set idle_delay 2000
set metadata_deep_search false
set clear_filters_on_dir_change false
set line_numbers false


###############################################################################
# Keybinds
###############################################################################


# Cursor
map l move up=1
map k move down=1
map j move left=1
map ; move right=1
map h set show_hidden!
map s move to=0
map d move to=-1
map [ move up=1 pages=True
map ' move down=1 pages=True

# Insert
map o console delete
map u console touch%space

# Quit
map p quit
1 change: 1 addition & 0 deletions .i3/config
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ set $ws9 9

# Specify open type
for_window [class="^.*"] border pixel 2
for_window [class="^Viewnior$"] border normal
for_window [class="^Pulseeffects$"] floating enable border pixel 2
for_window [class="^Pavucontrol$"] floating enable border pixel 2
for_window [class="^Nm-connection-editor$"] floating enable border pixel 2
Expand Down
7 changes: 5 additions & 2 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


###############################################################################
# General config
# Basic config
###############################################################################


Expand All @@ -26,7 +26,10 @@ export ZSH_THEME=custom
export plugins=(git virtualenv shrink-path)
source $ZSH/oh-my-zsh.sh

# Custom ls config
# ranger config
export RANGER_LOAD_DEFAULT_RC=false

# ls alias
alias ls="ls -F -h --color=always -a"


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@ Considering the words above, there are a couple of things to know to approach th

Using this ship is difficult because the rudder has been very tunned.

I leave at hand a wiki that helps to know the customized keyboard shortcuts used for VSCode, tmux, and i3, and that also lists all the useful functions that are available for the shell.
I leave at hand a wiki that helps to know the customized keyboard shortcuts used for VSCode, ranger, tmux, and i3, and that also lists all the useful functions that are available for the shell.

[Command center](https://github.com/lucasvazq/dotfiles/wiki)
3 changes: 2 additions & 1 deletion docs/Home.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Using this ship is difficult because the rudder has been very tunned.
I leave at hand this wiki that helps to know the customized keyboard shortcuts used for VSCode, tmux, and i3, and that also lists all the useful functions that are available for the shell.
I leave at hand this wiki that helps to know the customized keyboard shortcuts used for VSCode, ranger, tmux, and i3, and that also lists all the useful functions that are available for the shell.

## Keybinds

Expand All @@ -16,6 +16,7 @@ I leave at hand this wiki that helps to know the customized keyboard shortcuts u
</span>

- [VSCode keybinds](https://github.com/lucasvazq/dotfiles/wiki/VSCode-keybinds)
- [ranger keybinds](https://github.com/lucasvazq/dotfiles/wiki/ranger-keybinds)
- [tmux keybinds](https://github.com/lucasvazq/dotfiles/wiki/tmux-keybinds)
- [i3wm keybinds](https://github.com/lucasvazq/dotfiles/wiki/i3-keybinds)

Expand Down
1 change: 1 addition & 0 deletions docs/_Sidebar.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[Keyboard layout](https://github.com/lucasvazq/dotfiles/blob/master/docs/keyboard_layout.png)

- [VSCode keybinds](https://github.com/lucasvazq/dotfiles/wiki/VSCode-keybinds)
- [ranger keybinds](https://github.com/lucasvazq/dotfiles/wiki/ranger-keybinds)
- [tmux keybinds](https://github.com/lucasvazq/dotfiles/wiki/tmux-keybinds)
- [i3wm keybinds](https://github.com/lucasvazq/dotfiles/wiki/i3-keybinds)

Expand Down
29 changes: 29 additions & 0 deletions docs/ranger-keybinds.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Index

1) [Cursor](#cursor)
2) [Insert](#insert)
3) [Quit](#quit)

## Cursor
```yaml
move up=1 l
move down=1 k
move left=1 j
move right=1 ;
set show_hidden! h
move to=0 s
move to=-1 d
move up=1 pages=True [
move down=1 pages=True '
```

## Insert
```yaml
console delete o
console touch%space u
```

## Quit
```yaml
quit q
```
8 changes: 5 additions & 3 deletions setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@

# Ask for password and save it to don't ask for it again in the future
CORRECT_PASSWORD=false
until [ $CORRECT_PASSWORD ]; do
until [ $CORRECT_PASSWORD == true ]; do
echo -n "Password: "
IFS= read -rs PASSWORD
sudo -k
if echo "$PASSWORD" | sudo -Sl &> /dev/null; then
CORRECT_PASSWORD=true
else
echo -e "\nWrong password"
fi
done

# Config yay
yay --save --answerclean None --answerdiff None --answeredit None --noremovemake --cleanafter --noprovides
yay --save --answerclean None --answerdiff None --answeredit None --noremovemake --cleanafter --noprovides --sudoloop

# Update and Upgrade
yes | yay -Syu --sudoloop
yes | yay -Syu

# Update timezone
echo "$PASSWORD" | sudo -S timedatectl set-ntp true
Expand Down

0 comments on commit df9a8f7

Please sign in to comment.