diff options
| -rw-r--r-- | debian/.Xresources-dark | 4 | ||||
| -rw-r--r-- | nix/.config/gtk-3.0/settings.ini | 8 | ||||
| -rw-r--r--[l---------] | nix/.config/systemd/user/emacs.service | 16 | ||||
| -rw-r--r-- | nix/.gtkrc-2.0 | 6 | ||||
| -rwxr-xr-x | vim/.vim/vimrc | 4 |
5 files changed, 27 insertions, 11 deletions
diff --git a/debian/.Xresources-dark b/debian/.Xresources-dark index 760770b..6978380 100644 --- a/debian/.Xresources-dark +++ b/debian/.Xresources-dark @@ -8,8 +8,8 @@ *.color4: #2c78bf *.color5: #e02c6d *.color6: #0aaeb3 -*.color7: #918175 -*.color8: #2D2C29 +*.color7: #d0bfa1 +*.color8: #918175 *.color9: #f75341 *.color10: #98bc37 *.color11: #fed06e diff --git a/nix/.config/gtk-3.0/settings.ini b/nix/.config/gtk-3.0/settings.ini index 7d11d05..42cbb12 100644 --- a/nix/.config/gtk-3.0/settings.ini +++ b/nix/.config/gtk-3.0/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-font-name = Latin Modern Sans 12 -gtk-key-theme-name = Emacs -gtk-modules = appmenu-gtk-module -gtk-shell-shows-menubar = 1 +gtk-font-name=Latin Modern Sans 12 +gtk-key-theme-name=Emacs +gtk-modules=appmenu-gtk-module +gtk-shell-shows-menubar=1 diff --git a/nix/.config/systemd/user/emacs.service b/nix/.config/systemd/user/emacs.service index f6b71e8..d06a506 120000..100644 --- a/nix/.config/systemd/user/emacs.service +++ b/nix/.config/systemd/user/emacs.service @@ -1 +1,15 @@ -/nix/store/6j0xw99ihkx2hw0nyklanydgb3bczfpb-unit-emacs.service/emacs.service \ No newline at end of file +[Unit] +Description=Emacs: the extensible, self-documenting text editor + +[Service] +Environment="LOCALE_ARCHIVE=/nix/store/l4qnw7z34dv4kbn2wnckq0bdjlyzxrmx-glibc-locales-2.27/lib/locale/locale-archive" +Environment="PATH=/nix/store/j0lhk5xkky410h5v9af98sz6kd8cbp40-coreutils-8.31/bin:/nix/store/kmc865qs56czqk5k5vr0nj4zvfijlq7n-findutils-4.7.0/bin:/nix/store/20b535jb98hy7k4z8vkrlkjma212a3l5-gnugrep-3.3/bin:/nix/store/dv52knazq6pb1zv9pazzj666zg550zni-gnused-4.7/bin:/nix/store/jy856r03m1jk299wkk2zm3dan8gqj64s-systemd-243/bin:/nix/store/j0lhk5xkky410h5v9af98sz6kd8cbp40-coreutils-8.31/sbin:/nix/store/kmc865qs56czqk5k5vr0nj4zvfijlq7n-findutils-4.7.0/sbin:/nix/store/20b535jb98hy7k4z8vkrlkjma212a3l5-gnugrep-3.3/sbin:/nix/store/dv52knazq6pb1zv9pazzj666zg550zni-gnused-4.7/sbin:/nix/store/jy856r03m1jk299wkk2zm3dan8gqj64s-systemd-243/sbin" +Environment="TZDIR=/nix/store/27ils7qkz0rkhq02bq104gyj9s10vaf6-tzdata-2019b/share/zoneinfo" + +ExecStart=/nix/store/b34zjdmq5l8k6rwdykjx55yl9r9isl8k-bash-4.4-p23/bin/bash -c 'source /nix/store/j68zvm2dnkgmflcn128la1c51bpka127-set-environment; exec /nix/store/47jy4mm9262hx88k88b8acrlb9w86z9m-emacs-26.3/bin/emacs --daemon' +ExecStop=/nix/store/47jy4mm9262hx88k88b8acrlb9w86z9m-emacs-26.3/bin/emacsclient --eval (kill-emacs) +Restart=always +Type=forking + +[Install] +WantedBy=default.target diff --git a/nix/.gtkrc-2.0 b/nix/.gtkrc-2.0 index 073491d..8d4f904 100644 --- a/nix/.gtkrc-2.0 +++ b/nix/.gtkrc-2.0 @@ -1,3 +1,3 @@ -gtk-font-name = "Latin Modern Sans 12" -gtk-key-theme-name = "Emacs" -gtk-modules = appmenu-gtk-module +gtk-font-name="Latin Modern Sans 12" +gtk-key-theme-name="Emacs" +gtk-modules=appmenu-gtk-module diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 9046c06..e544c5a 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -14,9 +14,10 @@ set ignorecase infercase dictionary=/usr/share/dict/words set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1 set omnifunc=syntaxcomplete#Complete set diffopt+=algorithm:patience -autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal autocmd BufNewFile,BufRead *.m setlocal filetype=octave +autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) +autocmd FileType python,cython let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) autocmd FileType c,h,go,glsl setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 autocmd FileType rst setlocal shiftwidth=3 autocmd FileType css,javascript,python,perl6 setlocal shiftwidth=4 @@ -39,6 +40,7 @@ Plug 'https://github.com/tpope/vim-abolish.git' Plug 'https://github.com/alx741/vinfo.git' Plug 'https://github.com/lervag/vimtex.git', {'for': 'tex'} Plug 'https://github.com/kovisoft/slimv.git', {'for': 'lisp'} +Plug 'https://github.com/anntzer/vim-cython.git', {'for': 'cython'} Plug 'https://github.com/artur-shaik/vim-javacomplete2.git', {'for': 'java'} call plug#end() source /usr/share/doc/fzf/examples/fzf.vim |