diff --git a/configs/i3/config b/configs/i3/config index 89e4fce..370a695 100644 --- a/configs/i3/config +++ b/configs/i3/config @@ -368,8 +368,8 @@ font pango:Hack 11 # }}} mod key/font # # media keys {{{ # -bindsym $mod+d exec ~/linux-config/change-sink.sh dac -bindsym $mod+o exec ~/linux-config/change-sink.sh line-out +bindsym $mod+d exec ~/linux-config/scripts/change-sink.sh dac +bindsym $mod+o exec ~/linux-config/scripts/change-sink.sh line-out bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 0 sset Master 3+ bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 0 sset Master 3- diff --git a/configs/ranger/scope-old.sh b/configs/ranger/scope-old.sh deleted file mode 100755 index ce9ee57..0000000 --- a/configs/ranger/scope-old.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env sh -# ranger supports enhanced previews. If the option "use_preview_script" -# is set to True and this file exists, this script will be called and its -# output is displayed in ranger. ANSI color codes are supported. - -# NOTES: This script is considered a configuration file. If you upgrade -# ranger, it will be left untouched. (You must update it yourself.) -# Also, ranger disables STDIN here, so interactive scripts won't work properly - -# Meanings of exit codes: -# code | meaning | action of ranger -# -----+------------+------------------------------------------- -# 0 | success | success. display stdout as preview -# 1 | no preview | failure. display no preview at all -# 2 | plain text | display the plain content of the file -# 3 | fix width | success. Don't reload when width changes -# 4 | fix height | success. Don't reload when height changes -# 5 | fix both | success. Don't ever reload -# 6 | image | success. display the image $cached points to as an image preview - -# Meaningful aliases for arguments: -path="$1" # Full path of the selected file -width="$2" # Width of the preview pane (number of fitting characters) -height="$3" # Height of the preview pane (number of fitting characters) -cached="$4" # Path that should be used to cache image previews - -maxln=200 # Stop after $maxln lines. Can be used like ls | head -n $maxln - -# Find out something about the file: -mimetype=$(file --mime-type -Lb "$path") -extension=$(/bin/echo -E "${path##*.}" | tr "[:upper:]" "[:lower:]") - -# Functions: -# runs a command and saves its output into $output. Useful if you need -# the return value AND want to use the output in a pipe -try() { output=$(eval '"$@"'); } - -# writes the output of the previously used "try" command -dump() { /bin/echo -E "$output"; } - -# a common post-processing function used after most commands -trim() { head -n "$maxln"; } - -# wraps highlight to treat exit code 141 (killed by SIGPIPE) as success -highlight() { command highlight "$@"; test $? = 0 -o $? = 141; } - -case "$extension" in - # Archive extensions: - 7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\ - rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip) - try als "$path" && { dump | trim; exit 0; } - try acat "$path" && { dump | trim; exit 3; } - try bsdtar -lf "$path" && { dump | trim; exit 0; } - exit 1;; - rar) - try unrar -p- lt "$path" && { dump | trim; exit 0; } || exit 1;; - # PDF documents: - pdf) - try pdftotext -l 10 -nopgbrk -q "$path" - && \ - { dump | trim | fmt -s -w $width; exit 0; } || exit 1;; - # BitTorrent Files - torrent) - try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;; - # HTML Pages: - htm|html|xhtml) - try w3m -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; } - try lynx -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; } - try elinks -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; } - ;; # fall back to highlight/cat if the text browsers fail -esac - -case "$mimetype" in - # Syntax highlight for text files: - text/* | */xml) - try highlight --out-format=ansi "$path" && { dump | trim; exit 5; } || exit 2;; - # Ascii-previews of images: - image/*) - img2txt --gamma=0.6 --width="$width" "$path" && exit 4 || exit 1;; - # Image preview for videos, disabled by default: - # video/*) - # ffmpegthumbnailer -i "$path" -o "$cached" -s 0 && exit 6 || exit 1;; - # Display information about media files: - video/* | audio/*) - exiftool "$path" && exit 5 - # Use sed to remove spaces so the output fits into the narrow window - try mediainfo "$path" && { dump | trim | sed 's/ \+:/: /;'; exit 5; } || exit 1;; -esac - -exit 1 diff --git a/configs/set-configs.sh b/configs/set-configs.sh index a76e0b2..f11eb73 100755 --- a/configs/set-configs.sh +++ b/configs/set-configs.sh @@ -1,5 +1,7 @@ +#!/bin/bash + # Get directory variables from script. -. ../dirs.sh +. ../scripts/dirs.sh # List of config dirs in system config dir that I want to link to. config_dirs=(neofetch i3 i3blocks sam-i3blocks ranger) # config_dirs=(neofetch i3 i3blocks ranger) diff --git a/dotfiles/set-dotfiles.sh b/dotfiles/set-dotfiles.sh index 0f18215..6f558d2 100755 --- a/dotfiles/set-dotfiles.sh +++ b/dotfiles/set-dotfiles.sh @@ -1,7 +1,9 @@ #!/bin/zsh +# link files {{{ # + # Get directory variables from script. -. ../dirs.sh +. ../scripts/dirs.sh # List of dotfiles I want to link to system. dotfiles=(bashrc gitconfig inputrc imwheelrc vimrc xinitrc Xmodmap Xresources zshrc) # cd $dot_dir @@ -11,3 +13,15 @@ for dotfile in $dotfiles; do # Link dotfile in repository to system dotfile. ln -s "$dot_dir"/"$dotfile" ~/."$dotfile" done + +# }}} link files # + +# setup nvim config {{{ # + +orig_file="$sys_config_dir"/nvim/init.vim +# Remove system dotfile. +rm "$orig_file" +# Link dotfile in repository to system dotfile. +ln -s "$dot_dir"/nvim "$orig_file" + +# }}} setup nvim config # diff --git a/dotfiles/set-nvim.sh b/dotfiles/set-nvim.sh deleted file mode 100755 index d29c227..0000000 --- a/dotfiles/set-nvim.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Get directory variables from script. -. ../dirs.sh -orig_file="$sys_config_dir"/nvim/init.vim -# Remove system dotfile. -rm "$orig_file" -# Link dotfile in repository to system dotfile. -ln -s "$dot_dir"/nvim "$orig_file" diff --git a/backup.sh b/scripts/backup.sh similarity index 100% rename from backup.sh rename to scripts/backup.sh diff --git a/change-sink.sh b/scripts/change-sink.sh similarity index 100% rename from change-sink.sh rename to scripts/change-sink.sh diff --git a/dirs.sh b/scripts/dirs.sh similarity index 92% rename from dirs.sh rename to scripts/dirs.sh index 03bf10b..59b0062 100755 --- a/dirs.sh +++ b/scripts/dirs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash linux_config_dir=~/linux-config dot_dir=$linux_config_dir/dotfiles diff --git a/shortcuts.sh b/scripts/shortcuts.sh similarity index 100% rename from shortcuts.sh rename to scripts/shortcuts.sh diff --git a/key_dirs.txt b/txt/key_dirs.txt similarity index 100% rename from key_dirs.txt rename to txt/key_dirs.txt diff --git a/key_files.txt b/txt/key_files.txt similarity index 100% rename from key_files.txt rename to txt/key_files.txt diff --git a/pacman-pkgs.txt b/txt/pacman-pkgs.txt similarity index 99% rename from pacman-pkgs.txt rename to txt/pacman-pkgs.txt index 317c722..1ef4ca5 100644 --- a/pacman-pkgs.txt +++ b/txt/pacman-pkgs.txt @@ -9,6 +9,7 @@ eog fakeroot feh findutils +fzf git grep grub diff --git a/x/marble-mouse/set-config.sh b/x/marble-mouse/set-config.sh index 852288c..bc22770 100755 --- a/x/marble-mouse/set-config.sh +++ b/x/marble-mouse/set-config.sh @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Get directory variables from script. -. ../../dirs.sh +. ../../scripts/dirs.sh config_file_name="10-evdev.conf" sys_layout_file="/etc/X11/xorg.conf.d/$config_file_name"