Posodobitve konfiguracij za T460s FHD (sway!)

t460s-fhd
Jurij Podgoršek 2020-09-01 00:54:56 +02:00
parent ac50450e5f
commit e022f6c867
18 changed files with 279 additions and 168 deletions

View File

@ -1,9 +1,10 @@
!!! Scaling, fonts !!! !!! Scaling, fonts !!!
Xft.dpi: 210 Xft.dpi: 158
!Xft.autohint: 1
Xft.autohint: 0 Xft.autohint: 0
!Xft.autohint: 1
Xft.lcdfilter: lcddefault Xft.lcdfilter: lcddefault
Xft.hintstyle: hintslight !Xft.hintstyle: hintslight
Xft.hintstyle: hintfull
Xft.hinting: 1 Xft.hinting: 1
Xft.antialias: 1 Xft.antialias: 1
Xft.rgba: rgb Xft.rgba: rgb
@ -54,8 +55,7 @@ Xft.rgba: rgb
!!! Urxvt options !!! !!! Urxvt options !!!
! font ! font
!URxvt*font: xft:Fira Mono Medium:size=10,xft:Noto Emoji:size=10 URxvt*font: xft:Fira Code Medium:size=9,xft:Noto Emoji:size=9
URxvt*font: xft:Fira Mono Medium:size=8,xft:Noto Emoji:size=8
! Fix letter spacing; this is not needed in patched urxvt ! Fix letter spacing; this is not needed in patched urxvt
! URxvt*letterSpace: -1 ! URxvt*letterSpace: -1
! hide scrollbar ! hide scrollbar

View File

@ -5,7 +5,7 @@
set $mod Mod4 set $mod Mod4
# DPI scaling # DPI scaling
exec xrandr --dpi 210 exec xrandr --dpi 158
# Font for window titles. Will also be used by the bar unless a different font # Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. # is used in the bar {} block below.
@ -83,7 +83,7 @@ bindsym $mod+shift+f floating toggle
bindsym $mod+shift+space focus mode_toggle bindsym $mod+shift+space focus mode_toggle
# focus the parent container # focus the parent container
bindsym $mod+shift+a focus parent bindsym $mod+a focus parent
# focus the child container # focus the child container
#bindsym $mod+shift+c focus child #bindsym $mod+shift+c focus child
@ -141,10 +141,10 @@ assign [class="Revolt"] $w4
assign [class="Lollypop"] $w7 assign [class="Lollypop"] $w7
# Program startup # Program startup
exec thunderbird & #exec thunderbird &
#exec revolt & #exec revolt &
exec riot-web & #exec riot-web &
exec pidgin & #exec pidgin &
# reload the configuration file # reload the configuration file
bindsym $mod+Shift+c reload bindsym $mod+Shift+c reload
@ -183,33 +183,32 @@ bindsym $mod+r mode "resize"
# External monitor # External monitor
set $restart_compton (killall compton && compton -b) || compton -b set $restart_compton (killall compton && compton -b) || compton -b
set $restart_polybar ~/.config/polybar/launch.sh bindsym $mod+p exec xrandr --output HDMI-2 --auto --right-of eDP-1 && $set_bg && $restart_compton
bindsym $mod+p exec xrandr --output HDMI1 --auto --right-of eDP1 && $set_bg && $restart_compton && $restart_polybar bindsym $mod+Shift+p exec xrandr --output HDMI-2 --off && $restart_compton
bindsym $mod+Shift+p exec xrandr --output HDMI1 --off && $restart_compton && $restart_polybar
# Lock screen # Lock screen
bindsym $mod+shift+b exec i3lock-fancy bindsym $mod+shift+b exec i3lock-fancy
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
#bar { bar {
# position top position top
#status_command i3blocks #status_command i3blocks
# #status_command i3bar status_command i3status
# colors { colors {
# background #232323 background #232323
# statusline #DCDCDC statusline #DCDCDC
#
# focused_workspace #555555 #555555 #ffffff focused_workspace #555555 #555555 #ffffff
# inactive_workspace #232323 #232323 #888888 inactive_workspace #232323 #232323 #888888
# } }
# #font pango:Fira Mono, Icons 10 #font pango:Fira Mono, Icons 10
# #font pango:Iosevka Medium 10 #font pango:Iosevka Medium 10
# font pango: Iosevka Medium 8 font pango: Iosevka Medium 8
# strip_workspace_numbers yes strip_workspace_numbers yes
# height 46 height 36
# tray_padding 2 tray_padding 2
#} }
# Colors # Colors
client.focused #444444 #444444 #A9D000 #8c9825 #444444 client.focused #444444 #444444 #A9D000 #8c9825 #444444
@ -223,17 +222,14 @@ client.background #222222
####################### #######################
# Touchpad tap to click # Touchpad tap to click
exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Tapping Enabled" 1 exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1
exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "Synaptics Tap Action" 0 0 0 0 1 3 #exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "Synaptics Tap Action" 0 0 0 0 1 3
# Touchpad natural scrolling # Touchpad natural scrolling
exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Natural Scrolling Enabled" 1 exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1
#exec --no-startup-id xinput set-prop "Synaptics TM3289-002" 314 -44 -44
exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "Synaptics Scrolling Distance" -44 -44
# Cursor acceleration # Cursor acceleration
exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Accel Speed" 0.456 exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.456
# Autolock # Autolock
#exec --no-startup-id xautolock -time 10 -locker 'i3lock-next' & #exec --no-startup-id xautolock -time 10 -locker 'i3lock-next' &
@ -242,24 +238,21 @@ exec --no-startup-id xinput set-prop "Synaptics TM3289-002" "libinput Accel Spee
exec --no-startup-id compton --unredir-if-possible -b exec --no-startup-id compton --unredir-if-possible -b
# Redshift (hello sleep) # Redshift (hello sleep)
#exec redshift-gtk & #exec --no-startup-id redshift-gtk -l 46.0552778:14.5144444 &
exec --no-startup-id redshift-gtk -l 46.0552778:14.5144444 & exec --no-startup-id redshift-gtk &
# Background # Background
set $set_bg feh --bg-fill ~/Slike/Wallpapers/neka_trava.jpg set $set_bg feh --bg-fill ~/Slike/Wallpapers/1596344206877.jpg
exec --no-startup-id $set_bg & exec_always --no-startup-id $set_bg &
# Network manager applet # Network manager applet
exec nm-applet & exec nm-applet &
# Keyboard layout, caps lock as compose key # Keyboard layout, caps lock as compose key
#exec_always --no-startup-id "setxkbmap -layout us,si -option grp:lctrl_lwin_toggle -option compose:caps" exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggle -option compose:caps"
#exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggle -option compose:caps"
#exec_always --no-startup-id "setxkbmap -layout us,si -option compose:caps"
# Change layout # Change layout
bindym $mod+space exec "i3-keyboard-layout cycle us si" bindym $mod+space exec "i3-keyboard-layout cycle us si"
#i3-keyboard-layout cycle us si
# gaps between windows # gaps between windows
gaps inner 7 gaps inner 7
@ -278,10 +271,6 @@ focus_follows_mouse yes
# Various app shortcuts # # Various app shortcuts #
######################### #########################
# Firefox
bindsym $mod+shift+w exec firefox
bindsym Mod1+shift+w exec chromium --force-device-scale-factor=1
# Increase volume # Increase volume
set $vol_sig_cmd pkill -RTMIN+10 i3blocks set $vol_sig_cmd pkill -RTMIN+10 i3blocks
#set $vol_down_cmd pulsemixer --change-volume -5 #set $vol_down_cmd pulsemixer --change-volume -5
@ -298,8 +287,8 @@ bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd"
bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd" bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd"
# start a terminal # start a terminal
bindsym $mod+Return exec i3-sensible-terminal #bindsym $mod+Return exec i3-sensible-terminal
#bindsym $mod+Return exec "termite -t konz0l" bindsym $mod+Return exec kitty
# kill focused window # kill focused window
bindsym $mod+shift+q kill bindsym $mod+shift+q kill
@ -309,29 +298,23 @@ bindsym $mod+ctrl+q exec --no-startup-id "xterm -e xkill"
#bindsym $mod+d exec dmenu_run #bindsym $mod+d exec dmenu_run
# start rofi (alt program launcher) # start rofi (alt program launcher)
bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config" bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun,run -show combi -modi combi -icon-theme Papirus -show-icons -config ~/.local/rofi/config"
# Screen brightness # Screen brightness
set $brt_sig_cmd pkill -RTMIN+5 i3blocks set $brt_sig_cmd pkill -RTMIN+5 i3blocks
bindsym XF86MonBrightnessUp exec "xbacklight -inc 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 XF86MonBrightnessDown exec "xbacklight -dec 8.333 -time 222 -steps 5 && $brt_sig_cmd"
# File manager
bindsym Mod1+shift+q exec nautilus
# Emacs!
bindsym $mod+a exec emacs
# Radio študent # Radio študent
bindsym Mod1+shift+r exec vlc /home/g1smo/Glasba/radiostudent.m3u bindsym Mod1+shift+r exec vlc /home/g1smo/Glasba/rs.m3u
bindsym Mod1+shift+z exec playerctl play-pause bindsym Mod1+shift+x exec playerctl play-pause
bindsym Mod1+shift+y exec playerctl play-pause bindsym Mod1+shift+c exec playerctl play-pause
# Skrinšot # Skrinšot
bindsym 0xff61 exec gnome-screenshot -i bindsym 0xff61 exec gnome-screenshot -i
# Keyring related # Keyring related
exec --no-startup-id /usr/share/gnome-settings-daemon #exec --no-startup-id /usr/share/gnome-settings-daemon
# Pulseaudio zagon # Pulseaudio zagon
#exec --no-startup-id /usr/bin/pulseaudio -D #exec --no-startup-id /usr/bin/pulseaudio -D
@ -343,7 +326,7 @@ exec --no-startup-id /usr/share/gnome-settings-daemon
exec_always --no-startup-id ~/.config/polybar/launch.sh exec_always --no-startup-id ~/.config/polybar/launch.sh
# Signal chat ane # Signal chat ane
exec /usr/bin/signal-desktop #exec /usr/bin/signal-desktop
# autotajling # autotajling
exec --no-startup-id autotiling #exec --no-startup-id autotiling

View File

@ -0,0 +1,32 @@
font_family Fira Code Medium
bold_font auto
italic_font auto
bold_italic_font auto
font_size 11.0
foreground #839496
background #002b36
background_opacity 0.9
color0 #073642
color1 #dc322f
color2 #859900
color3 #b58900
color4 #268bd2
color5 #d33682
color6 #2aa198
color7 #eee8d5
color8 #002b36
color9 #cb4b16
color10 #586e75
color11 #657b83
color12 #839496
color13 #6c71c4
color14 #93a1a1
color15 #fdf6e3
window_padding_width 2
touch_scroll_multiplier 10.0
strip_trailing_spaces smart

View File

@ -10,20 +10,27 @@ set $right semicolon
set $altright ccaron set $altright ccaron
# Terminal # Terminal
set $term termite set $term kitty
# Font # Font
font pango:Iosevka Medium 10 font pango:Iosevka Medium 10
# Launcher # Launcher
set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config" set $menu "rofi -combi-modi window,drun,run -show combi -modi combi -config ~/.local/rofi/config"
#set $menu j4-dmenu-desktop #set $menu j4-dmenu-desktop
#set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec #set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec
output eDP-1 resolution 2560x1440 scale 2 output eDP-1 {
pos 0 0
resolution 1920x1080
scale 1.25
scale_filter linear
}
#output eDP-1 resolution 2560x1440 scale 2 #output eDP-1 resolution 2560x1440 scale 2
#output eDP-1 resolution 1920x1080 scale 1 #output eDP-1 resolution 1920x1080 scale 1
output "*" background ~/Slike/Wallpapers/neka_trava.jpg fill output "*" background ~/Slike/Wallpapers/1596344206877.jpg fill
# Zamik dobimo z SIRINA / SCALE
output HDMI-A-2 pos 1536 0 scale 1
# start a terminal # start a terminal
bindsym $mod+Return exec $term bindsym $mod+Return exec $term
@ -77,16 +84,16 @@ bindsym $mod+d exec $menu
# #
# name workspaces # name workspaces
set $w1 1:λ set $w1 1:
set $w2 2: set $w2 2:λ
set $w3 3: set $w3 3:
set $w4 4: set $w4 4:
set $w5 5:✡ set $w5 5:✡
set $w6 6: set $w6 6:
set $w7 7:✭❀❤♫ set $w7 7:✭❀❤♫
set $w8 8:☭ set $w8 8:☭
set $w9 9: set $w9 9:
set $w0 0: set $w0 0:
# switch to workspace # switch to workspace
bindsym $mod+1 workspace $w1 bindsym $mod+1 workspace $w1
@ -115,10 +122,13 @@ bindsym $mod+Shift+0 move container to workspace $w0
bindsym $mod+Tab workspace next bindsym $mod+Tab workspace next
bindsym $mod+Shift+Tab workspace prev bindsym $mod+Shift+Tab workspace prev
bindsym Mod1+Shift+colon move workspace to output right bindsym Mod1+Shift+$right move workspace to output right
bindsym Mod1+Shift+ccaron move workspace to output right bindsym Mod1+Shift+$altright move workspace to output right
bindsym Mod1+Shift+j move workspace to output left bindsym Mod1+Shift+j move workspace to output left
# back and forth between workspaces
bindsym Mod1+Tab workspace back_and_forth
# workspace bindings # workspace bindings
assign [class="Firefox"] $w2 assign [class="Firefox"] $w2
assign [class="Gnote"] $w9 assign [class="Gnote"] $w9
@ -140,7 +150,7 @@ assign [class="Nicotine+"] $w3
# You can "split" the current object of your focus with # You can "split" the current object of your focus with
# $mod+b or $mod+v, for horizontal and vertical splits # $mod+b or $mod+v, for horizontal and vertical splits
# respectively. # respectively.
bindsym $mod+b splith bindsym $mod+h splith
bindsym $mod+v splitv bindsym $mod+v splitv
# Switch the current container between different layout styles # Switch the current container between different layout styles
@ -202,7 +212,8 @@ bindsym $mod+r mode "resize"
# Read `man 5 sway-bar` for more information about this section. # Read `man 5 sway-bar` for more information about this section.
bar { bar {
position top position top
status_command i3blocks # status_command i3blocks
status_command i3status
colors { colors {
background #232323 background #232323
statusline #DCDCDC statusline #DCDCDC
@ -210,10 +221,10 @@ bar {
focused_workspace #555555 #555555 #ffffff focused_workspace #555555 #555555 #ffffff
inactive_workspace #232323 #232323 #888888 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 strip_workspace_numbers yes
height 18 height 26
#tray_padding 2 tray_padding 2
} }
include /etc/sway/config.d/* include /etc/sway/config.d/*
@ -225,11 +236,71 @@ client.unfocused #222222 #222222 #888888 #292d2e #222222
client.background #222222 client.background #222222
# gaps between windows # gaps between windows
gaps inner 4 gaps inner 6
smart_gaps on smart_gaps on
#smart_borders on #smart_borders on
# No titles # No titles
for_window [class="^.*"] border pixel 2 #for_window [class="^.*"] border pixel 2
default_border pixel 3
default_floating_border normal
hide_edge_borders smart
# Mouse focus # Mouse focus
focus_follows_mouse yes focus_follows_mouse yes
# KBD layouti
input "type:keyboard" {
xkb_layout us,si
xkb_options grp:win_space_toggle,compose:caps
}
# Touchpad fensi
input "type:touchpad" {
tap enabled
natural_scroll enabled
dwt enabled
scroll_factor 0.25
}
exec ~/sredstva/dotfiles/inactive-windows-transparency.py
exec i3-auto-layout
# Radio študent
bindsym Mod1+shift+r exec vlc /home/g1smo/Glasba/rs.m3u
bindsym Mod1+shift+x exec playerctl play-pause
bindsym Mod1+shift+c exec playerctl play-pause
# Zvok
set $vol_down_cmd amixer -c 0 -q sset Master 2%-
set $vol_up_cmd amixer -c 0 -q sset Master 2%+
bindsym $mod+shift+d exec "$vol_up_cmd && $vol_sig_cmd"
bindsym XF86AudioRaiseVolume exec "$vol_up_cmd && $vol_sig_cmd"
bindsym $mod+shift+s exec "$vol_down_cmd && $vol_sig_cmd"
bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd"
bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd"
# GTK tema
set $gnome-schema org.gnome.desktop.interface
exec_always {
gsettings set $gnome-schema gtk-theme 'Arc-Darker'
gsettings set $gnome-schema icon-theme 'Papirus'
gsettings set $gnome-schema cursor-theme 'Adwaita'
}
# Desktop notifikacije
exec mako
# Zvetlost zaslona
bindsym XF86MonBrightnessUp exec "light -A 3"
bindsym XF86MonBrightnessDown exec "light -U 3"
# Zunanji skrin
bindsym $mod+p exec "swaymsg output HDMI-A-2 enable"
bindsym $mod+shift+p exec "swaymsg output HDMI-A-2 disable"
# Rdece, da lahko spim, hvala
exec gammastep -m wayland
# Pidgin plx
exec pidgin

View File

@ -4,9 +4,11 @@
[user] [user]
name = Jurij Podgoršek name = Jurij Podgoršek
email = podgorsek.jurij@gmail.com email = jurij@kompot.si
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[pull]
rebase = false

View File

View File

@ -30,7 +30,7 @@ command=/usr/lib/i3blocks/$BLOCK_NAME
#label=♪ #label=♪
label= label=
#instance=Lollypop #instance=Lollypop
command="/home/g1smo/Sredstva/i3blocks-contrib/mediaplayer/mediaplayer" command="/home/g1smo/sredstva/i3blocks-contrib/mediaplayer/mediaplayer"
#instance=mpd #instance=mpd
interval=5 interval=5
signal=10 signal=10
@ -38,7 +38,7 @@ signal=10
#[monitors] #[monitors]
#label= #label=
#interval=once #interval=once
#command="/home/g1smo/Sredstva/i3blocks-contrib/monitor_manager/monitor_manager" #command="/home/g1smo/sredstva/i3blocks-contrib/monitor_manager/monitor_manager"
[brightness] [brightness]
label= label=
@ -48,7 +48,7 @@ interval=once
signal=5 signal=5
[volume-pulseaudio] [volume-pulseaudio]
command=/home/g1smo/Sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S -F "\${SYMB}\${VOL}%" command=/home/g1smo/sredstva/i3blocks-contrib/volume-pulseaudio/volume-pulseaudio -S -F "\${SYMB}\${VOL}%"
#label= #label=
#SUBSCRIBE=1 #SUBSCRIBE=1
interval=persist interval=persist
@ -57,7 +57,7 @@ interval=persist
#label=MEM #label=MEM
label= label=
color=#A85FFF color=#A85FFF
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//' command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/memory/memory | sed -r 's/ \(.+//'
interval=10 interval=10
#[memory] #[memory]
@ -74,21 +74,21 @@ interval=10
[disk-root] [disk-root]
label= label=
color=#AAAAAA color=#AAAAAA
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/disk/disk
instance=/ instance=/
interval=30 interval=30
[disk-home] [disk-home]
label= label=
color=#AAAAAA color=#AAAAAA
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/disk/disk
instance=/home instance=/home
interval=30 interval=30
[disk-var] [disk-var]
label= label=
color=#AAAAAA color=#AAAAAA
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/disk/disk command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/disk/disk
instance=/var instance=/var
interval=30 interval=30
@ -99,7 +99,7 @@ interval=30
color=#33DD00 color=#33DD00
interval=10 interval=10
separator=false separator=false
command=/home/g1smo/Sredstva/i3blocks-contrib/iface/iface command=/home/g1smo/sredstva/i3blocks-contrib/iface/iface
[wifi] [wifi]
#instance=wlp4s0 #instance=wlp4s0
@ -107,7 +107,7 @@ instance=wlp2s0
interval=10 interval=10
label= label=
color=#11DD00 color=#11DD00
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/wifi/wifi
#separator=false #separator=false
#[bandwidth] #[bandwidth]
@ -123,13 +123,13 @@ command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/wifi/wifi
#label= #label=
#label= #label=
label= 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 | sed -r 's/^([0-9])\./\ \1\./'
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1 command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/cpu_usage/cpu_usage -d 1
color=#FA0009 color=#FA0009
interval=1 interval=1
align=right align=right
min_width= 99.0% min_width= 99.0%
#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 | sed -r 's/^([0-9])\./\ \1\./'
[load_average] [load_average]
#label= #label=
@ -137,22 +137,22 @@ min_width= 99.0%
label= label=
color=#70E2FF color=#70E2FF
interval=3 interval=3
command=echo -n "$label ";/home/g1smo/Sredstva/i3blocks-contrib/load_average/load_average command=echo -n "$label ";/home/g1smo/sredstva/i3blocks-contrib/load_average/load_average
[key_layout] [key_layout]
label=⌨ label=⌨
interval=5 interval=5
#command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout" #command="/home/h1smo/sredstva/i3blocks-contrib/key_layout/key_layout"
command=echo -n "$label ";xkb-switch command=echo -n "$label ";xkb-switch
#interval=persist #interval=persist
#command="/home/h1smo/Sredstva/i3blocks-contrib/kbdd_layout/kbdd_layout" #command="/home/h1smo/sredstva/i3blocks-contrib/kbdd_layout/kbdd_layout"
[battery2] [battery2]
#label=BAT #label=BAT
#label=⚡ #label=⚡
#instance=1 #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=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/i3blocks-contrib/battery2/battery2"
interval=30 interval=30
markup=pango markup=pango
@ -160,7 +160,7 @@ markup=pango
label= label=
color=#ffffff color=#ffffff
command=echo -n "$label ";date '+%a %d %b' command=echo -n "$label ";date '+%a %d %b'
#command=/home/g1smo/Sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar #command=/home/g1smo/sredstva/i3blocks-contrib/rofi-calendar/rofi-calendar
interval=5 interval=5
separator=false separator=false
@ -173,7 +173,7 @@ interval=5
[shutdown] [shutdown]
full_text= full_text=
command=/home/g1smo/Sredstva/i3blocks-contrib/shutdown_menu/shutdown_menu -c command=/home/g1smo/sredstva/i3blocks-contrib/shutdown_menu/shutdown_menu -c
#interval=once #interval=once
# OpenVPN support # OpenVPN support

View File

@ -3,5 +3,5 @@ rofi.color-urgent: #002d303b, #cc6666, #e52d303b, #a54242, #f9f9f9
rofi.color-active: #002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9 rofi.color-active: #002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9
rofi.color-window: #f22d303b, #7c8389, #1d1f21 rofi.color-window: #f22d303b, #7c8389, #1d1f21
rofi.separator-style: solid rofi.separator-style: solid
rofi.font: terminus 18 rofi.font: Iosevka 11

View File

@ -1,17 +1,13 @@
. /etc/profile
# <3 default editor # <3 default editor
export EDITOR="vim" export EDITOR="vim"
export VISUAL="vim" export VISUAL="vim"
# Default term (i3) # Default term (i3)
export TERMINAL="termite" #export TERMINAL="termite"
#export TERM="xterm-256color" #export TERM="xterm-256color"
# Chrome scaling
export CHROMIUM_FLAGS="--force-device-scale-factor=1.75"
# QT5 autoscaling
export QT_AUTO_SCREEN_SCALE_FACTOR=1
# Flatpak # Flatpak
export XDG_DATA_DIRS="$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share/applications:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS" export XDG_DATA_DIRS="$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share/applications:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS"
@ -28,20 +24,9 @@ export PHANTOMJS_BIN=/usr/bin/phantomjs
export PATH="$HOME/.racket/7.2/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH" export PATH="$HOME/.racket/7.2/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH"
export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile" export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile"
# Racket scaling
export PLT_DISPLAY_BACKING_SCALE=2
# emacspeak speech server # emacspeak speech server
export DTK_PROGRAM=espeak export DTK_PROGRAM=espeak
# Pot do GO zadev (knjiznice, ...)
export GOPATH=~/Sredstva/go
# Android SDK && React Native build settings
#export ANDROID_HOME=$HOME/Android/Sdk
#export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
#export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
# User bin # User bin
export PATH="/home/g1smo/bin:$PATH" export PATH="/home/g1smo/bin:$PATH"

View File

@ -108,7 +108,8 @@ This function should only modify configuration layer settings."
htmlize htmlize
fireplace fireplace
arduino-mode arduino-mode
fennel-mode) fennel-mode
elpher)
;; A list of packages that cannot be updated. ;; A list of packages that cannot be updated.
dotspacemacs-frozen-packages '() dotspacemacs-frozen-packages '()
@ -258,7 +259,7 @@ It should only modify the values of Spacemacs settings."
;; Default font, or prioritized list of fonts. `powerline-scale' allows to ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy. ;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '("Iosevka Medium" dotspacemacs-default-font '("Iosevka Medium"
:size 24 :size 16
:weight bold :weight bold
:width normal :width normal
:powerline-scale 1.1) :powerline-scale 1.1)
@ -631,7 +632,7 @@ This function is called at the very end of Spacemacs initialization."
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
(quote (quote
(swiper zenburn-theme yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode ssass-mode vue-html-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tidal tao-theme tagedit suscolors-theme sql-indent spaceline powerline solarized-theme smex smeargle slim-mode scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-plus-contrib org-mime org-download org-bullets open-junk-file ob-restclient ob-http nginx-mode neotree move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint js2-refactor js-doc ivy-hydra indent-guide hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make haskell-mode haml-mode guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile company-web company-tern company-statistics company-restclient company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby bundler bind-key auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell)))) (racket-mode faceup mu4e-maildirs-extension mu4e-alert ht markdown-mode lua-mode skewer-mode simple-httpd js2-mode dash-functional parent-mode edit-indirect magit-popup bui go-guru go-eldoc fringe-helper git-gutter+ git-gutter geiser pos-tip flycheck flx fennel-mode highlight magit git-commit with-editor smartparens iedit anzu evil goto-chg undo-tree php-mode transient tablist json-mode docker-tramp json-snatcher json-reformat projectile counsel ivy web-completion-data restclient know-your-http-well company-go go-mode company hydra inflections multiple-cursors paredit lv eval-sexp-fu cider sesman queue pkg-info parseedn clojure-mode parseclj a epl inf-ruby bind-map yasnippet packed auctex async arduino-mode spinner anaconda-mode pythonic f s all-the-icons memoize avy auto-complete popup swiper zenburn-theme yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode ssass-mode vue-html-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tidal tao-theme tagedit suscolors-theme sql-indent spaceline powerline solarized-theme smex smeargle slim-mode scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-plus-contrib org-mime org-download org-bullets open-junk-file ob-restclient ob-http nginx-mode neotree move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint js2-refactor js-doc ivy-hydra indent-guide hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make haskell-mode haml-mode guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile company-web company-tern company-statistics company-restclient company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby bundler bind-key auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell))))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

View File

@ -24,7 +24,3 @@ if [ "$TERM" = "linux" ]; then
clear # against bg artifacts clear # against bg artifacts
fi fi
export XDG_CONFIG_HOME="$HOME/.config"
#export GDK_SCALE=2
export GDK_DPI_SCALE=0.8
export GUIX_GITHUB_TOKEN="22b00f8346ae4c2f4795cc6c6b346516bb43a619"

View File

@ -1 +1,2 @@
[[ -e ~/.profile ]] && emulate sh -c 'source ~/.profile' [[ -e ~/.profile ]] && emulate sh -c 'source ~/.profile'
. ~/.zshrc

63
.zshrc
View File

@ -64,21 +64,16 @@ bindkey '^R' history-incremental-pattern-search-backward
#} #}
# Guix! # Guix!
export GUIX_PROFILE="$HOME/.guix-profile" #export GUIX_PROFILE="$HOME/.guix-profile"
#export GUIX_PROFILE="$HOME/.config/guix/current"
# Svez guix bin # Svez guix bin
export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" #export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
# Guix guile zadeve #export GUIX_PACKAGE_PATH="$HOME/projekti/guix-packages"
export GUILE_LOAD_PATH=$HOME/.config/guix/current/share/guile/site/3.0 #export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
export GUILE_LOAD_COMPILED_PATH=$HOME/.config/guix/current/lib/guile/3.0/site-ccache
export GUIX_PACKAGE_PATH="$HOME/Projekti/guix-packages" #export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile"
export GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" #[ -e $GUIX_PROFILE_FILE ] && source $GUIX_PROFILE_FILE
export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile"
[ -e $GUIX_PROFILE_FILE ] && source $GUIX_PROFILE_FILE
#export SSL_CERT_DIR="$GUIX_PROFILE/etc/ssl/certs" #export SSL_CERT_DIR="$GUIX_PROFILE/etc/ssl/certs"
#export SSL_CERT_FILE="$SSL_CERT_DIR/ca-certificates.crt" #export SSL_CERT_FILE="$SSL_CERT_DIR/ca-certificates.crt"
#export GIT_SSL_CAINFO="$SSL_CERT_FILE" #export GIT_SSL_CAINFO="$SSL_CERT_FILE"
@ -87,34 +82,18 @@ export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile"
# Aliasi # Aliasi
alias ls='ls --color=auto' alias ls='ls --color=auto'
alias vi='vim' alias vi='vim'
alias apachelog="gnome-terminal -e \"tail -f /var/log/httpd/error_log\""
alias sudo="sudo " alias sudo="sudo "
alias grep="grep --color=auto" alias grep="grep --color=auto"
# Fix za termite ssh # Kitty terminal ssh fix
alias ssh="TERM=xterm-256color ssh" alias ssh="kitty +kitten ssh"
# Remove not-required-anymore packages
alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')"
# Seznam paketov po velikosti (archlinux)
alias pacsize="expac -H M '%m\t%n' | sort -h"
alias ffon="sudo cp /etc/resolv.conf.ff /etc/resolv.conf"
alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done" alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done"
alias sctl="systemctl" alias sctl="systemctl"
alias ddrush="ddev exec drush" alias ddrush="ddev exec drush"
alias dcomposer="ddev exec composer" alias dcomposer="ddev exec composer"
alias sc="chromium --force-device-scale-factor=1"
alias emacs-live="HOME=~/Sredstva/emacs-live emacs"
alias offer-files="python3 -m http.server" alias offer-files="python3 -m http.server"
# Firefox scaling!
alias sf="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.00/' {} + ; firefox"
# Navaden firefox
alias ff="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.75/' {} + ; firefox"
# X on wayland # X on wayland
alias wxon="xhost +local:" alias wxon="xhost +local:"
@ -133,14 +112,30 @@ alias pg="ping 1.1.1.1"
# Najvecji fajli # Najvecji fajli
alias najvecji="find . -printf '%s %p\n'| sort -nr | head -30" alias najvecji="find . -printf '%s %p\n'| sort -nr | head -30"
# NVM
#export NVM_DIR="/home/g1smo/.nvm"
#[ -e /usr/share/nvm/init-nvm.sh ] && . /usr/share/nvm/init-nvm.sh
alias invm=". /usr/share/nvm/init-nvm.sh"
# RŠ ssh # RŠ ssh
alias srs='f(){ ssh jurijp@$1.radiostudent.local };f' alias srs='f(){ ssh jurijp@$1.radiostudent.local };f'
alias srr='f(){ ssh root@$1.radiostudent.local };f'
alias rss='f(){ ssh jurijp@$1.radiostudent.si };f'
alias rsr='f(){ ssh root@$1.radiostudent.si };f'
# Poslusaj snemanje # Poslusaj snemanje
alias poslusaj='pactl load-module module-loopback latency_msec=1' alias poslusaj='pactl load-module module-loopback latency_msec=1'
alias tisina='pactl unload-module module-loopback' alias tisina='pactl unload-module module-loopback'
# Firefox webrender
export MOZ_WEBRENDER=1
# Wayland pls!
export KITTY_ENABLE_WAYLAND=1
export MOZ_ENABLE_WAYLAND=1
export XDG_SESSION_TYPE=wayland
# Zadeva zgoraj bi moral bit replacement
#export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export QT_WAYLAND_FORCE_DPI=physical
# Tole bojda ni dobra ideja (pravi wiki!)
#export GDK_BACKEND=wayland
#export TERM=xterm-24bits
export TERM=rxvt-256color

15
checkbatt.sh 100755
View File

@ -0,0 +1,15 @@
#!/bin/bash
praznim=$(acpi -b | grep Discharging)
lvl=$(acpi -b | sed -e 's/[,%\s]//g' | awk '{s+=$4} END {printf "%.0f", s/2}')
nizka=7
kriticna=3
if [[ $praznim ]]; then
if [[ $lvl -lt $kriticna ]]; then
systemctl suspend
elif [[ $lvl -lt $nizka ]]; then
notify-send -u critical -i /usr/share/icons/gnome/32x32/status/battery-low.png "BATERIJA NISKA: $lvl%"
fi
fi

View File

@ -0,0 +1,2 @@
ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", RUN+="/bin/chgrp video /sys/class/backlight/%k/brightness"
ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", RUN+="/bin/chmod g+w /sys/class/backlight/%k/brightness"

View File

@ -0,0 +1,22 @@
#!/usr/bin/python3
import i3ipc
ipc = i3ipc.Connection()
prev_focused = None
for window in ipc.get_tree():
if window.focused:
prev_focused = window
else:
window.command('opacity 0.8')
def on_window_focus(ipc, focused):
global prev_focused
if focused.container.id != prev_focused.id: # https://github.com/swaywm/sway/issues/2859
focused.container.command('opacity 1')
prev_focused.command('opacity 0.8')
prev_focused = focused.container
ipc.on("window::focus", on_window_focus)
ipc.main()

7
init.sh 100755
View File

@ -0,0 +1,7 @@
#!/bin/sh
# Instaliraj vim plug!
curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
# Instaliraj spacemacs!
git clone https://github.com/syl20bnr/spacemacs ~/.emacs.d

View File

@ -4,8 +4,6 @@ DIR=`pwd`
echo "DIR: $DIR" echo "DIR: $DIR"
ln -s $DIR/.zshrc ~/.zshrc ln -s $DIR/.zshrc ~/.zshrc
ln -s $DIR/.config/gtk-3.0 ~/.config/gtk-3.0
mkdir ~/.config/i3 mkdir ~/.config/i3
ln -s $DIR/.config/i3/config ~/.config/i3/config ln -s $DIR/.config/i3/config ~/.config/i3/config
@ -15,12 +13,13 @@ ln -s $DIR/.config/sway/config ~/.config/sway/config
mkdir ~/.config/termite mkdir ~/.config/termite
ln -s $DIR/.config/termite/config ~/.config/termite/config ln -s $DIR/.config/termite/config ~/.config/termite/config
mkdir ~/.config/kitty
ln -s $DIR/.config/kitty/kitty.conf ~/.config/kitty/kitty.conf
ln -s $DIR/.config/compton.conf ~/.config/compton.conf ln -s $DIR/.config/compton.conf ~/.config/compton.conf
ln -s $DIR/.config/redshift ~/.config/redshift ln -s $DIR/.config/redshift ~/.config/redshift
ln -s $DIR/.gtkrc-2.0 ~/.gtkrc-2.0
ln -s $DIR/.i3blocks.conf ~/.i3blocks.conf ln -s $DIR/.i3blocks.conf ~/.i3blocks.conf
mkdir ~/.local/rofi mkdir ~/.local/rofi
@ -36,5 +35,5 @@ ln -s $DIR/.zlogin ~/.zlogin
ln -s $DIR/.gitconfig ~/.gitconfig ln -s $DIR/.gitconfig ~/.gitconfig
ln -s $DIR/.profile ~/.profile #ln -s $DIR/.profile ~/.profile
ln -s $DIR/.zprofile ~/.zprofile ln -s $DIR/.zprofile ~/.zprofile