From d8c3a5aeb296f985e52404cfb28976ae8b41a85e Mon Sep 17 00:00:00 2001 From: George Rawlinson Date: Sat, 22 Oct 2016 07:30:35 +1300 Subject: [PATCH] Remove bash, xfce4 & obsolete ssh-agent.zsh --- bash/README.md | 3 - bash/bash_aliases | 31 ---------- bash/bash_profile | 7 --- bash/bashrc | 143 ---------------------------------------------- xfce4/README.md | 63 -------------------- xfce4/gtkrc-2.0 | 1 - xfce4/terminalrc | 26 --------- xfce4/xinitrc | 26 --------- xfce4/xresources | 33 ----------- zsh/README.md | 10 ---- zsh/ssh-agent.zsh | 7 --- 11 files changed, 350 deletions(-) delete mode 100644 bash/README.md delete mode 100644 bash/bash_aliases delete mode 100644 bash/bash_profile delete mode 100644 bash/bashrc delete mode 100644 xfce4/README.md delete mode 100644 xfce4/gtkrc-2.0 delete mode 100644 xfce4/terminalrc delete mode 100644 xfce4/xinitrc delete mode 100644 xfce4/xresources delete mode 100644 zsh/ssh-agent.zsh diff --git a/bash/README.md b/bash/README.md deleted file mode 100644 index e458124..0000000 --- a/bash/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# bash - -Backup of old bash scripts. diff --git a/bash/bash_aliases b/bash/bash_aliases deleted file mode 100644 index 93c391c..0000000 --- a/bash/bash_aliases +++ /dev/null @@ -1,31 +0,0 @@ -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -# User defined functions [Arch] -# Pacman alias examples -alias pacupg="sudo pacman -Syu" # Synchronize with repositories and then upgrade packages that are out of date on the local system. -alias pacdl="pacman -Sw" # Download specified package(s) as .tar.xz ball -alias pacin="sudo pacman -S" # Install specific package(s) from the repositories -alias pacins="sudo pacman -U" # Install specific package not from the repositories but from a file -alias pacre="sudo pacman -R" # Remove the specified package(s), retaining its configuration(s) and required dependencies -alias pacrem="sudo pacman -Rns" # Remove the specified package(s), its configuration(s) and unneeded dependencies -alias pacrep="pacman -Si" # Display information about a given package in the repositories -alias pacreps="pacman -Ss" # Search for package(s) in the repositories -alias pacloc="pacman -Qi" # Display information about a given package in the local database -alias paclocs="pacman -Qs" # Search for package(s) in the local database -alias paclo="pacman -Qdt" # List all packages which are orphaned -alias pacc="sudo pacman -Scc" # Clean cache - delete all the package files in the cache -alias paclf="pacman -Ql" # List all files installed by a given package -alias pacown="pacman -Qo" # Show package(s) owning the specified file(s) -alias pacexpl="pacman -D --asexp" # Mark one or more installed packages as explicitly installed -alias pacimpl="pacman -D --asdep" # Mark one or more installed packages as non explicitly installed - -# Additional pacman alias examples -alias pacupd="sudo pacman -Sy && sudo abs" # Update and refresh the local package and ABS databases against repositories -alias pacinsd="sudo pacman -S --asdeps" # Install given package(s) as dependencies -alias pacmir="sudo pacman -Syy" # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist - -# NPM -alias npmls="npm -g ls --depth=0" # List globally installed packages. diff --git a/bash/bash_profile b/bash/bash_profile deleted file mode 100644 index f07ff4c..0000000 --- a/bash/bash_profile +++ /dev/null @@ -1,7 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc - -[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx diff --git a/bash/bashrc b/bash/bashrc deleted file mode 100644 index 3b975a4..0000000 --- a/bash/bashrc +++ /dev/null @@ -1,143 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=90000 -HISTFILESIZE=${HISTSIZE} - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='\[\033[01;31m\]\u\[\033[01;33m\]@\[\033[01;36m\]\h \[\033[01;33m\]\w \[\033[01;35m\]\$ \[\033[00m\]' -else - PS1='\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi - -# If this is an xterm set more declarative titles -# "dir: last_cmd" and "actual_cmd" during execution -# If you want to exclude a cmd from being printed see line 156 -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\$(print_title)\a\]$PS1" - __el_LAST_EXECUTED_COMMAND="" - print_title () - { - __el_FIRSTPART="" - __el_SECONDPART="" - if [ "$PWD" == "$HOME" ]; then - __el_FIRSTPART=$(gettext --domain="pantheon-files" "Home") - else - if [ "$PWD" == "/" ]; then - __el_FIRSTPART="/" - else - __el_FIRSTPART="${PWD##*/}" - fi - fi - if [[ "$__el_LAST_EXECUTED_COMMAND" == "" ]]; then - echo "$__el_FIRSTPART" - return - fi - #trim the command to the first segment and strip sudo - if [[ "$__el_LAST_EXECUTED_COMMAND" == sudo* ]]; then - __el_SECONDPART="${__el_LAST_EXECUTED_COMMAND:5}" - __el_SECONDPART="${__el_SECONDPART%% *}" - else - __el_SECONDPART="${__el_LAST_EXECUTED_COMMAND%% *}" - fi - printf "%s: %s" "$__el_FIRSTPART" "$__el_SECONDPART" - } - put_title() - { - __el_LAST_EXECUTED_COMMAND="${BASH_COMMAND}" - printf "\033]0;%s\007" "$1" - } - - # Show the currently running command in the terminal title: - # http://www.davidpashley.com/articles/xterm-titles-with-bash.html - update_tab_command() - { - # catch blacklisted commands and nested escapes - case "$BASH_COMMAND" in - *\033]0*|update_*|echo*|printf*|clear*|cd*) - __el_LAST_EXECUTED_COMMAND="" - ;; - *) - put_title "${BASH_COMMAND}" - ;; - esac - } - preexec_functions+=(update_tab_command) - ;; -*) - ;; -esac diff --git a/xfce4/README.md b/xfce4/README.md deleted file mode 100644 index 173c07b..0000000 --- a/xfce4/README.md +++ /dev/null @@ -1,63 +0,0 @@ -# xfce4 - -**Obsolete**: I've since switched to KDE Plasma 5. -The X11 files are still useful. - -## General - -* Ensure notifications work properly. ([Reference][2] & [Source][1]) -* Autostart xfce4 at login.([Source][3]) - -## UI - -### Terminal - -* Monokai Theme. (Filename: [base16-monokai.dark.terminalrc][4]) -* UI "improvements" - -### Icons, Panel, Dock - -* Numix Theme -* Numix Icons -* Numix notifications -* Topmenu Panel. Ensure this works properly. ([Reference][5]) -* Docky - -DOCKY TODO: - -* [Docky](http://unix.stackexchange.com/questions/74664/where-does-docky-store-its-configuration) [Config](http://wiki.go-docky.com/index.php?title=GConf_Settings) -* Autostart - -Create a symlink for `.xinitrc` - -`ln -s ~/.dotfiles/xfce4/xinitrc ~/.xinitrc` - -Create folders for terminal settings & symlink `terminalrc` - -`mkdir -p ~/.config/xfce4/terminal` - -`ln -s ~/.dotfiles/xfce4/terminalrc ~/.config/xfce4/terminal/terminalrc` - -Install Numix Theme + Docky - -`pacman -S numix-theme docky` - -Install Icons + Topmenu. After clone, enter each directory & `makepkg -sri` - -`git clone https://aur.archlinux.org/numix-icon-theme-git.git` - -`git clone https://aur.archlinux.org/numix-circle-icon-theme-git.git` - -`git clone https://aur.archlinux.org/topmenu-gtk-git.git` - -`git clone https://aur.archlinux.org/xfce4-topmenu-plugin-git.git` - -Create a symlink for `.gtkrc-2.0` - -`ln -s ~/.dotfiles/xfce4/gtk-2.0 ~/.gtkrc-2.0` - -[1]: https://wiki.archlinux.org/index.php/xinitrc#Configuration -[2]: https://bbs.archlinux.org/viewtopic.php?id=203164 -[3]: https://wiki.archlinux.org/index.php/xinitrc#Autostart_X_at_login -[4]: https://github.com/chriskempson/base16-xfce4-terminal -[5]: https://git.javispedro.com/cgit/topmenu-gtk.git/about/ diff --git a/xfce4/gtkrc-2.0 b/xfce4/gtkrc-2.0 deleted file mode 100644 index 6e8f032..0000000 --- a/xfce4/gtkrc-2.0 +++ /dev/null @@ -1 +0,0 @@ -gtk-modules = "canberra-gtk-module:topmenu-gtk-module" diff --git a/xfce4/terminalrc b/xfce4/terminalrc deleted file mode 100644 index 9ddc4ff..0000000 --- a/xfce4/terminalrc +++ /dev/null @@ -1,26 +0,0 @@ -[Configuration] -FontName=DejaVu Sans Mono 10 -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBordersDefault=TRUE -MiscCursorBlinks=FALSE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=150x40 -MiscInheritGeometry=FALSE -MiscMenubarDefault=TRUE -MiscMouseAutohide=FALSE -MiscToolbarDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE -ShortcutsNoMnemonics=TRUE -ScrollingBar=TERMINAL_SCROLLBAR_NONE - -# Supposedly Monokai -ColorCursor=#f8f8f2 -ColorForeground=#f8f8f2 -ColorBackground=#272822 -ColorPalette=#272822;#f92672;#a6e22e;#f4bf75;#66d9ef;#ae81ff;#a1efe4;#f8f8f2;#75715e;#f92672;#a6e22e;#f4bf75;#66d9ef;#ae81ff;#a1efe4;#f9f8f5 diff --git a/xfce4/xinitrc b/xfce4/xinitrc deleted file mode 100644 index d702c0f..0000000 --- a/xfce4/xinitrc +++ /dev/null @@ -1,26 +0,0 @@ -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?* ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# twm & -# xclock -geometry 50x50-1+1 & -# xterm -geometry 80x50+494+51 & -# xterm -geometry 80x20+494-0 & -# exec xterm -geometry 80x66+0+0 -name login - -## some applications that should be run in the background -xscreensaver & -xsetroot -cursor_name left_ptr & - -# Gnome Keyring Daemon -eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) -export SSH_AUTH_SOCK - -# URXVTD Daemon -[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -urxvtd -q -f -o - -exec startxfce4 diff --git a/xfce4/xresources b/xfce4/xresources deleted file mode 100644 index 101f201..0000000 --- a/xfce4/xresources +++ /dev/null @@ -1,33 +0,0 @@ -!URxvt.scrollBar_right: true -URxvt.scrollBar: false -URxvt.font: xft:DejaVu Sans Mono:size=10:antialias=true:hinting=true - -! Colours -URxvt.background: #272822 -URxvt.foreground: #f8f8f2 -URxvt.color0: #272822 -URxvt.color1: #f92672 -URxvt.color2: #a6e22e -URxvt.color3: #f4bf75 -URxvt.color4: #66d9ef -URxvt.color5: #ae81ff -URxvt.color6: #a1efe4 -URxvt.color7: #f8f8f2 -URxvt.color8: #75715e -URxvt.color9: #f92672 -URxvt.color10: #a6e22e -URxvt.color11: #f4bf75 -URxvt.color12: #66d9ef -URxvt.color13: #ae81ff -URxvt.color14: #a1efe4 -URxvt.color15: #f9f8f5 - -! Tighter letter spacing -URxvt.letterSpace: -1 - -! Perl Extensions: Clickable URLs + Simple Tabs -URxvt.perl-ext-common: default,matcher,tabbed -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 - -URxvt.internalBorder: 0 diff --git a/zsh/README.md b/zsh/README.md index 7bd3fe2..4554403 100644 --- a/zsh/README.md +++ b/zsh/README.md @@ -30,15 +30,5 @@ `ln -s ~/.dotfiles/zsh/steam.zsh ~/.oh-my-zsh/custom/steam.zsh` -## Obsolete - -Create a symlink for `.zlogin` - -`ln -s ~/.dotfiles/zsh/zlogin ~/.zlogin` - -Create a symlink for `ssh-agent.zsh` - -`ln -s ~/.dotfiles/zsh/ssh-agent.zsh ~/.oh-my-zsh/custom/ssh-agent.zsh` - [1]: https://github.com/robbyrussell/oh-my-zsh [2]: https://github.com/zsh-users/zsh-completions diff --git a/zsh/ssh-agent.zsh b/zsh/ssh-agent.zsh deleted file mode 100644 index 4cb8813..0000000 --- a/zsh/ssh-agent.zsh +++ /dev/null @@ -1,7 +0,0 @@ -if ! pgrep -u $USER ssh-agent > /dev/null; then - ssh-agent > ~/.ssh-agent-thing -fi -if [[ "$SSH_AGENT_PID" == "" ]]; then - eval $(<~/.ssh-agent-thing) -fi -ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'