commit 99afa5b5ba9eee5b55d1d569c11e4e5fc2d85d01
parent 6e2387292cd40e8b45871b7304111dab5f4f16b0
Author: dudley <pyratebeard@gmail.com>
Date: Tue, 6 Sep 2016 17:55:51 +0100
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat:
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,6 @@ ranger/.config/ranger/colorschemes/__pycache__/
ranger/.config/ranger/history
ranger/.config/ranger/tagged
ranger/.config/ranger/colorschemes/*.pyo
+qutebrowser/.config/qutebrowser/qsettings/
turses/.turses/log
vim/.vim/bundle/
diff --git a/irssi/.irssi/config b/irssi/.irssi/config
@@ -41,7 +41,7 @@ chatnets = {
channels = (
{ name = "##linux"; chatnet = "freenode"; autojoin = "Yes"; },
{ name = "#r_netsec"; chatnet = "freenode"; autojoin = "Yes"; },
- { name = "#nixers"; chatnet = "nixers"; autojoin = "Yes"; }
+ { name = "#unix"; chatnet = "nixers"; autojoin = "Yes"; }
);
aliases = {
@@ -93,6 +93,6 @@ ignores = (
{ mask = "channels"; level = "ALL"; },
{
level = "JOINS PARTS QUITS NICKS";
- channels = ( "##linux", "#r_netsec", "#nixers" );
+ channels = ( "##linux", "#r_netsec", "#unix" );
}
);
diff --git a/zsh/.zsh/minimal-prompt.zsh b/zsh/.zsh/minimal-prompt.zsh
@@ -12,4 +12,4 @@
#
#█▓▒░ minial prompt
# PROMPT='${USER_LEVEL}[%F{white}%1~${USER_LEVEL}]$(prompt_git_info)── -%f '
-PROMPT='${USERNAME}@[chatsubo]:%1~$(prompt_git_info)%f# '
+PROMPT='${USERNAME}@[$HOSTNAME]:%1~$(prompt_git_info)%f# '