mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-06 14:50:05 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 80b2e542bf | |||
| 9c3ba8f2e8 |
@@ -69,6 +69,7 @@ alias composerUp='composer global update'
|
|||||||
alias npmUp='npm -g up'
|
alias npmUp='npm -g up'
|
||||||
|
|
||||||
alias zedit='$EDITOR ~/.zshrc ~/.alias'
|
alias zedit='$EDITOR ~/.zshrc ~/.alias'
|
||||||
|
alias zdots='$EDITOR ~/.dotfiles'
|
||||||
|
|
||||||
if [[ -f "$HOME/.aliases.local" ]]; then
|
if [[ -f "$HOME/.aliases.local" ]]; then
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
|
|||||||
@@ -57,13 +57,16 @@ require('packer').startup(function(use)
|
|||||||
-- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
|
-- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
|
||||||
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 }
|
use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 }
|
||||||
|
|
||||||
|
-- catppuccin theme
|
||||||
|
use { "catppuccin/nvim", as = "catppuccin" }
|
||||||
|
|
||||||
use {
|
use {
|
||||||
"folke/which-key.nvim",
|
"folke/which-key.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("which-key").setup {
|
require("which-key").setup {
|
||||||
-- your configuration comes here
|
-- your configuration comes here
|
||||||
-- or leave it empty to use the default settings
|
-- or leave it empty to use the default settings
|
||||||
-- refer to the configuration section below
|
-- refer to the configuration section in the docs
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
@@ -128,7 +131,8 @@ vim.wo.signcolumn = 'yes'
|
|||||||
|
|
||||||
-- Set colorscheme
|
-- Set colorscheme
|
||||||
vim.o.termguicolors = true
|
vim.o.termguicolors = true
|
||||||
vim.cmd.colorscheme('palenight')
|
--vim.cmd.colorscheme('palenight')
|
||||||
|
vim.cmd.colorscheme('catppuccin-macchiato')
|
||||||
|
|
||||||
-- Set completeopt to have a better completion experience
|
-- Set completeopt to have a better completion experience
|
||||||
vim.o.completeopt = 'menuone,noselect'
|
vim.o.completeopt = 'menuone,noselect'
|
||||||
@@ -162,7 +166,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
|
|||||||
require('lualine').setup {
|
require('lualine').setup {
|
||||||
options = {
|
options = {
|
||||||
icons_enabled = false,
|
icons_enabled = false,
|
||||||
theme = 'onedark',
|
theme = 'catppuccin-macchiato',
|
||||||
component_separators = '|',
|
component_separators = '|',
|
||||||
section_separators = '',
|
section_separators = '',
|
||||||
},
|
},
|
||||||
@@ -350,7 +354,14 @@ require('mason').setup()
|
|||||||
|
|
||||||
-- Enable the following language servers
|
-- Enable the following language servers
|
||||||
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed
|
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed
|
||||||
local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls' }
|
local servers = {
|
||||||
|
'clangd',
|
||||||
|
'rust_analyzer',
|
||||||
|
'pyright',
|
||||||
|
'tsserver',
|
||||||
|
'sumneko_lua',
|
||||||
|
'gopls'
|
||||||
|
}
|
||||||
|
|
||||||
-- Ensure the servers above are installed
|
-- Ensure the servers above are installed
|
||||||
require('mason-lspconfig').setup {
|
require('mason-lspconfig').setup {
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
Host *
|
|
||||||
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
|
|
||||||
|
|
||||||
Host github.com
|
Host github.com
|
||||||
User git
|
User git
|
||||||
HostName github.com
|
HostName github.com
|
||||||
@@ -14,3 +11,6 @@ Host gitlab.com
|
|||||||
Hostname gitlab.com
|
Hostname gitlab.com
|
||||||
IdentityFile ~/.ssh/id_rsa
|
IdentityFile ~/.ssh/id_rsa
|
||||||
|
|
||||||
|
Host *
|
||||||
|
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
|
||||||
|
|
||||||
|
|||||||
3
zshrc
3
zshrc
@@ -5,7 +5,7 @@
|
|||||||
autoload -U colors zsh/terminfo
|
autoload -U colors zsh/terminfo
|
||||||
colors
|
colors
|
||||||
|
|
||||||
export PATH="/opt/homebrew/bin:/usr/local/sbin:$PATH"
|
export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/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
|
||||||
@@ -77,6 +77,7 @@ 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 nvm 2>/dev/null && antigen bundle Sparragus/zsh-auto-nvm-use
|
hash nvm 2>/dev/null && antigen bundle Sparragus/zsh-auto-nvm-use
|
||||||
hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
|
||||||
|
|||||||
Reference in New Issue
Block a user