mirror of
https://github.com/ForeverPyrite/dotfiles.git
synced 2025-12-10 01:08:06 +00:00
Changes I didn't realized I stashed + appearance
Now I HAVE to use Tmux. Finally. I like that. I'm considering changing it from running the command to execing it Since hypothetically I have plent of tmux managment within tmux itself, including plugins. Surely there is some way that can go wrong though, but after enough time I might deside "what could possibly go wrong!?"
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
|
||||
[font]
|
||||
normal = { family = "Hack Nerd Font", style = "Regular" }
|
||||
bold = { family = "Hack Nerd Font", style = "Bold" }
|
||||
italic = { family = "Hack Nerd Font", style = "Italic" }
|
||||
size = 9.0
|
||||
normal = { family = "Hack Nerd Font Mono", style = "Regular" }
|
||||
bold = { family = "Hack Nerd Font Mono", style = "Bold" }
|
||||
italic = { family = "Hack Nerd Font Mono", style = "Italic" }
|
||||
# There is no winning with this stupid ass monitor...
|
||||
size = 14.0
|
||||
|
||||
[window]
|
||||
decorations = "None"
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# ~/.config/fish/config.fish
|
||||
|
||||
# --- Environment Variables ---
|
||||
# Set a default editor (used by many command-line tools)
|
||||
@@ -9,11 +8,10 @@ set -x EDITOR nvim
|
||||
fish_add_path "$HOME/.cargo/bin"
|
||||
# Add the local user bin to path as well
|
||||
fish_add_path "$HOME/.local/bin"
|
||||
# Add bob's nvim bin to path
|
||||
fish_add_path "$HOME/.local/share/bob/nvim-bin"
|
||||
|
||||
# --- Tool Initialization ---
|
||||
# Starship Prompt
|
||||
starship init fish | source
|
||||
|
||||
# Zoxide (replaces cd)
|
||||
set -x FZF_DEFAULT_OPTS --tmux
|
||||
zoxide init --cmd cd fish | source
|
||||
@@ -27,9 +25,26 @@ if test -f "$HOME/.fzf.fish"
|
||||
source "$HOME/.fzf.fish"
|
||||
end
|
||||
|
||||
# --- Appearance ---
|
||||
# While the GitHub says to use `fish theme save`, I think it's either
|
||||
# outdated or slightly incorrect.
|
||||
fish_config theme choose "Catppuccin Mocha"
|
||||
# I also want to either swap some of the Catppuccin colors around,
|
||||
# or break the Catppuccin theme for my shell since it makes the most
|
||||
# sense to be the most personalized.
|
||||
# What I normally do is a lot of cyan and purple though, which isn't
|
||||
# the most appealing.
|
||||
# Perhaps when I get to that I'll customize Starship a little more too...
|
||||
|
||||
# # Hopefully fixes the length errors in nvim
|
||||
# set -gx XDG_CACHE_HOME "/tmp/.nv"
|
||||
# Starship Prompt
|
||||
starship init fish | source
|
||||
|
||||
# --- Forcing Tmux Upon Thyself ---
|
||||
# I keep doing all these things with tmux and looking at tpm plugins,
|
||||
# yet for some reason I'm not always using it
|
||||
|
||||
# Should I go ahead and `tmux start-server` in here?
|
||||
# Making it a varible just in case I wanna change it some day
|
||||
set DEFAULT_SESSION home
|
||||
if status is-interactive && not set -q TMUX
|
||||
tmux attach -t $DEFAULT_SESSION || tmux new-session -s $DEFAULT_SESSION
|
||||
end
|
||||
|
||||
@@ -1,32 +1,43 @@
|
||||
# This file contains fish universal variable definitions.
|
||||
# VERSION: 3.0
|
||||
SETUVAR __fish_initialized:3400
|
||||
SETUVAR fish_color_autosuggestion:555\x1ebrblack
|
||||
SETUVAR fish_color_cancel:\x2dr
|
||||
SETUVAR fish_color_command:blue
|
||||
SETUVAR fish_color_comment:red
|
||||
SETUVAR fish_color_cwd:green
|
||||
SETUVAR fish_color_autosuggestion:6c7086
|
||||
SETUVAR fish_color_cancel:f38ba8
|
||||
SETUVAR fish_color_command:33fff3
|
||||
SETUVAR fish_color_comment:7f849c
|
||||
SETUVAR fish_color_cwd:f9e2af
|
||||
SETUVAR fish_color_cwd_root:red
|
||||
SETUVAR fish_color_end:green
|
||||
SETUVAR fish_color_error:brred
|
||||
SETUVAR fish_color_escape:brcyan
|
||||
SETUVAR fish_color_end:fab387
|
||||
SETUVAR fish_color_error:f38ba8
|
||||
SETUVAR fish_color_escape:eba0ac
|
||||
SETUVAR fish_color_gray:6c7086
|
||||
SETUVAR fish_color_history_current:\x2d\x2dbold
|
||||
SETUVAR fish_color_host:normal
|
||||
SETUVAR fish_color_host_remote:yellow
|
||||
SETUVAR fish_color_normal:normal
|
||||
SETUVAR fish_color_operator:brcyan
|
||||
SETUVAR fish_color_param:cyan
|
||||
SETUVAR fish_color_quote:yellow
|
||||
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
|
||||
SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
|
||||
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
|
||||
SETUVAR fish_color_status:red
|
||||
SETUVAR fish_color_user:brgreen
|
||||
SETUVAR fish_color_host:89b4fa
|
||||
SETUVAR fish_color_host_remote:a6e3a1
|
||||
SETUVAR fish_color_keyword:f38ba8
|
||||
SETUVAR fish_color_normal:cdd6f4
|
||||
SETUVAR fish_color_operator:f5c2e7
|
||||
SETUVAR fish_color_option:a6e3a1
|
||||
SETUVAR fish_color_param:f2cdcd
|
||||
SETUVAR fish_color_quote:a6e3a1
|
||||
SETUVAR fish_color_redirection:f5c2e7
|
||||
SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d313244
|
||||
SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244
|
||||
SETUVAR fish_color_status:f38ba8
|
||||
SETUVAR fish_color_user:94e2d5
|
||||
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
||||
SETUVAR fish_key_bindings:fish_default_key_bindings
|
||||
SETUVAR fish_pager_color_completion:normal
|
||||
SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
|
||||
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
||||
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
||||
SETUVAR fish_pager_color_selected_background:\x2dr
|
||||
SETUVAR fish_user_paths:/home/foreverpyrite/\x2elocal/bin\x1e/home/foreverpyrite/\x2ecargo/bin\x1e/root/\x2ecargo/bin\x1e/root/\x2efzf/bin\x1e/home/foreverpyrite/\x2efzf/bin
|
||||
SETUVAR fish_pager_color_background:\x1d
|
||||
SETUVAR fish_pager_color_completion:cdd6f4
|
||||
SETUVAR fish_pager_color_description:6c7086
|
||||
SETUVAR fish_pager_color_prefix:f5c2e7
|
||||
SETUVAR fish_pager_color_progress:6c7086
|
||||
SETUVAR fish_pager_color_secondary_background:\x1d
|
||||
SETUVAR fish_pager_color_secondary_completion:\x1d
|
||||
SETUVAR fish_pager_color_secondary_description:\x1d
|
||||
SETUVAR fish_pager_color_secondary_prefix:\x1d
|
||||
SETUVAR fish_pager_color_selected_background:\x1d
|
||||
SETUVAR fish_pager_color_selected_completion:\x1d
|
||||
SETUVAR fish_pager_color_selected_description:\x1d
|
||||
SETUVAR fish_pager_color_selected_prefix:\x1d
|
||||
SETUVAR fish_user_paths:/home/foreverpyrite/\x2elocal/share/bob/nvim\x2dbin\x1e/home/foreverpyrite/\x2elocal/bin\x1e/home/foreverpyrite/\x2ecargo/bin\x1e/root/\x2ecargo/bin\x1e/root/\x2efzf/bin\x1e/home/foreverpyrite/\x2efzf/bin
|
||||
|
||||
30
fish/.config/fish/themes/Catppuccin Mocha.theme
Normal file
30
fish/.config/fish/themes/Catppuccin Mocha.theme
Normal file
@@ -0,0 +1,30 @@
|
||||
# name: 'Catppuccin Mocha'
|
||||
# url: 'https://github.com/catppuccin/fish'
|
||||
# preferred_background: 1e1e2e
|
||||
|
||||
fish_color_normal cdd6f4
|
||||
fish_color_command 89b4fa
|
||||
fish_color_param f2cdcd
|
||||
fish_color_keyword f38ba8
|
||||
fish_color_quote a6e3a1
|
||||
fish_color_redirection f5c2e7
|
||||
fish_color_end fab387
|
||||
fish_color_comment 7f849c
|
||||
fish_color_error f38ba8
|
||||
fish_color_gray 6c7086
|
||||
fish_color_selection --background=313244
|
||||
fish_color_search_match --background=313244
|
||||
fish_color_option a6e3a1
|
||||
fish_color_operator f5c2e7
|
||||
fish_color_escape eba0ac
|
||||
fish_color_autosuggestion 6c7086
|
||||
fish_color_cancel f38ba8
|
||||
fish_color_cwd f9e2af
|
||||
fish_color_user 94e2d5
|
||||
fish_color_host 89b4fa
|
||||
fish_color_host_remote a6e3a1
|
||||
fish_color_status f38ba8
|
||||
fish_pager_color_progress 6c7086
|
||||
fish_pager_color_prefix f5c2e7
|
||||
fish_pager_color_completion cdd6f4
|
||||
fish_pager_color_description 6c7086
|
||||
66
moxide/.config/moxide/settings.toml
Normal file
66
moxide/.config/moxide/settings.toml
Normal file
@@ -0,0 +1,66 @@
|
||||
# Leave blank to try to import from Obsidian Daily Notes
|
||||
dailynote = "%Y-%m-%d" # this is akin to YYYY-MM-DD from Obsidian
|
||||
|
||||
# Fuzzy match file headings in completions
|
||||
heading_completions = true
|
||||
|
||||
# Set true if you title your notes by the first heading
|
||||
# Right now, if true this will cause completing a file link in the markdown style
|
||||
# to insert the name of the first heading in the display text area
|
||||
# [](file) -> [first heading of file.md](file)
|
||||
# If false, [](file) -> [](file) (for example)
|
||||
title_headings = true
|
||||
|
||||
# Show diagnostics for unresolved links; note that even if this is turned off,
|
||||
# special semantic tokens will be sent for the unresolved links, allowing you
|
||||
# to visually identify unresolved links
|
||||
unresolved_diagnostics = true
|
||||
|
||||
semantic_tokens = true
|
||||
|
||||
# Resolve tags in code blocks
|
||||
tags_in_codeblocks = false
|
||||
# Resolve references in code blocks
|
||||
references_in_codeblocks = false
|
||||
|
||||
# The folder for new files to be created in; this is relevant for the code action that creates
|
||||
# from an unresolved link. If not specified, it will import from your obsidian config option titled
|
||||
# "Default Location for new notes" -- which is "" by default too.
|
||||
# new_file_folder_path = ""
|
||||
|
||||
|
||||
# The folder for new daily notes: this is applied for the create file for unresolved link code action
|
||||
# as well as the Today, Tomorrow, Yesterday, and Daily... lsp commands
|
||||
#
|
||||
# This is also imported from obsidian if not specified: specifically the option titled "New file location"
|
||||
# daily_notes_folder = ""
|
||||
|
||||
|
||||
# Whether markdown links should include an extension or not
|
||||
# for example [File](file.md) or [File](file)
|
||||
include_md_extension_md_link = false
|
||||
|
||||
# Whether wikilinks should include an extension or not (needed for Markor compatibility)
|
||||
# for example [[File]] or [[File.md]]
|
||||
include_md_extension_wikilink = false
|
||||
|
||||
# Enable hover; this is relevant for VSCode and Zed where hover could be triggered on mouse hover
|
||||
# and could be annoying
|
||||
hover = true
|
||||
|
||||
# Handle case in fuzzy matches: Ignore | Smart | Respect
|
||||
case_matching = "Smart"
|
||||
|
||||
# Enable inlay hints
|
||||
inlay_hints = true
|
||||
# Enable transclusion, in the form of inlay hints, for embedded block links: ![[link]]
|
||||
# Inlay hints must be enabled
|
||||
block_transclusion = true
|
||||
# Full or Partial, for Partial, block_transclusion_length = { partial = 10 }
|
||||
# block_transclusion must be enabled for this to take effect
|
||||
block_transclusion_length = "Full"
|
||||
|
||||
# Link file names only
|
||||
# Enables autocompleting by heading but inserting link to filename (instead of filename + heading)
|
||||
# Useful for unique notes / Zettelkasten users
|
||||
link_filenames_only = false
|
||||
@@ -22,7 +22,7 @@ return {
|
||||
dependencies = {
|
||||
"folke/snacks.nvim",
|
||||
--- The below dependencies are optional
|
||||
-- "catppuccin/nvim",
|
||||
"catppuccin/nvim",
|
||||
-- "nvim-tree/nvim-tree.lua", --- Neo-tree integration {
|
||||
-- "nvim-neo-tree/neo-tree.nvim",
|
||||
-- opts = function(_, opts)
|
||||
|
||||
@@ -5,20 +5,6 @@
|
||||
# Palettes must be defined _after_ this line
|
||||
palette = "catppuccin_mocha"
|
||||
|
||||
# Starship modules
|
||||
[character]
|
||||
# I think I like mauve more than peach...might change it
|
||||
success_symbol = "[[](green) ❯](mauve)"
|
||||
error_symbol = "[[](red) ❯](mauve)"
|
||||
vimcmd_symbol = "[ ❮](subtext1)" # For use with zsh-vi-mode
|
||||
|
||||
[git_branch]
|
||||
style = "bold mauve"
|
||||
|
||||
[directory]
|
||||
truncation_length = 4
|
||||
style = "bold lavender"
|
||||
|
||||
# Palette definitions
|
||||
[palettes.catppuccin_mocha]
|
||||
rosewater = "#f5e0dc"
|
||||
@@ -48,3 +34,221 @@ base = "#1e1e2e"
|
||||
mantle = "#181825"
|
||||
crust = "#11111b"
|
||||
|
||||
# Starship modules
|
||||
[character]
|
||||
# I think I like mauve more than peach...might change it
|
||||
success_symbol = "[[](green) ❯](mauve)"
|
||||
error_symbol = "[[](red) ❯](mauve)"
|
||||
# For use with zsh-vi-mode (but I don't use zsh)
|
||||
vimcmd_symbol = "[ ❮](subtext1)"
|
||||
|
||||
[directory]
|
||||
truncation_length = 4
|
||||
style = "bold lavender"
|
||||
read_only = " "
|
||||
|
||||
[git_branch]
|
||||
symbol = " "
|
||||
style = "bold mauve"
|
||||
|
||||
[git_status]
|
||||
# See I lied the idea, but it wasn't executed all that well
|
||||
# Need to make sure the icons fit well together...
|
||||
# conflicted = ''
|
||||
# ahead = '⇡${count}'
|
||||
# behind = '⇣${count}'
|
||||
# diverged = '⇕⇡${ahead_count}⇣${behind_count}'
|
||||
# up_to_date = '✓'
|
||||
# untracked = ''
|
||||
# stashed = '📦'
|
||||
# modified = ''
|
||||
# staged = '[++\($count\)](green)'
|
||||
# renamed = ''
|
||||
# deleted = '🗑'
|
||||
|
||||
[aws]
|
||||
symbol = " "
|
||||
|
||||
[buf]
|
||||
symbol = " "
|
||||
|
||||
[bun]
|
||||
symbol = " "
|
||||
|
||||
[c]
|
||||
symbol = " "
|
||||
|
||||
[cpp]
|
||||
symbol = " "
|
||||
|
||||
[cmake]
|
||||
symbol = " "
|
||||
|
||||
[conda]
|
||||
symbol = " "
|
||||
|
||||
[crystal]
|
||||
symbol = " "
|
||||
|
||||
[dart]
|
||||
symbol = " "
|
||||
|
||||
[deno]
|
||||
symbol = " " # uh...nice?
|
||||
|
||||
[docker_context]
|
||||
symbol = " "
|
||||
|
||||
[elixir]
|
||||
symbol = " "
|
||||
|
||||
[elm]
|
||||
symbol = " "
|
||||
|
||||
[fennel]
|
||||
symbol = " "
|
||||
|
||||
[fossil_branch]
|
||||
symbol = " "
|
||||
|
||||
[gcloud]
|
||||
symbol = " "
|
||||
|
||||
[git_commit]
|
||||
tag_symbol = ' '
|
||||
|
||||
[golang]
|
||||
symbol = " "
|
||||
|
||||
[guix_shell]
|
||||
symbol = " "
|
||||
|
||||
[haskell]
|
||||
symbol = " "
|
||||
|
||||
[haxe]
|
||||
symbol = " "
|
||||
|
||||
[hg_branch]
|
||||
symbol = " "
|
||||
|
||||
[hostname]
|
||||
ssh_symbol = " "
|
||||
|
||||
[java]
|
||||
symbol = " "
|
||||
|
||||
[julia]
|
||||
symbol = " "
|
||||
|
||||
[kotlin]
|
||||
symbol = " "
|
||||
|
||||
[lua]
|
||||
symbol = " "
|
||||
|
||||
[memory_usage]
|
||||
symbol = " "
|
||||
|
||||
[meson]
|
||||
symbol = " "
|
||||
|
||||
[nim]
|
||||
symbol = " "
|
||||
|
||||
[nix_shell]
|
||||
symbol = " "
|
||||
|
||||
[nodejs]
|
||||
symbol = " "
|
||||
|
||||
[ocaml]
|
||||
symbol = " "
|
||||
|
||||
[os.symbols]
|
||||
Alpaquita = " "
|
||||
Alpine = " "
|
||||
AlmaLinux = " "
|
||||
Amazon = " "
|
||||
Android = " "
|
||||
Arch = " "
|
||||
Artix = " "
|
||||
CachyOS = " "
|
||||
CentOS = " "
|
||||
Debian = " "
|
||||
DragonFly = " "
|
||||
Emscripten = " "
|
||||
EndeavourOS = " "
|
||||
Fedora = " "
|
||||
FreeBSD = " "
|
||||
Garuda = " "
|
||||
Gentoo = " "
|
||||
HardenedBSD = " "
|
||||
Illumos = " "
|
||||
Kali = " "
|
||||
Linux = " "
|
||||
Mabox = " "
|
||||
Macos = " "
|
||||
Manjaro = " "
|
||||
Mariner = " "
|
||||
MidnightBSD = " "
|
||||
Mint = " "
|
||||
NetBSD = " "
|
||||
NixOS = " "
|
||||
Nobara = " "
|
||||
OpenBSD = " "
|
||||
openSUSE = " "
|
||||
OracleLinux = " "
|
||||
Pop = " "
|
||||
Raspbian = " "
|
||||
Redhat = " "
|
||||
RedHatEnterprise = " "
|
||||
RockyLinux = " "
|
||||
Redox = " "
|
||||
Solus = " "
|
||||
SUSE = " "
|
||||
Ubuntu = " "
|
||||
Unknown = " "
|
||||
Void = " "
|
||||
Windows = " "
|
||||
|
||||
[package]
|
||||
symbol = " "
|
||||
|
||||
[perl]
|
||||
symbol = " "
|
||||
|
||||
[php]
|
||||
symbol = " "
|
||||
|
||||
[pijul_channel]
|
||||
symbol = " "
|
||||
|
||||
[pixi]
|
||||
symbol = " "
|
||||
|
||||
[python]
|
||||
symbol = " "
|
||||
|
||||
[rlang]
|
||||
symbol = " "
|
||||
|
||||
[ruby]
|
||||
symbol = " "
|
||||
|
||||
[rust]
|
||||
# I think I like ferris more
|
||||
symbol = " "
|
||||
# symbol = " "
|
||||
|
||||
[scala]
|
||||
symbol = " "
|
||||
|
||||
[swift]
|
||||
symbol = " "
|
||||
|
||||
[zig]
|
||||
symbol = " "
|
||||
|
||||
[gradle]
|
||||
symbol = " "
|
||||
|
||||
@@ -46,6 +46,8 @@ set -g @plugin 'omerxx/tmux-sessionx' # Session manager
|
||||
set -g @plugin 'tmux-plugins/tmux-resurrect' # Allows tmux environments to be saved and restored via prefix Ctrl+s and Ctrl+r
|
||||
# I would also like to look into stuff like nvim session restoration: https://github.com/tmux-plugins/tmux-resurrect
|
||||
set -g @plugin 'tmux-plugins/tmux-continuum' # Automatically saves with ^ every 15 minutes, and restores on tmux server start.
|
||||
# Restore tmux environment on server start
|
||||
set -g @continuum-restore 'on'
|
||||
# Note:
|
||||
# > In order to be executed periodically, the plugin updates the status-right tmux variable.
|
||||
# > In case some plugin (usually themes) overwrites the status-right variable, the autosave feature stops working.
|
||||
|
||||
Reference in New Issue
Block a user