diff options
| -rw-r--r-- | .config/emacs/init.el | 27 | ||||
| m--------- | .config/emacs/lisp/proj | 0 | ||||
| -rw-r--r-- | .config/sway/config | 30 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | files/wallpapers/mill.png | bin | 0 -> 18767386 bytes | |||
| -rw-r--r-- | files/wallpapers/sunset.jpg | bin | 0 -> 1579391 bytes | |||
| -rwxr-xr-x | scripts/open-emacs | 2 | ||||
| -rwxr-xr-x | scripts/open-emacs-project | 2 | ||||
| -rwxr-xr-x | scripts/restartemacs | 2 |
9 files changed, 36 insertions, 28 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 25c940b..25f5311 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -115,6 +115,7 @@ ;; some binds (global-set-key (kbd "C-c f") 'ff-find-other-file) (global-set-key (kbd "C-c c") 'recompile) +(global-set-key (kbd "C-<return>") 'browse-url-xdg-open) ;; better commenting (use-package evil-nerd-commenter @@ -357,6 +358,14 @@ orig-result))) (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) +;; == eglot +;; (use-package eglot +;; :ensure nil +;; :config +;; (add-to-list 'eglot-ignored-server-capabilities ':inlayHintProvider) +;; (add-to-list 'eglot-ignored-server-capabilities ':documentOnTypeFormattingProvider) +;; (add-hook 'eglot-mode-hook 'flymake-mode)) + ;; == dumb jump (use-package dumb-jump :init @@ -413,15 +422,15 @@ ("TAB" . nil) ("M-I" . nil))) -(use-package yasnippet - :bind - (:map yas-minor-mode-map - ("C-'". yas-expand) - ([(tab)] . nil) - ("TAB" . nil)) - :config - (yas-reload-all) - (yas-global-mode t)) +;; (use-package yasnippet +;; :bind +;; (:map yas-minor-mode-map +;; ("C-'". yas-expand) +;; ([(tab)] . nil) +;; ("TAB" . nil)) +;; :config +;; (yas-reload-all) +;; (yas-global-mode t)) (use-package yasnippet-snippets :after yasnippet) diff --git a/.config/emacs/lisp/proj b/.config/emacs/lisp/proj -Subproject 4f227e82f37467ce1bb100eb660e21f9a912463 +Subproject b84a1feb35a528d6bcfa4e807c0b416d23dfeeb diff --git a/.config/sway/config b/.config/sway/config index 496f818..6d80b11 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -18,13 +18,15 @@ exec startup ### Output configuration # # Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) -# output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * bg ~/dotfiles/files/wallpapers/mill.png fill # # Example configuration: # # output HDMI-A-1 resolution 1920x1080 position 1920,0 # # You can get the names of your outputs by running: swaymsg -t get_outputs +output eDP-1 position -0,0 +output HDMI-A-1 position -0,0 ### Idle configuration exec swayidle -w \ @@ -209,18 +211,18 @@ bindsym $mod+r mode "resize" # Status Bar: # # Read `man 5 sway-bar` for more information about this section. -bar { - position top - - # When the status_command prints a new line to stdout, swaybar updates. - # The default just shows the current date and time. - status_command while true; do echo $(TERM="" sysinfo | tr '\n' ' '); sleep 1; done - - colors { - statusline #ffffff - background #323232 - inactive_workspace #32323200 #32323200 #5c5c5c - } -} +# bar { +# position top + +# # When the status_command prints a new line to stdout, swaybar updates. +# # The default just shows the current date and time. +# status_command while true; do echo $(TERM="" sysinfo | tr '\n' ' '); sleep 1; done + +# colors { +# statusline #ffffff +# background #323232 +# inactive_workspace #32323200 #32323200 #5c5c5c +# } +# } include @sysconfdir@/sway/config.d/* @@ -27,5 +27,6 @@ Config files can be installed by running `stow .` Since there are probably confl ## TODO - [x] emacs project launcher script +- [ ] switch to eglot - [ ] better sleeping - [ ] battery reminders diff --git a/files/wallpapers/mill.png b/files/wallpapers/mill.png Binary files differnew file mode 100644 index 0000000..2a9f616 --- /dev/null +++ b/files/wallpapers/mill.png diff --git a/files/wallpapers/sunset.jpg b/files/wallpapers/sunset.jpg Binary files differnew file mode 100644 index 0000000..fa13f21 --- /dev/null +++ b/files/wallpapers/sunset.jpg diff --git a/scripts/open-emacs b/scripts/open-emacs index 15b0794..92272df 100755 --- a/scripts/open-emacs +++ b/scripts/open-emacs @@ -1,7 +1,5 @@ #!/bin/bash -emacsclient -e '(message "")' 2>&1 >/dev/null || emacs --daemon & - emacs_attached() { [ "$(emacsclient -e '(- (length (frame-list)) 1)')" = 0 ] && return 1 || return 0 } diff --git a/scripts/open-emacs-project b/scripts/open-emacs-project index a5e4338..23df773 100755 --- a/scripts/open-emacs-project +++ b/scripts/open-emacs-project @@ -1,7 +1,5 @@ #!/bin/bash -emacsclient -e '(message "")' 2>&1 >/dev/null || emacs --daemon & - find_dirs() { echo $(emacsclient -e "(proj--get-paths)" | sed -ze 's/(\(.*\))/\1/') | xargs -n1 } diff --git a/scripts/restartemacs b/scripts/restartemacs index 5e55c81..7f2cee4 100755 --- a/scripts/restartemacs +++ b/scripts/restartemacs @@ -1,3 +1,3 @@ #!/bin/sh pkill -x emacs -emacs --daemon=main +emacs --daemon |
