mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-01 10:47:24 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c05733b5d | ||
| d4e02bbb89 | |||
| 32dbec6476 | |||
|
|
980fc9aa7d | ||
|
|
a2c3de1b3b |
4
Brewfile
4
Brewfile
@@ -148,6 +148,8 @@ brew "ruby"
|
|||||||
brew "shellcheck"
|
brew "shellcheck"
|
||||||
# Autoformat shell script source code
|
# Autoformat shell script source code
|
||||||
brew "shfmt"
|
brew "shfmt"
|
||||||
|
# Cross-shell prompt for astronauts
|
||||||
|
brew "starship"
|
||||||
# Version control system designed to be a better CVS
|
# Version control system designed to be a better CVS
|
||||||
brew "subversion"
|
brew "subversion"
|
||||||
# Send macOS User Notifications from the command-line
|
# Send macOS User Notifications from the command-line
|
||||||
@@ -250,6 +252,8 @@ cask "qlstephen"
|
|||||||
cask "quicklook-json"
|
cask "quicklook-json"
|
||||||
# QuickLook generator for Adobe Swatch Exchange files
|
# QuickLook generator for Adobe Swatch Exchange files
|
||||||
cask "quicklookase"
|
cask "quicklookase"
|
||||||
|
# Automatically hides or quits apps after periods of inactivity
|
||||||
|
cask "quitter"
|
||||||
# Move and resize windows using keyboard shortcuts or snap areas
|
# Move and resize windows using keyboard shortcuts or snap areas
|
||||||
cask "rectangle"
|
cask "rectangle"
|
||||||
# MySQL/MariaDB database management
|
# MySQL/MariaDB database management
|
||||||
|
|||||||
@@ -48,11 +48,6 @@ require('packer').startup(function(use)
|
|||||||
after = 'nvim-treesitter',
|
after = 'nvim-treesitter',
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Git related plugins
|
|
||||||
use 'tpope/vim-fugitive'
|
|
||||||
use 'tpope/vim-rhubarb'
|
|
||||||
use 'lewis6991/gitsigns.nvim'
|
|
||||||
|
|
||||||
-- Theme based off the Material Pale Night
|
-- Theme based off the Material Pale Night
|
||||||
use 'drewtempelmeyer/palenight.vim'
|
use 'drewtempelmeyer/palenight.vim'
|
||||||
-- Fancier statusline
|
-- Fancier statusline
|
||||||
@@ -342,18 +337,6 @@ require('indent_blankline').setup {
|
|||||||
show_current_context_start = true,
|
show_current_context_start = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Gitsigns
|
|
||||||
-- See `:help gitsigns.txt`
|
|
||||||
require('gitsigns').setup {
|
|
||||||
signs = {
|
|
||||||
add = { text = '+' },
|
|
||||||
change = { text = '~' },
|
|
||||||
delete = { text = '_' },
|
|
||||||
topdelete = { text = '‾' },
|
|
||||||
changedelete = { text = '~' },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- [[ Configure Telescope ]]
|
-- [[ Configure Telescope ]]
|
||||||
-- See `:help telescope` and `:help telescope.setup()`
|
-- See `:help telescope` and `:help telescope.setup()`
|
||||||
require('telescope').setup {
|
require('telescope').setup {
|
||||||
@@ -485,16 +468,6 @@ require('nvim-treesitter.configs').setup {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Load custom treesitter grammar for org filetype
|
|
||||||
require('orgmode').setup_ts_grammar()
|
|
||||||
require('orgmode').setup({
|
|
||||||
org_agenda_files = {
|
|
||||||
vim.fn.expand '~/.local/share/_nvalt/**/*',
|
|
||||||
vim.fn.expand '~/.dotfiles/local/org/**/*'
|
|
||||||
},
|
|
||||||
org_default_notes_file = vim.fn.expand '~/.local/share/_nvalt/refile.org',
|
|
||||||
})
|
|
||||||
|
|
||||||
-- LSP settings.
|
-- LSP settings.
|
||||||
-- This function gets run when an LSP connects to a particular buffer.
|
-- This function gets run when an LSP connects to a particular buffer.
|
||||||
local on_attach = function(_, bufnr)
|
local on_attach = function(_, bufnr)
|
||||||
|
|||||||
@@ -76,36 +76,10 @@ return function(use)
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- nvim orgmode, to get me use nvim even more.
|
|
||||||
use({
|
|
||||||
"nvim-orgmode/orgmode",
|
|
||||||
config = function()
|
|
||||||
require('orgmode').setup_ts_grammar()
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Markdown support
|
-- Markdown support
|
||||||
use 'preservim/vim-markdown'
|
use 'preservim/vim-markdown'
|
||||||
use 'godlygeek/tabular'
|
use 'godlygeek/tabular'
|
||||||
|
|
||||||
-- obsidian plugin for nvim
|
|
||||||
-- https://github.com/epwalsh/obsidian.nvim
|
|
||||||
use({
|
|
||||||
"epwalsh/obsidian.nvim",
|
|
||||||
config = function()
|
|
||||||
require("obsidian").setup({
|
|
||||||
dir = '~/.local/share/_nvalt',
|
|
||||||
notes_subdir = "notes",
|
|
||||||
daily_notes = {
|
|
||||||
folder = "_daily"
|
|
||||||
},
|
|
||||||
completion = {
|
|
||||||
nvim_cmp = true, -- if using nvim-cmp, otherwise set to false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Creates missing folders on save
|
-- Creates missing folders on save
|
||||||
-- https://github.com/jghauser/mkdir.nvim
|
-- https://github.com/jghauser/mkdir.nvim
|
||||||
use { 'jghauser/mkdir.nvim' }
|
use { 'jghauser/mkdir.nvim' }
|
||||||
|
|||||||
9
config/starship.toml
Normal file
9
config/starship.toml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# Get editor completions based on the config schema
|
||||||
|
"$schema" = 'https://starship.rs/config-schema.json'
|
||||||
|
|
||||||
|
# Inserts a blank line between shell prompts
|
||||||
|
add_newline = true
|
||||||
|
|
||||||
|
# Replace the '❯' symbol in the prompt with '➜'
|
||||||
|
[character] # The name of the module we are configuring is 'character'
|
||||||
|
success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'
|
||||||
20
zshrc
20
zshrc
@@ -5,7 +5,7 @@
|
|||||||
autoload -U colors zsh/terminfo
|
autoload -U colors zsh/terminfo
|
||||||
colors
|
colors
|
||||||
|
|
||||||
export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH"
|
export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/sbin:$PATH"
|
||||||
|
|
||||||
if [ command -v brew &> /dev/null ]; then
|
if [ command -v brew &> /dev/null ]; then
|
||||||
BREW_BIN=$(brew --prefix)/bin
|
BREW_BIN=$(brew --prefix)/bin
|
||||||
@@ -65,7 +65,7 @@ ssh-add -A 2>/dev/null;
|
|||||||
if command -v antigen &> /dev/null; then
|
if command -v antigen &> /dev/null; then
|
||||||
antigen use oh-my-zsh
|
antigen use oh-my-zsh
|
||||||
|
|
||||||
antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
|
# antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
|
||||||
|
|
||||||
antigen bundle ssh-agent
|
antigen bundle ssh-agent
|
||||||
antigen bundle colored-man-pages
|
antigen bundle colored-man-pages
|
||||||
@@ -80,8 +80,8 @@ if command -v antigen &> /dev/null; then
|
|||||||
hash php 2>/dev/null && antigen bundle php
|
hash php 2>/dev/null && antigen bundle php
|
||||||
hash nvm 2>/dev/null && antigen bundle nvm
|
hash nvm 2>/dev/null && antigen bundle nvm
|
||||||
hash docker 2>/dev/null && antigen bundle docker
|
hash docker 2>/dev/null && antigen bundle docker
|
||||||
hash ruby 2>/dev/null && antigen bundle ruby
|
# hash ruby 2>/dev/null && antigen bundle ruby
|
||||||
hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
# hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
||||||
hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
|
hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
|
||||||
hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
|
hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
|
||||||
# antigen bundle voronkovich/phpcs.plugin.zsh
|
# antigen bundle voronkovich/phpcs.plugin.zsh
|
||||||
@@ -108,11 +108,13 @@ if hash op 2>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# gcloud is present
|
# gcloud is present
|
||||||
if hash gcloud 2>/dev/null; then
|
#if hash gcloud 2>/dev/null; then
|
||||||
GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
|
# GCLOUD_LOC=$(gcloud info --format="value(installation.sdk_root)" --quiet)
|
||||||
[[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
|
# [[ -f "$GCLOUD_LOC/path.zsh.inc" ]] && builtin source "$GCLOUD_LOC/path.zsh.inc"
|
||||||
[[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
|
# [[ -f "$GCLOUD_LOC/completion.zsh.inc" ]] && builtin source "$GCLOUD_LOC/completion.zsh.inc"
|
||||||
fi
|
#fi
|
||||||
|
|
||||||
|
eval "$(starship init zsh)"
|
||||||
|
|
||||||
# Fig post block. Keep at the bottom of this file.
|
# Fig post block. Keep at the bottom of this file.
|
||||||
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
|
[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
|
||||||
|
|||||||
Reference in New Issue
Block a user