updates

etc/.editorconfig

@@ -3,26 +3,18 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
-indent_style = space
 trim_trailing_whitespace = true
+indent_style = space
 
-[*.rs]
-indent_size = 4
-
-[*.zig]
-indent_size = 4
+[*.lua]
+indent_size = 2
 
-[*.go]
+[{justfile,*.fish,*.rs,*.zig}]
 indent_size = 4
-indent_style = tab
 
-[Makefile]
+[{*.go,Makefile}]
 indent_size = 4
 indent_style = tab
 
 [*.md]
 trim_trailing_whitespace = false
-
-[*.fish]
-indent_size = 4

fish/config.fish

@@ -3,10 +3,10 @@ set -U fish_greeting
 
 set -x LC_ALL en_US.UTF-8
 
-set -x GIT_EDITOR "nvim"
-set -x EDITOR "nvim"
-set -x VISUAL "nvim"
-set -x PAGER "moar"
+set -gx XDG_CONFIG_HOME $HOME/.config
+set -gx XDG_DATA_HOME $HOME/.local/share
+set -gx XDG_CACHE_HOME $HOME/.cache
+set -gx XDG_STATE_HOME $HOME/.local/state
 
 set -x GOPATH $HOME
 
@@ -36,6 +36,15 @@ if test -f $HOME/.opam/opam-init/init.fish
     source $HOME/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
 end
 
+if type -q nvim
+    set -gx EDITOR nvim
+    set -gx VISUAL nvim
+    set -gx MANPAGER 'nvim +Man!'
+end
+
+if type -q moar
+    set -x PAGER "moar"
+end
 
 if type -q fzf
     fzf --fish | source
@@ -78,7 +87,6 @@ end
 alias cat='bat --paging=never'
 alias rf="rm -fr"
 alias e="nvim"
-alias r="NVIM_APPNAME=reboot nvim"
 
 alias d="git diff --stat"
 alias s="git status -s"

jj/config.toml

@@ -3,14 +3,18 @@ name = "Marcus André"
 email = "[email protected]"
 
 [ui]
-editor = "nvim"
 default-command = "status"
 # diff.tool = ["difft", "--color=always", "$left", "$right"]
 
 [git]
 push-branch-prefix = "man/push-"
 
-# [signing]
-# sign-all = true
-# backend = "ssh"
-# key = "~/.ssh/id_ed25519_sign.pub"
+[signing]
+sign-all = true
+backend = "ssh"
+key = "~/.ssh/id_ed25519_sign.pub"
+
+[aliases]
+l = ["log"]
+d = ["diff"]
+rb = ["rebase"]

nvim/lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "78296bfabf756dbb6c7134aa219e75564dddf40f" },
+  "LuaSnip": { "branch": "master", "commit": "03c607c2bd4db0238d8f93a6393ffbd931466390" },
   "SchemaStore.nvim": { "branch": "main", "commit": "953dc9a37f646a7f0420c41394f716f0dddf5687" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
@@ -23,12 +23,12 @@
   "molokai": { "branch": "master", "commit": "c67bdfcdb31415aa0ade7f8c003261700a885476" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
-  "nvim-cmp": { "branch": "main", "commit": "abacd4cb7ffd640b558845b617cfca1692dcb1a6" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
   "nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" },
   "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
   "nvim-lspconfig": { "branch": "master", "commit": "a284b14b3a9c4851f900286cd7eb68e3a8f90b1c" },
   "nvim-spectre": { "branch": "master", "commit": "50e96602153f14c913e1969aaf9720e080394eb3" },
-  "nvim-treesitter": { "branch": "master", "commit": "19ac9e8b5c1e5eedd2ae7957243e25b32e269ea7" },
+  "nvim-treesitter": { "branch": "master", "commit": "00a8cfd562dc805eb4d732fbca35e23640dbf7c8" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "84cc9ed772f1fee2f47c1e076f518829583d8347" },
   "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
   "obsidian.nvim": { "branch": "main", "commit": "db41b1f20459293436fab510bec58c82a73bd1f7" },
@@ -45,7 +45,7 @@
   "ts-error-translator.nvim": { "branch": "main", "commit": "11ae55b28bde02663b5f983f59b0e3fd9c4e845b" },
   "tsc.nvim": { "branch": "main", "commit": "06734767eee606ebaa0a4645e0fd801c64e6aa7a" },
   "typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" },
-  "vim-fugitive": { "branch": "master", "commit": "19ca61c78c86a2ce6a425aee9b1c6664e5149ea6" },
+  "vim-fugitive": { "branch": "master", "commit": "a0b0c1ddc1ece7eabc846e586b6e35e9c4dabe1d" },
   "vim-projectionist": { "branch": "master", "commit": "729f3630a4c19e52e1fd825802d2a1659daeaf48" },
   "vim-test": { "branch": "master", "commit": "eb5bd18d58a859e7d55d732d37e4e2b94fa50275" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }

wezterm/wezterm.lua

@@ -7,8 +7,8 @@ config.term = 'wezterm'
 
 -- Text
 -- config.font = wezterm.font('JetBrains Mono')
--- config.font = wezterm.font('Berkeley Mono')
-config.font = wezterm.font('Fira Code')
+config.font = wezterm.font('Berkeley Mono')
+-- config.font = wezterm.font('Fira Code')
 -- config.font = wezterm.font('Input Mono Narrow')
 config.font_size = 14
 -- config.line_height = 1.125
@@ -28,7 +28,7 @@ config.color_scheme = 'nightfox'
 config.enable_scroll_bar = false
 config.tab_bar_at_bottom = true
 config.use_fancy_tab_bar = false
--- config.force_reverse_video_cursor = true
+config.force_reverse_video_cursor = true
 
 config.window_padding = {
   left = 0,