Skip to content

Commit

Permalink
fix ncmpcpp, zsh now uses profile.d
Browse files Browse the repository at this point in the history
Fixed ncmpcpp to display artists correctly.

Rofi now uses ctrl-jk to scroll up/down entries.

Improve sway touchpad experience for Phryne

Small changes to tmux (ESC to get out of visual mode, etc)

Change xterm font to DejaVu Sans Mono

zsh now uses $XDG_CONFIG_HOME/profile.d/{function,aliases}, which are
shared with bash (not yet implemented)
  • Loading branch information
mbfraga committed Oct 20, 2017
1 parent 46f0f6a commit 87bcf79
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 168 deletions.
2 changes: 1 addition & 1 deletion ncmpcpp/.config/ncmpcpp/config
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ colors_enabled="yes"
# Playlist

#"$L(9)[black]{l} (20)[red]{a} (30)[blue]{b} $L(20)[default]{t}"
song_columns_list_format = "(3f)[yellow]{n} (40)[default]{t|f} (30)[white]{A|a} (30)[white]{br} (5f)[white]{lr}"
song_columns_list_format = "(3f)[yellow]{n} (40)[default]{t|f} (30)[white]{a|A} (30)[white]{br} (5f)[white]{lr}"
#song_list_format = "$1$9%l$1$9 $1¦$9 $2%a$9 $1¦$9 $5%b$9 $R$1$9%t$1$9 $1¦$9 $1%n$9"
#song_list_format = "$(16)%t$9 $R $(8){%A}{%a}$9"
song_list_format = "%D/%f"
Expand Down
4 changes: 4 additions & 0 deletions rofi/.config/rofi/config.rasi
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ configuration {
run-command: "{cmd}";
run-shell-command: "{terminal} -e '{cmd}'";
levenshtein-sort: false;
kb-accept-entry: "Control+m,Return,KP_Enter";
kb-remove-to-eol: "";
kb-row-up: "Up,Control+p,ISO_Left_Tab,Control+k";
kb-row-down: "Down,Control+n,Shift+ISO_Left_Tab,Control+j";
threads: 4;
kb-custom-1: "Alt+1";
kb-custom-2: "Alt+2";
Expand Down
7 changes: 7 additions & 0 deletions sway/.config/sway/chani/touchpad
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
input "0:0:Cypress_APA_Trackpad_(cyapa)" {
accel_profile flat
click_method clickfinger
dwt enabled
tap disabled
natural_scroll disabled
}
6 changes: 3 additions & 3 deletions sway/.config/sway/phryne/chromebook_specific_settings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
bindsym Mod1+F3 kill

input 0:0:Cypress_APA_Trackpad_(cyapa) {
tap enabled
tap disabled
natural_scroll disabled
dwt enabled
accel_profile flat
pointer_accel [-1,1]
accel_profile adaptive
pointer_accel [-0.4,0.4]
#accel_profile <adaptive|flat>
#click_method <none|button_areas|clickfinger
#middle_emulation <enabled|disabled>
Expand Down
13 changes: 13 additions & 0 deletions tmux/.config/tmux/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,26 @@ unbind ^A
bind ^A select-pane -t :.+

set-window-option -g mode-keys vi
bind Escape copy-mode
unbind p
bind p paste-buffer
bind-key -T copy-mode-vi 'v' send -X begin-selection
bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel
bind-key -T copy-mode-vi 'Space' send -X halfpage-down
bind-key -T copy-mode-vi 'Bspace' send -X halfpage-up



bind r source-file ~/.config/tmux/tmux.conf

bind | split-window -h -c "#{pane_current_path}"
bind - split-window -v -c "#{pane_current_path}"

# Set terminal titles
set -g set-titles on
set -g set-titles-string "#T"


# Renumber windows sequentially after closing any of them.
# Otherwise if you close the second tab of three, you end
# up with tabs numbered 1 and 3.
Expand Down
3 changes: 1 addition & 2 deletions xsettings/.Xresources
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,5 @@ xterm*scrollBar: false
xterm*rightScrollBar: false
xterm*background: #1f1f1f
xterm*foreground: #dcdcdc
xterm*font:-*-terminus-large-*-*-*-16-*-*-*-*-*-iso8859-*
xterm*geometry: 120x28
xterm*faceName: DejaVu Sans Mono:pixelsize=14

86 changes: 0 additions & 86 deletions zsh/.config/zsh/zsh_aliases

This file was deleted.

66 changes: 0 additions & 66 deletions zsh/.config/zsh/zsh_functions

This file was deleted.

Empty file.
File renamed without changes.
30 changes: 20 additions & 10 deletions zsh/.config/zsh/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ autoload -Uz run-help zmv


#--[Shell Options ]--
setopt auto_cd \
appendhistory \
hist_verify \
hist_fcntl_lock \
hist_save_no_dups \
histignorealldups \
promptsubst
# name of directory will cd to it
setopt auto_cd
setopt appendhistory
setopt hist_verify
setopt hist_fcntl_lock
setopt hist_save_no_dups
setopt histignorealldups
setopt promptsubst
# disable ctrl-d closing the terminal
setopt IGNORE_EOF

# History
HISTSIZE=10000
SAVEHIST=10000
Expand Down Expand Up @@ -57,12 +61,18 @@ fi


#--[ Source other important files ]--
source "$XDG_CONFIG_HOME/zsh/zsh_aliases"
source "$XDG_CONFIG_HOME/zsh/zsh_functions"
source "$XDG_CONFIG_HOME/zsh/zsh_prompt"
source "$XDG_CONFIG_HOME/zsh/zsh_prompt.zsh"
source "$XDG_CONFIG_HOME/zsh/zsh_functions.zsh"
source "$XDG_CONFIG_HOME/zsh/host_specific/$(hostname).zsh"
source "$XDG_CONFIG_HOME/zsh/fzf/completion.zsh"
source "$XDG_CONFIG_HOME/zsh/fzf/key-bindings.zsh"
# Source $XDG_CONFIG_HOME/profile/*
# I keep my aliases and generic functions in there.
if [[ -d "$XDG_CONFIG_HOME/profile.d" ]]; then
for f in $XDG_CONFIG_HOME/profile.d/*; do
. "$f"
done
fi


#--[ fzf ]--
Expand Down

0 comments on commit 87bcf79

Please sign in to comment.