From d16dce3c303894797c9fffd7d88399e9759e54b7 Mon Sep 17 00:00:00 2001 From: Random Date: Sun, 4 Apr 2021 11:24:39 -0700 Subject: [PATCH] Added laptop config --- Xresources | 13 +++-- i3/config | 6 +- i3/{i3status.conf => i3status.conf.desktop} | 0 i3/i3status.conf.laptop | 61 +++++++++++++++++++++ zsh/zshrc | 32 ++++++++--- 5 files changed, 99 insertions(+), 13 deletions(-) rename i3/{i3status.conf => i3status.conf.desktop} (100%) create mode 100644 i3/i3status.conf.laptop diff --git a/Xresources b/Xresources index 9f06ebe..7902631 100644 --- a/Xresources +++ b/Xresources @@ -6,11 +6,16 @@ URxvt.shading: 10 URxvt.scrollBar: false URxvt.internalBorder: 10 -!URxvt.perl-ext-common: resize-font -!URxvt.resize-font.smaller: C-j -!URxvt.resize-font.bigger: C-k - +! Font styles URxvt.font: xft:MesloLGS NF:size=12 URxvt.cursorColor: #d50505 URxvt.highlightColor: #303030 URxvt.highlightTextColor: #A0A0A0 +URxvt.saveLines: 200000 + +! External packages +URxvt.perl-ext-common: resize-font + +! Resize terminal +URxvt.resize-font.smaller: C-j +URxvt.resize-font.bigger: C-k diff --git a/i3/config b/i3/config index 0d7e93b..a349ac6 100644 --- a/i3/config +++ b/i3/config @@ -40,10 +40,14 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod -# start a terminal +# start applications bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+Shift+f exec firefox +bindsym $mod+Shift+d exec discord +bindsym Print exec "flameshot gui" # kill focused window +bindsym $mod+q kill bindsym $mod+Shift+q kill # start dmenu (a program launcher) diff --git a/i3/i3status.conf b/i3/i3status.conf.desktop similarity index 100% rename from i3/i3status.conf rename to i3/i3status.conf.desktop diff --git a/i3/i3status.conf.laptop b/i3/i3status.conf.laptop new file mode 100644 index 0000000..2e91451 --- /dev/null +++ b/i3/i3status.conf.laptop @@ -0,0 +1,61 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 1 +} + +order += "wireless tun0" +order += "wireless _first_" +order += "disk /" +order += "cpu_usage" +order += "memory" +order += "battery 0" +order += "volume master" +order += "tztime local" + +wireless _first_ { + format_up = "WiFi: %ip (%bitrate at %essid)" + format_down = "WiFi: down" +} + +wireless tun0 { + format_up = "VPN: %ip (%bitrate)" + format_down = "VPN: down" +} + +disk "/" { + format = "HDD: %avail free, %used used" +} + +cpu_usage { + format = "CPU: %usage" +} + +memory { + format = "Memory: %used used, %available free" + threshold_degraded = "1G" +} + +battery 0 { + format = "%status %percentage %remaining Hours" + path = "/sys/class/power_supply/BAT0/uevent" +} + +volume master { + format = " %volume" + format_muted = " %volume" + device = "default" + mixer = "Master" + mixer_idx = 0 +} + +tztime local { + format = "%A %m-%d-%Y %I:%M:%S" +} diff --git a/zsh/zshrc b/zsh/zshrc index 3eea827..4922a4d 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -43,8 +43,8 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' # case insensitive tab # History configurations HISTFILE=~/.zsh_history -HISTSIZE=1000 -SAVEHIST=2000 +HISTSIZE=1000000 +SAVEHIST=1000000 setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE setopt hist_ignore_dups # ignore duplicated commands history list setopt hist_ignore_space # ignore commands that start with space @@ -84,12 +84,9 @@ if [ -n "$force_color_prompt" ]; then fi if [ "$color_prompt" = yes ]; then - PROMPT=$'%F{%(#.blue.green)}┌──${debian_chroot:+($debian_chroot)──}(%B%F{%(#.red.blue)}%n%(#.💀.㉿)%m%b%F{%(#.blue.green)})-[%B%F{reset}%(6~.%-1~/…/%4~.%5~)%b%F{%(#.blue.green)}]\n└─%B%(#.%F{red}#.%F{blue}$)%b%F{reset} ' - RPROMPT=$'%(?.. %? %F{red}%B⨯%b%F{reset})%(1j. %j %F{yellow}%B⚙%b%F{reset}.)' - # enable syntax-highlighting - if [ -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && [ "$color_prompt" = yes ]; then - . /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + if [ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && [ "$color_prompt" = yes ]; then + . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) ZSH_HIGHLIGHT_STYLES[default]=none ZSH_HIGHLIGHT_STYLES[unknown-token]=fg=red,bold @@ -203,9 +200,28 @@ fi LS_COLORS=$LS_COLORS:'di=1;31:' ; export LS_COLORS # Load zplug and extensions -source /usr/share/zplug/init.zsh +source /usr/share/zsh/scripts/zplug/init.zsh zplug romkatv/powerlevel10k, as:theme, depth:1 zplug load +# Source completion and highlighting scripts +source /usr/share/fzf/completion.zsh +source /usr/share/fzf/key-bindings.zsh +source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh + # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + +# CUSTOM ALIASES & FUNCTIONS +alias open='xdg-open' +alias cewl='ruby -W0 /opt/CeWL/cewl.rb' +alias up='sudo python -m http.server 80' + +# Wordlists +export directorylist="~/Wordlists/directory-list.txt" +export rockyou="/usr/share/seclists/Passwords/Leaked-Databases/rockyou.txt" +export fasttrack="/usr/share/seclists/Passwords/fasttrack.txt" + +# Ease of use +alias kraken="ssh random@10.0.0.13" +alias pi="ssh root@10.0.0.31"