diff --git a/config/.bashrc b/config/.bashrc index 3a57b9e..bf3702d 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -197,9 +197,9 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vipe' fi -if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then - alias helix='tmux new-session -e "EDITOR=hx" hx > /dev/null' - alias hx='tmux new-session -e "EDITOR=hx" hx > /dev/null' +if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix)" ] && [ -z "$TMUX" ]; then + alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null' + # alias hx='tmux new-session -e "EDITOR=helix" helix > /dev/null' fi # if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then # SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" diff --git a/config/.config/ghostty/config b/config/.config/ghostty/config index 0aeb910..76c7c8c 100644 --- a/config/.config/ghostty/config +++ b/config/.config/ghostty/config @@ -3,7 +3,7 @@ font-family = "" # font-family = "PragmataPro Liga" # font-family = "BigBlueTermPlus Nerd Font" # font-family = "Olympe Mono Hacked" -font-family = "Iosevka SS12" +font-family = "Iosevka Term SS12" font-family = "Cascadia Code" font-family = "CaskaydiaCove Nerd Font" # font-family = "Terminess Nerd Font Mono" @@ -15,7 +15,7 @@ font-size = 14 font-thicken = true # font-variation = wdth=100 # theme = light:xcodelight,dark:xcodedark -theme = light:nord-light,dark:nord +theme = light:dawnfox,dark:carbonfox # theme = Monokai Classic # window-decoration = false # gtk-adwaita = false diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index 3f4cf40..d508d54 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -15,6 +15,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" }, "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, + "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua index a4447a7..aa4b7a6 100644 --- a/config/.config/nvim/lua/config/keymap.lua +++ b/config/.config/nvim/lua/config/keymap.lua @@ -9,6 +9,7 @@ setnx('f?', Snacks.picker.grep, 'Search in files') setnx('fr', Snacks.picker.recent, 'Find recent files') setnx('b', Snacks.picker.buffers, 'List buffers') setnx('h', Snacks.picker.help, 'Search help') +setnx('X', require'hex'.toggle, 'Toggle hex editor') setnx('m', Snacks.picker.marks, 'Search marks') setnx('q', Snacks.picker.qflist, 'Search quickfix list') setnx('l', Snacks.picker.loclist, 'Search location list') diff --git a/config/.config/nvim/lua/config/lazy.lua b/config/.config/nvim/lua/config/lazy.lua index 0a8aebb..a7701c6 100644 --- a/config/.config/nvim/lua/config/lazy.lua +++ b/config/.config/nvim/lua/config/lazy.lua @@ -29,7 +29,7 @@ require("lazy").setup({ }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "nord" } }, + -- install = { colorscheme = { "nord" } }, -- automatically check for plugin updates checker = { enabled = false, notify = false }, }) diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index 8af55c2..5258d87 100644 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -65,7 +65,7 @@ vim.g.netrw_alto = 0 vim.ui.select = Snacks.picker.select -vim.cmd('colorscheme nord') +-- vim.cmd('colorscheme carbonfox') vim.lsp.config('lua_ls', { settings = { diff --git a/config/.config/nvim/lua/plugins/colors.lua b/config/.config/nvim/lua/plugins/colors.lua index 366ee81..cf5c2c8 100644 --- a/config/.config/nvim/lua/plugins/colors.lua +++ b/config/.config/nvim/lua/plugins/colors.lua @@ -137,5 +137,27 @@ return { lazy = true, }, + { + "EdenEast/nightfox.nvim", + priority = 1000, + lazy = true, + }, + + { + "f-person/auto-dark-mode.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + set_dark_mode = function() + vim.api.nvim_set_option_value("background", "dark", {}) + vim.cmd('colorscheme carbonfox') + end, + set_light_mode = function() + vim.api.nvim_set_option_value("background", "light", {}) + vim.cmd('colorscheme dawnfox') + end, + }, + }, -- use 'xiyaowong/transparent.nvim' } diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua index 9e9293f..a1f11d9 100644 --- a/config/.config/nvim/lua/plugins/util.lua +++ b/config/.config/nvim/lua/plugins/util.lua @@ -6,6 +6,16 @@ return { lazy = true, }, + { + 'RaafatTurki/hex.nvim', + config = true, + cmd = { + 'HexDump', + 'HexAssemble', + 'HexToggle', + }, + }, + { "sindrets/diffview.nvim", event = 'VeryLazy',