mirror of
https://github.com/dnlbauer/dotfiles.git
synced 2026-09-10 13:35:30 +00:00
Merge branch 'master' of https://github.com/danijoo/dotfiles
This commit is contained in:
Daniel Bauer
@@ -2,8 +2,12 @@
|
||||
[user]
|
||||
# Please adapt and uncomment the following lines:
|
||||
name = Daniel Bauer
|
||||
email = bauer@cbs.tu-darmstadt.de
|
||||
[pack]
|
||||
threads = 8
|
||||
[merge]
|
||||
tool = kdiff3
|
||||
[core]
|
||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||
[alias]
|
||||
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
|
||||
cm = !git add -A && git commit -m
|
||||
|
||||
1165
profiles/base/bin/diff-so-fancy
Executable file
1165
profiles/base/bin/diff-so-fancy
Executable file
File diff suppressed because it is too large
Load Diff
33
profiles/base/bin/github_http_to_ssh.sh
Executable file
33
profiles/base/bin/github_http_to_ssh.sh
Executable file
@@ -0,0 +1,33 @@
|
||||
#/bin/bash
|
||||
#-- Script to automate https://help.github.com/articles/why-is-git-always-asking-for-my-password
|
||||
# Modified from https://gist.github.com/m14t/3056747 to work on http/https and .git/nothing repos
|
||||
|
||||
|
||||
REPO_URL=`git remote -v | grep -m1 '^origin' | sed -Ene's#.*(https*://[^[:space:]]*).*#\1#p'`
|
||||
if [ -z "$REPO_URL" ]; then
|
||||
echo "-- ERROR: Could not identify Repo url."
|
||||
echo " It is possible this repo is already using SSH instead of HTTPS."
|
||||
exit
|
||||
fi
|
||||
|
||||
USER=`echo $REPO_URL | sed -Ene's#https*://github.com/([^/]*)/(.*)(\.git)?#\1#p'`
|
||||
if [ -z "$USER" ]; then
|
||||
echo "-- ERROR: Could not identify User."
|
||||
exit
|
||||
fi
|
||||
|
||||
REPO=`echo $REPO_URL | sed -Ene's#https*://github.com/([^/]*)/(.*)(\.git)?#\2#p'`
|
||||
if [ -z "$REPO" ]; then
|
||||
echo "-- ERROR: Could not identify Repo."
|
||||
exit
|
||||
fi
|
||||
|
||||
NEW_URL="git@github.com:$USER/$REPO.git"
|
||||
echo "Changing repo url from "
|
||||
echo " '$REPO_URL'"
|
||||
echo " to "
|
||||
echo " '$NEW_URL'"
|
||||
echo ""
|
||||
CHANGE_CMD="git remote set-url origin $NEW_URL"
|
||||
`$CHANGE_CMD`
|
||||
echo "Success"
|
||||
@@ -6,7 +6,7 @@ killall -q polybar
|
||||
while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
|
||||
|
||||
# Launch bar1 and bar2
|
||||
polybar -c ~/.config/polybar/config laptop &
|
||||
polybar -c ~/.config/polybar/config laptop_extern &
|
||||
polybar -c ~/.config/polybar/config workstation &
|
||||
polybar -c ~/.config/polybar/config workstation2 &
|
||||
|
||||
echo "Bars launched..."
|
||||
|
||||
@@ -7,8 +7,7 @@
|
||||
[
|
||||
"~/conda/bin/pyls"
|
||||
],
|
||||
"enabled": true,
|
||||
|
||||
"enabled": false
|
||||
},
|
||||
"rls":
|
||||
{
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
"hot_exit": false,
|
||||
"ignored_packages":
|
||||
[
|
||||
"A File Icon",
|
||||
"Boxy Theme",
|
||||
"DeleteBlankLines",
|
||||
"Monokai - Spacegray",
|
||||
"RestructuredText",
|
||||
"Rust",
|
||||
"Six",
|
||||
@@ -31,5 +35,6 @@
|
||||
"vintage_start_in_command_mode": true,
|
||||
"vintageous_use_ctrl_keys": false,
|
||||
"vintageous_use_super_keys": false,
|
||||
"word_wrap": false,
|
||||
"wrap_width": 80
|
||||
}
|
||||
|
||||
@@ -1,481 +1,20 @@
|
||||
[colors]
|
||||
background = #222
|
||||
background-alt = #444
|
||||
foreground = #dfdfdf
|
||||
foreground-alt = #555
|
||||
primary = #ffb52a
|
||||
secondary = #e60053
|
||||
alert = #bd2c40
|
||||
green = #689d6a
|
||||
yellow = #fabc2f
|
||||
red = #cc241d
|
||||
|
||||
[bar/base]
|
||||
width = 900 ;100%
|
||||
height = 35
|
||||
radius = 6.0
|
||||
fixed-center = false
|
||||
background = ${colors.background}
|
||||
foreground = ${colors.foreground}
|
||||
line-size = 3
|
||||
line-color = #f00
|
||||
border-size = 0
|
||||
border-color = #00000000
|
||||
padding-left = 0
|
||||
padding-right = 2
|
||||
module-margin-left = 1
|
||||
module-margin-right = 3
|
||||
|
||||
wm-restack = i3
|
||||
;override-redirect = true
|
||||
scroll-up = i3wm-wsnext
|
||||
scroll-down = i3wm-wsprev
|
||||
|
||||
|
||||
[bar/laptop]
|
||||
monitor = ${env:MONITOR:eDP-1}
|
||||
inherit = bar/base
|
||||
tray-position = right
|
||||
fixed-center = true
|
||||
tray-padding = 2
|
||||
modules-left = i3 xwindow
|
||||
modules-right = spotify previous playpause next mpd pulseaudio cpu memory battery1 date
|
||||
|
||||
font-0 = "Noto Sans:size=14:style=Regular;1"
|
||||
font-1 = unifont:fontformat=truetype:size=14:antialias=false;0
|
||||
font-2 = FontAwesome:size=14;0
|
||||
|
||||
[bar/laptop_station]
|
||||
inherit = bar/laptop
|
||||
monitor = ${env:MONITOR:HDMI-2}
|
||||
include-file = ~/.config/polybar/config.d/colors
|
||||
include-file = ~/.config/polybar/config.d/settings
|
||||
include-file = ~/.config/polybar/config.d/modules
|
||||
include-file = ~/.config/polybar/config.d/base_bar
|
||||
|
||||
[bar/workstation]
|
||||
inherit = bar/base
|
||||
monitor = ${env:MONITOR:DP-4}
|
||||
modules-left = i3 xwindow
|
||||
modules-right = spotify previous playpause next mpd pulseaudio filesystem cpu gpu memory date xkeyboard
|
||||
tray-position = false
|
||||
tray-padding = 2
|
||||
|
||||
font-0 = "Noto Sans:size=11:style=Regular;1"
|
||||
font-1 = unifont:fontformat=truetype:size=11:antialias=false;0
|
||||
font-2 = FontAwesome:size=11;0
|
||||
font-0 = "Noto Sans:size=12:style=Regular;1"
|
||||
font-1 = unifont:fontformat=truetype:size=12:antialias=false;0
|
||||
font-2 = FontAwesome:size=12;0
|
||||
|
||||
[bar/workstation2]
|
||||
inherit = bar/workstation
|
||||
monitor = ${env:MONITOR:DP-2}
|
||||
tray-position = right
|
||||
|
||||
|
||||
[module/xwindow]
|
||||
type = internal/xwindow
|
||||
label = "> %title:0:75:...%"
|
||||
|
||||
|
||||
[module/xkeyboard]
|
||||
type = internal/xkeyboard
|
||||
blacklist-0 = num lock
|
||||
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-underline = ${colors.secondary}
|
||||
|
||||
label-layout = %layout%
|
||||
label-layout-underline = ${colors.secondary}
|
||||
|
||||
label-indicator-padding = 2
|
||||
label-indicator-margin = 1
|
||||
label-indicator-background = ${colors.secondary}
|
||||
label-indicator-underline = ${colors.secondary}
|
||||
|
||||
[module/filesystem]
|
||||
type = internal/fs
|
||||
interval = 25
|
||||
|
||||
mount-0 = /
|
||||
mount-1 = /data
|
||||
mount-2 = /backup
|
||||
|
||||
label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
|
||||
label-unmounted = %mountpoint% not mounted
|
||||
label-unmounted-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/bspwm]
|
||||
type = internal/bspwm
|
||||
|
||||
label-focused = %index%
|
||||
label-focused-background = ${colors.background-alt}
|
||||
label-focused-underline= ${colors.primary}
|
||||
label-focused-padding = 2
|
||||
|
||||
label-occupied = %index%
|
||||
label-occupied-padding = 2
|
||||
|
||||
label-urgent = %index%!
|
||||
label-urgent-background = ${colors.alert}
|
||||
label-urgent-padding = 2
|
||||
|
||||
label-empty = %index%
|
||||
label-empty-foreground = ${colors.foreground-alt}
|
||||
label-empty-padding = 2
|
||||
|
||||
[module/i3]
|
||||
type = internal/i3
|
||||
format = <label-state> <label-mode>
|
||||
index-sort = true
|
||||
wrapping-scroll = false
|
||||
strip-wsnumbers = true
|
||||
pin-workspaces = true
|
||||
|
||||
label-mode-padding = 2
|
||||
label-mode-foreground = #000
|
||||
label-mode-background = ${colors.primary}
|
||||
|
||||
label-focused = %icon%
|
||||
label-focused-background = ${colors.green}
|
||||
label-focused-underline = ${colors.green}
|
||||
label-focused-padding = ${module/bspwm.label-focused-padding}
|
||||
|
||||
label-unfocused = %icon%
|
||||
label-unfocused-padding = ${module/bspwm.label-occupied-padding}
|
||||
|
||||
label-urgent = %icon%
|
||||
label-urgent-background = ${colors.red}
|
||||
label-urgent-underline = ${colors.red}
|
||||
label-urgent-padding = ${module/bspwm.label-urgent-padding}
|
||||
|
||||
label-visible = %icon%
|
||||
label-visible-background = ${self.label-focused-background}
|
||||
label-visible-underline = ${self.label-focused-underline}
|
||||
label-visible-padding = ${self.label-focused-padding}
|
||||
ws-icon-0 = 1;1
|
||||
ws-icon-1 = 2;2
|
||||
ws-icon-2 = 3;3
|
||||
ws-icon-3 = 4;4
|
||||
ws-icon-4 = 5;5
|
||||
ws-icon-5 = 6;6
|
||||
ws-icon-6 = 7;
|
||||
ws-icon-7 = 8;
|
||||
ws-icon-8 = 9;
|
||||
|
||||
[module/mpd]
|
||||
type = internal/mpd
|
||||
format-online = <label-song> <icon-prev> <icon-stop> <toggle> <icon-next>
|
||||
|
||||
icon-prev =
|
||||
icon-stop =
|
||||
icon-play =
|
||||
icon-pause =
|
||||
icon-next =
|
||||
|
||||
label-song-maxlen = 25
|
||||
label-song-ellipsis = true
|
||||
|
||||
[module/xbacklight]
|
||||
type = internal/xbacklight
|
||||
|
||||
format = <label> <bar>
|
||||
label = BL
|
||||
|
||||
bar-width = 10
|
||||
bar-indicator = |
|
||||
bar-indicator-foreground = #ff
|
||||
bar-indicator-font = 2
|
||||
bar-fill = ─
|
||||
bar-fill-font = 2
|
||||
bar-fill-foreground = #9f78e1
|
||||
bar-empty = ─
|
||||
bar-empty-font = 2
|
||||
bar-empty-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/backlight-acpi]
|
||||
inherit = module/xbacklight
|
||||
type = internal/backlight
|
||||
card = intel_backlight
|
||||
|
||||
[module/cpu]
|
||||
type = internal/cpu
|
||||
interval = 0.5
|
||||
format = <label> <ramp-coreload>
|
||||
label = CPU
|
||||
ramp-font = 2
|
||||
ramp-coreload-0 = ▁
|
||||
ramp-coreload-font = 3
|
||||
ramp-coreload-0-foreground = ${colors.green}
|
||||
ramp-coreload-1 = ▂
|
||||
ramp-coreload-1-font = 2
|
||||
ramp-coreload-1-foreground = ${colors.green}
|
||||
ramp-coreload-2 = ▃
|
||||
ramp-coreload-2-font = 2
|
||||
ramp-coreload-2-foreground = ${colors.green}
|
||||
ramp-coreload-3 = ▄
|
||||
ramp-coreload-3-font = 2
|
||||
ramp-coreload-3-foreground = ${colors.green}
|
||||
ramp-coreload-4 = ▅
|
||||
ramp-coreload-4-font = 2
|
||||
ramp-coreload-4-foreground = ${colors.yellow}
|
||||
ramp-coreload-5 = ▆
|
||||
ramp-coreload-5-font = 2
|
||||
ramp-coreload-5-foreground = ${colors.yellow}
|
||||
ramp-coreload-6 = ▇
|
||||
ramp-coreload-6-font = 2
|
||||
ramp-coreload-6-foreground = ${colors.red}
|
||||
ramp-coreload-7 = █
|
||||
ramp-coreload-7-font = 2
|
||||
ramp-coreload-7-foreground = ${colors.red}
|
||||
|
||||
|
||||
|
||||
[module/memory]
|
||||
type = internal/memory
|
||||
format = <label> <bar-used>
|
||||
label = MEM
|
||||
|
||||
bar-used-indicator =
|
||||
bar-used-width = 20
|
||||
bar-used-foreground-0 = ${colors.green}
|
||||
bar-used-foreground-1 = ${colors.yellow}
|
||||
bar-used-foreground-2 = ${colors.red}
|
||||
bar-used-fill = ▐
|
||||
bar-used-empty = ▐
|
||||
bar-used-empty-foreground = #444444
|
||||
|
||||
[module/wlan]
|
||||
type = internal/network
|
||||
interface =
|
||||
interval = 3.0
|
||||
|
||||
format-connected = <ramp-signal> <label-connected>
|
||||
format-connected-underline = #9f78e1
|
||||
label-connected = %essid%
|
||||
|
||||
format-disconnected =
|
||||
;format-disconnected = <label-disconnected>
|
||||
;format-disconnected-underline = ${self.format-connected-underline}
|
||||
;label-disconnected = %ifname% disconnected
|
||||
;label-disconnected-foreground = ${colors.foreground-alt}
|
||||
|
||||
ramp-signal-0 =
|
||||
ramp-signal-1 =
|
||||
ramp-signal-2 =
|
||||
ramp-signal-3 =
|
||||
ramp-signal-4 =
|
||||
ramp-signal-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/eth]
|
||||
type = internal/network
|
||||
interface =
|
||||
interval = 3.0
|
||||
|
||||
format-connected-underline = #55aa55
|
||||
format-connected-prefix = " "
|
||||
format-connected-prefix-foreground = ${colors.foreground-alt}
|
||||
label-connected = %local_ip%
|
||||
|
||||
format-disconnected =
|
||||
;format-disconnected = <label-disconnected>
|
||||
;format-disconnected-underline = ${self.format-connected-underline}
|
||||
;label-disconnected = %ifname% disconnected
|
||||
;label-disconnected-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/date]
|
||||
type = internal/date
|
||||
interval = 1
|
||||
|
||||
date = %a %d %b %Y%%{F-}
|
||||
date-alt = %a %d %b %Y%%{F-}
|
||||
|
||||
time = %H:%M
|
||||
time-alt = %H:%M:%S
|
||||
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
|
||||
label = %time% %date%
|
||||
format = <label>
|
||||
|
||||
[module/pulseaudio]
|
||||
type = internal/pulseaudio
|
||||
format-volume = <label-volume> <bar-volume>
|
||||
label-volume =
|
||||
label-volume-foreground = ${root.foreground}
|
||||
|
||||
format-muted-foreground = ${colors.foreground-alt}
|
||||
label-muted = sound muted
|
||||
|
||||
bar-volume-width = 20
|
||||
bar-volume-foreground-0 = #55aa55
|
||||
bar-volume-foreground-1 = #55aa55
|
||||
bar-volume-foreground-2 = #55aa55
|
||||
bar-volume-foreground-3 = #55aa55
|
||||
bar-volume-foreground-4 = #55aa55
|
||||
bar-volume-foreground-5 = #f5a70a
|
||||
bar-volume-foreground-6 = #ff5555
|
||||
bar-volume-gradient = false
|
||||
bar-volume-indicator = ▐
|
||||
bar-volume-indicator-font = 2
|
||||
bar-volume-fill = ─
|
||||
bar-volume-fill-font = 2
|
||||
bar-volume-empty = ─
|
||||
bar-volume-empty-font = 2
|
||||
bar-volume-empty-foreground = ${colors.foreground-alt}
|
||||
|
||||
|
||||
[module/volume]
|
||||
type = internal/alsa
|
||||
format-volume = <label-volume> <bar-volume>
|
||||
label-volume =
|
||||
label-volume-foreground = ${root.foreground}
|
||||
|
||||
format-muted-foreground = ${colors.foreground-alt}
|
||||
label-muted = sound muted
|
||||
|
||||
bar-volume-width = 20
|
||||
bar-volume-foreground-0 = #55aa55
|
||||
bar-volume-foreground-1 = #55aa55
|
||||
bar-volume-foreground-2 = #55aa55
|
||||
bar-volume-foreground-3 = #55aa55
|
||||
bar-volume-foreground-4 = #55aa55
|
||||
bar-volume-foreground-5 = #f5a70a
|
||||
bar-volume-foreground-6 = #ff5555
|
||||
bar-volume-gradient = false
|
||||
bar-volume-indicator = ▐
|
||||
bar-volume-indicator-font = 2
|
||||
bar-volume-fill = ─
|
||||
bar-volume-fill-font = 2
|
||||
bar-volume-empty = ─
|
||||
bar-volume-empty-font = 2
|
||||
bar-volume-empty-foreground = ${colors.foreground-alt}
|
||||
|
||||
|
||||
[module/temperature]
|
||||
type = internal/temperature
|
||||
thermal-zone = 0
|
||||
warn-temperature = 60
|
||||
|
||||
format = <ramp> <label>
|
||||
format-underline = #f50a4d
|
||||
format-warn = <ramp> <label-warn>
|
||||
format-warn-underline = ${self.format-underline}
|
||||
|
||||
label = %temperature%
|
||||
label-warn = %temperature%
|
||||
label-warn-foreground = ${colors.secondary}
|
||||
|
||||
ramp-0 =
|
||||
ramp-1 =
|
||||
ramp-2 =
|
||||
ramp-foreground = ${colors.foreground-alt}
|
||||
|
||||
[module/powermenu]
|
||||
type = custom/menu
|
||||
|
||||
format-spacing = 1
|
||||
|
||||
label-open =
|
||||
label-open-foreground = ${colors.secondary}
|
||||
label-close = cancel
|
||||
label-close-foreground = ${colors.secondary}
|
||||
label-separator = |
|
||||
label-separator-foreground = ${colors.foreground-alt}
|
||||
|
||||
menu-0-0 = reboot
|
||||
menu-0-0-exec = menu-open-1
|
||||
menu-0-1 = power off
|
||||
menu-0-1-exec = menu-open-2
|
||||
|
||||
menu-1-0 = cancel
|
||||
menu-1-0-exec = menu-open-0
|
||||
menu-1-1 = reboot
|
||||
menu-1-1-exec = sudo reboot
|
||||
|
||||
menu-2-0 = power off
|
||||
menu-2-0-exec = sudo poweroff
|
||||
menu-2-1 = cancel
|
||||
menu-2-1-exec = menu-open-0
|
||||
|
||||
[settings]
|
||||
screenchange-reload = true
|
||||
;compositing-background = xor
|
||||
;compositing-background = screen
|
||||
;compositing-foreground = source
|
||||
;compositing-border = over
|
||||
|
||||
[global/wm]
|
||||
margin-top = 5
|
||||
margin-bottom = 5
|
||||
|
||||
[module/gpu]
|
||||
type=custom/script
|
||||
exec = /bin/bash ~/.config/polybar/gpu.sh
|
||||
interval = 1
|
||||
tail = false
|
||||
format = GPU <label>
|
||||
|
||||
[module/spotify]
|
||||
type=custom/script
|
||||
exec = python3 ~/.config/polybar/spotify.py
|
||||
interval = 1
|
||||
tail = false
|
||||
format = <label>
|
||||
; vim:ft=dosini
|
||||
|
||||
[module/battery1]
|
||||
type = internal/battery
|
||||
full-at = 95
|
||||
battery = BAT0
|
||||
adapter = ADP1
|
||||
time-format = %Hh:%Mm
|
||||
|
||||
label-charging = %time% full
|
||||
format-charging = <label-charging>
|
||||
|
||||
label-full = Fully charged
|
||||
format_full = <label-full>
|
||||
|
||||
label-discharging = %percentage%% %time% left
|
||||
format-discharging = <ramp-capacity> <label-discharging>
|
||||
|
||||
ramp-capacity-0 =
|
||||
ramp-capacity-0-foreground = ${colors.red}
|
||||
ramp-capacity-1 =
|
||||
ramp-capacity-1-foreground = ${colors.yellow}
|
||||
ramp-capacity-2 =
|
||||
ramp-capacity-2-foreground = ${colors.green}
|
||||
ramp-capacity-3 =
|
||||
ramp-capacity-3-foreground = ${colors.green}
|
||||
ramp-capacity-4 =
|
||||
ramp-capacity-4-foreground = ${colors.green}
|
||||
|
||||
animation-discharging-0 =
|
||||
|
||||
[module/previous]
|
||||
type = custom/script
|
||||
interval = 86400
|
||||
format = "%{T3}<label>"
|
||||
format-padding = 1
|
||||
exec = echo ""
|
||||
exec-if = "pgrep spotify"
|
||||
line-size = 1
|
||||
click-left = "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous"
|
||||
|
||||
[module/playpause]
|
||||
type = custom/script
|
||||
interval = 86400
|
||||
format = "%{T3}<label>"
|
||||
format-padding = 1
|
||||
exec = echo "/"
|
||||
exec-if = "pgrep spotify"
|
||||
line-size = 1
|
||||
click-left = "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
|
||||
|
||||
|
||||
[module/next]
|
||||
type = custom/script
|
||||
interval = 86400
|
||||
format = "%{T3}<label>"
|
||||
format-padding = 1
|
||||
exec = echo ""
|
||||
exec-if = "pgrep spotify"
|
||||
line-size = 1
|
||||
click-left = "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user