commit 8beabc0e6fee8dd48f510c1b936553e635dc4064
parent 872a36707b2a50ac11a7d159859c6c627bf51c34
Author: andersuno <anders.hedman01@gmail.com>
Date: Tue, 14 Jan 2020 02:14:29 +0100
Changes to be committed:
modified: .bash_aliases
modified: .bashrc
modified: .config/bspwm/bspwmrc
modified: .config/conky/AK-Wiu.conkyrc
modified: .config/polybar/config
modified: .config/sxhkd/sxhkdrc
modified: .config/terminator/config
new file: .profile
modified: .ssh/authorized_keys
new file: .zprofile
Diffstat:
10 files changed, 71 insertions(+), 39 deletions(-)
diff --git a/.bash_aliases b/.bash_aliases
@@ -1,6 +1,7 @@
+alias ls='ls --color=auto'
alias ll='ls -la'
alias lsl='ls -l'
-alias pacman='sudo pacman'
+alias pm='sudo pacman'
alias reb='sudo reboot'
alias shut='sudo shutdown now'
alias grep='grep --color=auto'
@@ -9,5 +10,7 @@ alias grep='grep --color=auto'
alias x='startx'
alias findt='sudo find / -path /timeshift -prune -o'
alias timeshiftsync='/home/anders/Scripts/timeshiftsync.sh'
-alias vifm='/home/anders/.config/vifm/scripts/vifmrun'
-alias dotgit='/usr/bin/git --git-dir=$HOME/Repos/dotfiles.git --work-tree=$HOME'
+#alias vifm='/home/anders/.config/vifm/scripts/vifmrun'
+alias dotgit='/usr/bin/git --git-dir=$HOME/Repos/dotfiles/ --work-tree=$HOME'
+
+[ -f ~/.config/sshhosts ] && source ~/.config/sshhosts
diff --git a/.bashrc b/.bashrc
@@ -5,16 +5,12 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
-alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
fi
-if [ -f ~/.bash_sshhosts ]; then
- . ~/.bash_sshhosts
-fi
#Foreground colors, Normal (non-bold) is the default, so the 0; prefix is optional.
#
@@ -49,9 +45,6 @@ fi
#Vi mode
#set -o vi
-PATH=$PATH:/usr/sbin
-PATH=$PATH:/home/anders/.vim/bundle
-PATH=$PATH:/usr/lib
#Exports
#export PS1='┌──[\u@\h]─[\w]\n└──╼ \$ '
@@ -60,10 +53,5 @@ PATH=$PATH:/usr/lib
export PS1="\[\e[1;32m\]┌──[\[\e[0;36m\]\u\[\e[0;32m\]@\[\e[0;31m\]\h\[\e[1;32m\]]─[\[\e[0;34m\]\w\[\e[1;32m\]]\n\[\e[1;32m\]└──╼ \$\[\e[0;0m\] "
#export PS1="\[\e[1;32m\][\[\e[0;36m\]\u\[\e[0;32m\]@\[\e[0;31m\]\h\[\e[1;32m\]]─[\[\e[0;34m\]\w\[\e[1;32m\]]\$\[\e[0;0m\] "
-export RANGER_LOAD_DEFAULT_RC=FALSE
-export EDITOR="vim"
-export SUDO_EDITOR="vim"
-export VISUAL="vim"
-export XDG_CONFIG_HOME=$HOME/.config
~/Scripts/pfetch
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
@@ -6,8 +6,9 @@
~/Scripts/polybar.sh
picom &
#compton &
+xfce4-power-manager
-bspc monitor -d I II III IV V VI VII VIII IX X
+bspc monitor -d 1 2 3 4 5 6 7 8 9 10
bspc config border_width 1
bspc config window_gap 0
diff --git a/.config/conky/AK-Wiu.conkyrc b/.config/conky/AK-Wiu.conkyrc
@@ -117,18 +117,18 @@ ${voffset 4}${fs_used /}/${fs_size /} ${alignr}${fs_bar 8,60 /}
#${voffset 4}${fs_free /home}/${fs_size /home} ${alignr}${fs_bar 8,60 /home}
${font Zekton:Bold:size=11}NET${hr 2}
-#Wired = enp1s0f0 and WiFi = wlp2s0
-${if_existing /proc/net/route enp1s0f0}
+#Wired = enp0s31f6 and WiFi = wlp61s0
+${if_existing /proc/net/route enp0s31f6}
${voffset -15}${alignc 0}${font Deja sans:size=12}Wired
-${font StyleBats:Bold:size=14}V${font} Up: ${upspeed enp1s0f0}${alignr}${upspeedgraph enp1s0f0 8,60 black black}
-${voffset 4}${font StyleBats:Bold:size=14}T${font} Down: ${downspeed enp1s0f0}${alignr}${downspeedgraph enp1s0f0 8,60 black black}
-${voffset 4}${font StyleBats:Bold:size=14}N${font} Upload: ${alignr}${totalup enp1s0f0}
-${voffset 4}${font StyleBats:Bold:size=14}X${font} Download: ${alignr}${totaldown enp1s0f0}
-${else}${if_existing /proc/net/route wlp2s0}${alignc 0}${font Deja sans:size=12}Wireless
-${font}SSID: ${wireless_essid wlp2s0}
-Signal: ${wireless_link_qual_perc wlp2s0}% ${alignr}${wireless_link_bar 8,60 wlp2s0}
-${voffset 8}${font StyleBats:Bold:size=14}V${font} Up: ${upspeed wlp2s0}${alignr}${upspeedgraph wlp2s0 8,60 black black}
-${voffset 4}${font StyleBats:Bold:size=14}T${font} Down: ${downspeed wlp2s0}${alignr}${downspeedgraph wlp2s0 8,60 black black}
-${voffset 4}${font StyleBats:Bold:size=14}N${font} Upload: ${alignr}${totalup wlp2s0}
-${voffset 4}${font StyleBats:Bold:size=14}X${font} Download: ${alignr}${totaldown wlp2s0}
+${font StyleBats:Bold:size=14}V${font} Up: ${upspeed enp0s31f6}${alignr}${upspeedgraph enp0s31f6 8,60 black black}
+${voffset 4}${font StyleBats:Bold:size=14}T${font} Down: ${downspeed enp0s31f6}${alignr}${downspeedgraph enp0s31f6 8,60 black black}
+${voffset 4}${font StyleBats:Bold:size=14}N${font} Upload: ${alignr}${totalup enp0s31f6}
+${voffset 4}${font StyleBats:Bold:size=14}X${font} Download: ${alignr}${totaldown enp0s31f6}
+${else}${if_existing /proc/net/route wlp61s0}${alignc 0}${font Deja sans:size=12}Wireless
+${font}SSID: ${wireless_essid wlp61s0}
+Signal: ${wireless_link_qual_perc wlp61s0}% ${alignr}${wireless_link_bar 8,60 wlp61s0}
+${voffset 8}${font StyleBats:Bold:size=14}V${font} Up: ${upspeed wlp61s0}${alignr}${upspeedgraph wlp61s0 8,60 black black}
+${voffset 4}${font StyleBats:Bold:size=14}T${font} Down: ${downspeed wlp61s0}${alignr}${downspeedgraph wlp61s0 8,60 black black}
+${voffset 4}${font StyleBats:Bold:size=14}N${font} Upload: ${alignr}${totalup wlp61s0}
+${voffset 4}${font StyleBats:Bold:size=14}X${font} Download: ${alignr}${totaldown wlp61s0}
${endif}
diff --git a/.config/polybar/config b/.config/polybar/config
@@ -46,7 +46,8 @@ aqua = #00ffff
white = #ffffff
[bar/mybar]
-;monitor = ${env:MONITOR:HDMI-1}
+monitor = ${env:MONITOR:eDP1}
+;monitor = ${env:MONITOR:HDMI2}
width = 100%
height = 20
;offset-x = 1%
@@ -222,7 +223,7 @@ label = %gb_used%
[module/wlan]
type = internal/network
-interface = wlp2s0
+interface = wlp61s0
interval = 3.0
format-connected = <ramp-signal> <label-connected>
@@ -245,7 +246,7 @@ ramp-signal-foreground = ${colors.lime}
[module/eth]
type = internal/network
-interface = enp1s0f0
+interface = enp0s31f6
interval = 3.0
format-connected-underline = #55aa55
@@ -333,7 +334,7 @@ bar-volume-empty-foreground = ${colors.foreground-alt}
[module/battery]
type = internal/battery
-battery = BAT1
+battery = BAT0
adapter = ACAD
full-at = 100
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
@@ -58,6 +58,10 @@ super + shift + p
super + KP_Enter
i3lock-fancy
+#Screenoutput
+XF86Display
+ $HOME/Scripts/screenoutput.sh
+
#Volume
XF86Audio{Raise,Lower}Volume
pactl set-sink-volume 0 {+,-}5%
@@ -65,12 +69,16 @@ XF86Audio{Raise,Lower}Volume
XF86AudioMute
pactl set-sink-mute 0 toggle
-#Brightness
-XF86MonBrightness{Down,Up}
- sudo /home/anders/Scripts/bright{down,up}.sh
+#Mic
+XF86AudioMicMute
+ pactl set-source-mute 1 toggle
-super + KP_{Subtract,Add}
- sudo /home/anders/Scripts/bright{down,up}.sh
+#Brightness
+#XF86MonBrightness{Down,Up}
+# sudo /home/anders/Scripts/bright{down,up}.sh
+#
+#super + KP_{Subtract,Add}
+# sudo /home/anders/Scripts/bright{down,up}.sh
# program launcher
super + d
diff --git a/.config/terminator/config b/.config/terminator/config
@@ -1,4 +1,5 @@
[global_config]
+ title_font = Source Code Pro 9
[keybindings]
help = F11
layout_launcher = None
@@ -14,7 +15,7 @@
[profiles]
[[default]]
cursor_color = "#aaaaaa"
- font = DejaVu Sans Mono 10
+ font = DejaVu Sans Mono 11
foreground_color = "#ffffff"
palette = "#000000:#cd0000:#00cd00:#cdcd00:#0000ee:#cd00cd:#00cdcd:#e5e5e5:#7f7f7f:#ff0000:#00ff00:#ffff00:#5c5cff:#ff00ff:#00ffff:#ffffff"
scrollback_lines = 1000
diff --git a/.profile b/.profile
@@ -0,0 +1,28 @@
+#Exports
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_CACHE_HOME=$HOME/.cache
+export XDG_DATA_HOME=$HOME/.local/share
+export EDITOR="vim"
+export SUDO_EDITOR="vim"
+export VISUAL="vim"
+export TERMINAL="terminator"
+export BROWSER="Chromium"
+export READER="zathura"
+#export FILE="ranger"
+#export RANGER_LOAD_DEFAULT_RC=FALSE
+export ZDOTDIR="$HOME/.config/zsh"
+
+export LESS_TERMCAP_mb=$'\e[1;32m'
+export LESS_TERMCAP_md=$'\e[1;32m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[01;33m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[1;4;31m'
+
+PATH=$PATH:/usr/sbin
+PATH=$PATH:/home/anders/.vim/bundle
+PATH=$PATH:/usr/lib
+
+# Start graphical server on tty1 if not already running.
+[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx
diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys
diff --git a/.zprofile b/.zprofile
@@ -0,0 +1 @@
+/home/anders/.profile
+\ No newline at end of file
