Posodobitve

k0ns
Jurij Podgoršek 2020-08-04 17:07:00 +02:00 committed by Jurij Podgoršek
parent 12e9a12ac2
commit 306b1ec9e3
3 changed files with 66 additions and 24 deletions

View File

@ -116,7 +116,6 @@ bindsym $mod+8 workspace $w8
bindsym $mod+9 workspace $w9
bindsym $mod+0 workspace $w0
# move focused container to workspace
bindsym $mod+Shift+1 move container to workspace $w1
bindsym $mod+Shift+2 move container to workspace $w2
@ -135,7 +134,7 @@ bindsym Mod1+Shift+$right move workspace to output right
bindsym Mod1+Shift+$altright move workspace to output right
bindsym Mod1+Shift+j move workspace to output left
# back and forth between workspaces
# Back and forth between workspaces
bindsym Mod1+Tab workspace back_and_forth
# workspace bindings
@ -220,11 +219,6 @@ 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
@ -235,15 +229,9 @@ 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
font pango:FontAwesome Regular 11, Iosevka Medium 11
strip_workspace_numbers yes
height 22
>>>>>>> 46ad6f3 (Posodobitve)
#tray_padding 2
separator_symbol " "
}
@ -270,7 +258,6 @@ hide_edge_borders smart
# Mouse focus
focus_follows_mouse yes
<<<<<<< HEAD
# KBD layouti
input "type:keyboard" {
xkb_layout us,si
@ -376,3 +363,17 @@ exec ~/bin/swaynag-battery
# Lebdeca okna (najdes preko "swaymsg -t get_tree")
for_window [app_id="org.keepassxc.KeePassXC"] floating enable
input "9610:30:Pine64_Pinebook_Pro_Touchpad" {
tap enabled
natural_scroll enabled
drag enabled
}
# Brez titlebara pls
default_border none
# opacity na neaktivna okna
exec_always --no-startup-id ~/bin/inactive-windows-transparency.py
# avtomatski layout
exec_always --no-startup-id i3-auto-layout

View File

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

57
.zshrc
View File

@ -20,6 +20,15 @@ export GREP_COLORS='1;32'
export CLICOLOR=1
export LSCOLORS=ExFxCxDxBxegedabagacad
# PATH additions
export GOPATH=~/Sredstva/go
export PATH="/home/g1smo/bin:/home/g1smo/.cargo/bin:$GOPATH/bin:$PATH"
# Default term (i3)
#export TERMINAL="termite"
export TERMINAL="kitty"
export TERM="xterm-256color"
function man() {
LESS_TERMCAP_mb=$(printf "\e[1;35m") \
LESS_TERMCAP_md=$(printf "\e[1;34m") \
@ -47,6 +56,25 @@ precmd () {
setopt prompt_subst
PROMPT='%n@%m %1~ %{$fg[green]%}${vcs_info_msg_0_}%{$fg[blue]%}» %{$reset_color%}'
# Aliases
alias ls='ls --color=auto'
#alias vim='TERM=xterm-256color vim'
alias vi='vim'
alias sudo="sudo "
alias grep="grep --color=auto"
# Remove not-required-anymore packages
alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')"
# List packages by size
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 sctl="systemctl"
# Firefox scaling!
alias sf="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.00/' {} + ; firefox"
# regular firefox
alias ff="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.75/' {} + ; firefox"
# Reverse search shortcut
bindkey '^R' history-incremental-pattern-search-backward
@ -102,8 +130,9 @@ alias rsr='f(){ ssh root@$1.radiostudent.si };f'
alias poslusaj='pactl load-module module-loopback latency_msec=1'
alias tisina='pactl unload-module module-loopback'
# PI ssh
alias spi='ssh pi@192.168.64.88'
# Guix guile things
#export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/2.2:$GUILE_LOAD_PATH
#export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/2.2/site-ccache:$GUILE_LOAD_COMPILED_PATH
# Na prostem sajt(i)
alias nps='cd ~/ljudmila/naprostem/sajt'
@ -151,14 +180,14 @@ export CHROMIUM_FLAGS="$CHROMIUM_FLAGS \
--flag-switches-end"
# Guix!
export GUIX_PROFILE="$HOME/.guix-profile"
#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 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 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"
@ -168,3 +197,15 @@ export PATH="/home/g1smo/.guix-profile/bin${PATH:+:}$PATH"
export MOZ_WEBRENDER=0
# Wayland native firefox
export MOZ_ENABLE_WAYLAND=1
# Layout tipkovnice
export XKB_DEFAULT_LAYOUT=us,si
export XKB_DEFAULT_OPTIONS=grp:win_space_toggle,compose:caps
# Novejsi opengl
export PAN_MESA_DEBUG=gl3
export GDK_BACKEND=wayland
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1