Browse Source

fix: Better config, removed layer dependence in config

master
Dale 7 months ago
parent
commit
da7ef08b3e
4 changed files with 26 additions and 42 deletions
  1. 10
    3
      config.el
  2. 2
    2
      keybindings.el
  3. 0
    28
      layers.el
  4. 14
    9
      packages.el

+ 10
- 3
config.el View File

@@ -1,4 +1,4 @@
(setq-default
(setq
typescript-indent-level 2
js2-basic-offset 2
css-indent-offset 2
@@ -6,9 +6,16 @@
web-mode-css-indent-offset 2
web-mode-code-indent-offset 2
web-mode-attr-indent-offset 2
emms-player-mpd-server-name "localhost"
emms-player-mpd-server-port "6600"
emms-player-mpd-music-directory "/home/deiru/Music"
ensime-startup-notification nil
emms-source-file-default-directory "~/Music"
emms-cache-file "~/.emacs.d/emms/cache"
)

(setq-default
shell-default-shell 'eshell
shell-enable-smart-eshell 1
rcirc-server-alist '(
(
"pentium.cc"
@@ -20,5 +27,5 @@
:encryption tls
)
)
)
)
(add-to-list 'auto-mode-alist '("\\.js\\'" . react-mode))

+ 2
- 2
keybindings.el View File

@@ -1,5 +1,5 @@
(use-package emms)
(spacemacs/set-leader-keys "amb" (lambda () (interactive) (emms-player-mpd-update-all-reset-cache) (emms-browser) (evil-insert)))
(spacemacs/set-leader-keys "amb" 'emms-browser)
(spacemacs/set-leader-keys "amr" 'emms-streams)
(spacemacs/set-leader-keys "aqn" 'emms-cue-next)
(spacemacs/set-leader-keys "aqp" 'emms-cue-previous)
@@ -19,7 +19,7 @@
(global-set-key (kbd "<mouse-3>") 'evil-force-normal-state)
(exwm-input-set-key (kbd "s-n") 'exwm-workspace-add)
(exwm-input-set-key (kbd "s-d") 'exwm-workspace-delete)
(exwm-input-set-key (kbd "s-b") 'helm-mini)
(exwm-input-set-key (kbd "s-b") 'ivy-switch-buffer)
(exwm-input-set-key (kbd "s-Q") (lambda () (interactive) (start-process "lock" (get-buffer-create "*tmp*") "/run/current-system/sw/bin/dm-tool" "lock")))
(exwm-input-set-key (kbd "s-v") 'spacemacs/exwm-launch-split-right)
(exwm-input-set-key (kbd "s-s") 'spacemacs/exwm-launch-split-below)

+ 0
- 28
layers.el View File

@@ -1,28 +0,0 @@
;; Third party
(configuration-layer/declare-layer 'exwm)
(configuration-layer/declare-layer 'music)
(configuration-layer/declare-layer 'flow)
;; First-party Spacemacs

(configuration-layer/declare-layer 'sql)
(configuration-layer/declare-layer 'yaml)
(configuration-layer/declare-layer 'html)
(configuration-layer/declare-layer 'nixos)
(configuration-layer/declare-layer 'markdown)
(configuration-layer/declare-layer 'scala)
(configuration-layer/declare-layer 'java)
(configuration-layer/declare-layer 'python)
(configuration-layer/declare-layer 'django)
(configuration-layer/declare-layer 'javascript)
(configuration-layer/declare-layer 'typescript)
(configuration-layer/declare-layer 'react)
(configuration-layer/declare-layer 'git)
(configuration-layer/declare-layer 'github)
(configuration-layer/declare-layer 'helm)
(configuration-layer/declare-layer 'emacs-lisp)
(configuration-layer/declare-layer 'org)
(configuration-layer/declare-layer 'pdf-tools)
(configuration-layer/declare-layer 'evil-commentary)
(configuration-layer/declare-layer 'shell)
(configuration-layer/declare-layer 'rcirc)
(configuration-layer/declare-layer 'auto-completion)

+ 14
- 9
packages.el View File

@@ -1,23 +1,28 @@
(defconst dalemacs-packages
'(
;; Get the package from MELPA, ELPA, etc.
golden-ratio
emms
virtualenvwrapper
direnv
emms
))

(defun dalemacs/init-golden-ratio ()
(use-package golden-ratio)
(golden-ratio-mode 1))

(defun dalemacs/init-emms ()
(use-package emms))

(defun dalemacs/init-virtualenvwrapper ()
(use-package virtualenvwrapper))


(defun dalemacs/init-direnv ()
(use-package direnv)
(direnv-mode 1))

(defun dalemacs/init-emms ()
(use-package emms)
(require 'emms-setup)
(require 'emms-player-mpd)
(emms-standard)
(emms-default-players)
(setq emms-player-list '(emms-player-mpd))
(emms-player-set emms-player-mpd 'regex
"\\.ogg\\|\\.mp3\\|\\.wma\\|\\.ogm\\|\\.asf\\|\\.mkv\\|\\.tta\\|\\.cue\\|http://\\|mms://\\|\\.rmvb\\|\\.flac\\|\\.vob\\|\\.m4a\\|\\.ape\\|\\.mpc")
(emms-player-mpd-update-all)
(emms-cache-set-from-mpd-all)
)

Loading…
Cancel
Save