From b9ca95420bb2c76c934290dcb068a3c02485993d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Wed, 11 Nov 2020 00:16:56 +0100 Subject: [PATCH] Posodobitve --- .config/rofi/themes/gruvbox/gruvbox | 1 + .config/sway/config | 46 ++++++++++++++++++++--------- .profile | 42 ++++++++++++++++---------- .vimrc | 1 + .zprofile | 3 +- .zshrc | 23 ++------------- bin/backmeup | 9 +++++- povezi.sh | 4 +++ 8 files changed, 76 insertions(+), 53 deletions(-) create mode 120000 .config/rofi/themes/gruvbox/gruvbox diff --git a/.config/rofi/themes/gruvbox/gruvbox b/.config/rofi/themes/gruvbox/gruvbox new file mode 120000 index 0000000..dd6748e --- /dev/null +++ b/.config/rofi/themes/gruvbox/gruvbox @@ -0,0 +1 @@ +/home/g1smo/sredstva/dotfiles/.config/rofi/themes/gruvbox \ No newline at end of file diff --git a/.config/sway/config b/.config/sway/config index 10f644e..4b905e8 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -13,7 +13,7 @@ set $altright ccaron set $term kitty # Font -font pango:Iosevka Medium 10 +font pango:Iosevka SS05 Medium 10 # Launcher set $menu "rofi -combi-modi window,drun,run -show combi -modi combi -config ~/.local/rofi/config" @@ -215,14 +215,15 @@ bar { # status_command i3blocks status_command i3status colors { - background #272727E5 + focused_background #272727E5 + background #272727B8 #statusline #ebdbb2E5 statusline #DCDCDC focused_workspace #555555E5 #555555E5 #ffffff - inactive_workspace #232323E5 #232323E5 #888888 + inactive_workspace #272727E5 #272727E5 #888888 } - font pango:FontAwesome Regular 12, Iosevka Medium 12 + font pango:FontAwesome Regular 12, Iosevka SS05 Medium 12 strip_workspace_numbers yes height 26 #tray_padding 2 @@ -265,9 +266,6 @@ input "type:touchpad" { 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 @@ -290,9 +288,6 @@ exec_always { gsettings set $gnome-schema cursor-theme 'Adwaita' } -# Desktop notifikacije -exec mako --default-timeout=10000 - # Zvetlost zaslona bindsym XF86MonBrightnessUp exec "light -A 3" bindsym XF86MonBrightnessDown exec "light -U 3" @@ -304,11 +299,34 @@ bindsym $mod+shift+p exec "swaymsg output HDMI-A-2 disable" # Skrinsot bindsym 0xff61 exec ~/bin/screenshot -# Rdece, da lahko spim, hvala -exec gammastep-indicator -m wayland +###### +# AUTOSTART +### -# Mejli pls -exec thunderbird +# transparenca nekativnih oken +exec ~/sredstva/dotfiles/inactive-windows-transparency.py + +# Desktop notifikacije +exec mako --default-timeout=10000 # Autotiling https://github.com/nwg-piotr/autotiling exec ~/.local/bin/autotiling + +# Rdece, da lahko spim, hvala +exec gammastep-indicator -m wayland + +# Zagoni programov razporejeni na workspejse +workspace 1: +exec /home/g1smo/sredstva/firefox/firefox-bin + +workspace 2:λ +exec emacs + +workspace 3: +exec thunderbird + +workspace 4: +exec revolt + +workspace 9: +exec keepassxc diff --git a/.profile b/.profile index a57447f..e86b9fc 100644 --- a/.profile +++ b/.profile @@ -1,16 +1,7 @@ -. /etc/profile - # <3 default editor export EDITOR="vim" export VISUAL="vim" -# Default term (i3) -#export TERMINAL="termite" -#export TERM="xterm-256color" - -# 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" - # Nek Java fix? export NLS_LANG=American_America.UTF8 @@ -20,18 +11,39 @@ export GUILE_WARN_DEPRECATED="detailed" # PhantomJS binary location export PHANTOMJS_BIN=/usr/bin/phantomjs -# Racket pot -export PATH="$HOME/.racket/7.2/bin:$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH" -export GUIX_PROFILE_FILE="$GUIX_PROFILE/etc/profile" - # emacspeak speech server export DTK_PROGRAM=espeak +# Racket pot +export PATH="$HOME/.racket/7.2/bin:$PATH" + +# Rust paketi +export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH" + # User bin -export PATH="/home/g1smo/bin:$PATH" +export PATH="$HOME/bin:$PATH" + +# Firefox webrender +export MOZ_WEBRENDER=1 + +# Wayland pls! +export KITTY_ENABLE_WAYLAND=1 +export MOZ_ENABLE_WAYLAND=1 +export XDG_SESSION_TYPE=wayland + +# Tole bojda ni dobra ideja (pravi wiki!) +#export GDK_BACKEND=wayland + +export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=lcd -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $_JAVA_OPTIONS" +export JAVA_FONTS="/usr/share/fonts/TTF" +export QT_QPA_PLATFORM=wayland-egl +export QT_WAYLAND_FORCE_DPI=physical +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +export SDL_VIDEODRIVER=wayland +export _JAVA_AWT_WM_NONREPARENTING=1 # Loadamo sway na tty5! # If running from tty1 start sway -if [ "$(tty)" = "/dev/tty5" ]; then +if [ "$(tty)" = "/dev/tty1" ]; then exec sway fi diff --git a/.vimrc b/.vimrc index f4edde3..13303b6 100644 --- a/.vimrc +++ b/.vimrc @@ -23,6 +23,7 @@ Plug 'jceb/vim-orgmode' Plug 'tpope/vim-rails' Plug 'marlun/vim-starwars' Plug 'morhetz/gruvbox' +Plug 'bakpakin/fennel.vim' call plug#end() " Colorscheme " diff --git a/.zprofile b/.zprofile index ff119cc..a2c42ef 100644 --- a/.zprofile +++ b/.zprofile @@ -1,2 +1 @@ -[[ -e ~/.profile ]] && emulate sh -c 'source ~/.profile' -. ~/.zshrc +. ~/.profile diff --git a/.zshrc b/.zshrc index 8e37ea1..ea159fd 100644 --- a/.zshrc +++ b/.zshrc @@ -106,24 +106,5 @@ 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' -# 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 -export EDITOR=vim - -export PATH="~/.local/bin:~/.cargo/bin:$PATH" - +# PI ssh +alias spi='ssh pi@192.168.64.112' diff --git a/bin/backmeup b/bin/backmeup index e3c4c55..828a233 100755 --- a/bin/backmeup +++ b/bin/backmeup @@ -1,5 +1,12 @@ #!/bin/sh datum=$(date +"%y-%m-%d") +backuplog=/root/backup-log -borg create pi@192.168.64.112:~/mast/bak/tp::$datum /etc /home /opt /root /srv /var --stats +#sudo sshfs pi@192.168.64.112:/home/pi/mast/bak/tp /root/.bak + +borg create -svp pi@192.168.64.112:~/mast/bak/tp::$datum /etc /home /opt /root /srv /var | sudo tee -a $backuplog +echo "Backup sistema $datum" | sudo tee -a $backuplog +#sudo borg create --stats --verbose --compression=lz4 "/root/.bak::$datum" /etc /home /opt /root /srv /var | sudo tee -a $backuplog + +#sudo umount /root/.bak diff --git a/povezi.sh b/povezi.sh index 1936831..5321c69 100755 --- a/povezi.sh +++ b/povezi.sh @@ -3,8 +3,12 @@ DIR=`pwd` echo "DIR: $DIR" +# Profile +ln -s $DIR/.profile ~/.profile + # ZSH shell! ln -s $DIR/.zshrc ~/.zshrc +ln -s $DIR/.zprofile ~/.zprofile # i3 config (<3 tiling WM) mkdir ~/.config/i3