diff options
| -rw-r--r-- | .aliases | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/simenandre/plugins/harpoon.lua | 20 | ||||
| -rw-r--r-- | .config/nvim/lua/simenandre/plugins/plugins.lua | 21 | ||||
| -rw-r--r-- | .config/nvim/lua/simenandre/set.lua | 13 | ||||
| -rwxr-xr-x | .extras | 12 | ||||
| -rw-r--r-- | .zshrc | 1 | ||||
| -rw-r--r-- | Brewfile | 26 |
7 files changed, 68 insertions, 26 deletions
@@ -4,6 +4,7 @@ alias gb='git checkout -b' alias gfr='git fetch upstream && git rebase upstream/main' alias git-undo='git reset --soft HEAD~1' alias git-clean-branches="git for-each-ref --format '%(refname:short)' refs/heads | grep -v 'master\|main' | xargs git branch -D" +alias :q='exit' # Generic / Random / Utility alias rg="rg --hidden --glob '!.git' --glob '!node_modules'" diff --git a/.config/nvim/lua/simenandre/plugins/harpoon.lua b/.config/nvim/lua/simenandre/plugins/harpoon.lua index 3bd4896..ee2dfdb 100644 --- a/.config/nvim/lua/simenandre/plugins/harpoon.lua +++ b/.config/nvim/lua/simenandre/plugins/harpoon.lua @@ -15,23 +15,17 @@ return { harpoon.ui:toggle_quick_menu(harpoon:list()) end) - -- vim.keymap.set("n", "<C-j>", function() - -- harpoon:list():select(1) - -- end) - -- vim.keymap.set("n", "<C-k>", function() - -- harpoon:list():select(2) - -- end) - -- vim.keymap.set("n", "<C-l>", function() - -- harpoon:list():select(3) - -- end) - -- vim.keymap.set("n", "<C-[>", function() - -- harpoon:list():select(4) - -- end) - for _, idx in ipairs({ 1, 2, 3, 4, 5 }) do vim.keymap.set("n", string.format("<leader>%d", idx), function() harpoon:list():select(idx) end) end + + vim.keymap.set("n", "<A-S-P>", function() + harpoon:list():prev() + end) + vim.keymap.set("n", "<A-S-N>", function() + harpoon:list():next() + end) end, } diff --git a/.config/nvim/lua/simenandre/plugins/plugins.lua b/.config/nvim/lua/simenandre/plugins/plugins.lua index 2dfcf73..e502cca 100644 --- a/.config/nvim/lua/simenandre/plugins/plugins.lua +++ b/.config/nvim/lua/simenandre/plugins/plugins.lua @@ -13,6 +13,23 @@ return { }, }, }, + { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" }, + { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" }, + { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" }, + { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" }, + { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" }, + }, + }, { -- Useful plugin to show you pending keybinds. "folke/which-key.nvim", event = "VimEnter", -- Sets the loading event to 'VimEnter' @@ -138,6 +155,10 @@ return { vim.keymap.set("n", "<leader>sn", function() builtin.find_files({ cwd = vim.fn.stdpath("config") }) end, { desc = "[S]earch [N]eovim files" }) + + if vim.fn.argv(0) == "" then + builtin.find_files() + end end, }, diff --git a/.config/nvim/lua/simenandre/set.lua b/.config/nvim/lua/simenandre/set.lua index c1248ee..1bd1b6c 100644 --- a/.config/nvim/lua/simenandre/set.lua +++ b/.config/nvim/lua/simenandre/set.lua @@ -1,4 +1,3 @@ --- Set <space> as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = " " @@ -65,8 +64,20 @@ vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. vim.opt.scrolloff = 10 + +vim.opt.tabstop = 2 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 2 +vim.opt.expandtab = true + +vim.opt.smartindent = true + +vim.opt.colorcolumn = "80" +vim.opt.wrap = false + -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` +-- -- Highlight when yanking (copying) text -- Try it with `yap` in normal mode @@ -1,14 +1,20 @@ NOTES_DIR=$HOME/ghq/github.com/simenandre/notes/ function note() { if [ $1 ]; then - echo $1 >> $NOTES_DIR/$(date +%Y-%m-%d).md + FILE=$NOTES_DIR/$(date +%Y-%m-%d).md + + if [ $2 ]; then + FILE=$2 + fi + + echo $1 >> $FILE fi } function nt() { if [ $1 ]; then CONTENT="- [ ] $1" - note $CONTENT + note $CONTENT $2 fi } @@ -18,3 +24,5 @@ function getBjerkIssues() { --json title,body,url,createdAt,assignees,number,labels,comments \ --jq 'map({url, createdAt, title, labels: [.labels[].name], assignees: [.assignees[].login], body, number: "#\(.number)", comments: .comments | map({ body: .body, createdAt: .createdAt })})' } + + @@ -16,3 +16,4 @@ fi . "$HOME/.cargo/env" +autoload -U compinit; compinit @@ -29,7 +29,6 @@ brew "zstd" brew "libffi" # more recent versions of some macOS tools. -brew "vim" brew "grep" brew "openssh" brew "screen" @@ -41,6 +40,8 @@ tap "homebrew/cask-drivers" brew "sfnt2woff" brew "sfnt2woff-zopfli" brew "woff2" +cask "font-symbols-only-nerd-font" +cask "font-jetbrains-mono" # Programming languages brew "golang" @@ -73,6 +74,7 @@ brew "whalebrew" brew "gh" brew "microplane" brew "jq" +brew "fzf" brew "rclone" brew "asciinema" brew "goreleaser" @@ -81,10 +83,14 @@ brew "git-secret" brew "tmate" brew "doctl" brew "act" -cask "hammerspoon" cask "karabiner-elements" brew "dasel" -brew "tmux" +brew "tldr" +brew "pkl" +brew "lazygit" +brew "yq" +tap "danielgtaylor/restish" +brew "restish" # Javascript Runtimes and tools tap "oven-sh/bun" @@ -94,7 +100,7 @@ brew "volta" brew "corepack" brew "deno" -# IaC +# IaC / Cloud tap "pulumi/tap" brew "pulumi" brew "crd2pulumi" @@ -104,8 +110,10 @@ brew "tf2pulumi" brew "esc" brew "helm" brew "cilium-cli" +brew "azure-cli" # Container-related tools +cask "docker" brew "podman" brew "podman-compose" cask "podman-desktop" @@ -114,8 +122,6 @@ cask "podman-desktop" tap "go-task/tap" brew "go-task" -brew "neovim" - # Google stuff cask "google-chrome" cask "google-drive-file-stream" @@ -133,12 +139,12 @@ cask "zoom" # Actively used applications cask "visual-studio-code" cask "spotify" -cask "memory" +brew "neovim" cask "slack" cask "sonos" +brew "tmux" cask "figma" cask "discord" -cask "warp" cask "grammarly" cask "microsoft-remote-desktop" cask "postico" @@ -146,9 +152,9 @@ cask "cyberduck" cask "adobe-creative-cloud" cask "1password" cask "openvpn-connect" -cask "devtoys" cask "raycast" - +cask "wezterm" +cask "rectangle" # Obsidian stuff cask "obsidian" |