diff options
| -rw-r--r-- | .bash_aliases | 23 | ||||
| -rw-r--r-- | 20-libinput.conf | 1 | ||||
| -rw-r--r-- | 30-backlight.conf | 2 | ||||
| -rw-r--r-- | LICENSE | 339 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | applications.txt | 51 | ||||
| -rw-r--r-- | bash_aliases | 53 | ||||
| -rw-r--r-- | bashrc (renamed from .bashrc) | 20 | ||||
| -rw-r--r-- | fun.vim (renamed from vimfun) | 3 | ||||
| -rw-r--r-- | inputrc (renamed from .inputrc) | 0 | ||||
| -rw-r--r-- | install.sh | 24 | ||||
| -rw-r--r-- | newdebian | 16 | ||||
| -rw-r--r-- | profile | 24 | ||||
| -rw-r--r-- | readme.md | 17 | ||||
| -rw-r--r-- | slinks | 13 | ||||
| -rw-r--r-- | vimrc | 91 |
16 files changed, 256 insertions, 422 deletions
diff --git a/.bash_aliases b/.bash_aliases deleted file mode 100644 index 169e105..0000000 --- a/.bash_aliases +++ /dev/null @@ -1,23 +0,0 @@ -alias aliases='vim ~/.bash_aliases && source ~/.bash_aliases' -alias diff2='diff --color=always -y' -alias dir='dir --color=auto' -alias grepc='grep --color=auto -i' # color and ... -alias la='ls -A' -alias ll='ls -l -h' -alias lla='ll -A' -alias ls='ls --color=auto' -#alias mv='mv -v' -#alias cp='cp -v' -#alias less='less -Ri' # make less's searches case insensitive and - # colorized -LESS=Ri - -# cosmetic -# ======== -alias :q='cowsay -d "this isn'\''t Vim"' # To scape single quotes in single - # quoted string first finish opened - # string and add the scaped quote - # (\'). -alias :w="cowsay -b \"this isn't Vim\"" -alias miola='cowsay -e ^^ "te extraño, mi galletita"' -alias miola2='cowsay -e ^^ "🌊Nandita 💃 bonita 🌊"' diff --git a/20-libinput.conf b/20-libinput.conf index f60b3f7..b621fa2 100644 --- a/20-libinput.conf +++ b/20-libinput.conf @@ -1,5 +1,6 @@ # Enable single tab, double tab, tab with 2 and 3 fingers and # natural scrolling. +# Retrived/Adapted from https://abdullah.today/2019/09/19/things-to-do-after-debian-install.html Section "InputClass" Identifier "libinput touchpad catchall" MatchIsTouchpad "on" diff --git a/30-backlight.conf b/30-backlight.conf deleted file mode 100644 index e7d98ec..0000000 --- a/30-backlight.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Fix backlight on some systems -Section "Device" Identifier "card0" Driver "intel" Option "Backlight" "intel_backlight" BusID "PCI:0:2:0" EndSection diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 840b692..0000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - Zazke's dotfiles - Copyright (C) 2019 zazke - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - zazkesinriquin, 07 April 2019 - zazke, zazke's zazke - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/README.md b/README.md deleted file mode 100644 index 190997a..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -My configuration settings and config files for various programs. diff --git a/applications.txt b/applications.txt new file mode 100644 index 0000000..e856407 --- /dev/null +++ b/applications.txt @@ -0,0 +1,51 @@ +Applications and programs I use + +Programs +================================================================================ + +Most of these can be easily installed using apt(8). + +utilities + ghostscript gnupg screenfetch neofetch htop gparted R rename curl gzip grep + +devices + acpi cups + +media + vlc audacity mpv feh + +docs + pdftk pandoc groff vim libreoffice + +mail + mutt thunderbird + +reading + zathura calibre + +music + clementine mpc ncmpcpp spotify + +games + zsnes retroarch dolphin cowsay steam minecraft + +productivity + taskwarrior timewarrior + +dev + virtualbox git netbeans + +ref + goldendict wordnet gcide tldr + +network + qbittorrent + +internet + brave-browser discord mullvad-vpn + + +Manual config +====================================================================== + +feh: add heif support using https://github.com/vi/imlib2-heic diff --git a/bash_aliases b/bash_aliases new file mode 100644 index 0000000..8d75f2b --- /dev/null +++ b/bash_aliases @@ -0,0 +1,53 @@ +# Shortcuts +# ====================================================================== +alias aliases='vim ~/.bash_aliases && source ~/.bash_aliases' +alias evrc='vim ~/.config/vim/vimrc' +alias ebrc='vim ~/.bashrc && source ~/.bashrc' + + +# Common program's options +# ====================================================================== + +# coretools +alias diff2='diff --color=always -y' +alias dir='dir --color=auto' +alias grep='grep --color=auto -i' # color case-insensitive +alias la='ls -A' +alias ll='ls -l -h' +alias lla='ll -A' +alias ls='ls --color=auto' +#alias less='less -Ri' # make less's searches case insensitive and + # colorized +LESS=Ri # TODO move to an appropiate place + +# Other program's options +# ====================================================================== +alias feh='feh -g 640x480 -S filename' +alias units='units --verbose' + + +# Precautionary +# ====================================================================== +alias rm='rm -I' # Promt before removing more than 3 files +alias mv='mv -i' # Promt before overwrite +alias cp='cp -i' # same + + +# Quick tools +# ====================================================================== +alias pdfreduce='gs -sDEVICE=pdfwrite -dPDFSETTINGS=/ebook' +alias weather="curl wttr.in/Austin?mF" +alias weatherhelp="curl wttr.in/:help" +alias youtube-dl_info='youtube-dl --get-filename --get-format --get-duration --get-description' +alias youtube-dl_fast='youtube-dl --format "best[height<=720]" -o '\''%(title)s.%(ext)s'\' + + +# Cosmetic +# ====================================================================== +alias :q='cowsay -d "this isn'\''t Vim"' # To scape single quotes in single + # quoted string first finish opened + # string and add the scaped quote + # (\'). +alias :w="cowsay -b \"this isn't Vim\"" +alias miola='cowsay -e ^^ "te extraño, mi galletita"' +alias miola2='cowsay -e ^^ "🌊Nandita 💃 bonita 🌊"' @@ -80,10 +80,6 @@ if [ -x /usr/bin/dircolors ]; then alias ls='ls --color=auto' alias dir='dir --color=auto' #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto -i' - #alias fgrep='fgrep --color=auto' - #alias egrep='egrep --color=auto' fi # colored GCC warnings and errors @@ -114,3 +110,19 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" +fi + +# Greeting or salute +cowsay -f flaming-sheep "oh no" + +# Some environmental variables. +export TLDR_CONFIG_DIR="$HOME/.config" +export GPG=TTY=$(tty) @@ -16,7 +16,8 @@ function! LongestLineLength ( ) " exe ':0' " exe 'normal O' " exe 'normal 0C'.maxlength - exe ":echo \"".maxlinenumber.": ".maxlength."\"" + exe "normal" . maxlinenumber . "G" + exe ":echo \"" . maxlinenumber . ": " . maxlength . "\"" endfunction command LongestLineLength call LongestLineLength() diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..c5c69a9 --- /dev/null +++ b/install.sh @@ -0,0 +1,24 @@ +# Run this first + +source profile + + +# bash + +ln -sf ~/.dotfiles/profile ~/.profile +ln -sf ~/.dotfiles/bash_aliases ~/.bash_aliases +ln -sf ~/.dotfiles/bashrc ~/.bashrc +ln -sf ~/.dotfiles/inputrc ~/.inputrc # allow Vim mode in bash + + +# vim + +[ -d "$XDG_DATA_HOME"/vim/ ] || mkdir -p "$XDG_DATA_HOME"/vim/{undo,swap,backup} + +ln -sf ~/.dotfiles/vimrc ~/.config/vim/vimrc +ln -sf ~/.dotfiles/fun.vim ~/.config/vim/fun.vim + + +# done + +echo "all done :)" @@ -1,15 +1,4 @@ -Commands and configuration description of my Debian - Plasma KDE 5 -configuration - -# Software - -apt install ghostscript gnupg screenfetch neofetch vlc pdftk htop gparted R mutt zathura calibre clementine audacity zsnes mpv qbittorrent virtualbox npm ncmpcpp git feh rename pandoc - - -## Manual install - -MullvadVPN netbeans Steam Spotify - +My configuration description of Debian - Plasma KDE 5. # KDE Plasma 5 configuration @@ -64,7 +53,7 @@ Workspace: Run command Alt+Space Web: (shortcut:"search string" in Run command) Amazon amz - RAE rae + RAE rae https://dle.rae.es/?w=\{@} Github gh Gitlab gt Google gg @@ -153,6 +142,7 @@ Hardware: Removable Devices: Enable automatic mounting of removable media: OFF + ## Widgets configuration Application Menu: @@ -0,0 +1,24 @@ +if [ "$SHELL" = "/bin/bash" ]; then + . ~/.bashrc +fi + + +# Variables +# ====================================================================== + +# redundant but useful +# (XDG = Cross-Desktop Group, +# more info at https://wiki.archlinux.org/index.php/XDG_Base_Directory) +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_DATA_HOME="$HOME/.local/share" +#export XDG_DATA_DIRS="/usr/local/share:/usr/share" +#export XDG_CONFIG_DIRS="/etc/xdg" + +export VIMINIT=":source $XDG_CONFIG_HOME"/vim/vimrc + + +# Fun +# ====================================================================== + +echo "Welcome back $LOGNAME" diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..b7fa38e --- /dev/null +++ b/readme.md @@ -0,0 +1,17 @@ +My configuration settings and config files for various programs. + + +# Files + +``` +20-libinput.conf enable touchpad functionality +bash_aliases +bashrc bash "run commands" +fun.vim some vim functions +inputrc vim input for bash +newdebian my debian/KDE Pasma 5 conf +qtcurvetestsettings.qtcurve +slinks symlinks script +vimrc vim "run commands" + +``` @@ -1,13 +0,0 @@ -# TODO make this an actual script, for now it only contains some slink commands -# and other shit maybe. - -# Config files symbolic links names and targets (aka soft links, these link the -# paths; hard links link the inode) - -makedir ~/.vim/ - -ln -s -T ~/.dotfiles/.bash_aliases ~/.bash_aliases -ln -s -T ~/.dotfiles/.bashrc ~/.bashrc -ln -s -T ~/.dotfiles/.inputrc ~/.inputrc # allow Vim mode in bash -ln -s -T ~/.dotfiles/vimrc ~/.vim/vimrc -ln -s -T ~/.dotfiles/vimfun ~/.vim/vimfun @@ -7,7 +7,11 @@ " │v│i│m│r│c│←│█▓▒░ ば " └─┴─┴─┴─┴─┴─┘ れ -" Shit that gets disabled because I created this file +" XDG compliant +" TODO: sort sections + + +" Useful " ---------------------------------------------------------------------- set nocompatible " Auto-recognize files and apply pluggins @@ -15,17 +19,16 @@ set nocompatible syntax on set wildmenu set showcmd -set scrolloff=5 " show a few lines of context +set scrolloff=5 " show a few lines of context -" Options that aren't default in some systems -" ---------------------------------------------------------------------- +" not default in some systems set backspace=indent,eol,start -" Number gutter -" ---------------------------------------------------------------------- +" number gutter set nonumber set norelativenumber + " Search " ---------------------------------------------------------------------- set hlsearch @@ -35,35 +38,38 @@ nnoremap <C-L> :nohl<CR><C-L> set ignorecase set smartcase + " Indentation " ---------------------------------------------------------------------- -" softtabs de 4 columnas -" TODO mapping to switch from softtabs to actual tabs by reseting expandtab and -" softtabstop +" 4 column softtabs (uses ' ', not '\t'). +" TODO: move this 'guide' to somewhere apropiate +" tab->softtab (:set tabstop=n) (:set expandtab) :retab +" softtab->tab :set noexpandtab :set tabstop={softtabstop} :retab! +" Caution: This will insert a tab wherever it can, even between words +" separated by as few as 2 spaces! set tabstop=8 set softtabstop=4 set shiftwidth=4 set expandtab " autoindent -> smartindent -> cindent -> indentexpr (from less to more " general, each one overrides the previous ones) -set smartindent " This is a really nice and simple one -"set cindent -"set cinoptions=:0,g0 " See C-indenting +set smartindent " This is a really nice and simple one +"set cindent +"set cinoptions=:0,g0 " See C-indenting + " Automatic formatting " ---------------------------------------------------------------------- " see fo-table set formatoptions=rql -set formatoptions-=o " Automatically insert the current comment leader - " after hitting 'o'. -set formatoptions+=t " auto-wrap text (when inserting) -set formatoptions+=c " auto-wrap comments (when inserting) -"set formatoptions+=a " auto-formatting of paragraphs (always). (this - " messes with being able to '=====' underline - " just below a section header comment. -set formatoptions+=p " Don't break lines after '.' -set formatoptions+=n " Allow lists -set formatoptions+=j " Removes comment leader when joining lines +set formatoptions-=o " Automatically insert the current comment leader + " after hitting 'o'. +set formatoptions+=t " auto-wrap text (when inserting) +set formatoptions+=c " auto-wrap comments (when inserting) +set formatoptions+=p " Don't break honorifics like Prof. Smith +set formatoptions+=n " Allow lists +set formatoptions+=j " Removes comment leader when joining lines + " Word wrap " ---------------------------------------------------------------------- @@ -73,6 +79,7 @@ set linebreak " "gp{motion}", where {motion} can be "[/", "]/", "ip", "i{", "a{". set textwidth=80 + " Other settings " ---------------------------------------------------------------------- set mouse=a @@ -82,6 +89,7 @@ set laststatus=2 set ruler set encoding=utf-8 + " Mappings " ---------------------------------------------------------------------- map <F7> :tabp<CR> @@ -89,12 +97,14 @@ map <F8> :tabn<CR> " TODO: Funcking unmap the F1 key "unmap <F1> + " Yanking and pasting " ---------------------------------------------------------------------- " TODO: map something to "+y (cut buffer) and "*y (selection buffer) while in " visual mode. -"vmap <++> "+y " The yank to the cut buffer (clipboard) -"vmap <++> "*y " The yank to the selection buffer +"vmap <++> "+y " The yank to the cut buffer (clipboard) +"vmap <++> "*y " The yank to the selection buffer + " Buffers " ---------------------------------------------------------------------- @@ -102,6 +112,7 @@ set hidden map <S-F7> :bNext<LF> map <S-F8> :bnext<LF> + " Printing " ---------------------------------------------------------------------- set printoptions=paper:A4,duplex:long @@ -109,12 +120,25 @@ set printoptions=paper:A4,duplex:long " TODO: Figure out how to print multibyte encodings. Enabling this settings " produces errors. " set printencoding=utf-8 -" set printmbcharset=JIS_X_1990 " This allows Japanese characters to be printed +" set printmbcharset=JIS_X_1990 " This allows Japanese characters to be printed " set printmbfont=r:Noto-Sans-CJK-JP + +" Variables +" ---------------------------------------------------------------------- +set undodir=$XDG_DATA_HOME/vim/undo +set directory=$XDG_DATA_HOME/vim/swap +set backupdir=$XDG_DATA_HOME/vim/backup +set viminfo+='1000,n$XDG_DATA_HOME/vim/viminfo +set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after +" TODO fix this +"let vcpath="~/.vim/vimfun/" " vim configuration path + + " Functions " ---------------------------------------------------------------------- -source vimfun +source ~/.config/vim/fun.vim + " Additions " ---------------------------------------------------------------------- @@ -129,7 +153,22 @@ source vimfun " Replaces previous WORD arithmetic expression with result inoremap <C-A> <Esc>diWi<C-R>=<C-R>"<CR> + " iVim " ---------------------------------------------------------------------- " TODO: map :h _argument_ to :h _argument_ <C-w>L<C-w>_ This makes help window " to almost fill the super small screen. + + +" Plugins +" ---------------------------------------------------------------------- +" Install vim-plug +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif +call plug#begin() +Plug 'ARM9/arm-syntax-vim' +au BufNewFile,BufRead *.s,*.S set filetype=arm " arm = armv6/7 +call plug#end() |