mirror of
https://github.com/gyoder/dots.git
synced 2026-09-01 02:35:50 +00:00
multiple: changes to multiple configs
This commit is contained in:
parent
10c80394a7
commit
fef08c2efa
9 changed files with 90 additions and 69 deletions
|
|
@ -1 +1 @@
|
||||||
source "$HOME/.cargo/env.fish"
|
# source "$HOME/.cargo/env.fish"
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,30 @@
|
||||||
set host (hostname)
|
set host (hostname)
|
||||||
|
|
||||||
if string match -q "*turing*" "$host"
|
if string match -q Darwin (uname)
|
||||||
set -x PATH /Users/scie/.local/nvim-macos-arm64/bin \
|
set -x PATH ~/.local/nvim-macos-arm64/bin \
|
||||||
/opt/homebrew/Cellar/universal-ctags/HEAD-43ca055/bin \
|
/opt/homebrew/opt/uutils-coreutils/libexec/uubin \
|
||||||
/Users/scie/.local/xonsh-env/xbin \
|
~/.local/xonsh-env/xbin \
|
||||||
/Users/scie/.local/xonsh-env/xbin \
|
~/.local/xonsh-env/xbin \
|
||||||
/opt/homebrew/opt/icu4c@76/sbin \
|
/opt/homebrew/opt/icu4c@76/sbin \
|
||||||
/opt/homebrew/opt/icu4c@76/bin \
|
/opt/homebrew/opt/icu4c@76/bin \
|
||||||
/opt/homebrew/opt/llvm/bin \
|
/opt/homebrew/opt/llvm/bin \
|
||||||
/Users/scie/.dotnet/tools \
|
~/.dotnet/tools \
|
||||||
/Users/scie/.local/bin \
|
~/.local/bin \
|
||||||
/Users/scie/Library/Python/3.9/bin \
|
~/Library/Python/3.9/bin \
|
||||||
/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/emulators \
|
|
||||||
/opt/homebrew/bin/iodine \
|
/opt/homebrew/bin/iodine \
|
||||||
/opt/homebrew/bin \
|
/opt/homebrew/bin \
|
||||||
/opt/homebrew/opt/zig@0.14/bin \
|
/opt/homebrew/opt/zig@0.14/bin \
|
||||||
/Users/scie/.platformio/penv/bin/ \
|
~/.platformio/penv/bin/ \
|
||||||
/Users/scie/.cargo/bin \
|
~/.cargo/bin \
|
||||||
/Users/scie/.local/xonsh-env/xbin \
|
~/.local/xonsh-env/xbin \
|
||||||
/Users/scie/go/bin \
|
~/go/bin \
|
||||||
/usr/bin \
|
/usr/bin \
|
||||||
/usr/local/bin \
|
/usr/local/bin \
|
||||||
/usr/sbin \
|
/usr/sbin \
|
||||||
/usr/local/sbin \
|
/usr/local/sbin \
|
||||||
/bin \
|
/bin \
|
||||||
/sbin
|
/sbin \
|
||||||
|
$PATH
|
||||||
else if test "$host" = lovelace
|
else if test "$host" = lovelace
|
||||||
set -x PATH /home/scie/.local/bin \
|
set -x PATH /home/scie/.local/bin \
|
||||||
/home/linuxbrew/.linuxbrew/bin \
|
/home/linuxbrew/.linuxbrew/bin \
|
||||||
|
|
|
||||||
4
fish/.config/fish/functions/ask.fish
Normal file
4
fish/.config/fish/functions/ask.fish
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
function ask --description "Ask for input and respond with input"
|
||||||
|
read -s -P "Enter Input: " response
|
||||||
|
echo $response
|
||||||
|
end
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
# Copilot Generated
|
|
||||||
function load_env --description 'Load environment variables from a .env file (defaults to ./.env)'
|
|
||||||
set -l env_file ".env"
|
|
||||||
if test (count $argv) -gt 0
|
|
||||||
set env_file $argv[1]
|
|
||||||
end
|
|
||||||
|
|
||||||
if not test -f "$env_file"
|
|
||||||
echo "Error: Environment file not found: $env_file" >&2
|
|
||||||
return 1
|
|
||||||
end
|
|
||||||
|
|
||||||
for line in (cat -- "$env_file")
|
|
||||||
set -l trimmed (string trim -- "$line")
|
|
||||||
# Skip empty lines and comments
|
|
||||||
if test -z "$trimmed"; or string match -q -r "^\s*#" -- "$trimmed"
|
|
||||||
continue
|
|
||||||
end
|
|
||||||
|
|
||||||
# Only process lines with =
|
|
||||||
if not string match -q -- '*=*' "$trimmed"
|
|
||||||
continue
|
|
||||||
end
|
|
||||||
|
|
||||||
# Use regex to extract key and value, and preserve quotes in value
|
|
||||||
set -l key (string match -r '^[^=]+' "$trimmed")
|
|
||||||
set -l rest (string match -r '=[\s\S]*$' "$trimmed")
|
|
||||||
|
|
||||||
if test -z "$key" -o -z "$rest"
|
|
||||||
continue
|
|
||||||
end
|
|
||||||
|
|
||||||
set -l key (string trim -- "$key")
|
|
||||||
set -l value (string trim -- (string sub -s 2 -- "$rest")) # Remove leading '='
|
|
||||||
|
|
||||||
# Validate variable name
|
|
||||||
if not string match -q -r '^[a-zA-Z_][a-zA-Z0-9_]*$' "$key"
|
|
||||||
echo "Warning: Invalid variable name '$key'. Skipping."
|
|
||||||
continue
|
|
||||||
end
|
|
||||||
|
|
||||||
# Reconstruct assignment and use eval to preserve value as-is
|
|
||||||
eval "set -gx $key $value"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
3
fish/.config/fish/functions/pysource.fish
Normal file
3
fish/.config/fish/functions/pysource.fish
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
function pysource --wraps='source .venv/bin/activate.fish' --description 'alias pysource=source .venv/bin/activate.fish'
|
||||||
|
source .venv/bin/activate.fish $argv
|
||||||
|
end
|
||||||
3
fish/.config/fish/functions/tcl.fish
Normal file
3
fish/.config/fish/functions/tcl.fish
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
function tcl --wraps='clear && clear' --description 'alias tcl=clear && clear'
|
||||||
|
clear && clear $argv
|
||||||
|
end
|
||||||
3
fish/.config/fish/functions/tclear.fish
Normal file
3
fish/.config/fish/functions/tclear.fish
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
function tclear --wraps='clear && clear' --description 'alias tclear=clear && clear'
|
||||||
|
clear && clear $argv
|
||||||
|
end
|
||||||
|
|
@ -19,3 +19,4 @@ quick-terminal-position = center
|
||||||
quick-terminal-animation-duration = .1
|
quick-terminal-animation-duration = .1
|
||||||
|
|
||||||
keybind = alt+i=inspector:toggle
|
keybind = alt+i=inspector:toggle
|
||||||
|
keybind = super+t=unbind
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,18 @@ return require("packed").setup(function(use)
|
||||||
"--line-number",
|
"--line-number",
|
||||||
"--column",
|
"--column",
|
||||||
"--smart-case",
|
"--smart-case",
|
||||||
|
"--hidden",
|
||||||
|
"--glob=!.git/*",
|
||||||
"--glob=!node_modules/**",
|
"--glob=!node_modules/**",
|
||||||
"--glob=!build/**",
|
"--glob=!build/**",
|
||||||
},
|
},
|
||||||
file_ignore_patterns = { "node_modules", "build" },
|
file_ignore_patterns = { "node_modules", "^build/", "^.git/" },
|
||||||
},
|
},
|
||||||
|
pickers = {
|
||||||
|
find_files = {
|
||||||
|
hidden = true,
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
@ -181,14 +188,6 @@ return require("packed").setup(function(use)
|
||||||
use 'mbbill/undotree'
|
use 'mbbill/undotree'
|
||||||
use 'nvim-tree/nvim-web-devicons'
|
use 'nvim-tree/nvim-web-devicons'
|
||||||
use 'mfussenegger/nvim-lint'
|
use 'mfussenegger/nvim-lint'
|
||||||
use {
|
|
||||||
'nvim-lualine/lualine.nvim',
|
|
||||||
config = function()
|
|
||||||
require('lualine').setup {
|
|
||||||
options = { theme = "rose-pine" }
|
|
||||||
}
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
-- grrr why does neovim not have this?
|
-- grrr why does neovim not have this?
|
||||||
use {
|
use {
|
||||||
|
|
@ -364,6 +363,59 @@ return require("packed").setup(function(use)
|
||||||
}
|
}
|
||||||
use "HiPhish/rainbow-delimiters.nvim"
|
use "HiPhish/rainbow-delimiters.nvim"
|
||||||
|
|
||||||
|
use {
|
||||||
|
'diogo464/hotreload.nvim',
|
||||||
|
config = function()
|
||||||
|
require('hotreload').setup({
|
||||||
|
interval = 500,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
use {
|
||||||
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
|
config = function()
|
||||||
|
require("ibl").setup {
|
||||||
|
indent = { highlight = { "Comment" }, char = "▏" },
|
||||||
|
scope = { highlight = { "@variable" }, show_start = false, show_end = false },
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
use {
|
||||||
|
"https://tangled.org/bpavuk.neocities.org/jj-log.nvim.git",
|
||||||
|
config = function()
|
||||||
|
require('jj-log').setup {
|
||||||
|
out_waiting = "...",
|
||||||
|
out_no_jj_repo = "~no_jj_repo~",
|
||||||
|
out_no_desc = "~no_desc~",
|
||||||
|
max_desc_length = 47,
|
||||||
|
full_desc = false,
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
use {
|
||||||
|
'nvim-lualine/lualine.nvim',
|
||||||
|
config = function()
|
||||||
|
require('lualine').setup {
|
||||||
|
options = { theme = "rose-pine" },
|
||||||
|
sections = {
|
||||||
|
lualine_a = {'mode'},
|
||||||
|
lualine_b = {
|
||||||
|
function()
|
||||||
|
return vim.b.jj_desc or "~no desc~"
|
||||||
|
end,
|
||||||
|
'diff',
|
||||||
|
'diagnostics'},
|
||||||
|
lualine_c = {'filename'},
|
||||||
|
lualine_x = {'encoding', 'fileformat', 'filetype'},
|
||||||
|
lualine_y = {'progress'},
|
||||||
|
lualine_z = {'location'}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
------------------------
|
------------------------
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue