diff --git a/aliases/.git_aliases b/aliases/.git_aliases index 2017f4e..af93645 100644 --- a/aliases/.git_aliases +++ b/aliases/.git_aliases @@ -1,34 +1,37 @@ # Aliases {{{ # . ~/.secure -alias gs="git status -u" -alias gpl="git pull --rebase" -alias grbc="git rebase --continue" -alias gps="git push" -alias vig="vi .gitignore" +alias egc="vim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" alias ga="git add -A * && gs" alias gac="git add -A *; git commit" alias gai="git add .gitignore" +alias gc="git commit" +alias gchom="git checkout master" +alias gclear="git stash clear" alias gd="git diff -w" alias gdc="git diff --cached" -alias gstore="git config credential.helper store" -gcm(){ git commit -m "$1" ; } -alias gc="git commit" alias gl="git log" +alias gpl="git pull --rebase" +alias gps="git push" +alias grbc="git rebase --continue" +alias gs="git status -u" alias gsl="git shortlog" alias gst="git stash" +alias gstore="git config credential.helper store" alias gstp="git stash pop" -alias gclear="git stash clear" -alias egc="vim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" -alias gchom="git checkout master" +alias vig="vi .gitignore" +gcm(){ git commit -m "$1" ; } # Aliases }}} # Functions {{{ gcho() { git checkout $1 ; } gcln() { git clone $1 ; } + gremotes() { git remote set-url --add --push origin $1 git remote set-url --add --push origin $2 } + +# gmrgr: merge repos {{{ # gmrgr() { # 1 = remote name, 2 = remote path git remote add $1 $2 @@ -37,11 +40,16 @@ gmrgr() { git merge --allow-unrelated-histories $1/master git remote remove $1 } +# }}} merge repos # +# gunc() { git update-index --assume-unchanged $1 ; } + +# pull all {{{ # gpla() { cmds="lc snp 9r sch" for cmd in $cmds; do eval $cmd && gst && gpl && gstp && gclear done } +# }}} pull all # # Functions }}} diff --git a/aliases/.pc_aliases b/aliases/.pc_aliases index 1e6d15a..f4f11f1 100644 --- a/aliases/.pc_aliases +++ b/aliases/.pc_aliases @@ -2,22 +2,36 @@ if [ "$(whoami)" == "kevin" ]; then alias vbn="cvlc --loop --alsa-gain 1 ~/Downloads/brown-noise.mp3" + # school {{{ # alias mt="ok ~/Documents/School/calc-textbook.pdf" alias clc="gcalccmd" alias 6t="ok ~/Documents/School/236-textbook.pdf" alias doc="d ~/Documents" + # }}} school # + # i3 {{{ # alias v3="vi ~/.config/i3/config" alias v3b="vi ~/.config/i3blocks/i3blocks.conf" alias i3b="d /usr/share/i3blocks" + # }}} i3 # + + # coding projs {{{ # + cd_coding_dir="d ~/Documents/coding" alias ans="d /usr/local/android-studio/bin && ./studio.sh" + alias cdn="$cd_coding_dir" + alias tb="$cd_coding_dir/trapbot" + alias vtb="$cd_coding_dir/trapbot && vi trapbot.py" + alias ptb="python trapbot.py" + # }}} coding projs # + bl() { xbacklight -set $1 ; } cld() { colordiff -y --suppress-common-lines $1 $2 ; } fi # Both PC/Laptop }}} # NZXT {{{ if [ "$(hostname)" == "NZXT" ]; then + # rotate monitor {{{ # rt() { output="HDMI-0" if [ "$1" = "s" ] @@ -40,52 +54,51 @@ if [ "$(hostname)" == "NZXT" ]; then # echo "xrandr --output \"$output\" --rotate \"$dir\"" xrandr --output "$output" --rotate "$dir" } + # }}} rotate monitor # + # audio {{{ # alias alsi="pactl list short sink-inputs" alias als="pactl list short sinks" amsih() { pactl move-sink-input $1 0 ; } amsis() { pactl move-sink-input $1 1 ; } + # }}} audio # - alias w7="VBoxManage startvm W7 --type headless" - + # apps {{{ # chr() { google-chrome $1 ; } alias nem="nemo ." alias spt="speedtest" alias pg="ping -c 5 google.ca" + alias w7="VBoxManage startvm W7 --type headless" + # }}} apps # - cd_coding_dir="d ~/Documents/coding" - alias cdn="$cd_coding_dir" + # various coding projs {{{ # alias res="vi ~/Documents/resume/README.md" alias sfa="d ~/Documents/self-authoring" alias rcg="$cd_coding_dir/random-color-generator" alias dcr="$cd_coding_dir/dcr-logger" alias pf="$cd_coding_dir/ParsaFood" - alias tb="$cd_coding_dir/trapbot" - alias vtb="$cd_coding_dir/trapbot && vi trapbot.py" - alias ptb="python trapbot.py" - alias ptbo="python trapbot.py > output.py" alias sb="$cd_coding_dir/swbot" # alias psb="p3 create_skills_dict.py" # alias psbo="p3 create_skills_dict.py > output.py" alias psb="p3 create_monster_dict.py" alias psbo="p3 create_monster_dict.py > output.py" - - # xset r rate 200 75 - # xmodmap -e "clear Lock" - # xmodmap -e "keycode 22 = Caps_Lock" - # xmodmap -e "keycode 66 = BackSpace" + # }}} various coding projs # fi # NZXT }}} # Laptop {{{ if [ "$(hostname)" == "X1-Carbon" ]; then - # key swaps + # key swaps {{{ # xmodmap -e "keycode 9 = Escape" xmodmap -e "keycode 22 = Home" xmodmap -e "keycode 119 = End" xmodmap -e "keycode 110 = Delete" xmodmap -e "keycode 115 = BackSpace" + # }}} key swaps # alias thn="thunar ." + + alias plz="d ~/platterz2018/ocr-reader/app/src/main/java/com/google/android/gms/samples/vision/ocrreader" + alias ans="d /usr/local/android-studio/bin/" fi # Laptop }}} diff --git a/aliases/.school_aliases b/aliases/.school_aliases index 5a682c0..2edd55e 100644 --- a/aliases/.school_aliases +++ b/aliases/.school_aliases @@ -1,5 +1,5 @@ in_lab=false -cd_school="d ~/Documents/School/notes"; +cd_school="d ~/Documents/School/notes" # Lab Setup/Aliases {{{ if [ $(whoami) == "mokkar" ]; then diff --git a/configs/X1-Carbon/i3.conf b/configs/X1-Carbon/i3.conf index 61aff80..d356002 100644 --- a/configs/X1-Carbon/i3.conf +++ b/configs/X1-Carbon/i3.conf @@ -6,9 +6,11 @@ exec imwheel exec terminator # }}} startup # +bindsym Mod4+e exec cd /usr/local/android-studio/bin/ && ./studio.sh bindsym $mod+control+Return exec i3-sensible-terminal bindsym Mod4+c exec google-chrome-stable --force-device-scale-factor=1.5 bindsym Mod4+d exec discord +bindsym Mod4+t exec thunar # redshift {{{ # bindsym $mod+Mod4+1 exec redshift -O 1500 @@ -91,10 +93,10 @@ set $ws1 "1 " set $ws2 "2 " set $ws3 "3 🌐" set $ws4 "4 🖹" -set $ws5 "5 🗪" -set $ws6 "6 " +set $ws5 "5 " +set $ws6 "6 🗪" set $ws7 "7 ↥" -set $ws8 "8 " +set $ws8 "8 📱" set $ws9 "9 ✎" set $ws10 "10 " assign [class="discord"] $ws6 @@ -119,20 +121,20 @@ bindsym $mod+0 workspace $ws10 # move container to ws {{{ # # move focused container to workspace -bindsym $mod+control+1 move container to workspace $ws1 -bindsym $mod+control+2 move container to workspace $ws2 -bindsym $mod+control+3 move container to workspace $ws3 -bindsym $mod+control+4 move container to workspace $ws4 -# bindsym $mod+control+1 move container to workspace $ws1; workspace $ws1 -# bindsym $mod+control+2 move container to workspace $ws2; workspace $ws2 -# bindsym $mod+control+3 move container to workspace $ws3; workspace $ws3 -# bindsym $mod+control+4 move container to workspace $ws4; workspace $ws4 -bindsym $mod+control+5 move container to workspace $ws5 -bindsym $mod+control+6 move container to workspace $ws6 -bindsym $mod+control+7 move container to workspace $ws7 -bindsym $mod+control+8 move container to workspace $ws8 -bindsym $mod+control+9 move container to workspace $ws9 -bindsym $mod+control+0 move container to workspace $ws10 +# bindsym $mod+control+1 move container to workspace $ws1 +# bindsym $mod+control+2 move container to workspace $ws2 +# bindsym $mod+control+3 move container to workspace $ws3 +# bindsym $mod+control+4 move container to workspace $ws4 +bindsym $mod+control+1 move container to workspace $ws1; workspace $ws1 +bindsym $mod+control+2 move container to workspace $ws2; workspace $ws2 +bindsym $mod+control+3 move container to workspace $ws3; workspace $ws3 +bindsym $mod+control+4 move container to workspace $ws4; workspace $ws4 +bindsym $mod+control+5 move container to workspace $ws5; workspace $ws5 +bindsym $mod+control+6 move container to workspace $ws6; workspace $ws6 +bindsym $mod+control+7 move container to workspace $ws7; workspace $ws7 +bindsym $mod+control+8 move container to workspace $ws8; workspace $ws8 +bindsym $mod+control+9 move container to workspace $ws9; workspace $ws9 +bindsym $mod+control+0 move container to workspace $ws10; workspace $ws10 # }}} move container to ws # # gaps {{{ # @@ -161,7 +163,7 @@ bindsym $mod+control+l resize grow width 10 px or 10 ppt # status bar {{{ # # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) -set $sb_font Hack Bold 24 +set $sb_font Hack Bold 16 bar { font pango:$sb_font status_command i3blocks -c ~/.config/i3blocks/i3blocks.conf diff --git a/configs/X1-Carbon/neofetch.conf b/configs/X1-Carbon/neofetch.conf new file mode 100644 index 0000000..41107ce --- /dev/null +++ b/configs/X1-Carbon/neofetch.conf @@ -0,0 +1,734 @@ +# Neofetch config file +# https://github.com/dylanaraps/neofetch + + +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info +print_info() { + info title + info underline + + info "OS" distro + info "Terminal" term + info "WM" wm + info "CPU" cpu + info "Memory" memory + info "Resolution" resolution + info "Uptime" uptime + info "Install Date" install_date + + # not showing up + info "Terminal Font" term_font + info "WM Theme" wm_theme + + # info "GPU" gpu + # info "Font" font + # info "Users" users + # info "Host" model + # info "Kernel" kernel + # info "Packages" packages + # info "Shell" shell + # info "DE" de + # info "Theme" theme + # info "Icons" icons + # info "GPU Driver" gpu_driver # Linux only + # info "CPU Usage" cpu_usage + # info "Disk" disk + # info "Battery" battery + # info "Song" song + # info "Local IP" local_ip + # info "Public IP" public_ip + # info "Locale" locale # This only works on glibc systems. + + info line_break + info cols + info line_break +} + + +# Kernel + + +# Shorten the output of the kernel function. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --kernel_shorthand +# Supports: Everything except *BSDs (except PacBSD and PC-BSD) +# +# Example: +# on: '4.8.9-1-ARCH' +# off: 'Linux 4.8.9-1-ARCH' +kernel_shorthand="on" + + +# Distro + + +# Shorten the output of the distro function +# +# Default: 'off' +# Values: 'on', 'off', 'tiny' +# Flag: --distro_shorthand +# Supports: Everything except Windows and Haiku +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Show 'x86_64', 'x86' and etc in 'Distro:' output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --os_arch +# +# Example: +# on: 'Arch Linux x86_64' +# off: 'Arch Linux' +os_arch="off" + + +# Uptime + + +# Shorten the output of the uptime function +# +# Default: 'on' +# Values: 'on', 'off', 'tiny' +# Flag: --uptime_shorthand +# +# Example: +# on: '2 days, 10 hours, 3 mins' +# off: '2 days, 10 hours, 3 minutes' +# tiny: '2d 10h 3m' +uptime_shorthand="on" + + +# Shell + + +# Show the path to $SHELL +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --shell_path +# +# Example: +# on: '/bin/bash' +# off: 'bash' +shell_path="off" + +# Show $SHELL version +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --shell_version +# +# Example: +# on: 'bash 4.4.5' +# off: 'bash' +shell_version="on" + + +# CPU + + +# CPU speed type +# +# Default: 'bios_limit' +# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. +# Flag: --speed_type +# Supports: Linux with 'cpufreq' +# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. +speed_type="bios_limit" + +# CPU speed shorthand +# +# Default: 'off' +# Values: 'on', 'off'. +# Flag: --speed_shorthand. +# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz +# +# Example: +# on: 'i7-6500U (4) @ 3.1GHz' +# off: 'i7-6500U (4) @ 3.100GHz' +speed_shorthand="on" + +# Enable/Disable CPU brand in output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_brand +# +# Example: +# on: 'Intel i7-6500U' +# off: 'i7-6500U (4)' +cpu_brand="on" + +# CPU Speed +# Hide/Show CPU speed. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_speed +# +# Example: +# on: 'Intel i7-6500U (4) @ 3.1GHz' +# off: 'Intel i7-6500U (4)' +cpu_speed="on" + +# CPU Cores +# Display CPU cores in output +# +# Default: 'logical' +# Values: 'logical', 'physical', 'off' +# Flag: --cpu_cores +# Support: 'physical' doesn't work on BSD. +# +# Example: +# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) +# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) +# off: 'Intel i7-6500U @ 3.1GHz' +cpu_cores="logical" + +# CPU Temperature +# Hide/Show CPU temperature. +# Note the temperature is added to the regular CPU function. +# +# Default: 'off' +# Values: 'C', 'F', 'off' +# Flag: --cpu_temp +# Supports: Linux, BSD +# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable +# coretemp kernel module. This only supports newer Intel processors. +# +# Example: +# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' +# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' +# off: 'Intel i7-6500U (4) @ 3.1GHz' +cpu_temp="off" + + +# GPU + + +# Enable/Disable GPU Brand +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gpu_brand +# +# Example: +# on: 'AMD HD 7950' +# off: 'HD 7950' +gpu_brand="on" + +# Which GPU to display +# +# Default: 'all' +# Values: 'all', 'dedicated', 'integrated' +# Flag: --gpu_type +# Supports: Linux +# +# Example: +# all: +# GPU1: AMD HD 7950 +# GPU2: Intel Integrated Graphics +# +# dedicated: +# GPU1: AMD HD 7950 +# +# integrated: +# GPU1: Intel Integrated Graphics +gpu_type="all" + + +# Resolution + + +# Display refresh rate next to each monitor +# Default: 'off' +# Values: 'on', 'off' +# Flag: --refresh_rate +# Supports: Doesn't work on Windows. +# +# Example: +# on: '1920x1080 @ 60Hz' +# off: '1920x1080' +refresh_rate="off" + + +# Gtk Theme / Icons / Font + + +# Shorten output of GTK Theme / Icons / Font +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --gtk_shorthand +# +# Example: +# on: 'Numix, Adwaita' +# off: 'Numix [GTK2], Adwaita [GTK3]' +gtk_shorthand="off" + + +# Enable/Disable gtk2 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk2 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Adwaita [GTK3]' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk3 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Numix [GTK2]' +gtk3="on" + + +# IP Address + + +# Website to ping for the public IP +# +# Default: 'http://ident.me' +# Values: 'url' +# Flag: --ip_host +public_ip_host="http://ident.me" + + +# Disk + + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +# NOTE: By default we only show the disk info for '/'. +# +# Default: '/' +# Values: '/', '/dev/sdXX', '/path/to/drive'. +# Flag: --disk_show +# +# Example: +# disk_show=('/' '/dev/sdb1'): +# 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 823G / 893G (93%)' +# +# disk_show=('/'): +# 'Disk (/): 74G / 118G (66%)' +# +disk_show=('/') + +# Disk subtitle. +# What to append to the Disk subtitle. +# +# Default: 'mount' +# Values: 'mount', 'name', 'dir' +# Flag: --disk_subtitle +# +# Example: +# name: 'Disk (/dev/sda1): 74G / 118G (66%)' +# 'Disk (/dev/sdb2): 74G / 118G (66%)' +# +# mount: 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 74G / 118G (66%)' +# +# dir: 'Disk (/): 74G / 118G (66%)' +# 'Disk (Local Disk): 74G / 118G (66%)' +# 'Disk (Videos): 74G / 118G (66%)' +disk_subtitle="mount" + + +# Song + + +# Print the Artist and Title on separate lines +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --song_shorthand +# +# Example: +# on: 'Artist: The Fratellis' +# 'Song: Chelsea Dagger' +# +# off: 'Song: The Fratellis - Chelsea Dagger' +song_shorthand="off" + + +# Install Date + + +# Whether to show the time in the output +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --install_time +# +# Example: +# on: 'Thu 14 Apr 2016 11:50 PM' +# off: 'Thu 14 Apr 2016' +install_time="off" + +# Set time format in the output +# +# Default: '24h' +# Values: '12h', '24h' +# Flag: --install_time_format +# +# Example: +# 12h: 'Thu 14 Apr 2016 11:50 PM' +# 24h: 'Thu 14 Apr 2016 23:50' +install_time_format="24h" + + +# Text Colors + + +# Text Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --colors +# +# Each number represents a different part of the text in +# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' +# +# Example: +# colors=(distro) - Text is colored based on Distro colors. +# colors=(4 6 1 8 8 6) - Text is colored in the order above. +colors=(distro) + + +# Text Options + + +# Toggle bold text +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bold +bold="on" + +# Enable/Disable Underline +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --underline +underline_enabled="on" + +# Underline character +# +# Default: '-' +# Values: 'string' +# Flag: --underline_char +underline_char="-" + + +# Color Blocks + + +# Color block range +# The range of colors to print. +# +# Default: '0', '7' +# Values: 'num' +# Flag: --block_range +# +# Example: +# +# Display colors 0-7 in the blocks. (8 colors) +# neofetch --block_range 0 7 +# +# Display colors 0-15 in the blocks. (16 colors) +# neofetch --block_range 0 15 +block_range=(0 7) + +# Toggle color blocks +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --color_blocks +color_blocks="on" + +# Color block width in spaces +# +# Default: '3' +# Values: 'num' +# Flag: --block_width +block_width=3 + +# Color block height in lines +# +# Default: '1' +# Values: 'num' +# Flag: --block_height +block_height=1 + + +# Progress Bars + + +# Bar characters +# +# Default: '-', '=' +# Values: 'string', 'string' +# Flag: --bar_char +# +# Example: +# neofetch --bar_char 'elapsed' 'total' +# neofetch --bar_char '-' '=' +bar_char_elapsed="-" +bar_char_total="=" + +# Toggle Bar border +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bar_border +bar_border="on" + +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# +# Default: '15' +# Values: 'num' +# Flag: --bar_length +bar_length=15 + +# Progress bar colors +# When set to distro, uses your distro's logo colors. +# +# Default: 'distro', 'distro' +# Values: 'distro', 'num' +# Flag: --bar_colors +# +# Example: +# neofetch --bar_colors 3 4 +# neofetch --bar_colors distro 5 +bar_color_elapsed="distro" +bar_color_total="distro" + + +# Info display +# Display a bar with the info. +# +# Default: 'off' +# Values: 'bar', 'infobar', 'barinfo', 'off' +# Flags: --cpu_display +# --memory_display +# --battery_display +# --disk_display +# +# Example: +# bar: '[---=======]' +# infobar: 'info [---=======]' +# barinfo: '[---=======] info' +# off: 'info' +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" + + +# Backend Settings + + +# Image backend. +# +# Default: 'ascii' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m' +# Flag: --backend +image_backend="ascii" + +# Image Source +# +# Which image or ascii file to display. +# +# Default: 'auto' +# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# Flag: --source +# +# NOTE: 'auto' will pick the best image source for whatever image backend is used. +# In ascii mode, distro ascii art will be used and in an image mode, your +# wallpaper will be used. +image_source="auto" + + +# Ascii Options + + +# Ascii distro +# Which distro's ascii art to display. +# +# Default: 'auto' +# Values: 'auto', 'distro_name' +# Flag: --ascii_distro +# +# NOTE: Arch and Ubuntu have 'old' logo variants. +# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: Ubuntu has flavor variants. +# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. +# NOTE: Arch, Crux and Gentoo have a smaller logo variant. +# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +ascii_distro="auto" + +# Ascii Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --ascii_colors +# +# Example: +# ascii_colors=(distro) - Ascii is colored based on Distro colors. +# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. +ascii_colors=(distro) + +# Bold ascii logo +# Whether or not to bold the ascii logo. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --ascii_bold +ascii_bold="on" + + +# Image Options + + +# Image loop +# Setting this to on will make neofetch redraw the image constantly until +# Ctrl+C is pressed. This fixes display issues in some terminal emulators. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --loop +image_loop="off" + +# Thumbnail directory +# +# Default: '~/.cache/thumbnails/neofetch' +# Values: 'dir' +thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" + +# Crop mode +# +# Default: 'normal' +# Values: 'normal', 'fit', 'fill' +# Flag: --crop_mode +# +# See this wiki page to learn about the fit and fill options. +# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F +crop_mode="normal" + +# Crop offset +# Note: Only affects 'normal' crop mode. +# +# Default: 'center' +# Values: 'northwest', 'north', 'northeast', 'west', 'center' +# 'east', 'southwest', 'south', 'southeast' +# Flag: --crop_offset +crop_offset="center" + +# Image size +# The image is half the terminal width by default. +# +# Default: 'auto' +# Values: 'auto', '00px', '00%', 'none' +# Flags: --image_size +# --size +image_size="auto" + +# Ggap between image and text +# +# Default: '3' +# Values: 'num', '-num' +# Flag: --gap +gap=3 + +# Image offsets +# Only works with the w3m backend. +# +# Default: '0' +# Values: 'px' +# Flags: --xoffset +# --yoffset +yoffset=0 +xoffset=0 + +# Image background color +# Only works with the w3m backend. +# +# Default: '' +# Values: 'color', 'blue' +# Flag: --bg_color +background_color= + + +# Scrot Options + + +# Whether or not to always take a screenshot +# You can manually take a screenshot with "--scrot" or "-s" +# +# Default: 'off' +# Values: 'on', 'off' +# Flags: --scrot +# -s +scrot="off" + +# Screenshot Program +# Neofetch will automatically use whatever screenshot tool +# is installed on your system. +# +# If 'neofetch -v' says that it couldn't find a screenshot +# tool or you're using a custom tool then you can change +# the option below to a custom command. +# +# Default: 'auto' +# Values: 'auto' 'cmd -flags' +# Flag: --scrot_cmd +scrot_cmd="auto" + +# Screenshot Filename +# What to name the screenshots +# +# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' +# Values: 'string' +# Flag: --scrot_name +scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" + +# Image upload host +# Where to upload the image. +# +# Default: 'teknik' +# Values: 'imgur', 'teknik' +# Flag: --image_host +# +# NOTE: If you'd like another image host to be added to Neofetch. +# Open an issue on github. +image_host="teknik" + + +# Misc Options + +# Stdout mode +# Turn off all colors and disables image backend (ASCII/Image). +# Useful for piping into another command. +# Default: 'off' +# Values: 'on', 'off' +stdout="off" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="3.3.0" diff --git a/configs/X1-Carbon/terminator.conf b/configs/X1-Carbon/terminator.conf index cca0424..b42cd03 100644 --- a/configs/X1-Carbon/terminator.conf +++ b/configs/X1-Carbon/terminator.conf @@ -22,7 +22,7 @@ copy_on_selection = True cursor_color = "#b9b9b9" custom_command = env TERM=xterm-256color bash - font = Hack 18 + font = Hack 17 foreground_color = "#0077ff" palette = "#000000:#aa0000:#00aa00:#aa5500:#0000aa:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#5555ff:#ff55ff:#55ffff:#ffffff" use_custom_command = True diff --git a/dotfiles/bashrc b/dotfiles/bashrc index 4efb384..8189579 100644 --- a/dotfiles/bashrc +++ b/dotfiles/bashrc @@ -188,8 +188,11 @@ if [ "$(whoami)" == "kevin" ]; then xset r rate 200 90 fi # NZXT -if [ "$(hostname)" == "NZXT" ]; then +if [ "$(hostname)" == "NZXT" ]; +then xmodmap -e "clear Lock" xmodmap -e "keycode 22 = Caps_Lock" xmodmap -e "keycode 66 = BackSpace" +else + xrandr --dpi 150 fi