diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 309d7bf..546683e 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -10,10 +10,9 @@ set -gx EDITOR emacsclient -n set -gx MANPAGER "sh -c 'col -bx | bat -l man -p'" bind -M insert \cx restore_job -bind -M insert \ed 'edit-dotfile' if [ (uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip') ] - set -g DISPLAY (cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}') + set -gx DISPLAY 127.0.0.1:0.0 alias xdg-open wsl-open end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 9ec56ab..b738a59 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -32,7 +32,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_hybrid_key_bindings +SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_completion:normal SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 6ef0c27..1ae4618 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,8 +1,5 @@ call plug#begin(stdpath('data') . '/plugged') -" Themes -Plug 'morhetz/gruvbox' - "Timmy Popester Plug 'tpope/vim-surround' Plug 'tpope/vim-repeat' @@ -40,8 +37,6 @@ Plug 'airblade/vim-gitgutter' " This one is going to depend on whether vim stil call plug#end() -color gruvbox - set number set relativenumber set autochdir diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 311ca87..5c545c7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -126,7 +126,7 @@ all of the evil keybindings in buffers like magit, without compromises." '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(package-selected-packages - '(ranger evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) + '(evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) '(window-divider-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -340,9 +340,6 @@ all of the evil keybindings in buffers like magit, without compromises." (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) -(require 'nav-flash) -(nav-flash-show) - (setq recentf-max-menu-items 1000) (defun joe/recentf-open-files () "Use `completing-read' to open a recent file." diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..97a9101 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.emacs.d/elpa +.emacs.d/saves +.emacs.d/var +.emacs.d/transient +.emacs.d/recentf