From 46ad6f3449cfdb1b5c57be3651cc34ffb786ef49 Mon Sep 17 00:00:00 2001 From: Jurij P Date: Mon, 3 Aug 2020 12:38:46 +0200 Subject: [PATCH] Posodobitve --- .config/i3/battery_stat.sh | 18 ++++++++++++++++++ .config/i3/config | 22 ++++++++++++++-------- .config/sway/config | 24 +++++++++++++++++------- .config/termite/config | 2 +- .i3blocks.conf | 38 +++++++++++++++++++------------------- .spacemacs | 5 ++++- .zshrc | 22 +++++++++++++++++++++- 7 files changed, 94 insertions(+), 37 deletions(-) create mode 100755 .config/i3/battery_stat.sh diff --git a/.config/i3/battery_stat.sh b/.config/i3/battery_stat.sh new file mode 100755 index 0000000..869d96b --- /dev/null +++ b/.config/i3/battery_stat.sh @@ -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 diff --git a/.config/i3/config b/.config/i3/config index fcec233..c29a3d3 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -12,7 +12,7 @@ set $mod Mod4 # DPI scaling -exec xrandr --dpi 166 +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. @@ -20,7 +20,7 @@ exec xrandr --dpi 166 #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). @@ -183,9 +183,9 @@ mode "resize" { bindsym $mod+r mode "resize" # External monitor -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 +#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 # Lock screen bindsym $mod+shift+b exec i3lock-next @@ -228,15 +228,18 @@ exec --no-startup-id xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" # Touchpad natural scrolling exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1 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 + # 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 redshift-gtk & @@ -300,8 +303,10 @@ bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -m # 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" # File manager bindsym Mod1+Shift+q exec nautilus @@ -319,3 +324,4 @@ bindsym 0xff61 exec gnome-screenshot -i # Keyring related exec --no-startup-id /usr/share/gnome-settings-daemon + diff --git a/.config/sway/config b/.config/sway/config index d6aa689..0f95b26 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -10,10 +10,11 @@ set $right semicolon set $altright ccaron # Terminal -set $term termite +#set $term termite +set $term PAN_MESA_DEBUG=gl3 kitty # Font -font pango:Iosevka Medium 10 +font pango:Iosevka Medium 11 # Launcher set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config" @@ -21,8 +22,8 @@ set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local #set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec #output eDP-1 resolution 2440x1440 scale 2 -output eDP-1 resolution 1920x1080 scale 1 -output "*" background ~/Pictures/wlp.jpg fill +output eDP-1 resolution 1920x1080 scale 1.25 +output "*" background ~/Slike/wlp.jpg fill # start a terminal bindsym $mod+Return exec $term @@ -201,7 +202,7 @@ bindsym $mod+r mode "resize" # Read `man 5 sway-bar` for more information about this section. bar { position top - status_command i3blocks + status_command i3status colors { background #232323 statusline #DCDCDC @@ -209,9 +210,9 @@ bar { focused_workspace #555555 #555555 #ffffff inactive_workspace #232323 #232323 #888888 } - font pango:FontAwesome Regular 9, Iosevka Medium 9 + font pango:FontAwesome Regular 12, Iosevka Medium 12 strip_workspace_numbers yes - height 18 + height 22 #tray_padding 2 } @@ -232,3 +233,12 @@ for_window [class="^.*"] border pixel 2 # Mouse focus focus_follows_mouse yes + +input "9610:30:HAILUCK_CO.,LTD_USB_KEYBOARD_Touchpad" { + tap enabled + natural_scroll enabled + drag enabled +} + +# Brez titlebara pls +default_border none diff --git a/.config/termite/config b/.config/termite/config index 41e1f5c..4589f09 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -1,5 +1,5 @@ [options] -font = Fira Mono Medium 8 +font = Fira Mono Medium 11 [colors] #!!############################################## diff --git a/.i3blocks.conf b/.i3blocks.conf index 1b8e6f7..a308dea 100644 --- a/.i3blocks.conf +++ b/.i3blocks.conf @@ -40,9 +40,9 @@ separator_block_width=15 #command="/home/g1smo/Sredstva/i3blocks-contrib/monitor_manager/monitor_manager" [brightness] -label= +label= color=#F8FF05 -command=echo -n "$label $(xbacklight -get)%" +command=/home/g1smo/bin/lcd_bright.sh interval=once signal=5 @@ -56,9 +56,9 @@ interval=persist [memory] #label=MEM -label= +label= color=#A85FFF -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/ \(.+//' interval=10 #[memory] @@ -74,9 +74,9 @@ interval=10 # (defaults to 10 for 10%). [disk] #label=HOME -label= +label= color=#AAAAAA -command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk +command=/home/g1smo/Sredstva/i3blocks-contrib/disk/disk #instance=/mnt/data interval=30 @@ -93,9 +93,9 @@ command=/home/g1smo/Sredstva/i3blocks-contrib/iface/iface #instance=wlp4s0 instance=wlp2s0 interval=10 -label= +label= color=#11DD00 -command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi +command=/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi #separator=false #[bandwidth] @@ -110,9 +110,9 @@ command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi #label=CPU #label= #label= -label= +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 +command=/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1 color=#FA0009 interval=1 align=right @@ -121,16 +121,16 @@ min_width= 99.0% [load_average] #label= #label=☭ -label= +label= color=#70E2FF interval=3 -command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/load_average/load_average +command=/home/g1smo/Sredstva/i3blocks-contrib/load_average/load_average [key_layout] -label=⌨ +label=⌨ interval=5 #command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout" -command=echo -n "$label ";xkb-switch +command=xkb-switch #interval=persist #command="/home/h1smo/Sredstva/i3blocks-contrib/kbdd_layout/kbdd_layout" @@ -139,23 +139,23 @@ 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 ))% -command="/home/g1smo/Sredstva/i3blocks-contrib/battery2/battery2" +command="/home/g1smo/Sredstva/dotfiles/.config/i3/battery_stat.sh" interval=30 markup=pango [date] -label= +label= color=#ffffff -command=echo -n "$label ";date '+%a %d %b' +command=date '+%a %d %b' #command=/home/g1smo/Sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar interval=5 separator=false [time] #command=date '+%Y-%m-%d %H:%M:%S' -label= +label= color=#ffffff -command=echo -n "$label ";date '+%H:%M' +command=date '+%H:%M' interval=5 [shutdown] diff --git a/.spacemacs b/.spacemacs index 7524ff3..f161541 100644 --- a/.spacemacs +++ b/.spacemacs @@ -252,7 +252,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 19 + :size 13 :weight bold :width normal :powerline-scale 1.1) @@ -535,6 +535,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) diff --git a/.zshrc b/.zshrc index c21b1c2..32dd6a4 100644 --- a/.zshrc +++ b/.zshrc @@ -108,7 +108,22 @@ export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools # Chrome scaling -export CHROMIUM_FLAGS="--force-device-scale-factor=2" +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" @@ -123,3 +138,8 @@ export PATH="/home/g1smo/.guix-profile/bin${PATH:+:}$PATH" #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