Razni apdejti
Jurij Podgorsek
parent
0d6d76bbbe
commit
fb3cd73e84
|
|
@ -1,8 +1,10 @@
|
|||
!!! Scaling, fonts !!!
|
||||
Xft.dpi: 136
|
||||
Xft.autohint: 1
|
||||
! Xft.dpi: 136
|
||||
Xft.dpi: 166
|
||||
!Xft.autohint: 1
|
||||
Xft.autohint: 0
|
||||
Xft.lcdfilter: lcddefault
|
||||
Xft.hintstyle: hintfull
|
||||
Xft.hintstyle: hintslight
|
||||
Xft.hinting: 1
|
||||
Xft.antialias: 1
|
||||
Xft.rgba: rgb
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ shadow-offset-x = -3;
|
|||
shadow-offset-y = -3;
|
||||
shadow-opacity = 0.4;
|
||||
no-dock-shadow = true;
|
||||
shadow-exclude = "class_g ?= 'Notify-osd'"
|
||||
|
||||
# Flicker fix
|
||||
paint-on-overlay = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
set $mod Mod4
|
||||
|
||||
# DPI scaling
|
||||
exec xrandr --dpi 136
|
||||
exec xrandr --dpi 166
|
||||
|
||||
# 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 136
|
|||
#font pango:Fira Code 10
|
||||
#font pango:Cantarell 10
|
||||
#font pango:Fira Mono, Icons 9
|
||||
font pango:Iosevka Medium 9
|
||||
font pango:Iosevka Medium 8
|
||||
|
||||
# This font is widely installed, provides lots of unicode glyphs, right-to-left
|
||||
# text rendering and scalability on retina/hidpi displays (thanks to pango).
|
||||
|
|
@ -96,16 +96,16 @@ bindsym $mod+Shift+a focus parent
|
|||
#bindsym $mod+d focus child
|
||||
|
||||
# name workspaces
|
||||
set $w1 1:λ
|
||||
set $w2 2:
|
||||
set $w3 3:
|
||||
set $w0 0:
|
||||
set $w1 1:
|
||||
set $w2 2:
|
||||
set $w3 3:
|
||||
set $w4 4:
|
||||
set $w5 5:✡
|
||||
set $w5 5:✡
|
||||
set $w6 6:
|
||||
set $w7 7:✭❀ヅ❤♫
|
||||
set $w7 7:
|
||||
set $w8 8:☭
|
||||
set $w9 9:
|
||||
set $w0 0:∞
|
||||
|
||||
# switch to workspace
|
||||
bindsym $mod+1 workspace $w1
|
||||
|
|
@ -139,17 +139,13 @@ bindsym Mod1+Shift+ccaron move workspace to output right
|
|||
bindsym Mod1+Shift+j move workspace to output left
|
||||
|
||||
# workspace bindings
|
||||
assign [class="Firefox"] $w2
|
||||
assign [class="Gnote"] $w9
|
||||
assign [class="Thunderbird"] $w3
|
||||
assign [class="Slack"] $w4
|
||||
assign [class="Riot"] $w4
|
||||
assign [class="Lollypop"] $w3
|
||||
assign [class="Transmission"] $w3
|
||||
assign [class="Nicotine+"] $w3
|
||||
assign [class="Lollypop"] $w7
|
||||
|
||||
# Program startup
|
||||
exec firefox &
|
||||
exec lollypop &
|
||||
exec thunderbird &
|
||||
|
||||
# reload the configuration file
|
||||
bindsym $mod+Shift+c reload
|
||||
|
|
@ -199,6 +195,7 @@ bindsym $mod+shift+b exec i3lock-next
|
|||
bar {
|
||||
position top
|
||||
status_command i3blocks
|
||||
#status_command i3bar
|
||||
colors {
|
||||
background #232323
|
||||
statusline #DCDCDC
|
||||
|
|
@ -207,9 +204,10 @@ bar {
|
|||
inactive_workspace #232323 #232323 #888888
|
||||
}
|
||||
#font pango:Fira Mono, Icons 10
|
||||
font pango:FontAwesome Regular 10, Iosevka Medium 10
|
||||
#font pango:Iosevka Medium 10
|
||||
font pango: Iosevka Medium 8
|
||||
strip_workspace_numbers yes
|
||||
height 36
|
||||
height 34
|
||||
tray_padding 2
|
||||
}
|
||||
|
||||
|
|
@ -251,7 +249,8 @@ exec --no-startup-id $set_bg &
|
|||
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:lctrl_lwin_toggle -option compose:caps"
|
||||
exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggle -option compose:caps"
|
||||
|
||||
# gaps between windows
|
||||
gaps inner 7
|
||||
|
|
@ -287,7 +286,7 @@ bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd"
|
|||
|
||||
# start a terminal
|
||||
#bindsym $mod+Return exec i3-sensible-terminal
|
||||
bindsym $mod+Return exec termite
|
||||
bindsym $mod+Return exec "termite -t konz0l"
|
||||
|
||||
# kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
|
|
|
|||
|
|
@ -13,14 +13,15 @@ set $altright ccaron
|
|||
set $term termite
|
||||
|
||||
# Font
|
||||
font pango:Iosevka Medium 9
|
||||
font pango:Iosevka Medium 10
|
||||
|
||||
# Launcher
|
||||
#set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config"
|
||||
set $menu "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config"
|
||||
#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 2440x1440 scale 2
|
||||
#output eDP-1 resolution 2440x1440 scale 2
|
||||
output eDP-1 resolution 1920x1080 scale 1
|
||||
output "*" background ~/Pictures/wlp.jpg fill
|
||||
|
||||
# start a terminal
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[options]
|
||||
font = Fira Mono Medium 10
|
||||
font = Fira Mono Medium 8
|
||||
|
||||
[colors]
|
||||
#!!##############################################
|
||||
|
|
|
|||
23
.spacemacs
23
.spacemacs
|
|
@ -66,6 +66,7 @@ This function should only modify configuration layer settings."
|
|||
docker
|
||||
sql
|
||||
nginx
|
||||
coffeescript
|
||||
|
||||
;; Disable flychecker
|
||||
(syntax-checking :variables syntax-checking-enable-by-default nil)
|
||||
|
|
@ -99,7 +100,9 @@ This function should only modify configuration layer settings."
|
|||
vue-mode
|
||||
extempore-mode
|
||||
haskell-mode
|
||||
tidal)
|
||||
tidal
|
||||
htmlize
|
||||
fireplace)
|
||||
|
||||
;; A list of packages that cannot be updated.
|
||||
dotspacemacs-frozen-packages '()
|
||||
|
|
@ -249,8 +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 25
|
||||
:size 20
|
||||
:size 19
|
||||
:weight bold
|
||||
:width normal
|
||||
:powerline-scale 1.1)
|
||||
|
|
@ -571,15 +573,15 @@ before packages are loaded."
|
|||
(setq js2-strict-missing-semi-warning nil)
|
||||
|
||||
;; js default indent level
|
||||
(setq js-indent-level 4)
|
||||
(setq js2-indent-level 4)
|
||||
(setq js-indent-level 2)
|
||||
(setq js2-indent-level 2)
|
||||
|
||||
;; js2 globals
|
||||
(setq js2-global-externs '("require" "process"))
|
||||
|
||||
;; Web mode indent level
|
||||
(setq web-mode-markup-indent-offset 4)
|
||||
(setq sgml-basic-offset 4)
|
||||
(setq web-mode-markup-indent-offset 2)
|
||||
(setq sgml-basic-offset 2)
|
||||
|
||||
;; Word wrap orgmode
|
||||
(add-hook 'org-mode-hook #'(lambda ()
|
||||
|
|
@ -587,7 +589,12 @@ before packages are loaded."
|
|||
|
||||
;; Use web mode for files ending in .tpl
|
||||
(add-to-list 'auto-mode-alist '("\\.tpl$" . web-mode))
|
||||
|
||||
;; Agenda fajli
|
||||
(setq org-agenda-files
|
||||
(file-expand-wildcards "~/Documents/*.org"))
|
||||
)
|
||||
|
||||
(defun dotspacemacs/emacs-custom-settings ()
|
||||
"Emacs custom settings.
|
||||
This is an auto-generated function, do not modify its content directly, use
|
||||
|
|
@ -600,7 +607,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
|
||||
(zenburn-theme yasnippet-snippets tao-theme sql-indent solarized-theme hl-todo highlight-numbers guix gruvbox-theme evil-surround evil-matchit editorconfig dumb-jump doom-modeline docker counsel-projectile company-php aggressive-indent ace-window cider sesman anaconda-mode company counsel swiper flycheck helm ivy avy alert projectile magit git-commit with-editor yasnippet org-plus-contrib yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify vue-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tidal tagedit tablist symon suscolors-theme string-inflection spaceline-all-the-icons smex smeargle slim-mode shrink-path seeing-is-believing scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor ruby-hash-syntax rubocop rspec-mode robe rjsx-mode restart-emacs request rbenv rake rainbow-delimiters queue pyvenv pytest pyenv-mode py-isort pug-mode prettier-js popwin pippel pipenv pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator parent-mode paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file ob-restclient ob-http nginx-mode neotree nameless move-text minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum log4e livid-mode live-py-mode link-hint json-navigator json-mode js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hungry-delete highlight-parentheses highlight-indentation helm-make helm-core google-translate golden-ratio gnuplot gntp gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md geiser fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse extempore-mode expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-org evil-numbers evil-nerd-commenter evil-mc evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav eldoc-eval drupal-mode dotenv-mode dockerfile-mode docker-tramp diminish diff-hl define-word dakrone-light-theme cython-mode counsel-css company-web company-tern company-statistics company-restclient company-auctex company-anaconda column-enforce-mode clojure-snippets clojure-mode clojure-cheatsheet clean-aindent-mode cider-eval-sexp-fu chruby centered-cursor-mode bundler bui browse-at-remote autothemer auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired ace-link ac-php-core ac-ispell))))
|
||||
(zenburn-theme yasnippet-snippets wgrep web-mode tidal tao-theme sql-indent solarized-theme ruby-hash-syntax rspec-mode rjsx-mode request pyvenv phpcbf orgit org-projectile org-download org-brain live-py-mode ivy-hydra hl-todo highlight-indentation guix bui gruvbox-theme google-translate git-timemachine geiser eyebrowse evil-visual-mark-mode evil-surround evil-nerd-commenter evil-matchit evil-magit evil-goggles editorconfig dumb-jump doom-modeline eldoc-eval docker json-mode tablist diff-hl define-word cython-mode counsel-projectile cider-eval-sexp-fu eval-sexp-fu cider clojure-mode browse-at-remote auto-yasnippet auto-compile aggressive-indent ace-window ace-link anaconda-mode ac-php-core company counsel swiper smartparens flycheck projectile helm helm-core window-purpose imenu-list ivy avy magit magit-popup git-commit markdown-mode restclient php-mode f inf-ruby simple-httpd spaceline powerline dash async evil goto-chg org-plus-contrib hydra yapfify yaml-mode xcscope ws-butler writeroom-mode with-editor winum which-key web-beautify vue-mode volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package undo-tree treepy toc-org tagedit symon suscolors-theme string-inflection spaceline-all-the-icons smex smeargle slim-mode shrink-path sesman seeing-is-believing scss-mode sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop robe restart-emacs rbenv rake rainbow-delimiters queue pytest pyenv-mode py-isort pug-mode prettier-js popwin pippel pipenv pip-requirements phpunit php-extras php-auto-yasnippets persp-mode password-generator paradox packed overseer org-present org-pomodoro org-mime org-category-capture org-bullets open-junk-file ob-restclient ob-http ob-coffeescript nginx-mode neotree nameless move-text minitest markdown-toc magit-svn magit-gitflow macrostep lorem-ipsum livid-mode link-hint json-snatcher json-reformat json-navigator js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose indent-guide importmagic impatient-mode hungry-delete highlight-parentheses highlight-numbers helm-make haskell-mode graphql golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fireplace fill-column-indicator fancy-battery extempore-mode expand-region evil-visualstar evil-unimpaired evil-tutor evil-org evil-numbers evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav drupal-mode dotenv-mode dockerfile-mode docker-tramp diminish dakrone-light-theme counsel-css company-web company-tern company-statistics company-restclient company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clean-aindent-mode chruby centered-cursor-mode bundler autothemer auto-highlight-symbol all-the-icons-dired 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.
|
||||
|
|
|
|||
16
.zshrc
16
.zshrc
|
|
@ -17,7 +17,7 @@ autoload colors zsh/terminfo
|
|||
colors
|
||||
# PATH additions
|
||||
export GOPATH=~/Sredstva/go
|
||||
export PATH="/home/g1smo/bin:$PATH:/home/g1smo/.gem/ruby/2.5.0/bin:$GOPATH/bin"
|
||||
export PATH="/home/g1smo/bin:/home/g1smo/.gem/ruby/2.5.0/bin:$GOPATH/bin:$PATH"
|
||||
|
||||
# Default term (i3)
|
||||
export TERMINAL="termite"
|
||||
|
|
@ -70,7 +70,7 @@ export SAL_USE_VCLPLUGIN="gtk"
|
|||
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="sudo python3 -m http.server 811"
|
||||
alias offer-files="python3 -m http.server"
|
||||
# X on wayland
|
||||
alias wxon="xhost +local:"
|
||||
|
||||
|
|
@ -92,12 +92,10 @@ export PHANTOMJS_BIN=/usr/bin/phantomjs
|
|||
# Guile things
|
||||
export GUILE_WARN_DEPRECATED="detailed"
|
||||
|
||||
# Guix things
|
||||
# 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
|
||||
|
||||
|
|
@ -109,12 +107,18 @@ export ANDROID_HOME=/home/g1smo/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=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
|
||||
[ -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 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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue