summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/mpd/mpd.conf8
-rw-r--r--config/polybar/config8
-rw-r--r--config/rofi/colors-rofi-dark.rasi4
-rw-r--r--mkshrc2
-rwxr-xr-xscripts/bg.sh2
-rwxr-xr-xscripts/tablet13
6 files changed, 23 insertions, 14 deletions
diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf
index b086d5e..679ebd1 100644
--- a/config/mpd/mpd.conf
+++ b/config/mpd/mpd.conf
@@ -14,6 +14,14 @@ audio_output {
}
audio_output {
+ type "httpd"
+ name "HQ HTTP Stream"
+ encoder "wave" # optional, vorbis or lame
+ port "6681"
+ max_clients "0"
+}
+
+audio_output {
type "pulse"
name "mpd"
}
diff --git a/config/polybar/config b/config/polybar/config
index b28e8ea..ec82e1e 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -162,8 +162,8 @@ format-prefix = "力 "
[module/battery]
type = internal/battery
full-at = 99
-battery = BAT1
-adapter = ADP1
+battery = BAT0
+adapter = AC
poll-interval = 3
time-format = %H:%M
@@ -171,8 +171,8 @@ time-format = %H:%M
format-charging = <animation-charging> <label-charging>
format-discharging = <ramp-capacity> <label-discharging>
-label-charging = -%percentage%%
-label-discharging = -%percentage%%
+label-charging = +%percentage%%
+label-discharging = %percentage%%
label-full = %percentage%%
ramp-capacity-0 = 
diff --git a/config/rofi/colors-rofi-dark.rasi b/config/rofi/colors-rofi-dark.rasi
index 5c5fec3..0be691d 100644
--- a/config/rofi/colors-rofi-dark.rasi
+++ b/config/rofi/colors-rofi-dark.rasi
@@ -25,8 +25,8 @@
background-color: #00000000;
background: #191919;
background2: #191919;
- foreground: #f58f44;
- foreground2: #5f819d;
+ foreground: #fefefe;
+ foreground2: #373b41;
spacing: 2;
font: "mononoki 12";
diff --git a/mkshrc b/mkshrc
index 641c376..c7ddf96 100644
--- a/mkshrc
+++ b/mkshrc
@@ -50,6 +50,8 @@ function parse_git_dirty {
[ ! "${bits}" == "" ] && echo " ${bits}" || echo ""
}
+#set -o vi
+
bind '^L=clear-screen'
export PS1=$(echo -e "\e[0;97m\${PWD/#\$HOME/\~}\e[0;37m\`parse_git_branch\` > \e[0;0m")
diff --git a/scripts/bg.sh b/scripts/bg.sh
index 72c612c..34a1196 100755
--- a/scripts/bg.sh
+++ b/scripts/bg.sh
@@ -12,7 +12,7 @@ convert -coalesce $image $dir/%05d.png
printf "done\n"
amount_of_frames=$(ls -1 "$dir" | wc -l)
-frames_per_second=30
+frames_per_second=10
speed=$(echo "scale=3; ($amount_of_frames/$frames_per_second) * (1/$frames_per_second)" | bc -l)
while : ; do
diff --git a/scripts/tablet b/scripts/tablet
index 0965395..8190919 100755
--- a/scripts/tablet
+++ b/scripts/tablet
@@ -19,23 +19,22 @@ tablet_ratio = (lambda s: float(s[0]) / float(s[1]))(sys.argv[4].split(":")) if
#]
screens = [
- (0, 0, 1280, 1024),
- (1280, 0, 2560, 1440),
- (3840, 0, 1920, 1080),
- (5760, 0, 1920, 1080),
+ (0, 0, 1920, 1080),
+ (0, 1080, 1920, 1080),
+ (1920, 1080, 2560, 1440),
]
#TODO find this with xrandr
-target = screens[1]
+target = screens[2]
#Physical offset of the selected screen
offsetx = target[0]
offsety = target[1]
#Size of the full screen areas
-sh = 1920
-sw = 1280 + 2560 + 1080 + 1080
+sh = 1080+ 1440
+sw = 1920 + 2560
#TODO calculate using list of screens
#Aspect ratio of the tablet, to avoid weird scaling problems