dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:dustinswan/dotfiles

Browse source
This commit is contained in:
Dustin Swan 2018-02-18 20:31:22 -05:00
commit 3a7ff78640
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config.fish
View file

@ -30,18 +30,18 @@ if command --search p4 >/dev/null
end end
# PATH # PATH
set -x PATH $HOME/dotfiles/bin $PATH test -e $HOME/dotfiles/bin ; and set -x PATH $HOME/dotfiles/bin $PATH
# set -x PATH $HOME/.local/bin $PATH test -e $HOME/.local/bin ; and set -x PATH $HOME/.local/bin $PATH
set -x PATH $HOME/.npm-packages/bin $PATH test -e $HOME/.npm-packeges/bin ; and set -x PATH $HOME/.npm-packages/bin $PATH
# set -x PATH /usr/local/opt/python/libexec/bin $PATH test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/python/libexec/bin $PATH
set -x PATH $HOME/.cargo/bin $PATH test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH
# Keychain # Keychain
if status --is-interactive # if status --is-interactive
# TODO Take this out when keychain fixes this bug # TODO Take this out when keychain fixes this bug
set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1" # set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source # keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
end # end
# iTerm2 # iTerm2
test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
@ -57,3 +57,5 @@ end
if test -n "$EMACS" if test -n "$EMACS"
set -x TERM eterm-color set -x TERM eterm-color
end end
set fish_greeting ""

1
logitech_linux_mouse.sh
View file

@ -3,5 +3,6 @@
for id in `xinput --list|grep 'MX Master 2S'|perl -ne 'while (m/id=(\d+)/g){print "$1\n";}'`; do for id in `xinput --list|grep 'MX Master 2S'|perl -ne 'while (m/id=(\d+)/g){print "$1\n";}'`; do
xinput set-prop $id "Device Accel Velocity Scaling" 1 xinput set-prop $id "Device Accel Velocity Scaling" 1
xinput set-prop $id "Device Accel Constant Deceleration" 0.8 xinput set-prop $id "Device Accel Constant Deceleration" 0.8
# xinput set-prop $id "Evdev Scrolling Distance" -1 -1 -1
xinput set-button-map $id 1 2 3 5 4 # "natural" scrolling xinput set-button-map $id 1 2 3 5 4 # "natural" scrolling
done done

2
polybar
View file

@ -66,7 +66,7 @@ format-prefix = " "
format-prefix-foreground = ${colors.foreground-alt} format-prefix-foreground = ${colors.foreground-alt}
format-prefix-underline = ${colors.secondary} format-prefix-underline = ${colors.secondary}
label-layout = %layout% label-layout = %name%
label-layout-underline = ${colors.secondary} label-layout-underline = ${colors.secondary}
label-indicator-padding = 2 label-indicator-padding = 2

2
symlinks.sh
View file

@ -3,7 +3,7 @@
# ln -sf ~/dotfiles/zshrc ~/.zshrc # ln -sf ~/dotfiles/zshrc ~/.zshrc
mkdir -p ~/.config/fish; ln -sf ~/dotfiles/config.fish ~/.config/fish/config.fish mkdir -p ~/.config/fish; ln -sf ~/dotfiles/config.fish ~/.config/fish/config.fish
curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher
ln -s ~/dotfiles/fishfile ~/.config/fish/fishfile ln -sf ~/dotfiles/fishfile ~/.config/fish/fishfile
mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
ln -sf ~/dotfiles/gitconfig ~/.gitconfig ln -sf ~/dotfiles/gitconfig ~/.gitconfig
ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf

2
xmonad.hs
View file

@ -10,7 +10,7 @@ import XMonad.Util.EZConfig
lightBlue = "#66aaff" lightBlue = "#66aaff"
main = xmonad $ docks $ ewmh $ defaultConfig main = xmonad $ docks $ ewmh $ defaultConfig
{ terminal = "urxvtc" { terminal = "alacritty"
, modMask = mod4Mask , modMask = mod4Mask
, workspaces = [ "α", "β", "γ" ] , workspaces = [ "α", "β", "γ" ]
, borderWidth = 2 , borderWidth = 2