turing changes

This commit is contained in:
Grace Yoder 2026-02-19 15:16:51 -05:00
parent a01bb5c0ed
commit 3e110044f2
No known key found for this signature in database
6 changed files with 80 additions and 16 deletions

View file

@ -0,0 +1,14 @@
# This file was created by fish when upgrading to version 4.3, to migrate
# the 'fish_key_bindings' variable from its old default scope (universal)
# to its new default scope (global). We recommend you delete this file
# and configure key bindings in ~/.config/fish/config.fish if needed.
# set --global fish_key_bindings fish_default_key_bindings
# Prior to version 4.3, fish shipped an event handler that runs
# `set --universal fish_key_bindings fish_default_key_bindings`
# whenever the fish_key_bindings variable is erased.
# This means that as long as any fish < 4.3 is still running on this system,
# we cannot complete the migration.
# As a workaround, erase the universal variable at every shell startup.
set --erase --universal fish_key_bindings

View file

@ -0,0 +1,37 @@
# This file was created by fish when upgrading to version 4.3, to migrate
# theme variables from universal to global scope.
# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
# To customize your theme, delete this file and see
# help interactive#syntax-highlighting
# or
# man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
# for appropriate commands to add to ~/.config/fish/config.fish instead.
# See also the release notes for fish 4.3.0 (run `help relnotes`).
set --global fish_color_autosuggestion brblack
set --global fish_color_cancel -r
set --global fish_color_command normal
set --global fish_color_comment red
set --global fish_color_cwd green
set --global fish_color_cwd_root red
set --global fish_color_end green
set --global fish_color_error brred
set --global fish_color_escape brcyan
set --global fish_color_history_current --bold
set --global fish_color_host normal
set --global fish_color_host_remote yellow
set --global fish_color_normal normal
set --global fish_color_operator brcyan
set --global fish_color_param cyan
set --global fish_color_quote yellow
set --global fish_color_redirection cyan --bold
set --global fish_color_search_match white --background=brblack
set --global fish_color_selection white --bold --background=brblack
set --global fish_color_status red
set --global fish_color_user brgreen
set --global fish_color_valid_path --underline
set --global fish_pager_color_completion normal
set --global fish_pager_color_description yellow -i
set --global fish_pager_color_prefix normal --bold --underline
set --global fish_pager_color_progress brwhite --background=cyan
set --global fish_pager_color_selected_background -r

View file

@ -18,6 +18,7 @@ if string match -q "*turing*" "$host"
/Users/scie/.platformio/penv/bin/ \ /Users/scie/.platformio/penv/bin/ \
/Users/scie/.cargo/bin \ /Users/scie/.cargo/bin \
/Users/scie/.local/xonsh-env/xbin \ /Users/scie/.local/xonsh-env/xbin \
/Users/scie/go/bin \
/usr/bin \ /usr/bin \
/usr/local/bin \ /usr/local/bin \
/usr/sbin \ /usr/sbin \
@ -53,3 +54,5 @@ if status is-interactive
zoxide init fish | source zoxide init fish | source
end end
end end
alias setupidf "source /opt/esp/esp-idf/export.fish"

View file

@ -57,6 +57,8 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-yank'
# set -g @plugin 'Determinant/tmux-colortag' # set -g @plugin 'Determinant/tmux-colortag'
# set -g @plugin 'erikw/tmux-powerline' # set -g @plugin 'erikw/tmux-powerline'
set -g @plugin 'tomhey/tmux-remote-sessions'
set -g @plugin 'rose-pine/tmux' set -g @plugin 'rose-pine/tmux'
set -g @rose_pine_variant 'main' set -g @rose_pine_variant 'main'
set -g @rose_pine_left_separator ' > ' # The strings to use as separators are 1-space padded set -g @rose_pine_left_separator ' > ' # The strings to use as separators are 1-space padded

View file

@ -71,12 +71,23 @@ vim.api.nvim_create_autocmd("FileType", {
callback = function() callback = function()
-- Line wrapping settings -- Line wrapping settings
vim.opt_local.textwidth = 80 vim.opt_local.textwidth = 80
vim.opt_local.formatoptions = "atcqjnl" vim.opt_local.formatoptions = "tcqjnl"
vim.opt_local.wrap = true vim.opt_local.wrap = true
vim.opt_local.linebreak = true vim.opt_local.linebreak = true
-- Show column guide -- Show column guide
vim.opt_local.colorcolumn = "80" vim.opt_local.colorcolumn = "80"
-- Toggle 'a' in formatoptions
vim.keymap.set("n", "<leader>a", function()
local fo = vim.opt_local.formatoptions:get()
if fo.a then
vim.opt_local.formatoptions:remove("a")
print("Auto-formatting disabled")
else
vim.opt_local.formatoptions:append("a")
print("Auto-formatting enabled")
end
end, { buffer = true, desc = "Toggle auto-formatting" })
end, end,
}) })
-- Setup formatting on LSP attach -- Setup formatting on LSP attach

View file

@ -44,6 +44,7 @@ vim.keymap.set('n', '<leader>fs', ts_builtins.lsp_workspace_symbols, { desc = 'T
vim.keymap.set('n', '<leader>fts', ts_builtins.treesitter, { desc = 'Telescope find treesitter' }) vim.keymap.set('n', '<leader>fts', ts_builtins.treesitter, { desc = 'Telescope find treesitter' })
vim.keymap.set('n', '<leader>fd', ts_builtins.lsp_definitions, { desc = 'Telescope find definition' }) vim.keymap.set('n', '<leader>fd', ts_builtins.lsp_definitions, { desc = 'Telescope find definition' })
vim.keymap.set('n', '<leader>ftd', ts_builtins.lsp_type_definitions, { desc = 'Telescope find type definition' }) vim.keymap.set('n', '<leader>ftd', ts_builtins.lsp_type_definitions, { desc = 'Telescope find type definition' })
vim.keymap.set('n', '<leader>fr', ts_builtins.lsp_references, { desc = 'Telescope find references' })
-- Undo Tree -- Undo Tree
vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle) vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
@ -52,18 +53,18 @@ vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
local betterTerm = require('betterTerm') local betterTerm = require('betterTerm')
-- toggle firts term -- toggle firts term
vim.keymap.set({"n", "t"}, "<leader>tt", betterTerm.open, { desc = "Open terminal"}) vim.keymap.set({ "n", "t" }, "<leader>tt", betterTerm.open, { desc = "Open terminal" })
-- Select term focus -- Select term focus
-- vim.keymap.set({"n"}, "<leader>tf", betterTerm.select, { desc = "Select terminal"}) -- vim.keymap.set({"n"}, "<leader>tf", betterTerm.select, { desc = "Select terminal"})
-- Create new term -- Create new term
local current = 2 local current = 2
vim.keymap.set( vim.keymap.set(
{"n"}, "<leader>tn", { "n" }, "<leader>tn",
function() function()
betterTerm.open(current) betterTerm.open(current)
current = current + 1 current = current + 1
end, end,
{ desc = "New terminal"} { desc = "New terminal" }
) )
-- Neotree -- Neotree
@ -84,15 +85,11 @@ vim.keymap.set('n', '<C-b>', function()
ntc.execute({ ntc.execute({
action = "focus", -- OPTIONAL, this is the default value action = "focus", -- OPTIONAL, this is the default value
source = "filesystem", -- OPTIONAL, this is the default value source = "filesystem", -- OPTIONAL, this is the default value
position = "right", -- OPTIONAL, this is the default value position = "right", -- OPTIONAL, this is the default value
reveal_file = reveal_file, -- path to file or folder to reveal reveal_file = reveal_file, -- path to file or folder to reveal
reveal_force_cwd = true, -- change cwd without asking if needed reveal_force_cwd = true, -- change cwd without asking if needed
toggle = true, toggle = true,
}) end, })
end,
{ desc = "Show Sidebar" } { desc = "Show Sidebar" }
) )