diff --git a/.config/i3/config b/.config/i3/config index 03d0ac4..373e936 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -194,7 +194,7 @@ bindsym $mod+p exec xrandr --output HDMI2 --auto --right-of eDP1 && $set_bg && $ bindsym $mod+Shift+p exec xrandr --output HDMI2 --off && $restart_compton # Lock screen -bindsym $mod+shift+b exec i3lock-wrapper +bindsym $mod+shift+b exec i3lock-next # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) @@ -212,8 +212,9 @@ bar { #font pango:Fira Mono, Icons 10 font pango:FontAwesome Regular 9, Iosevka Medium 9 strip_workspace_numbers yes - height 44 - tray_padding 1 + height 46 + tray_padding 2 + output eDP1 } # Colors @@ -236,7 +237,7 @@ exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natu exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.456 # Autolock -exec --no-startup-id xautolock -time 10 -locker 'i3lock-wrapper' & +#exec --no-startup-id xautolock -time 10 -locker 'i3lock-next' & # Transparency exec --no-startup-id compton --unredir-if-possible -b @@ -315,7 +316,9 @@ bindsym Mod1+Shift+q exec nautilus bindsym $mod+a exec emacs # Radio študent -bindsym Mod1+Shift+r exec lollypop /home/g1smo/Music/radiostudent.m3u +bindsym Mod1+Shift+r exec vlc /home/g1smo/Music/radiostudent.m3u +bindsym Mod1+Shift+z exec playerctl play-pause +bindsym Mod1+Shift+y exec playerctl play-pause # Skrinšot bindsym 0xff61 exec gnome-screenshot -i diff --git a/.config/termite/config b/.config/termite/config index 72f41be..a8f5030 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -1,5 +1,5 @@ [options] -font = Fira Mono Medium 9 +font = Fira Mono Medium 10 [colors] #!!############################################## diff --git a/.i3blocks.conf b/.i3blocks.conf index 427d337..51244bb 100644 --- a/.i3blocks.conf +++ b/.i3blocks.conf @@ -116,8 +116,9 @@ interval=3 [key_layout] label= -interval=30 -command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout" +interval=5 +#command="/home/h1smo/Sredstva/i3blocks-contrib/key_layout/key_layout" +command="xkb-switch" [battery2] #label=BAT diff --git a/.local/rofi/config b/.local/rofi/config index eee66b4..945c2d4 100644 --- a/.local/rofi/config +++ b/.local/rofi/config @@ -3,5 +3,5 @@ rofi.color-urgent: #002d303b, #cc6666, #e52d303b, #a54242, #f9f9f9 rofi.color-active: #002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9 rofi.color-window: #f22d303b, #7c8389, #1d1f21 rofi.separator-style: solid -rofi.font: terminus 16 +rofi.font: terminus 17 diff --git a/.spacemacs b/.spacemacs index 2658d59..b77a641 100644 --- a/.spacemacs +++ b/.spacemacs @@ -33,8 +33,7 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers - '( - ;; ---------------------------------------------------------------- + '(;; ---------------------------------------------------------------- ;; 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. @@ -62,6 +61,11 @@ This function should only modify configuration layer settings." latex javascript ruby + restclient + yaml + docker + sql + nginx ;; Disable flychecker (syntax-checking :variables syntax-checking-enable-by-default nil) @@ -90,7 +94,10 @@ This function should only modify configuration layer settings." dakrone-light-theme tao-theme gruvbox-theme - rjsx-mode) + rjsx-mode + guix + vue-mode + extempore-mode) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() @@ -575,6 +582,9 @@ before packages are loaded." ;; Word wrap orgmode (add-hook 'org-mode-hook #'(lambda () (visual-line-mode))) + + ;; Use web mode for files ending in .tpl + (add-to-list 'auto-mode-alist '("\\.tpl$" . web-mode)) ) (defun dotspacemacs/emacs-custom-settings () @@ -589,7 +599,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 - (string-inflection phpcbf link-hint importmagic hl-todo anaconda-mode helm magit cider zenburn-theme yasnippet-snippets yapfify ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vmd-mode vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon suscolors-theme spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid 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 popwin pippel pipenv pip-requirements phpunit php-extras php-auto-yasnippets persp-mode password-generator paradox overseer orgit org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file neotree nameless move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative less-css-mode json-navigator json-mode js2-refactor js-doc ivy-xref ivy-purpose ivy-hydra indent-guide impatient-mode hungry-delete highlight-parentheses highlight-numbers highlight-indentation helm-make helm-core 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+ ghub gh-md geiser fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu epc emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby centered-cursor-mode bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell)))) + (counsel-projectile counsel json-mode smartparens magit cider ivy zenburn-theme yasnippet-snippets 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 tao-theme tagedit symon swiper suscolors-theme string-inflection sql-indent spaceline-all-the-icons solarized-theme smex smeargle slim-mode sesman scss-mode sayid 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 popwin pippel pipenv pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator 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 livid-mode live-py-mode link-hint json-snatcher json-reformat json-navigator js2-refactor js-doc ivy-yasnippet ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make guix gruvbox-theme google-translate golden-ratio gnuplot gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md 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-surround evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-escape evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode dotenv-mode dockerfile-mode docker diminish diff-hl define-word dakrone-light-theme cython-mode counsel-css company-web company-tern company-statistics company-restclient company-php company-auctex company-anaconda column-enforce-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby centered-cursor-mode bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent 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. diff --git a/.zshrc b/.zshrc index 4ae13dd..5b4dae5 100644 --- a/.zshrc +++ b/.zshrc @@ -54,8 +54,8 @@ 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 llc="sshfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead -o Ciphers=arcfour -o Compression=no" -alias llc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll" -alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.106:/Users/g1smo/Projects/LickList ~/ll" +alias llc="sudo mount -t nfs -v -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 10.0.0.195:/Users/g1smo/Projects/LickList ~/ll" +alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.104:/Users/g1smo/Projects/LickList ~/ll" alias lld="sudo umount -l ~/ll" alias sctl="systemctl" @@ -114,3 +114,13 @@ export ANDROID_HOME=/home/g1smo/Android/Sdk export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools +# Guix! +export GUIX_PROFILE="$HOME/.guix-profile" +export GUIX_PROFILE_FILE="$HOME/.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 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"