Posodobitve

k0ns
Jurij Podgoršek 2020-08-03 12:38:46 +02:00 committed by Jurij Podgoršek
parent 29c4d1ebd5
commit 12e9a12ac2
7 changed files with 144 additions and 14 deletions

View File

@ -0,0 +1,18 @@
#!/bin/bash
#simple Shellscript for i3blocks on Pinebook pro
#05012020 geri123@gmx.net Gerhard S.
#battery-symbols: on Manjaro you need the awesome-terminal-fonts package installed!
PERCENT=$(cat /sys/class/power_supply/cw2015-battery/capacity)
STATUS=$(cat /sys/class/power_supply/cw2015-battery/status)
case $((
$PERCENT >= 0 && $PERCENT <= 20 ? 1 :
$PERCENT > 20 && $PERCENT <= 40 ? 2 :
$PERCENT > 40 && $PERCENT <= 60 ? 3 :
$PERCENT > 60 && $PERCENT <= 80 ? 4 : 5)) in
#
(1) echo $STATUS "" $PERCENT%;;
(2) echo $STATUS "" $PERCENT%;;
(3) echo $STATUS "" $PERCENT%;;
(4) echo $STATUS "" $PERCENT%;;
(5) echo $STATUS "" $PERCENT%;;
esac

View File

@ -5,7 +5,7 @@
set $mod Mod4
# DPI scaling
exec xrandr --dpi 158
exec xrandr --dpi 157
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
@ -13,7 +13,7 @@ exec xrandr --dpi 158
#font pango:Fira Code 10
#font pango:Cantarell 10
#font pango:Fira Mono, Icons 9
font pango:Iosevka Medium 8
font pango:Iosevka Medium 10
# This font is widely installed, provides lots of unicode glyphs, right-to-left
# text rendering and scalability on retina/hidpi displays (thanks to pango).
@ -182,9 +182,15 @@ mode "resize" {
bindsym $mod+r mode "resize"
# External monitor
<<<<<<< HEAD
set $restart_compton (killall compton && compton -b) || compton -b
bindsym $mod+p exec xrandr --output HDMI-2 --auto --right-of eDP-1 && $set_bg && $restart_compton
bindsym $mod+Shift+p exec xrandr --output HDMI-2 --off && $restart_compton
=======
#set $restart_compton (killall compton && compton -b) || compton -b
#bindsym $mod+p exec xrandr --output HDMI-1 --auto --right-of eDP-1 && $set_bg && $restart_compton
#bindsym $mod+Shift+p exec xrandr --output HDMI-1 --off && $restart_compton
>>>>>>> 46ad6f3 (Posodobitve)
# Lock screen
bindsym $mod+shift+b exec i3lock-fancy
@ -227,15 +233,22 @@ exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapp
# Touchpad natural scrolling
exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1
<<<<<<< HEAD
=======
exec --no-startup-id xinput set-prop "Elan Touchpad" "libinput Natural Scrolling Enabled" 1
exec --no-startup-id xinput set-prop 'HAILUCK CO.,LTD USB KEYBOARD Touchpad' 'libinput Natural Scrolling Enabled' 1
>>>>>>> 46ad6f3 (Posodobitve)
# Cursor acceleration
exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.456
exec --no-startup-id xinput set-prop 'HAILUCK CO.,LTD USB KEYBOARD Touchpad' 'libinput Accel Speed' 0.6
# Autolock
#exec --no-startup-id xautolock -time 10 -locker 'i3lock-next' &
# Transparency
exec --no-startup-id compton --unredir-if-possible -b
#exec --no-startup-id compton --unredir-if-possible -b
# Redshift (hello sleep)
#exec --no-startup-id redshift-gtk -l 46.0552778:14.5144444 &
@ -303,8 +316,10 @@ bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun,run -show comb
# Screen brightness
set $brt_sig_cmd pkill -RTMIN+5 i3blocks
bindsym XF86MonBrightnessUp exec "xbacklight -inc 8.333 -time 222 -steps 5 && $brt_sig_cmd"
bindsym XF86MonBrightnessDown exec "xbacklight -dec 8.333 -time 222 -steps 5 && $brt_sig_cmd"
#bindsym XF86MonBrightnessUp exec "xbacklight -inc 8.333 -time 222 -steps 5 && $brt_sig_cmd"
#bindsym XF86MonBrightnessDown exec "xbacklight -dec 8.333 -time 222 -steps 5 && $brt_sig_cmd"
bindsym XF86MonBrightnessUp exec "/home/g1smo/bin/lcd_bright.sh U 200 && $brt_sig_cmd"
bindsym XF86MonBrightnessDown exec "/home/g1smo/bin/lcd_bright.sh D 200 && $brt_sig_cmd"
# Radio študent
bindsym Mod1+shift+r exec vlc /home/g1smo/Glasba/rs.m3u
@ -325,3 +340,6 @@ exec ~/.local/bin/autotiling
# Rdecenje skrina
exec gammastep -l 46.05108:14.50513
exec --no-startup-id /usr/share/gnome-settings-daemon

View File

@ -220,8 +220,11 @@ bindsym $mod+r mode "resize"
# Read `man 5 sway-bar` for more information about this section.
bar {
position top
<<<<<<< HEAD
# status_command i3blocks
# status_command i3status-rs
=======
>>>>>>> 46ad6f3 (Posodobitve)
status_command i3status
colors {
focused_background #272727E5
@ -232,9 +235,15 @@ bar {
focused_workspace #555555E5 #555555E5 #ffffff
inactive_workspace #272727E5 #272727E5 #888888
}
<<<<<<< HEAD
font pango:FontAwesome Regular 12, Iosevka SS01 Medium 12
strip_workspace_numbers yes
height 26
=======
font pango:FontAwesome Regular 12, Iosevka Medium 12
strip_workspace_numbers yes
height 22
>>>>>>> 46ad6f3 (Posodobitve)
#tray_padding 2
separator_symbol " "
}
@ -261,6 +270,7 @@ hide_edge_borders smart
# Mouse focus
focus_follows_mouse yes
<<<<<<< HEAD
# KBD layouti
input "type:keyboard" {
xkb_layout us,si

View File

@ -1,5 +1,5 @@
[options]
font = Fira Mono Medium 8
font = Fira Mono Medium 11
[colors]
#!!##############################################

View File

@ -41,9 +41,13 @@ signal=10
#command="/home/g1smo/sredstva/i3blocks-contrib/monitor_manager/monitor_manager"
[brightness]
label=
label=
color=#F8FF05
<<<<<<< HEAD
command=echo -n "$label $(xbacklight -get | sed -e 's/\.[0-9]\+//')%"
=======
command=/home/g1smo/bin/lcd_bright.sh
>>>>>>> 46ad6f3 (Posodobitve)
interval=once
signal=5
@ -55,9 +59,13 @@ interval=persist
[memory]
#label=MEM
label=
label=
color=#A85FFF
<<<<<<< HEAD
command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//'
=======
command=/home/g1smo/Sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//'
>>>>>>> 46ad6f3 (Posodobitve)
interval=10
#[memory]
@ -71,6 +79,7 @@ interval=10
# The directory defaults to $HOME if the instance is not specified.
# The script may be called with a optional argument to set the alert
# (defaults to 10 for 10%).
<<<<<<< HEAD
[disk-root]
label=
color=#AAAAAA
@ -90,6 +99,14 @@ label=
color=#AAAAAA
command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/disk/disk
instance=/var
=======
[disk]
#label=HOME
label=
color=#AAAAAA
command=/home/g1smo/Sredstva/i3blocks-contrib/disk/disk
#instance=/mnt/data
>>>>>>> 46ad6f3 (Posodobitve)
interval=30
[iface]
@ -105,9 +122,13 @@ command=/home/g1smo/sredstva/i3blocks-contrib/iface/iface
#instance=wlp4s0
instance=wlp2s0
interval=10
label=
label=
color=#11DD00
<<<<<<< HEAD
command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/wifi/wifi
=======
command=/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi
>>>>>>> 46ad6f3 (Posodobitve)
#separator=false
#[bandwidth]
@ -122,9 +143,15 @@ command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/wifi/wifi
#label=CPU
#label=
#label=
<<<<<<< HEAD
label=
#command=/home/g1smo/sredstva/i3blocks-contrib/cpu_usage/cpu_usage | sed -r 's/^([0-9])\./\ \1\./'
command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1
=======
label=
#command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage | sed -r 's/^([0-9])\./\ \1\./'
command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1
>>>>>>> 46ad6f3 (Posodobitve)
color=#FA0009
interval=1
align=right
@ -134,16 +161,25 @@ min_width= 99.0%
[load_average]
#label=
#label=☭
label=
label=
color=#70E2FF
interval=3
<<<<<<< HEAD
command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/load_average/load_average
=======
command=/home/g1smo/Sredstva/i3blocks-contrib/load_average/load_average
>>>>>>> 46ad6f3 (Posodobitve)
[key_layout]
label=⌨
label=⌨
interval=5
<<<<<<< HEAD
#command="/home/h1smo/sredstva/i3blocks-contrib/key_layout/key_layout"
command=echo -n "$label ";xkb-switch
=======
#command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout"
command=xkb-switch
>>>>>>> 46ad6f3 (Posodobitve)
#interval=persist
#command="/home/h1smo/sredstva/i3blocks-contrib/kbdd_layout/kbdd_layout"
@ -152,21 +188,30 @@ command=echo -n "$label ";xkb-switch
#label=⚡
#instance=1
#command=count=$(acpi -b | wc -l); sum=$(acpi -b | egrep -o '[0-9]{1,3}%' | tr -d '%' | xargs -I% echo -n '+%'); echo '' $(( sum / count ))%
<<<<<<< HEAD
command="/home/g1smo/sredstva/i3blocks-contrib/battery2/battery2"
=======
command="/home/g1smo/Sredstva/dotfiles/.config/i3/battery_stat.sh"
>>>>>>> 46ad6f3 (Posodobitve)
interval=30
markup=pango
[date]
label=
label=
color=#ffffff
<<<<<<< HEAD
command=echo -n "$label ";date '+%a %d %b'
#command=/home/g1smo/sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar
=======
command=date '+%a %d %b'
#command=/home/g1smo/Sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar
>>>>>>> 46ad6f3 (Posodobitve)
interval=5
separator=false
[time]
#command=date '+%Y-%m-%d %H:%M:%S'
label=
label=
color=#ffffff
command=echo -n "$label";date '+%H:%M'
interval=5

View File

@ -261,7 +261,7 @@ It should only modify the values of Spacemacs settings."
;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '("Iosevka Medium"
:size 16
:size 13
:weight bold
:width normal
:powerline-scale 1.1)
@ -544,6 +544,9 @@ before packages are loaded."
(use-package all-the-icons)
(setq neo-theme (if (display-graphic-p) 'icons 'arrow))
;; Fix for startup issue?
(setq projectile-git-submodule-command nil)
;; Also in dired
(use-package all-the-icons-dired)

36
.zshrc
View File

@ -132,3 +132,39 @@ export LD_LIBRARY_PATH="$(go env GOPATH)/deps/dqlite/.libs/:$(go env GOPATH)/dep
# JS fix (prevec nov za openssl)
#export NODE_OPTIONS="--openssl-legacy-provider"
# Chrome scaling
export CHROMIUM_FLAGS="$CHROMIUM_FLAGS \
--disable-low-res-tiling
--num-raster-threads=6 \
--profiler-timing=0 \
--disable-composited-antialiasing \
--test-type \
--show-component-extension-options \
--ignore-gpu-blacklist \
--use-gl=egl \
--ppapi-flash-path=/usr/lib/chromium-browser/pepper/libpepflashplayer.so \
--ppapi-flash-version=32.0.0.255 \
--enable-pinch \
--flag-switches-begin \
--enable-gpu-rasterization \
--enable-oop-rasterization \
--flag-switches-end"
# Guix!
export GUIX_PROFILE="$HOME/.guix-profile"
#export GUIX_PROFILE="$HOME/.config/guix/current"
export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile"
[ -e $GUIX_PROFILE_FILE ] && source $GUIX_PROFILE_FILE
export GUIX_PACKAGE_PATH="$HOME/Projects/guix-packages"
export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
#export PATH="/home/g1smo/.config/guix/current/bin${PATH:+:}$PATH"
export PATH="/home/g1smo/.guix-profile/bin${PATH:+:}$PATH"
#export SSL_CERT_DIR="$GUIX_PROFILE/etc/ssl/certs"
#export SSL_CERT_FILE="$SSL_CERT_DIR/ca-certificates.crt"
#export GIT_SSL_CAINFO="$SSL_CERT_FILE"
#export CURL_CA_BUNDLE="$SSL_CERT_FILE"
# Mozilla webrender
export MOZ_WEBRENDER=0
# Wayland native firefox
export MOZ_ENABLE_WAYLAND=1