From 37b2aeb0954d479a43cbd38265262a3b1ca0654b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20Podgor=C5=A1ek?= Date: Thu, 1 Feb 2018 19:43:19 +0100 Subject: [PATCH] Spacemacs, i3 update --- .Xresources | 2 +- .config/i3/config | 10 +-- .spacemacs | 181 ++++++++++++++++++++++++++++------------------ 3 files changed, 114 insertions(+), 79 deletions(-) diff --git a/.Xresources b/.Xresources index b24ccbf..a4288ec 100644 --- a/.Xresources +++ b/.Xresources @@ -76,4 +76,4 @@ URxvt*url-launcher: /usr/bin/xdg-open URxvt*matcher.button: 1 ! transparency URxvt*depth: 32 -URxvt*background: [85]S_base03 +URxvt*background: [90]S_base03 diff --git a/.config/i3/config b/.config/i3/config index fa29ee4..a044ff2 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -230,15 +230,9 @@ client.focused #222222 #222222 #AAAAAA #B6B6B6 #555555 ####################### # Touchpad tap to click -#exec --no-startup-id xinput set-prop 14 292 1 -#exec --no-startup-id xinput set-prop 13 280 1 -exec --no-startup-id xinput set-prop 11 278 1 -#exec --no-startup-id xinput set-prop 12 296 1 +exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1 # Touchpad natural scrolling -#exec --no-startup-id xinput set-prop 14 280 1 -#exec --no-startup-id xinput set-prop 13 290 1 -exec --no-startup-id xinput set-prop 11 286 1 -#exec --no-startup-id xinput set-prop 12 278 1 +exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1 # Autolock exec --no-startup-id xautolock -time 10 -locker 'i3lock-wrapper' & diff --git a/.spacemacs b/.spacemacs index 97e4068..3bbf655 100644 --- a/.spacemacs +++ b/.spacemacs @@ -10,6 +10,7 @@ This function should only modify configuration layer settings." ;; `+distribution'. For now available distributions are `spacemacs-base' ;; or `spacemacs'. (default 'spacemacs) dotspacemacs-distribution 'spacemacs + ;; Lazy installation of layers (i.e. layers are installed only when a file ;; with a supported type is opened). Possible values are `all', `unused' ;; and `nil'. `unused' will lazy install only unused layers (i.e. layers @@ -20,13 +21,16 @@ This function should only modify configuration layer settings." ;; variable `dotspacemacs-configuration-layers' to install it. ;; (default 'unused) dotspacemacs-enable-lazy-installation 'unused + ;; If non-nil then Spacemacs will ask for confirmation before installing ;; a layer lazily. (default t) dotspacemacs-ask-for-lazy-installation t + ;; If non-nil layers with lazy install support are lazy installed. ;; List of additional paths where to look for configuration layers. ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') dotspacemacs-configuration-layer-path '() + ;; List of configuration layers to load. dotspacemacs-configuration-layers '( @@ -37,50 +41,38 @@ This function should only modify configuration layer settings." ;; ---------------------------------------------------------------- ivy auto-completion - ;;better-defaults + ;; better-defaults emacs-lisp git markdown - org - ;;yaml - ;; (shell :variables - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;;spell-checking neotree - ;;syntax-checking + org + ;; (shell :variables + ;; shell-default-height 30 + ;; shell-default-position 'bottom) + ;; spell-checking + ;; syntax-checking version-control html - javascript php - ;;vimscript clojure - ;;sql - ;;rust python - ;;ruby floobits scheme latex - ;;games - ;;react - - ;;(treemacs - ;; :variables - ;; treemacs-use-follow-mode t - ;; treemacs-use-filewatch-mode t - ;; treemacs-use-collapsed-directories 3) ;; Disable flychecker - ;;(syntax-checking :variables syntax-checking-enable-by-default nil) + (syntax-checking :variables syntax-checking-enable-by-default nil) ) + ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these ;; packages, then consider creating a layer. You can also put the ;; configuration in `dotspacemacs/user-config'. - dotspacemacs-additional-packages '( - editorconfig - sublimity + ;; To use a local version of a package, use the `:location' property: + ;; '(your-package :location "~/path/to/your-package/") + ;; Also include the dependencies as they will not be resolved automatically. + dotspacemacs-additional-packages '(editorconfig all-the-icons all-the-icons-dired solarized-theme @@ -91,10 +83,13 @@ This function should only modify configuration layer settings." tao-theme gruvbox-theme rjsx-mode) + ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() + ;; A list of packages that will not be installed and loaded. dotspacemacs-excluded-packages '() + ;; Defines the behaviour of Spacemacs when installing packages. ;; Possible values are `used-only', `used-but-keep-unused' and `all'. ;; `used-only' installs only explicitly used packages and deletes any unused @@ -119,25 +114,37 @@ It should only modify the values of Spacemacs settings." ;; `--insecure' which forces the value of this variable to nil. ;; (default t) dotspacemacs-elpa-https t + ;; Maximum allowed time in seconds to contact an ELPA repository. ;; (default 5) dotspacemacs-elpa-timeout 15 + + ;; Set `gc-cons-threshold' and `gc-cons-percentage' when startup finishes. + ;; This is an advanced option and should not be changed unless you suspect + ;; performance issues due to garbage collection operations. + ;; (default '(100000000 0.1)) + dotspacemacs-gc-cons '(100000000 0.1) + ;; If non-nil then Spacelpa repository is the primary source to install - ;; a locked version of packages. If nil then Spacemacs will install the lastest - ;; version of packages from MELPA. (default nil) + ;; a locked version of packages. If nil then Spacemacs will install the + ;; lastest version of packages from MELPA. (default nil) dotspacemacs-use-spacelpa nil + ;; If non-nil then verify the signature for downloaded Spacelpa archives. ;; (default nil) dotspacemacs-verify-spacelpa-archives nil + ;; If non-nil then spacemacs will check for updates at startup ;; when the current branch is not `develop'. Note that checking for ;; new versions works via git commands, thus it calls GitHub services ;; whenever you start Emacs. (default nil) dotspacemacs-check-for-update nil + ;; If non-nil, a form that evaluates to a package directory. For example, to ;; use different package directories for different Emacs versions, set this ;; to `emacs-version'. (default 'emacs-version) dotspacemacs-elpa-subdirectory 'emacs-version + ;; One of `vim', `emacs' or `hybrid'. ;; `hybrid' is like `vim' except that `insert state' is replaced by the ;; `hybrid state' with `emacs' key bindings. The value can also be a list @@ -145,8 +152,10 @@ It should only modify the values of Spacemacs settings." ;; section of the documentation for details on available variables. ;; (default 'vim) dotspacemacs-editing-style 'vim + ;; If non-nil output loading progress in `*Messages*' buffer. (default nil) dotspacemacs-verbose-loading nil + ;; Specify the startup banner. Default value is `official', it displays ;; the official spacemacs logo. An integer value is the index of text ;; banner, `random' chooses a random text banner in `core/banners' @@ -154,6 +163,7 @@ It should only modify the values of Spacemacs settings." ;; by your Emacs build. ;; If the value is nil then no banner is displayed. (default 'official) dotspacemacs-startup-banner 'official + ;; List of items to show in startup buffer or an association list of ;; the form `(list-type . list-size)`. If nil then it is disabled. ;; Possible values for list-type are: @@ -162,10 +172,17 @@ It should only modify the values of Spacemacs settings." ;; `spacemacs-buffer-startup-lists-length' takes effect. dotspacemacs-startup-lists '((recents . 5) (projects . 7)) + ;; True if the home buffer should respond to resize events. (default t) dotspacemacs-startup-buffer-responsive t + ;; Default major mode of the scratch buffer (default `text-mode') dotspacemacs-scratch-mode 'text-mode + + ;; Initial message in the scratch buffer, such as "Welcome to Spacemacs!" + ;; (default nil) + dotspacemacs-initial-scratch-message nil + ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press `SPC T n' to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) @@ -179,45 +196,54 @@ It should only modify the values of Spacemacs settings." spacemacs-light solarized-dark zenburn) + ;; Set the theme for the Spaceline. Supported themes are `spacemacs', ;; `all-the-icons', `custom', `vim-powerline' and `vanilla'. The first three ;; are spaceline themes. `vanilla' is default Emacs mode-line. `custom' is a ;; user defined themes, refer to the DOCUMENTATION.org for more info on how - ;; to create your own spaceline theme.. (default 'spacemacs) + ;; to create your own spaceline theme. Value can be a symbol or list with\ + ;; additional properties. + ;; (default '(spacemacs :separator wave :separator-scale 1.5)) dotspacemacs-mode-line-theme 'vim-powerline + ;; If non-nil the cursor color matches the state color in GUI Emacs. ;; (default t) - ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t + ;; 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 '( - ;;"Fira Mono Medium" - "Iosevka Medium" - ;;:size 18 + dotspacemacs-default-font '("Iosevka Medium" :size 25 + ;;:size 18 :weight semibold ;;:weight normal :style medium :width normal :embolden t :powerline-scale 1.2) - ;; The leader key + + ;; The leader key (default "SPC") dotspacemacs-leader-key "SPC" + ;; The key used for Emacs commands `M-x' (after pressing on the leader key). ;; (default "SPC") dotspacemacs-emacs-command-key "SPC" + ;; The key used for Vim Ex commands (default ":") dotspacemacs-ex-command-key ":" + ;; The leader key accessible in `emacs state' and `insert state' ;; (default "M-m") dotspacemacs-emacs-leader-key "M-m" + ;; Major mode leader key is a shortcut key which is the equivalent of ;; pressing ` m`. Set it to `nil` to disable it. (default ",") dotspacemacs-major-mode-leader-key "," + ;; Major mode leader key accessible in `emacs state' and `insert state'. ;; (default "C-M-m") dotspacemacs-major-mode-emacs-leader-key "C-M-m" + ;; These variables control whether separate commands are bound in the GUI to ;; the key pairs `C-i', `TAB' and `C-m', `RET'. ;; Setting it to a non-nil value, allows for separate commands under `C-i' @@ -225,102 +251,132 @@ It should only modify the values of Spacemacs settings." ;; In the terminal, these pairs are generally indistinguishable, so this only ;; works in the GUI. (default nil) dotspacemacs-distinguish-gui-tab nil + ;; If non-nil `Y' is remapped to `y$' in Evil states. (default nil) dotspacemacs-remap-Y-to-y$ nil + ;; If non-nil, the shift mappings `<' and `>' retain visual state if used ;; there. (default t) dotspacemacs-retain-visual-state-on-shift t + ;; If non-nil, `J' and `K' move lines up and down when in visual mode. ;; (default nil) dotspacemacs-visual-line-move-text nil + ;; If non-nil, inverse the meaning of `g' in `:substitute' Evil ex-command. ;; (default nil) dotspacemacs-ex-substitute-global nil + ;; Name of the default layout (default "Default") dotspacemacs-default-layout-name "Default" + ;; If non-nil the default layout name is displayed in the mode-line. ;; (default nil) dotspacemacs-display-default-layout nil + ;; If non-nil then the last auto saved layouts are resumed automatically upon ;; start. (default nil) dotspacemacs-auto-resume-layouts nil + ;; If non-nil, auto-generate layout name when creating new layouts. Only has ;; effect when using the "jump to layout by number" commands. (default nil) dotspacemacs-auto-generate-layout-names nil + ;; Size (in MB) above which spacemacs will prompt to open the large file ;; literally to avoid performance issues. Opening a file literally means that ;; no major mode or minor modes are active. (default is 1) dotspacemacs-large-file-size 1 + ;; Location where to auto-save files. Possible values are `original' to ;; auto-save the file in-place, `cache' to auto-save the file to another ;; file stored in the cache directory and `nil' to disable auto-saving. ;; (default 'cache) dotspacemacs-auto-save-file-location 'cache + ;; Maximum number of rollback slots to keep in the cache. (default 5) dotspacemacs-max-rollback-slots 5 + ;; If non-nil, `helm' will try to minimize the space it uses. (default nil) dotspacemacs-helm-resize nil + ;; if non-nil, the helm header is hidden when there is only one source. ;; (default nil) dotspacemacs-helm-no-header nil + ;; define the position to display `helm', options are `bottom', `top', ;; `left', or `right'. (default 'bottom) dotspacemacs-helm-position 'bottom + ;; Controls fuzzy matching in helm. If set to `always', force fuzzy matching ;; in all non-asynchronous sources. If set to `source', preserve individual ;; source settings. Else, disable fuzzy matching in all sources. ;; (default 'always) dotspacemacs-helm-use-fuzzy 'always + ;; If non-nil, the paste transient-state is enabled. While enabled, pressing ;; `p' several times cycles through the elements in the `kill-ring'. ;; (default nil) dotspacemacs-enable-paste-transient-state nil + ;; Which-key delay in seconds. The which-key buffer is the popup listing ;; the commands bound to the current keystroke sequence. (default 0.4) dotspacemacs-which-key-delay 0.4 + ;; Which-key frame position. Possible values are `right', `bottom' and ;; `right-then-bottom'. right-then-bottom tries to display the frame to the ;; right; if there is insufficient space it displays it at the bottom. ;; (default 'bottom) dotspacemacs-which-key-position 'bottom + ;; Control where `switch-to-buffer' displays the buffer. If nil, ;; `switch-to-buffer' displays the buffer in the current window even if ;; another same-purpose window is available. If non-nil, `switch-to-buffer' ;; displays the buffer in a same-purpose window even if the buffer can be ;; displayed in the current window. (default nil) dotspacemacs-switch-to-buffer-prefers-purpose nil + ;; If non-nil a progress bar is displayed when spacemacs is loading. This ;; may increase the boot time on some systems and emacs builds, set it to ;; nil to boost the loading time. (default t) dotspacemacs-loading-progress-bar t + ;; If non-nil the frame is fullscreen when Emacs starts up. (default nil) ;; (Emacs 24.4+ only) dotspacemacs-fullscreen-at-startup nil + ;; If non-nil `spacemacs/toggle-fullscreen' will not use native fullscreen. ;; Use to disable fullscreen animations in OSX. (default nil) dotspacemacs-fullscreen-use-non-native nil + ;; If non-nil the frame is maximized when Emacs starts up. ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. ;; (default nil) (Emacs 24.4+ only) dotspacemacs-maximized-at-startup t + ;; A value from the range (0..100), in increasing opacity, which describes ;; the transparency level of a frame when it's active or selected. ;; Transparency can be toggled through `toggle-transparency'. (default 90) dotspacemacs-active-transparency 90 + ;; A value from the range (0..100), in increasing opacity, which describes ;; the transparency level of a frame when it's inactive or deselected. ;; Transparency can be toggled through `toggle-transparency'. (default 90) dotspacemacs-inactive-transparency 90 + ;; If non-nil show the titles of transient states. (default t) dotspacemacs-show-transient-state-title t + ;; If non-nil show the color guide hint for transient state keys. (default t) dotspacemacs-show-transient-state-color-guide t + ;; If non-nil unicode symbols are displayed in the mode line. (default t) dotspacemacs-mode-line-unicode-symbols t + ;; If non-nil smooth scrolling (native-scrolling) is enabled. Smooth ;; scrolling overrides the default behavior of Emacs which recenters point ;; when it reaches the top or bottom of the screen. (default t) dotspacemacs-smooth-scrolling t + ;; Control line numbers activation. ;; If set to `t' or `relative' line numbers are turned on in all `prog-mode' and ;; `text-mode' derivatives. If set to `relative', line numbers are relative. @@ -335,31 +391,34 @@ It should only modify the values of Spacemacs settings." ;; :size-limit-kb 1000) ;; (default nil) dotspacemacs-line-numbers t + ;; Code folding method. Possible values are `evil' and `origami'. ;; (default 'evil) dotspacemacs-folding-method 'evil + ;; If non-nil `smartparens-strict-mode' will be enabled in programming modes. ;; (default nil) dotspacemacs-smartparens-strict-mode nil + ;; If non-nil pressing the closing parenthesis `)' key in insert mode passes ;; over any automatically added closing parenthesis, bracket, quote, etc… ;; This can be temporary disabled by pressing `C-q' before `)'. (default nil) dotspacemacs-smart-closing-parenthesis nil + ;; Select a scope to highlight delimiters. Possible values are `any', ;; `current', `all' or `nil'. Default is `all' (highlight any scope and ;; emphasis the current one). (default 'all) dotspacemacs-highlight-delimiters 'all + ;; If non-nil, advise quit functions to keep server open when quitting. ;; (default nil) dotspacemacs-persistent-server nil + ;; List of search tool executable names. Spacemacs uses the first installed ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'. ;; (default '("rg" "ag" "pt" "ack" "grep")) dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep") - ;; The default package repository used if no explicit repository has been - ;; specified with an installed package. - ;; Not used for now. (default nil) - dotspacemacs-default-package-repository nil + ;; Format specification for setting the frame title. ;; %a - the `abbreviated-file-name', or `buffer-name' ;; %t - `projectile-project-name' @@ -378,23 +437,26 @@ It should only modify the values of Spacemacs settings." ;; %Z - like %z, but including the end-of-line format ;; (default "%I@%S") dotspacemacs-frame-title-format "%I@%S" + ;; Format specification for setting the icon title format ;; (default nil - same as frame-title-format) dotspacemacs-icon-title-format nil + ;; Delete whitespace while saving buffer. Possible values are `all' ;; to aggressively delete empty line and long sequences of whitespace, ;; `trailing' to delete only the whitespace at end of lines, `changed' to ;; delete only whitespace for changed lines or `nil' to disable cleanup. ;; (default nil) dotspacemacs-whitespace-cleanup "trailing" + ;; Either nil or a number of seconds. If non-nil zone out after the specified ;; number of seconds. (default nil) dotspacemacs-zone-out-when-idle 210 + ;; Run `spacemacs/prettify-org-buffer' when ;; visiting README.org files of Spacemacs. ;; (default nil) - dotspacemacs-pretty-docs t - )) + dotspacemacs-pretty-docs t)) (defun dotspacemacs/user-init () "Initialization for user code: @@ -405,12 +467,11 @@ If you are unsure, try setting them in `dotspacemacs/user-config' first." ) (defun dotspacemacs/user-config () - "Configuration function for user code. -This function is called at the very end of Spacemacs initialization after -layers configuration. -This is the place where most of your configurations should be done. Unless it is -explicitly specified that a variable should be set before a package is loaded, -you should place your code here." + "Configuration for user code: +This function is called at the very end of Spacemacs startup, after layer +configuration. +Put your configuration code here, except for variables that should be set +before packages are loaded." ;; Emacspeak ;;(load-file "~/Apps/emacspeak/lisp/emacspeak-setup.el") @@ -419,11 +480,6 @@ you should place your code here." (use-package editorconfig) (editorconfig-mode t) - ;; Smooth scrolling - ;;(use-package sublimity) - ;;(use-package sublimity-scroll) - ;;(sublimity-mode t) - ;; Quickly resize text (define-key global-map (kbd "C-+") 'text-scale-increase) (define-key global-map (kbd "C--") 'text-scale-decrease) @@ -464,7 +520,7 @@ you should place your code here." (add-to-list 'auto-mode-alist '("\\.js$" . rjsx-mode)) ;; Auto completion settings - (setq auto-completion-return-key-behavior nil) + ;;(setq auto-completion-return-key-behavior nil) ;; js2: make ; optional (react) (setq js2-strict-missing-semi-warning nil) @@ -472,25 +528,10 @@ you should place your code here." ;; js default indent level (setq js-indent-level 4) (setq js2-indent-level 4) + + ;; Web mode indent level + (setq web-mode-markup-indent-offset 2) ) (defun dotspacemacs/emacs-custom-settings () - "Emacs custom settings. -This is an auto-generated function, do not modify its content directly, use -Emacs customize menu instead. -This function is called at the very end of Spacemacs initialization." -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - (quote - (geiser magit ghub yasnippet which-key zenburn-theme yasnippet-snippets yapfify ws-butler winum wgrep web-mode web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon suscolors-theme sublimity string-inflection spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rudel rjsx-mode restart-emacs request rainbow-delimiters pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el 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 markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make 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 font-lock+ 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 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 coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu centered-cursor-mode 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)))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) )