g1smo
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update i3, spacemacs, minor zsh

x1carbon
Jure Podgoršek 2018-01-10 03:43:34 +01:00
parent 1aa7958483
commit aea096159d
3 changed files with 138 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.config/i3/config
View File

@ -58,6 +58,10 @@ bindsym $mod+Shift+q kill
# start dmenu (a program launcher) # start dmenu (a program launcher)
bindsym $mod+d exec dmenu_run bindsym $mod+d exec dmenu_run
# start rofi (alt program launcher)
#bindsym $mod+d exec rofi_run
# There also is the (new) i3-dmenu-desktop which only displays applications # There also is the (new) i3-dmenu-desktop which only displays applications
# shipping a .desktop file. It is a wrapper around dmenu, so you need that # shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed. # installed.
@ -179,7 +183,12 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
position top
status_command i3status status_command i3status
colors{
background #232323
statusline #DCDCDC
}
} }
@ -189,10 +198,12 @@ bar {
# Touchpad tap to click # Touchpad tap to click
#exec --no-startup-id xinput set-prop 14 292 1 #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 13 280 1
exec --no-startup-id xinput set-prop 12 296 1
# Touchpad natural scrolling # Touchpad natural scrolling
#exec --no-startup-id xinput set-prop 14 280 1 #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 13 290 1
exec --no-startup-id xinput set-prop 12 278 1
# Transparency # Transparency
exec compton -b exec compton -b
@ -201,7 +212,11 @@ exec compton -b
exec redshift-gtk exec redshift-gtk
# Background # Background
exec feh --bg-fill /home/g1smo/Pictures/kupka.jpg exec feh --bg-fill ~/Pictures/wlp.jpg
# Network manager applet # Network manager applet
exec nm-applet exec nm-applet
# gaps between windows
gaps inner 5
gaps outer 1

218
.spacemacs
View File

@ -3,9 +3,8 @@
;; It must be stored in your home directory. ;; It must be stored in your home directory.
(defun dotspacemacs/layers () (defun dotspacemacs/layers ()
"Configuration Layers declaration. "Layer configuration:
You should not put any user code in this function besides modifying the variable This function should only modify configuration layer settings."
values."
(setq-default (setq-default
;; Base distribution to use. This is a layer contained in the directory ;; Base distribution to use. This is a layer contained in the directory
;; `+distribution'. For now available distributions are `spacemacs-base' ;; `+distribution'. For now available distributions are `spacemacs-base'
@ -33,8 +32,8 @@ values."
'( '(
;; ---------------------------------------------------------------- ;; ----------------------------------------------------------------
;; Example of useful layers you may want to use right away. ;; Example of useful layers you may want to use right away.
;; Uncomment some layer names and press <SPC f e R> (Vim style) or ;; Uncomment some layer names and press `SPC f e R' (Vim style) or
;; <M-m f e R> (Emacs style) to install them. ;; `M-m f e R' (Emacs style) to install them.
;; ---------------------------------------------------------------- ;; ----------------------------------------------------------------
ivy ivy
auto-completion auto-completion
@ -48,6 +47,7 @@ values."
;; shell-default-height 30 ;; shell-default-height 30
;; shell-default-position 'bottom) ;; shell-default-position 'bottom)
;; spell-checking ;; spell-checking
neotree
syntax-checking syntax-checking
version-control version-control
html html
@ -98,23 +98,22 @@ values."
dotspacemacs-excluded-packages '() dotspacemacs-excluded-packages '()
;; Defines the behaviour of Spacemacs when installing packages. ;; Defines the behaviour of Spacemacs when installing packages.
;; Possible values are `used-only', `used-but-keep-unused' and `all'. ;; Possible values are `used-only', `used-but-keep-unused' and `all'.
;; `used-only' installs only explicitly used packages and uninstall any ;; `used-only' installs only explicitly used packages and deletes any unused
;; unused packages as well as their unused dependencies. ;; packages as well as their unused dependencies. `used-but-keep-unused'
;; `used-but-keep-unused' installs only the used packages but won't uninstall ;; installs only the used packages but won't delete unused ones. `all'
;; them if they become unused. `all' installs *all* packages supported by ;; installs *all* packages supported by Spacemacs and never uninstalls them.
;; Spacemacs and never uninstall them. (default is `used-only') ;; (default is `used-only')
dotspacemacs-install-packages 'used-only)) dotspacemacs-install-packages 'used-only))
(defun dotspacemacs/init () (defun dotspacemacs/init ()
"Initialization function. "Initialization:
This function is called at the very startup of Spacemacs initialization This function is called at the very beginning of Spacemacs startup,
before layers configuration. before layer configuration.
You should not put any user code in there besides modifying the variable It should only modify the values of Spacemacs settings."
values."
;; This setq-default sexp is an exhaustive list of all the supported ;; This setq-default sexp is an exhaustive list of all the supported
;; spacemacs settings. ;; spacemacs settings.
(setq-default (setq-default
;; If non nil ELPA repositories are contacted via HTTPS whenever it's ;; If non-nil ELPA repositories are contacted via HTTPS whenever it's
;; possible. Set it to nil if you have no way to use HTTPS in your ;; possible. Set it to nil if you have no way to use HTTPS in your
;; environment, otherwise it is strongly recommended to let it set to t. ;; environment, otherwise it is strongly recommended to let it set to t.
;; This variable has no effect if Emacs is launched with the parameter ;; This variable has no effect if Emacs is launched with the parameter
@ -122,16 +121,24 @@ values."
;; (default t) ;; (default t)
dotspacemacs-elpa-https t dotspacemacs-elpa-https t
;; Maximum allowed time in seconds to contact an ELPA repository. ;; Maximum allowed time in seconds to contact an ELPA repository.
;; (default 5)
dotspacemacs-elpa-timeout 15 dotspacemacs-elpa-timeout 15
;; If non nil then spacemacs will check for updates at startup ;; 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)
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 ;; when the current branch is not `develop'. Note that checking for
;; new versions works via git commands, thus it calls GitHub services ;; new versions works via git commands, thus it calls GitHub services
;; whenever you start Emacs. (default nil) ;; whenever you start Emacs. (default nil)
dotspacemacs-check-for-update nil dotspacemacs-check-for-update nil
;; If non-nil, a form that evaluates to a package directory. For example, to ;; If non-nil, a form that evaluates to a package directory. For example, to
;; use different package directories for different Emacs versions, set this ;; use different package directories for different Emacs versions, set this
;; to `emacs-version'. ;; to `emacs-version'. (default 'emacs-version)
dotspacemacs-elpa-subdirectory nil dotspacemacs-elpa-subdirectory 'emacs-version
;; One of `vim', `emacs' or `hybrid'. ;; One of `vim', `emacs' or `hybrid'.
;; `hybrid' is like `vim' except that `insert state' is replaced by the ;; `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 ;; `hybrid state' with `emacs' key bindings. The value can also be a list
@ -139,7 +146,7 @@ values."
;; section of the documentation for details on available variables. ;; section of the documentation for details on available variables.
;; (default 'vim) ;; (default 'vim)
dotspacemacs-editing-style 'vim dotspacemacs-editing-style 'vim
;; If non nil output loading progress in `*Messages*' buffer. (default nil) ;; If non-nil output loading progress in `*Messages*' buffer. (default nil)
dotspacemacs-verbose-loading nil dotspacemacs-verbose-loading nil
;; Specify the startup banner. Default value is `official', it displays ;; Specify the startup banner. Default value is `official', it displays
;; the official spacemacs logo. An integer value is the index of text ;; the official spacemacs logo. An integer value is the index of text
@ -151,17 +158,17 @@ values."
;; List of items to show in startup buffer or an association list of ;; 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. ;; the form `(list-type . list-size)`. If nil then it is disabled.
;; Possible values for list-type are: ;; Possible values for list-type are:
;; `recents' `bookmarks' `projects' `agenda' `todos'." ;; `recents' `bookmarks' `projects' `agenda' `todos'.
;; List sizes may be nil, in which case ;; List sizes may be nil, in which case
;; `spacemacs-buffer-startup-lists-length' takes effect. ;; `spacemacs-buffer-startup-lists-length' takes effect.
dotspacemacs-startup-lists '((recents . 5) dotspacemacs-startup-lists '((recents . 5)
(projects . 7)) (projects . 7))
;; True if the home buffer should respond to resize events. ;; True if the home buffer should respond to resize events. (default t)
dotspacemacs-startup-buffer-responsive t dotspacemacs-startup-buffer-responsive t
;; Default major mode of the scratch buffer (default `text-mode') ;; Default major mode of the scratch buffer (default `text-mode')
dotspacemacs-scratch-mode 'text-mode dotspacemacs-scratch-mode 'text-mode
;; List of themes, the first of the list is loaded when spacemacs starts. ;; 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 ;; Press `SPC T n' to cycle to the next theme in the list (works great
;; with 2 themes variants, one dark and one light) ;; with 2 themes variants, one dark and one light)
dotspacemacs-themes '( dotspacemacs-themes '(
suscolors suscolors
@ -180,15 +187,10 @@ values."
;; Default font, or prioritized list of fonts. `powerline-scale' allows to ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy. ;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '( dotspacemacs-default-font '(
;;"Source Code Pro" ;;"Fira Mono Medium"
;;"Fira Code" "Iosevka Medium"
;;"Fira Code, Retina"
"Fira Mono Medium"
;;"Inconsolata-g"
;;"Meslo LG M"
;;"Ubuntu Mono"
;;:size 18 ;;:size 18
:size 23 :size 24
:weight semibold :weight semibold
;;:weight normal ;;:weight normal
:style medium :style medium
@ -197,7 +199,7 @@ values."
:powerline-scale 1.0) :powerline-scale 1.0)
;; The leader key ;; The leader key
dotspacemacs-leader-key "SPC" dotspacemacs-leader-key "SPC"
;; The key used for Emacs commands (M-x) (after pressing on the leader key). ;; The key used for Emacs commands `M-x' (after pressing on the leader key).
;; (default "SPC") ;; (default "SPC")
dotspacemacs-emacs-command-key "SPC" dotspacemacs-emacs-command-key "SPC"
;; The key used for Vim Ex commands (default ":") ;; The key used for Vim Ex commands (default ":")
@ -212,31 +214,34 @@ values."
;; (default "C-M-m") ;; (default "C-M-m")
dotspacemacs-major-mode-emacs-leader-key "C-M-m" dotspacemacs-major-mode-emacs-leader-key "C-M-m"
;; These variables control whether separate commands are bound in the GUI to ;; These variables control whether separate commands are bound in the GUI to
;; the key pairs C-i, TAB and C-m, RET. ;; the key pairs `C-i', `TAB' and `C-m', `RET'.
;; Setting it to a non-nil value, allows for separate commands under <C-i> ;; Setting it to a non-nil value, allows for separate commands under `C-i'
;; and TAB or <C-m> and RET. ;; and TAB or `C-m' and `RET'.
;; In the terminal, these pairs are generally indistinguishable, so this only ;; In the terminal, these pairs are generally indistinguishable, so this only
;; works in the GUI. (default nil) ;; works in the GUI. (default nil)
dotspacemacs-distinguish-gui-tab nil dotspacemacs-distinguish-gui-tab nil
;; If non nil `Y' is remapped to `y$' in Evil states. (default nil) ;; If non-nil `Y' is remapped to `y$' in Evil states. (default nil)
dotspacemacs-remap-Y-to-y$ nil dotspacemacs-remap-Y-to-y$ nil
;; If non-nil, the shift mappings `<' and `>' retain visual state if used ;; If non-nil, the shift mappings `<' and `>' retain visual state if used
;; there. (default t) ;; there. (default t)
dotspacemacs-retain-visual-state-on-shift t dotspacemacs-retain-visual-state-on-shift t
;; If non-nil, J and K move lines up and down when in visual mode. ;; If non-nil, `J' and `K' move lines up and down when in visual mode.
;; (default nil) ;; (default nil)
dotspacemacs-visual-line-move-text nil dotspacemacs-visual-line-move-text nil
;; If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command. ;; If non-nil, inverse the meaning of `g' in `:substitute' Evil ex-command.
;; (default nil) ;; (default nil)
dotspacemacs-ex-substitute-global nil dotspacemacs-ex-substitute-global nil
;; Name of the default layout (default "Default") ;; Name of the default layout (default "Default")
dotspacemacs-default-layout-name "Default" dotspacemacs-default-layout-name "Default"
;; If non nil the default layout name is displayed in the mode-line. ;; If non-nil the default layout name is displayed in the mode-line.
;; (default nil) ;; (default nil)
dotspacemacs-display-default-layout nil dotspacemacs-display-default-layout nil
;; If non nil then the last auto saved layouts are resume automatically upon ;; If non-nil then the last auto saved layouts are resumed automatically upon
;; start. (default nil) ;; start. (default nil)
dotspacemacs-auto-resume-layouts 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 ;; Size (in MB) above which spacemacs will prompt to open the large file
;; literally to avoid performance issues. Opening a file literally means that ;; literally to avoid performance issues. Opening a file literally means that
;; no major mode or minor modes are active. (default is 1) ;; no major mode or minor modes are active. (default is 1)
@ -248,9 +253,9 @@ values."
dotspacemacs-auto-save-file-location 'cache dotspacemacs-auto-save-file-location 'cache
;; Maximum number of rollback slots to keep in the cache. (default 5) ;; Maximum number of rollback slots to keep in the cache. (default 5)
dotspacemacs-max-rollback-slots 5 dotspacemacs-max-rollback-slots 5
;; If non nil, `helm' will try to minimize the space it uses. (default nil) ;; If non-nil, `helm' will try to minimize the space it uses. (default nil)
dotspacemacs-helm-resize nil dotspacemacs-helm-resize nil
;; if non nil, the helm header is hidden when there is only one source. ;; if non-nil, the helm header is hidden when there is only one source.
;; (default nil) ;; (default nil)
dotspacemacs-helm-no-header nil dotspacemacs-helm-no-header nil
;; define the position to display `helm', options are `bottom', `top', ;; define the position to display `helm', options are `bottom', `top',
@ -261,8 +266,9 @@ values."
;; source settings. Else, disable fuzzy matching in all sources. ;; source settings. Else, disable fuzzy matching in all sources.
;; (default 'always) ;; (default 'always)
dotspacemacs-helm-use-fuzzy 'always dotspacemacs-helm-use-fuzzy 'always
;; If non nil the paste micro-state is enabled. When enabled pressing `p` ;; If non-nil, the paste transient-state is enabled. While enabled, pressing
;; several times cycle between the kill ring content. (default nil) ;; `p' several times cycles through the elements in the `kill-ring'.
;; (default nil)
dotspacemacs-enable-paste-transient-state nil dotspacemacs-enable-paste-transient-state nil
;; Which-key delay in seconds. The which-key buffer is the popup listing ;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystroke sequence. (default 0.4) ;; the commands bound to the current keystroke sequence. (default 0.4)
@ -272,17 +278,23 @@ values."
;; right; if there is insufficient space it displays it at the bottom. ;; right; if there is insufficient space it displays it at the bottom.
;; (default 'bottom) ;; (default 'bottom)
dotspacemacs-which-key-position 'bottom dotspacemacs-which-key-position 'bottom
;; If non nil a progress bar is displayed when spacemacs is loading. This ;; 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 ;; may increase the boot time on some systems and emacs builds, set it to
;; nil to boost the loading time. (default t) ;; nil to boost the loading time. (default t)
dotspacemacs-loading-progress-bar t dotspacemacs-loading-progress-bar t
;; If non nil the frame is fullscreen when Emacs starts up. (default nil) ;; If non-nil the frame is fullscreen when Emacs starts up. (default nil)
;; (Emacs 24.4+ only) ;; (Emacs 24.4+ only)
dotspacemacs-fullscreen-at-startup nil dotspacemacs-fullscreen-at-startup nil
;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. ;; If non-nil `spacemacs/toggle-fullscreen' will not use native fullscreen.
;; Use to disable fullscreen animations in OSX. (default nil) ;; Use to disable fullscreen animations in OSX. (default nil)
dotspacemacs-fullscreen-use-non-native nil dotspacemacs-fullscreen-use-non-native nil
;; If non nil the frame is maximized when Emacs starts up. ;; If non-nil the frame is maximized when Emacs starts up.
;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil.
;; (default nil) (Emacs 24.4+ only) ;; (default nil) (Emacs 24.4+ only)
dotspacemacs-maximized-at-startup t dotspacemacs-maximized-at-startup t
@ -294,13 +306,13 @@ values."
;; the transparency level of a frame when it's inactive or deselected. ;; the transparency level of a frame when it's inactive or deselected.
;; Transparency can be toggled through `toggle-transparency'. (default 90) ;; Transparency can be toggled through `toggle-transparency'. (default 90)
dotspacemacs-inactive-transparency 90 dotspacemacs-inactive-transparency 90
;; If non nil show the titles of transient states. (default t) ;; If non-nil show the titles of transient states. (default t)
dotspacemacs-show-transient-state-title t dotspacemacs-show-transient-state-title t
;; If non nil show the color guide hint for transient state keys. (default t) ;; If non-nil show the color guide hint for transient state keys. (default t)
dotspacemacs-show-transient-state-color-guide t dotspacemacs-show-transient-state-color-guide t
;; If non nil unicode symbols are displayed in the mode line. (default t) ;; If non-nil unicode symbols are displayed in the mode line. (default t)
dotspacemacs-mode-line-unicode-symbols t dotspacemacs-mode-line-unicode-symbols t
;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; If non-nil smooth scrolling (native-scrolling) is enabled. Smooth
;; scrolling overrides the default behavior of Emacs which recenters point ;; scrolling overrides the default behavior of Emacs which recenters point
;; when it reaches the top or bottom of the screen. (default t) ;; when it reaches the top or bottom of the screen. (default t)
dotspacemacs-smooth-scrolling t dotspacemacs-smooth-scrolling t
@ -321,7 +333,7 @@ values."
;; Code folding method. Possible values are `evil' and `origami'. ;; Code folding method. Possible values are `evil' and `origami'.
;; (default 'evil) ;; (default 'evil)
dotspacemacs-folding-method 'evil dotspacemacs-folding-method 'evil
;; If non-nil smartparens-strict-mode will be enabled in programming modes. ;; If non-nil `smartparens-strict-mode' will be enabled in programming modes.
;; (default nil) ;; (default nil)
dotspacemacs-smartparens-strict-mode nil dotspacemacs-smartparens-strict-mode nil
;; If non-nil pressing the closing parenthesis `)' key in insert mode passes ;; If non-nil pressing the closing parenthesis `)' key in insert mode passes
@ -332,32 +344,59 @@ values."
;; `current', `all' or `nil'. Default is `all' (highlight any scope and ;; `current', `all' or `nil'. Default is `all' (highlight any scope and
;; emphasis the current one). (default 'all) ;; emphasis the current one). (default 'all)
dotspacemacs-highlight-delimiters 'all dotspacemacs-highlight-delimiters 'all
;; If non nil, advise quit functions to keep server open when quitting. ;; If non-nil, advise quit functions to keep server open when quitting.
;; (default nil) ;; (default nil)
dotspacemacs-persistent-server nil dotspacemacs-persistent-server nil
;; List of search tool executable names. Spacemacs uses the first installed ;; List of search tool executable names. Spacemacs uses the first installed
;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
;; (default '("ag" "pt" "ack" "grep")) ;; (default '("rg" "ag" "pt" "ack" "grep"))
dotspacemacs-search-tools '("ag" "pt" "ack" "grep") dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
;; The default package repository used if no explicit repository has been ;; The default package repository used if no explicit repository has been
;; specified with an installed package. ;; specified with an installed package.
;; Not used for now. (default nil) ;; Not used for now. (default nil)
dotspacemacs-default-package-repository 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'
;; %I - `invocation-name'
;; %S - `system-name'
;; %U - contents of $USER
;; %b - buffer name
;; %f - visited file name
;; %F - frame name
;; %s - process status
;; %p - percent of buffer above top of window, or Top, Bot or All
;; %P - percent of buffer above bottom of window, perhaps plus Top, or Bot or All
;; %m - mode name
;; %n - Narrow if appropriate
;; %z - mnemonics of buffer, terminal, and keyboard coding systems
;; %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' ;; Delete whitespace while saving buffer. Possible values are `all'
;; to aggressively delete empty line and long sequences of whitespace, ;; to aggressively delete empty line and long sequences of whitespace,
;; `trailing' to delete only the whitespace at end of lines, `changed'to ;; `trailing' to delete only the whitespace at end of lines, `changed' to
;; delete only whitespace for changed lines or `nil' to disable cleanup. ;; delete only whitespace for changed lines or `nil' to disable cleanup.
;; (default nil) ;; (default nil)
dotspacemacs-whitespace-cleanup 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
)) ))
(defun dotspacemacs/user-init () (defun dotspacemacs/user-init ()
"Initialization function for user code. "Initialization for user code:
It is called immediately after `dotspacemacs/init', before layer configuration This function is called immediately after `dotspacemacs/init', before layer
executes. configuration.
This function is mostly useful for variables that need to be set It is mostly for variables that should be set before packages are loaded.
before packages are loaded. If you are unsure, you should try in setting them in If you are unsure, try setting them in `dotspacemacs/user-config' first."
`dotspacemacs/user-config' first."
) )
(defun dotspacemacs/user-config () (defun dotspacemacs/user-config ()
@ -420,45 +459,17 @@ you should place your code here."
;; Orgmode line wrap ;; Orgmode line wrap
(setq org-startup-truncated t) (setq org-startup-truncated t)
;;; Prettify symbols ;; Use react mode instead of js2 mode
(setq prettify-symbols-unprettify-at-point t)
(set-fontset-font t '(#Xe100 . #Xe16f) "Fira Code Symbol")
(defconst fira-code-font-lock-symbols-alist
(mapcar (lambda (s)
(cons (car s) (decode-char 'ucs (car (cdr s)))))
(list
'("www" #Xe100)
'(":::" #Xe10b)
'("::" #Xe10a)
'("->" #Xe114)
'("=>" #Xe13f)
'("!==" #Xe10f)
'("!=" #Xe10e)
'("===" #Xe13d)
'("!==" #Xe10f)
'("==" #Xe13c)
'("&&" #Xe131)
'("||" #Xe132)
'("####" #Xe11d)
'("###" #Xe11c)
'("##" #Xe11b)
'("#" #Xe11e))))
(add-hook 'prog-mode-hook
(lambda ()
(dolist (alias fira-code-font-lock-symbols-alist)
(push alias prettify-symbols-alist))
(prettify-symbols-mode)))
;; Fira code stuff
;;(set-language-environment "UTF-8")
;;(set-default-coding-systems 'utf-8)
(add-to-list 'auto-mode-alist '("\\.js$" . react-mode)) (add-to-list 'auto-mode-alist '("\\.js$" . react-mode))
) )
;; Do not write anything past this comment. This is where Emacs will
;; auto-generate custom variable definitions.
(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
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
@ -466,10 +477,11 @@ you should place your code here."
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
(quote (quote
(json-mode suscolors-theme yasnippet which-key undo-tree sql-indent rudel php-extras js2-mode ivy hydra evil-unimpaired diff-hl company-statistics coffee-mode auctex async aggressive-indent adaptive-wrap ace-window)))) (yapfify which-key use-package org-brain live-py-mode ivy-rich evil-unimpaired dumb-jump define-word counsel-projectile counsel goto-chg helm helm-core alert projectile org-plus-contrib magit git-commit ghub dash-functional php-mode cider f dash zenburn-theme yaml-mode ws-butler with-editor winum wgrep web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen unfill typit toml-mode toc-org tao-theme tagedit symon swiper suscolors-theme sudoku sublimity string-inflection sql-indent spaceline solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop rspec-mode robe restart-emacs request rbenv rake rainbow-delimiters racer queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox pacmacs overseer orgit org-projectile org-present org-pomodoro org-download org-bullets open-junk-file neotree nameless mwim move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum log4e livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-purpose ivy-hydra info+ indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make gruvbox-theme google-translate golden-ratio gnuplot gntp gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy flycheck-rust 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-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 drupal-mode diminish diff-hl dakrone-light-theme dactyl-mode cython-mode 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 chruby cargo bundler browse-at-remote bind-key auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game))))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
) )
)

10
.zshrc
View File

@ -59,8 +59,9 @@ alias grep="grep --color=auto"
alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')" alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')"
alias ffon="sudo cp /etc/resolv.conf.ff /etc/resolv.conf" 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 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" #alias llc="sshfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead -o Ciphers=arcfour -o Compression=no"
alias llcc="sshfs 192.168.1.103:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead" #alias llcc="sshfs 192.168.1.103:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead"
alias llc="sudo mount -t nfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll"
alias lld="sudo umount ~/ll" alias lld="sudo umount ~/ll"
# Firefox scaling! # Firefox scaling!
@ -105,9 +106,8 @@ alias mp3len="for i in \$(ls *.mp3); do echo \$i; soxi -d \$i; done"
alias pg="ping 8.8.8.8" alias pg="ping 8.8.8.8"
# GTK interface scale # GTK interface scale
#export GDK_SCALE=1 export GDK_SCALE=2
export GDK_DPI_SCALE=1 export GDK_DPI_SCALE=0.5
export GDK_SCALE=1
# PhantomJS binary location # PhantomJS binary location
export PHANTOMJS_BIN=/usr/bin/phantomjs export PHANTOMJS_BIN=/usr/bin/phantomjs