From 06ebba4c53dc2751a2aad1cbccb870bb7db6dc07 Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Thu, 2 Apr 2020 14:22:19 +0300 Subject: HUGE home cleanup --- dotfiles/.config/bemenurc | 24 ++ dotfiles/.config/dir_colors | 243 +++++++++++++++++++++ dotfiles/.config/gtk-2.0/gtkrc-2.0 | 19 ++ dotfiles/.config/mpd/mpd.conf | 2 +- dotfiles/.config/ncmpcpp/config | 8 +- dotfiles/.config/ranger/rc.conf | 34 +-- dotfiles/.config/ranger/rifle.conf | 6 +- dotfiles/.config/tmux/tmux.conf | 119 ++++++++++ .../.config/transmission-remote-gtk/config.json | 104 ++++++++- dotfiles/.config/transmission/settings.json | 36 ++- dotfiles/.config/user-dirs.dirs | 18 +- dotfiles/.config/zsh/.inputrc | 12 - dotfiles/.config/zsh/.zshrc | 55 +---- dotfiles/.config/zsh/inputrc | 12 + dotfiles/.config/zsh/shortcuts | 48 ++++ 15 files changed, 642 insertions(+), 98 deletions(-) create mode 100755 dotfiles/.config/bemenurc create mode 100644 dotfiles/.config/dir_colors create mode 100644 dotfiles/.config/gtk-2.0/gtkrc-2.0 create mode 100644 dotfiles/.config/tmux/tmux.conf delete mode 100644 dotfiles/.config/zsh/.inputrc create mode 100644 dotfiles/.config/zsh/inputrc create mode 100644 dotfiles/.config/zsh/shortcuts (limited to 'dotfiles/.config') diff --git a/dotfiles/.config/bemenurc b/dotfiles/.config/bemenurc new file mode 100755 index 0000000..22e7224 --- /dev/null +++ b/dotfiles/.config/bemenurc @@ -0,0 +1,24 @@ + +BEMENU_BACKEND=wayland + +## define the font for dmenu to be used +BEMENU_FN="BlexMonoNerdFontMono 10" + +## textcolour for title +BEMENU_TF="#D8DEE9" + +## background colour for unselected menu-items +BEMENU_NB="#1B1E25" + +## textcolour for unselected menu-items +BEMENU_NF="#D8DEE9" + +## background colour for highlighted menu-items +BEMENU_HB="#5B8277" + +## textcolour for highlighted menu-items +BEMENU_HF="#E5E9F0" + +## command for the terminal application to be used: +TERMINAL_CMD="terminal -e" + diff --git a/dotfiles/.config/dir_colors b/dotfiles/.config/dir_colors new file mode 100644 index 0000000..1e3ff8c --- /dev/null +++ b/dotfiles/.config/dir_colors @@ -0,0 +1,243 @@ +# Configuration file for dircolors, a utility to help you set the +# LS_COLORS environment variable used by GNU ls with the --color option. + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted provided the copyright notice and this notice are preserved. + +# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +# slackware version of dircolors) are recognized but ignored. + +# You can copy this file to .dir_colors in your $HOME directory to override +# the system defaults. + +# Below, there should be one TERM entry for each termtype that is colorizable +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM hurd +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mach-gnu-color +TERM mlterm +TERM putty +TERM putty-256color +TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM screen +TERM screen-256color +TERM screen-256color-bce +TERM screen-bce +TERM screen-w +TERM screen.Eterm +TERM screen.rxvt +TERM screen.linux +TERM st +TERM st-256color +TERM terminator +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian + +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # regular file: use no color at all +RESET 0 # reset to "normal" color +DIR 01;34 # directory +LINK 01;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 01;35 # socket +DOOR 01;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 01;05;37;41 # orphaned syminks +MISSING 01;05;37;41 # ... and the files they point to +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 31;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable + +# This is for files with execute permission: +EXEC 01;32 + +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') + +# If you use DOS-style suffixes, you may want to uncomment the following: +#.cmd 01;32 # executables (bright green) +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +# Or if you want to colorize scripts even if they do not have the +# executable bit actually set. +#.sh 01;32 +#.csh 01;32 + + # archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arc 01;31 +.arj 01;31 +.taz 01;31 +.lha 01;31 +.lz4 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.tzo 01;31 +.t7z 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lrz 01;31 +.lz 01;31 +.lzo 01;31 +.xz 01;31 +.bz2 01;31 +.bz 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.war 01;31 +.ear 01;31 +.sar 01;31 +.rar 01;31 +.alz 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 +.cab 01;31 + +# image formats +.jpg 01;35 +.jpeg 01;35 +.gif 01;35 +.bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 +.xbm 01;35 +.xpm 01;35 +.tif 01;35 +.tiff 01;35 +.png 01;35 +.svg 01;35 +.svgz 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.webm 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.flv 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.cgm 01;35 +.emf 01;35 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 01;35 +.anx 01;35 +.ogv 01;35 +.ogx 01;35 + +# Document files +.pdf 00;32 +.ps 00;32 +.txt 00;32 +.patch 00;32 +.diff 00;32 +.log 00;32 +.tex 00;32 +.doc 00;32 + +# audio formats +.aac 00;36 +.au 00;36 +.flac 00;36 +.m4a 00;36 +.mid 00;36 +.midi 00;36 +.mka 00;36 +.mp3 00;36 +.mpc 00;36 +.ogg 00;36 +.ra 00;36 +.wav 00;36 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 00;36 +.oga 00;36 +.spx 00;36 +.xspf 00;36 diff --git a/dotfiles/.config/gtk-2.0/gtkrc-2.0 b/dotfiles/.config/gtk-2.0/gtkrc-2.0 new file mode 100644 index 0000000..94ef305 --- /dev/null +++ b/dotfiles/.config/gtk-2.0/gtkrc-2.0 @@ -0,0 +1,19 @@ +# DO NOT EDIT! This file will be overwritten by LXAppearance. +# Any customization should be done in ~/.gtkrc-2.0.mine instead. + +include "/home/yaroslav/.gtkrc-2.0.mine" +gtk-theme-name="oomox-materia-dark" +gtk-icon-theme-name="Papirus-Dark" +gtk-font-name="FuraCode Nerd Font Mono 10" +gtk-cursor-theme-name="Adwaita" +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_TEXT +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintslight" +gtk-xft-rgba="rgb" diff --git a/dotfiles/.config/mpd/mpd.conf b/dotfiles/.config/mpd/mpd.conf index 59b9d5f..6023073 100644 --- a/dotfiles/.config/mpd/mpd.conf +++ b/dotfiles/.config/mpd/mpd.conf @@ -1,6 +1,6 @@ db_file "~/.config/mpd/database" log_file "~/.config/mpd/log" -music_directory "~/Music" +music_directory "~/music" playlist_directory "~/.config/mpd/playlists" pid_file "~/.config/mpd/pid" state_file "~/.config/mpd/state" diff --git a/dotfiles/.config/ncmpcpp/config b/dotfiles/.config/ncmpcpp/config index d89e7b8..254d9ac 100644 --- a/dotfiles/.config/ncmpcpp/config +++ b/dotfiles/.config/ncmpcpp/config @@ -2,7 +2,13 @@ ## This is the example configuration file. Copy it to $HOME/.ncmpcpp/config ## ## or $XDG_CONFIG_HOME/ncmpcpp/config and set up your preferences. ## ############################################################################## -# + +ncmpcpp_directory = ~/.config/ncmpcpp + +## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other +## MPD clients (eg. ncmpc) also use that location. +lyrics_directory = ~/.local/share/lyrics + # Interfaz: user_interface = "alternative" alternative_header_first_line_format = "$(white)─┤ $b$(red)%a$(end)$/b ├─$(end)" diff --git a/dotfiles/.config/ranger/rc.conf b/dotfiles/.config/ranger/rc.conf index db1e95a..2d88df8 100644 --- a/dotfiles/.config/ranger/rc.conf +++ b/dotfiles/.config/ranger/rc.conf @@ -88,7 +88,7 @@ map i display_file map ? help map W display_log map w taskview_open -map ss shell nohup $TERMINAL& +map ss shell nohup $TERMINAL > ~/.cache/nohup.out 2>&1 to send commands to a TMUX session inside +# another TMUX session +bind-key a send-prefix + +# Activity monitoring +setw -g monitor-activity on +set -g visual-activity on + +# hjkl pane traversal +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# set to main-horizontal, 66% height for main pane +bind m run-shell "~/.tmux/scripts/resize-adaptable.sh -l main-horizontal -p 66" +# Same thing for verical layouts +bind M run-shell "~/.tmux/scripts/resize-adaptable.sh -l main-vertical -p 50" + +bind-key C command-prompt -p "Name of new window: " "new-window -n '%%'" + +# reload config +bind r source-file ~/.config/tmux/tmux.conf \; display-message "Config reloaded..." + +# auto window rename +set-window-option -g automatic-rename + +# https://github.com/edkolev/dots/blob/master/tmux.conf +# Updates for tmux 1.9's current pane splitting paths. + +# from powerline +run-shell "tmux set-environment -g TMUX_VERSION_MAJOR $(tmux -V | cut -d' ' -f2 | cut -d'.' -f1 | sed 's/[^0-9]*//g')" +run-shell "tmux set-environment -g TMUX_VERSION_MINOR $(tmux -V | cut -d' ' -f2 | cut -d'.' -f2 | sed 's/[^0-9]*//g')" + +# Vi copypaste mode +set-window-option -g mode-keys vi +if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel' +if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection' + +# status bar +if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 2\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set-option -g status-utf8 on' + +# rm mouse mode fail +if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 1\)' 'set -g mouse off' +if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 1\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set -g mode-mouse off' + +# fix pane_current_path on new window and splits +if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind c; bind c new-window -c "#{pane_current_path}"' +if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" "unbind '\"'; bind '\"' split-window -v -c '#{pane_current_path}'" +if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind v; bind v split-window -h -c "#{pane_current_path}"' +#if-shell "test '#{$TMUX_VERSION_MAJOR} -gt 1 -o \( #{$TMUX_VERSION_MAJOR} -eq 1 -a #{$TMUX_VERSION_MINOR} -ge 8 \)'" 'unbind %; bind % split-window -h -c "#{pane_current_path}"' + + +# Colors +# How to use true colors in vim under tmux? #1246 for 2.6 and higher +# https://github.com/tmux/tmux/issues/1246: +# set -g default-terminal "tmux-256color" +# set -ga terminal-overrides ",*256col*:Tc" +# 2.5 and lower: +# set -g default-terminal "screen-256color" + +# Doesn't work on iterm2 / mac +# if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 6 \)'" 'set -g default-terminal "tmux-256color"' +# if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 6 \)'" 'set -ga terminal-overrides ",*256col*:Tc"' + +# Try screen256-color (https://github.com/tmux/tmux/issues/622): +if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 6 \)'" 'set -g default-terminal "screen-256color"' +if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 6 \)'" 'set -ga terminal-overrides ",screen-256color:Tc"' + +if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 6\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set -g default-terminal "screen-256color"' diff --git a/dotfiles/.config/transmission-remote-gtk/config.json b/dotfiles/.config/transmission-remote-gtk/config.json index bca0554..cac0424 100644 --- a/dotfiles/.config/transmission-remote-gtk/config.json +++ b/dotfiles/.config/transmission-remote-gtk/config.json @@ -21,18 +21,113 @@ "exec-commands" : [ ], "destinations" : [ - ] + ], + "last-move-destination" : "~/dls/P2P" } ], "profile-id" : 0, "tree-views" : { "TrgTorrentTreeView" : { + "sort-col" : -1, + "sort-type" : 0, + "widths" : [ + 453, + 76, + 66, + 72, + 70, + 91, + 100, + 113, + 92, + 57, + 93, + 114, + 65, + 149 + ], + "columns" : [ + "name", + "size", + "done", + "status", + "seeds", + "leechers", + "connected-peers", + "down-speed", + "up-speed", + "eta", + "uploaded", + "downloaded", + "ratio", + "added" + ] }, "TrgTrackersTreeView" : { + "sort-col" : -2, + "sort-type" : 0, + "widths" : [ + 175, + 346, + 187, + 236, + 243, + 244, + 221, + 230 + ], + "columns" : [ + "tier", + "announce-url", + "last-announce-peer-count", + "seeder-count", + "leecher-count", + "last-announce-time", + "last-result", + "scrape-url" + ] }, "TrgFilesTreeView" : { + "sort-col" : -2, + "sort-type" : 0, + "widths" : [ + 368, + 355, + 387, + 395, + 377 + ], + "columns" : [ + "name", + "size", + "progress", + "wanted", + "priority" + ] }, "TrgPeersTreeView" : { + "sort-col" : -2, + "sort-type" : 0, + "widths" : [ + 204, + 219, + 239, + 270, + 249, + 247, + 223, + 231 + ], + "columns" : [ + "ip", + "host", + "country", + "down-speed", + "up-speed", + "progress", + "flags", + "client" + ] }, "TrgFilesTreeView-dialog" : { "sort-col" : -2, @@ -114,5 +209,10 @@ "add-notify" : false, "complete-notify" : false, "dialog-width" : 1062, - "dialog-height" : 680 + "dialog-height" : 680, + "style" : 1, + "window-height" : 1021, + "window-width" : 1886, + "notebook-paned-pos" : 583, + "states-paned-pos" : 278 } \ No newline at end of file diff --git a/dotfiles/.config/transmission/settings.json b/dotfiles/.config/transmission/settings.json index f440feb..d341dcf 100644 --- a/dotfiles/.config/transmission/settings.json +++ b/dotfiles/.config/transmission/settings.json @@ -6,13 +6,16 @@ "alt-speed-time-enabled": false, "alt-speed-time-end": 1020, "alt-speed-up": 50, + "bind-address-ipv4": "0.0.0.0", + "bind-address-ipv6": "::", "blocklist-date": 0, "blocklist-enabled": false, "blocklist-updates-enabled": true, "blocklist-url": "http://www.example.com/blocklist", + "cache-size-mb": 4, "compact-view": false, "dht-enabled": true, - "download-dir": "/home/yaroslav/Downloads/P2P", + "download-dir": "/home/yaroslav/dls/P2P", "download-queue-enabled": true, "download-queue-size": 5, "encryption": 1, @@ -20,28 +23,33 @@ "filter-trackers": "", "idle-seeding-limit": 30, "idle-seeding-limit-enabled": false, - "incomplete-dir": "/home/yaroslav/Downloads", + "incomplete-dir": "/home/yaroslav/dls", "incomplete-dir-enabled": false, "inhibit-desktop-hibernation": false, "lpd-enabled": false, "main-window-height": 1017, + "main-window-is-maximized": 1, "main-window-layout-order": "menu,toolbar,filter,list,statusbar", "main-window-width": 618, - "main-window-x": 50, - "main-window-y": 50, + "main-window-x": 0, + "main-window-y": 0, "message-level": 2, - "open-dialog-dir": "/home/yaroslav", + "open-dialog-dir": "/home/yaroslav/", + "peer-congestion-algorithm": "", + "peer-id-ttl-hours": 6, "peer-limit-global": 200, "peer-limit-per-torrent": 50, "peer-port": 51413, "peer-port-random-high": 65535, "peer-port-random-low": 49152, "peer-port-random-on-start": false, - "peer-socket-tos": 0, + "peer-socket-tos": "default", "pex-enabled": true, "port-forwarding-enabled": true, "preallocation": 1, + "prefetch-enabled": true, "prompt-before-exit": true, + "queue-stalled-enabled": true, "queue-stalled-minutes": 30, "ratio-limit": 2, "ratio-limit-enabled": false, @@ -53,14 +61,21 @@ "remote-session-username": "", "rename-partial-files": true, "rpc-authentication-required": false, + "rpc-bind-address": "0.0.0.0", "rpc-enabled": false, - "rpc-password": "", + "rpc-host-whitelist": "", + "rpc-host-whitelist-enabled": true, + "rpc-password": "{d916cc0dfa7436101eaf5de51e526a3b6a7324602zEDSimP", "rpc-port": 9091, + "rpc-url": "/transmission/", "rpc-username": "", "rpc-whitelist": "127.0.0.1", "rpc-whitelist-enabled": true, + "scrape-paused-torrents-enabled": true, "script-torrent-done-enabled": false, - "script-torrent-done-filename": "", + "script-torrent-done-filename": "/home/yaroslav", + "seed-queue-enabled": false, + "seed-queue-size": 10, "show-backup-trackers": false, "show-extra-peer-details": false, "show-filterbar": true, @@ -68,6 +83,7 @@ "show-options-window": true, "show-statusbar": true, "show-toolbar": true, + "show-tracker-scrapes": false, "sort-mode": "sort-by-name", "sort-reversed": false, "speed-limit-down": 10240, @@ -81,10 +97,12 @@ "torrent-complete-notification-enabled": true, "torrent-complete-sound-command": "canberra-gtk-play -i complete-download -d 'transmission torrent downloaded'", "torrent-complete-sound-enabled": true, + "trash-can-enabled": true, "trash-original-torrent-files": false, + "umask": 18, "upload-slots-per-torrent": 14, "user-has-given-informed-consent": true, "utp-enabled": true, - "watch-dir": "/home/yaroslav/Downloads", + "watch-dir": "/home/yaroslav/dls", "watch-dir-enabled": false } diff --git a/dotfiles/.config/user-dirs.dirs b/dotfiles/.config/user-dirs.dirs index 74f5626..3aefcb6 100644 --- a/dotfiles/.config/user-dirs.dirs +++ b/dotfiles/.config/user-dirs.dirs @@ -1,8 +1,12 @@ + XDG_DESKTOP_DIR="$HOME/.local/desktop" -XDG_DOCUMENTS_DIR="$HOME/Documents" -XDG_DOWNLOAD_DIR="$HOME/Downloads" -XDG_MUSIC_DIR="$HOME/Music" -XDG_PICTURES_DIR="$HOME/Pictures" -XDG_PUBLICSHARE_DIR="$HOME/Public" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_VIDEOS_DIR="$HOME/Videos" +XDG_DOCUMENTS_DIR="$HOME/docs" +XDG_DOWNLOAD_DIR="$HOME/dls" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pics" +XDG_PUBLICSHARE_DIR="$HOME/etc" +XDG_TEMPLATES_DIR="$HOME/etc" +XDG_VIDEOS_DIR="$HOME/vids" +XDG_CONFIG_HOME="$HOME/.config" +XDG_CACHE_HOME="$HOME/.cache" +XDG_DATA_HOME="$HOME/.local/share" diff --git a/dotfiles/.config/zsh/.inputrc b/dotfiles/.config/zsh/.inputrc deleted file mode 100644 index f852d3b..0000000 --- a/dotfiles/.config/zsh/.inputrc +++ /dev/null @@ -1,12 +0,0 @@ -$include /etc/inputrc -set editing-mode vi -$if mode=vi - -set keymap vi-command -# these are for vi-command mode -Control-l: clear-screen - -set keymap vi-insert -# these are for vi-insert mode -Control-l: clear-screen -$endif diff --git a/dotfiles/.config/zsh/.zshrc b/dotfiles/.config/zsh/.zshrc index a597162..4a21004 100644 --- a/dotfiles/.config/zsh/.zshrc +++ b/dotfiles/.config/zsh/.zshrc @@ -1,8 +1,5 @@ # Colors and prompt autoload -U colors && colors -if [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]]; then - . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -fi autoload -Uz vcs_info precmd_vcs_info() { vcs_info } @@ -55,50 +52,16 @@ function zle-keymap-select { } echo -ne '\e[5 q' # Use beam shape cursor on startup. -preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. +printf "\033]2;%s\a" "$PWD" # Set terminal window title to current dir +# Repeat for every new prompt +preexec() { + echo -ne '\e[5 q' + printf "\033]2;%s\a" "$PWD" +} zle -N zle-keymap-select -# Some aliases -alias v="nvim" -alias abook="abook -C $HOME/.config/abook/abookrc --datafile $HOME/Documents/contacts/addressbook" -alias eslint="./node_modules/.bin/eslint" -alias ls="ls -hN --color=auto --group-directories-first" -weath() { curl wttr.in/$1 ;} # Check the weather (give city or leave blank). -wintitle() { printf "\033]2;%s\a" "$1";} - -# Generic shortcuts -alias music="ncmpcpp" -alias clock="ncmpcpp -s clock" -alias news="newsboat" -alias files="ranger" -alias audio="ncpamixer" -alias calendar="calcurse" -alias contacts="abook" -alias calc="R --no-save" +[ -f "$HOME/.config/zsh/shortcuts" ] && . "$HOME/.config/zsh/shortcuts" -# Mounting drive shortcuts -alias mnt="udisksctl mount -b" -alias umnt="udisksctl unmount -b" -alias dlock="udisksctl lock -b" -alias dulock="udisksctl unlock -b" - -# Internet -alias yt="youtube-dl --add-metadata -ic" # Download video link -alias yta="youtube-dl --add-metadata -xic" # Download only audio -alias YT="youtube-viewer" -alias starwars="telnet towel.blinkenlights.nl" - -# Audio and Music -alias mute="lmc mute" -alias vu="lmc up" -alias vd="lmc down" -alias play="mpc toggle" -alias next="mpc next" -alias prev="mpc prev" -alias pause="mpc pause" -alias beg="mpc seek 0%" -alias lilbak="mpc seek -10" -alias lilfor="mpc seek +10" -alias bigbak="mpc seek -120" -alias bigfor="mpc seek +120" +[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && + . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh diff --git a/dotfiles/.config/zsh/inputrc b/dotfiles/.config/zsh/inputrc new file mode 100644 index 0000000..f852d3b --- /dev/null +++ b/dotfiles/.config/zsh/inputrc @@ -0,0 +1,12 @@ +$include /etc/inputrc +set editing-mode vi +$if mode=vi + +set keymap vi-command +# these are for vi-command mode +Control-l: clear-screen + +set keymap vi-insert +# these are for vi-insert mode +Control-l: clear-screen +$endif diff --git a/dotfiles/.config/zsh/shortcuts b/dotfiles/.config/zsh/shortcuts new file mode 100644 index 0000000..a47bbba --- /dev/null +++ b/dotfiles/.config/zsh/shortcuts @@ -0,0 +1,48 @@ +#!/bin/sh + +# Some aliases +alias v="nvim" +alias abook="abook -C $HOME/.config/abook/abookrc --datafile $HOME/Documents/contacts/addressbook" +alias eslint="./node_modules/.bin/eslint" +alias ls="ls -hN --color=auto --group-directories-first" +alias tmux="tmux -f $HOME/.config/tmux/tmux.conf" +weath() { curl wttr.in/$1 ;} # Check the weather (give city or leave blank). +corona() { curl https://corona-stats.online/$1 ;} # It's corona time +wintitle() { printf "\033]2;%s\a" "$1";} + +# Generic shortcuts +alias music="ncmpcpp" +alias clock="ncmpcpp -s clock" +alias news="newsboat" +alias files="ranger" +alias audio="ncpamixer" +alias calendar="calcurse" +alias contacts="abook" +alias calc="R --no-save" + +# Mounting drive shortcuts +alias mnt="udisksctl mount -b" +alias umnt="udisksctl unmount -b" +alias dlock="udisksctl lock -b" +alias dulock="udisksctl unlock -b" + +# Internet +alias yt="youtube-dl --add-metadata -ic" # Download video link +alias yta="youtube-dl --add-metadata -xic" # Download only audio +alias YT="youtube-viewer" +alias starwars="telnet towel.blinkenlights.nl" + +# Audio and Music +alias mute="lmc mute" +alias vu="lmc up" +alias vd="lmc down" +alias play="mpc toggle" +alias next="mpc next" +alias prev="mpc prev" +alias pause="mpc pause" +alias beg="mpc seek 0%" +alias lilbak="mpc seek -10" +alias lilfor="mpc seek +10" +alias bigbak="mpc seek -120" +alias bigfor="mpc seek +120" + -- cgit v1.2.3