Compare commits

..

5 commits

15 changed files with 221 additions and 178 deletions

View file

@ -16,6 +16,7 @@ style = "Light"
opacity = 0.95
option_as_alt = "Both"
dynamic_padding = true
decorations= "Buttonless"
[window.padding]
x = 2

View file

@ -11,6 +11,7 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"copilot.lua": { "branch": "master", "commit": "858bbfa6fa81c88fb1f64107d7981f1658619e0a" },
"distant.nvim": { "branch": "v0.3", "commit": "998724f62386c8022a4e6c885f4509cf9477451a" },
"dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" },
"fidget.nvim": { "branch": "main", "commit": "a4a7edfea37e557dbff5509ee374ffb57051bba9" },
"friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
@ -22,6 +23,7 @@
"mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9e82ded0515186edd4f69e4ce6b1a5f1b55b47e9" },
"mason.nvim": { "branch": "main", "commit": "a09da6ac634926a299dd439da08bdb547a8ca011" },
"neovim": { "branch": "main", "commit": "c6d53a99d4c5c50fd10d5091208491b25130486b" },
"nerdy.nvim": { "branch": "main", "commit": "548437ebcea9106156e7ea3a5612ee6444a1aba4" },
"none-ls.nvim": { "branch": "main", "commit": "e7382de51b4cf629e56f1fa18192e716e5ba8145" },
"nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
@ -36,14 +38,17 @@
"nvim-treesitter-context": { "branch": "master", "commit": "652ec514d6ba8bc4a3c2de76c855fe668e2c7196" },
"nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" },
"oil.nvim": { "branch": "master", "commit": "523b61430cb7365f8f86609c2ea60e48456bac63" },
"orgmode": { "branch": "master", "commit": "ab045e3084d5987e8939d25d69b09baaf762278c" },
"plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
"themery.nvim": { "branch": "main", "commit": "1005a58801276d29c4b1e11244cf7631250f9143" },
"tla.nvim": { "branch": "master", "commit": "e419c75e805ab6d9967c7325bf35734c372d3d4b" },
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
"typst.vim": { "branch": "main", "commit": "308e7737d09de8c1100320ddc6bc270615ae791a" },
"undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
"vim-alloy": { "branch": "master", "commit": "5bd57c4890be39e221dd3e1f6735457dce454bbd" },
"vim-jukit": { "branch": "master", "commit": "73214c9a8abc4b6aa7a6266b5bc2ddbf8b3e3c00" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vimtex": { "branch": "master", "commit": "6179414f2eb3db977a513b7b19c23e7e62a0f388" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },

View file

@ -31,6 +31,7 @@ information = { "underline" },
},
},
})
vim.opt.background = "light"
vim.cmd("colorscheme catppuccin-latte")

View file

@ -12,6 +12,9 @@ vim.opt.smartindent = true
--Move lines
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
--Change word definition
vim.opt.iskeyword:append("-")
vim.opt.iskeyword:append("_")
--Remove Wrap
vim.opt.wrap = false
--Not let cursor go bellow 10 chars.
@ -35,6 +38,6 @@ vim.g.jukit_convert_overwrite_default = 1
vim.g.jukit_convert_open_default = 0
vim.g.jukit_shell_cmd = 'ipython3'
vim.g.jukit_terminal = 'nvimterm'
vim.g.jukit_inline_plotting=1
vim.g.jukit_show_prompt = 1
vim.g.jukit_pdf_viewer = 'zathura'
vim.g.jukit_mappings = 1

View file

@ -0,0 +1,26 @@
-- Create new code cell below. Argument: Whether to create code cell (0) or markdown cell (1)
vim.api.nvim_set_keymap('n', '<leader>jco', ':call jukit#cells#create_below(0)<CR>', { noremap = true, silent = true})
-- Create new code cell above. Argument: Whether to create code cell (0) or markdown cell (1)
vim.api.nvim_set_keymap('n', '<leader>jcO', ':call jukit#cells#create_above(0)<CR>', { noremap = true, silent = true})
-- Create new text (markdown) cell below. Argument: Whether to create code cell (0) or markdown cell (1)
vim.api.nvim_set_keymap('n', '<leader>jct', ':call jukit#cells#create_below(1)<CR>', { noremap = true, silent = true })
-- Create new text (markdown) cell above. Argument: Whether to create code cell (0) or markdown cell (1)
vim.api.nvim_set_keymap('n', '<leader>jcT', ':call jukit#cells#create_above(1)<CR>', { noremap = true, silent = true })
-- Deletes the current cell
vim.api.nvim_set_keymap('n', '<leader>jcd', ':call jukit#cells#delete()<CR>', { noremap = true, silent = true })
-- Send current section (argument: 0 indicates the current section)
vim.api.nvim_set_keymap('n', '<leader>jcc', ':call jukit#send#section(0)<CR>', { noremap = true, silent = true })
-- Send all sections up to the current section
vim.api.nvim_set_keymap('n', '<leader>jcac', ':call jukit#send#until_current_section()<CR>', { noremap = true, silent = true })
-- Send all sections
vim.api.nvim_set_keymap('n', '<leader>jca', ':call jukit#send#all()<CR>', { noremap = true, silent = true })
-- Open an output split
vim.api.nvim_set_keymap('n', '<leader>jos', ':call jukit#splits#output()<CR>', { noremap = true, silent = true })

View file

@ -17,8 +17,63 @@ lazy.setup({
lazy = false,
priority = 1000,
},
{ "ellisonleao/gruvbox.nvim", priority = 1000 },
'rose-pine/neovim',
-------------------------------------------------------MFP---------------------------------
{
'susliko/tla.nvim',
config = function()
require("tla").setup()
end
},
-------------------------------------------------------QOL---------------------------------
{
'chipsenkbeil/distant.nvim',
branch = 'v0.3',
config = function()
require('distant'):setup({
servers = {
['10.8.0.9'] = {
launch = {
default = {
username = 'afonso',
args = '--port 8080 --shutdown lonely=1'
}
}
},
}
})
end
},
--Python notebooks
{
'luk400/vim-jukit',
config = function()
require 'plugins.jukit'
end
},
--org mode
{
'nvim-orgmode/orgmode',
dependencies = {
{ 'nvim-treesitter/nvim-treesitter', lazy = true },
},
event = 'VeryLazy',
config = function()
-- Load treesitter grammar for org
require('orgmode').setup_ts_grammar()
-- Setup orgmode
require('orgmode').setup({
org_agenda_files = '~/orgfiles/**/*',
org_default_notes_file = '~/orgfiles/refile.org',
})
end,
},
{
"zbirenbaum/copilot.lua",
cmd = "Copilot",

View file

@ -48,6 +48,7 @@ require("themery").setup({
},
},
})
vim.opt.background = "dark"
]]
},
{
@ -85,8 +86,39 @@ require("themery").setup({
},
},
})
vim.opt.background = "light"
]]
},
{
name = "Rosé Pine",
colorscheme = "rose-pine",
before = [[
require('rose-pine').setup({
variant = "main"
})
vim.opt.background = "dark"
]]
},
{
name = "Rosé Pine Moon",
colorscheme = "rose-pine",
before = [[
require('rose-pine').setup({
variant = "moon"
})
vim.opt.background = "dark"
]]
},
{
name = "Rosé Pine Dawn",
colorscheme = "rose-pine",
before = [[
require('rose-pine').setup({
variant = "dawn"
})
vim.opt.background = "light"
]]
},
},
themeConfigFile = "~/.config/nvim/lua/core/theme.lua", -- Described below
livePreview = true, -- Apply theme while browsing. Default to true.

View file

@ -1,19 +1,23 @@
local present, treesitter = pcall(require, "nvim-treesitter.configs")
require('nvim-treesitter.install').update({ with_sync = true })
if not present then
return
end
require('nvim-treesitter.install').update({ with_sync = true })
local present, orgmode = pcall(require, "orgmode")
if present then
require('orgmode').setup_ts_grammar()
end
local options = {
ensure_installed = { "c", "lua", "haskell", "rust", "markdown", "org"},
ensure_installed = { "c", "lua", "haskell", "rust", "markdown", "org" },
highlight = {
enable = true,
use_languagetree = true,
additional_vim_regex_highlighting = {"org"},
additional_vim_regex_highlighting = { "org" },
},
indent = {
enable = true,

31
.config/skhd/skhdrc Normal file
View file

@ -0,0 +1,31 @@
# Terminal and Applications
cmd - t : open -na alacritty
cmd - b : open -a Firefox
# System Controls
cmd - return : yabai -m window --swap west
cmd - q : yabai -m window --close
cmd - u : yabai --load-sa && yabai --restart # Assuming you have scripting additions installed
# Window Management
cmd - h : yabai -m window --resize left:20:0
cmd - l : yabai -m window --resize right:20:0
cmd - j : yabai -m window --focus prev || yabai -m window --focus last
cmd - k : yabai -m window --focus next || yabai -m window --focus first
# Focus workspaces 1 through 6
cmd - 1 : yabai -m space --focus 1
cmd - 2 : yabai -m space --focus 2
cmd - 3 : yabai -m space --focus 3
cmd - 4 : yabai -m space --focus 4
cmd - 5 : yabai -m space --focus 5
cmd - 6 : yabai -m space --focus 6
# Move focused window to workspaces 1 through 6 and focus that space
cmd + shift - 1 : yabai -m window --space 1
cmd + shift - 2 : yabai -m window --space 2
cmd + shift - 3 : yabai -m window --space 3
cmd + shift - 4 : yabai -m window --space 4
cmd + shift - 5 : yabai -m window --space 5
cmd + shift - 6 : yabai -m window --space 6

26
.config/yabai/yabairc Executable file
View file

@ -0,0 +1,26 @@
yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
sudo yabai --load-sa
yabai -m config layout bsp
#yabai -m config debug_output on
# General settings
yabai -m config focus_follows_mouse autofocus
yabai -m config window_placement first_child
yabai -m config window_placement second_child
yabai -m rule --add app="^Firefox$" space=2
# Add more rules based on your applications and workspace preferences
#Indicator
yabai -m signal --add event=mission_control_exit action='echo "refresh" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=display_added action='echo "refresh" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=display_removed action='echo "refresh" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_created action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_destroyed action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_focused action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_moved action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_resized action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_minimized action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'
yabai -m signal --add event=window_deminimized action='echo "refresh windows" | nc -U /tmp/yabai-indicator.socket'

View file

@ -1,164 +0,0 @@
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"
# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
ZSH_THEME="robbyrussell"
# Set list of themes to pick from when loading at random
# Setting this variable when ZSH_THEME=random will cause zsh to load
# a theme from this variable instead of looking in $ZSH/themes/
# If set to an empty array, this variable will have no effect.
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion.
# Case-sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment one of the following lines to change the auto-update behavior
# zstyle ':omz:update' mode disabled # disable automatic updates
# zstyle ':omz:update' mode auto # update automatically without asking
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
# Uncomment the following line to change how often to auto-update (in days).
# zstyle ':omz:update' frequency 13
# Uncomment the following line if pasting URLs and other text is messed up.
# DISABLE_MAGIC_FUNCTIONS="true"
# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true"
# Uncomment the following line to display red dots whilst waiting for completion.
# You can also set it to another string to have that shown instead of the default red dots.
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
# COMPLETION_WAITING_DOTS="true"
# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
# much, much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output.
# You can set one of the optional three formats:
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
# or set a custom format using the strftime function format specifications,
# see 'man strftime' for details.
# HIST_STAMPS="mm/dd/yyyy"
# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder
# Which plugins would you like to load?
# Standard plugins can be found in $ZSH/plugins/
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
#THEME
source $HOME/.config/zsh/themes/catppuccin_frappe-zsh-syntax-highlighting.zsh
plugins=(git macos command-not-found web-search zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting)
source $ZSH/oh-my-zsh.sh
# User configuration
# export MANPATH="/usr/local/man:$MANPATH"
# You may need to manually set your language environment
# export LANG=en_US.UTF-8
# Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim'
# else
# export EDITOR='mvim'
# fi
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
#MY CONFIG HERE
#
HISTSIZE=10000000
SAVEHIST=10000000
setopt BANG_HIST # Treat the '!' character specially during expansion.
setopt EXTENDED_HISTORY # Write the history file in the ":start:elapsed;command" format.
setopt INC_APPEND_HISTORY # Write to the history file immediately, not when the shell exits.
setopt SHARE_HISTORY # Share history between all sessions.
setopt HIST_EXPIRE_DUPS_FIRST # Expire duplicate entries first when trimming history.
setopt HIST_IGNORE_DUPS # Don't record an entry that was just recorded again.
setopt HIST_IGNORE_ALL_DUPS # Delete old recorded entry if new entry is a duplicate.
setopt HIST_FIND_NO_DUPS # Do not display a line previously found.
setopt HIST_IGNORE_SPACE # Don't record an entry starting with a space.
setopt HIST_SAVE_NO_DUPS # Don't write duplicate entries in the history file.
setopt HIST_REDUCE_BLANKS # Remove superfluous blanks before recording entry.
setopt HIST_VERIFY
export EDITOR=nvim
export READER=mupdf
# Add paths
export PATH="/opt/homebrew/bin:$PATH"
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
export PATH="$HOME/.bun/bin:$PATH"
export PATH="$HOME/go/bin:$PATH"
export PATH="$HOME/.local/share/nvim/mason/bin:$PATH"
export PATH="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.ghcup/bin:$PATH"
export PATH="/usr/bin/vendor_perl:$PATH"
if [ "$(arch)" = "arm64" ]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
else
eval "$(/usr/local/bin/brew shellenv)"
fi
# Source custom functions
source $HOME/.config/zsh/dotfiles.zsh
source $HOME/.config/zsh/pacman.zsh
source $HOME/.config/zsh/qol.zsh
source $HOME/.config/zsh/replacements.zsh
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# bun
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
# opam configuration
source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
# Starship initialization
eval "$(starship init zsh)"
# Additional Zsh-specific configurations can go here

View file

@ -5,4 +5,3 @@ config() {
}
alias lc="lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/"

View file

@ -7,10 +7,8 @@ setopt INC_APPEND_HISTORY # Write to the history file immediately, not wh
setopt SHARE_HISTORY # Share history between all sessions.
setopt HIST_EXPIRE_DUPS_FIRST # Expire duplicate entries first when trimming history.
setopt HIST_IGNORE_DUPS # Don't record an entry that was just recorded again.
setopt HIST_IGNORE_ALL_DUPS # Delete old recorded entry if new entry is a duplicate.
setopt HIST_FIND_NO_DUPS # Do not display a line previously found.
setopt HIST_IGNORE_SPACE # Don't record an entry starting with a space.
setopt HIST_SAVE_NO_DUPS # Don't write duplicate entries in the history file.
setopt HIST_REDUCE_BLANKS # Remove superfluous blanks before recording entry.
setopt HIST_VERIFY
@ -28,6 +26,13 @@ export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.ghcup/bin:$PATH"
export PATH="/usr/bin/vendor_perl:$PATH"
export PATH="/Applications/usdpython/usdpython/USD:$PATH"
export PATH="/Applications/usdpython/usdzconvert:$PATH"
export PATH="/Users/afonso/Library/Python/3.11/bin:$PATH"
[ -f "/Users/afonso/.ghcup/env" ] && source "/Users/afonso/.ghcup/env" # ghcup-env
export PYTHONPATH="/Applications/usdpython/USD/lib/python:$PYTHONPATH"
export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
if [ "$(arch)" = "arm64" ]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
@ -40,6 +45,7 @@ fi
# bun
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
enable-fzf-tab
# opam configuration
source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true

View file

@ -1,2 +1,3 @@
ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd history completion)
ZSH_TMUX_AUTOSTART=true
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'

View file

@ -1,7 +1,3 @@
IdentityFile ~/.ssh/id_ed25519_sk
IdentityFile ~/.ssh/id_ed25519_sk_secondary
IdentityFile ~/.ssh/id_rsa
Host gon
ControlMaster auto
HostName git.olympuslab.net
@ -9,6 +5,18 @@ Host gon
Port 522
ControlPath ~/.ssh/session.%r@%h:%p
ControlPersist 5m
IdentityFile ~/.ssh/id_ed25519_sk
IdentityFile ~/.ssh/id_ed25519_sk_secondary
Host gh
ControlMaster auto
HostName github.com
User git
Port 22
ControlPath ~/.ssh/session.%r@%h:%p
ControlPersist 5m
IdentityFile ~/.ssh/id_ed25519_sk
IdentityFile ~/.ssh/id_ed25519_sk_secondary
Host Search
ControlMaster auto
@ -18,3 +26,12 @@ Host Search
IdentityFile ~/.ssh/id_search
ControlPath ~/.ssh/session.%r@%h:%p
ControlPersist 5m
Host Fixo
ControlMaster auto
HostName 10.8.0.9
User afonso
Port 22
IdentityFile ~/.ssh/id_rsa
ControlPath ~/.ssh/session.%r@%h:%p
ControlPersist 5m