Posodobitve konfiguracij

x1carbon
Jurij Podgoršek 2020-05-08 05:10:34 +02:00
parent f9a64b4288
commit 76d2a45dbf
7 changed files with 183 additions and 139 deletions

View File

@ -243,7 +243,7 @@ exec --no-startup-id compton --unredir-if-possible -b
# Redshift (hello sleep)
#exec redshift-gtk &
exec redshift -l 46.0552778:14.5144444
exec --no-startup-id redshift-gtk -l 46.0552778:14.5144444 &
# Background
set $set_bg feh --bg-fill ~/Slike/Wallpapers/neka_trava.jpg
@ -254,7 +254,7 @@ exec nm-applet &
# 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
@ -265,6 +265,7 @@ bindym $mod+space exec "i3-keyboard-layout cycle us si"
gaps inner 7
gaps outer 0
smart_gaps on
# No titles
for_window [class="^.*"] border pixel 2
@ -336,7 +337,13 @@ exec --no-startup-id /usr/share/gnome-settings-daemon
#exec --no-startup-id /usr/bin/pulseaudio -D
# JACK audio baby
#exec --no-startup-id qjackctl
#exec qjackctl
# Polybar
exec_always --no-startup-id ~/.config/polybar/launch.sh
# Signal chat ane
exec /usr/bin/signal-desktop
# autotajling
exec --no-startup-id autotiling

View File

@ -20,7 +20,7 @@ set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local
#set $menu j4-dmenu-desktop
#set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec
output eDP-1 resolution 2560x1440 scale 1
output eDP-1 resolution 2560x1440 scale 2
#output eDP-1 resolution 2560x1440 scale 2
#output eDP-1 resolution 1920x1080 scale 1
output "*" background ~/Slike/Wallpapers/neka_trava.jpg fill

52
.profile 100644
View File

@ -0,0 +1,52 @@
# <3 default editor
export EDITOR="vim"
export VISUAL="vim"
# Default term (i3)
export TERMINAL="termite"
#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
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
# Guile Zadeve
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"
# Racket scaling
export PLT_DISPLAY_BACKING_SCALE=2
# emacspeak speech server
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
export PATH="/home/g1smo/bin:$PATH"
# Loadamo sway na tty5!
# If running from tty1 start sway
if [ "$(tty)" = "/dev/tty5" ]; then
exec sway
fi

View File

@ -33,7 +33,8 @@ This function should only modify configuration layer settings."
;; List of configuration layers to load.
dotspacemacs-configuration-layers
'(;; ----------------------------------------------------------------
'(lua
;; ----------------------------------------------------------------
;; Example of useful layers you may want to use right away.
;; Uncomment some layer names and press `SPC f e R' (Vim style) or
;; `M-m f e R' (Emacs style) to install them.
@ -509,7 +510,7 @@ This function is called immediately after `dotspacemacs/init', before layer
configuration.
It is mostly for variables that should be set before packages are loaded.
If you are unsure, try setting them in `dotspacemacs/user-config' first."
)
(setq tidal-boot-script-path "/home/g1smo/.cabal/share/x86_64-linux-ghc-8.4.4/tidal-1.4.9/BootTidal.hs"))
(defun dotspacemacs/user-load ()
"Library to load while dumping.
@ -615,7 +616,7 @@ This function is called at the very end of Spacemacs initialization."
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
(helm-gtags helm helm-core godoctor go-tag go-rename go-impl go-guru go-gen-test go-fill-struct go-eldoc ggtags flycheck-gometalinter flycheck-golangci-lint counsel-gtags company-go go-mode 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))))
(helm-gtags helm helm-core ggtags counsel-gtags company-lua lua-mode 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 was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.

1
.zprofile 100644
View File

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

244
.zshrc
View File

@ -1,7 +1,9 @@
# Lines configured by zsh-newuser-install
# Zgodovina ukazov
HISTFILE=~/.histfile
HISTSIZE=1000
SAVEHIST=10000
# Vi zadeve, se mi zdi
bindkey -v
export KEYTIMEOUT=1
zstyle :compinstall filename '/home/g1smo/.zshrc'
@ -9,140 +11,10 @@ zstyle :compinstall filename '/home/g1smo/.zshrc'
autoload -Uz compinit
compinit
export EDITOR="vim"
export VISUAL="vim"
# Color
# Barve
autoload colors zsh/terminfo
colors
# GO PATH additions
export GOPATH=~/Sredstva/go
export PATH="$HOME/bin:$HOME/.local/bin:$GOPATH/bin:$PATH"
# Default term (i3)
export TERMINAL="termite"
export TERM="xterm-256color"
# Prompt
autoload -U promptinit
promptinit
autoload -Uz vcs_info
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' enable git svn hg
zstyle ':vcs_info:*' formats '(%b) '
precmd () {
vcs_info
}
# GIT prompt
setopt prompt_subst
PROMPT='%n@%m %1~ %{$fg[green]%}${vcs_info_msg_0_}%{$fg[blue]%}» %{$reset_color%}'
# Reverse search shortcut
bindkey '^R' history-incremental-pattern-search-backward
# Aliases
alias ls='ls --color=auto'
#alias vim='TERM=xterm-256color vim'
alias vi='vim'
alias apachelog="gnome-terminal -e \"tail -f /var/log/httpd/error_log\""
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"
alias ddrush="ddev exec drush"
alias dcomposer="ddev exec composer"
# 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"
# 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"
alias sc="chromium --force-device-scale-factor=1"
alias emacs-live="HOME=~/Sredstva/emacs-live emacs"
alias offer-files="python3 -m http.server"
# X on wayland
alias wxon="xhost +local:"
# RŠ aliasi
alias omnom="ssh root@debeli"
# Ljudmila
alias scdev="ssh culture@milci.ljudmila.org"
# Dolzina mp3 fajlov
alias mp3len="for i in \$(ls *.mp3); do echo \$i; soxi -d \$i; done"
# Hiter ping za net preverit
alias pg="ping 1.1.1.1"
# Najvecji fajli
alias najvecji="find . -printf '%s %p\n'| sort -nr | head -30"
# PhantomJS binary location
export PHANTOMJS_BIN=/usr/bin/phantomjs
# Guile things
export GUILE_WARN_DEPRECATED="detailed"
# 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
# Java fix?
export NLS_LANG=American_America.UTF8
# emacspeak speech server
export DTK_PROGRAM=espeak
# 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
# Chrome scaling
export CHROMIUM_FLAGS="--force-device-scale-factor=1.66"
# 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"
# Racket scaling
export PLT_DISPLAY_BACKING_SCALE=2
# 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
# Svez guix bin
#export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
export GUIX_PACKAGE_PATH="$HOME/Projekti/guix-packages"
export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale/2.29/"
#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"
camp() {
curl -s https://fahrplan.events.ccc.de/camp/2019/Fahrplan/schedule.json \
| jq -r '.schedule.conference.days | .[] | select(.date=="'$(date +%F)'") | .rooms | .[] | .[] | select(.date|strptime("%Y-%m-%dT%H:%M:%S%z") > now) | "\(.start) \(.duration)|\(.room)|\(.title)"' \
| sort -V | column -t -s'|'
}
# BARVE!
export GREP_COLOR='1;32'
export CLICOLOR=1
@ -162,5 +34,113 @@ function _colorman() {
function man() { _colorman man "$@"; }
function perldoc() { command perldoc -n less "$@" |man -l -; }
# Prompt za git
autoload -U promptinit
promptinit
autoload -Uz vcs_info
zstyle ':vcs_info:*' check-for-changes true
zstyle ':vcs_info:*' enable git svn hg
zstyle ':vcs_info:*' formats '(%b) '
precmd () {
vcs_info
}
setopt prompt_subst
PROMPT='%n@%m %1~ %{$fg[green]%}${vcs_info_msg_0_}%{$fg[blue]%}» %{$reset_color%}'
# Reverse search shortcut
bindkey '^R' history-incremental-pattern-search-backward
# Splosno barvanje zadev
[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
# CCCAMP 2019 fahrplan
#camp() {
# curl -s https://fahrplan.events.ccc.de/camp/2019/Fahrplan/schedule.json \
# | jq -r '.schedule.conference.days | .[] | select(.date=="'$(date +%F)'") | .rooms | .[] | .[] | select(.date|strptime("%Y-%m-%dT%H:%M:%S%z") > now) | "\(.start) \(.duration)|\(.room)|\(.title)"' \
# | sort -V | column -t -s'|'
#}
# Guix!
export GUIX_PROFILE="$HOME/.guix-profile"
#export GUIX_PROFILE="$HOME/.config/guix/current"
# Svez guix bin
export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
# Guix guile zadeve
export GUILE_LOAD_PATH=$HOME/.config/guix/current/share/guile/site/3.0
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_LOCPATH="$GUIX_PROFILE/lib/locale"
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_FILE="$SSL_CERT_DIR/ca-certificates.crt"
#export GIT_SSL_CAINFO="$SSL_CERT_FILE"
#export CURL_CA_BUNDLE="$SSL_CERT_FILE"
# Aliasi
alias ls='ls --color=auto'
alias vi='vim'
alias apachelog="gnome-terminal -e \"tail -f /var/log/httpd/error_log\""
alias sudo="sudo "
alias grep="grep --color=auto"
# Fix za termite ssh
alias ssh="TERM=xterm-256color 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 sctl="systemctl"
alias ddrush="ddev exec drush"
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"
# 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
alias wxon="xhost +local:"
# RŠ aliasi
alias omnom="ssh root@debeli"
# Ljudmila
alias scdev="ssh culture@milci.ljudmila.org"
# Dolzina mp3 fajlov
alias mp3len="for i in \$(ls *.mp3); do echo \$i; soxi -d \$i; done"
# Hiter ping za net preverit
alias pg="ping 1.1.1.1"
# Najvecji fajli
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
alias srs='f(){ ssh jurijp@$1.radiostudent.local };f'
# Poslusaj snemanje
alias poslusaj='pactl load-module module-loopback latency_msec=1'
alias tisina='pactl unload-module module-loopback'

View File

@ -35,3 +35,6 @@ ln -s $DIR/.Xresources ~/.Xresources
ln -s $DIR/.zlogin ~/.zlogin
ln -s $DIR/.gitconfig ~/.gitconfig
ln -s $DIR/.profile ~/.profile
ln -s $DIR/.zprofile ~/.zprofile