diff --git a/.bash_aliases b/.bash_aliases index 50e2b46..965db63 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -15,3 +15,4 @@ alias genpdf="pandoc -o migration.pdf -t ms" CFLAGS="-Wall -Werror -Wextra" alias cc="gcc ${CFLAGS}" alias update_ruby_build="git -C "$(rbenv root)"/plugins/ruby-build pull" +alias irc="ssh kernighan -t tmux attach -t irc" diff --git a/.bashrc b/.bashrc index a134e96..302a05b 100644 --- a/.bashrc +++ b/.bashrc @@ -7,6 +7,8 @@ XDG_STATE_HOME=$HOME/.state LC_ALL="en_GB.UTF-8" +export DIP=false + # Sane defaults for history HISTFILE=$XDG_STATE_HOME/.bash_history HISTSIZE=10000 diff --git a/.config/git/config b/.config/git/config index 04677f6..78eb045 100644 --- a/.config/git/config +++ b/.config/git/config @@ -27,11 +27,11 @@ # Fixup commit with all staged changes fu = "!sh -c '(git diff-files --quiet || (echo Unstaged changes, please commit or stash with --keep-index; exit 1)) && COMMIT=$(git rev-parse $1) && git commit --fixup=$COMMIT && git rebase -i --autosquash $COMMIT~1' -" g = log --all --grep # Search commit messages - hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short + hist = log -p -- last = log -1 HEAD maindiff = "!git log --no-merges develop ^main" noci = -o ci.skip - pf = push --force + pf = push --force-with-lease # Create a merge request, assign it to me pmrup = !git push -u origin $(git symbolic-ref --short HEAD) -o merge_request.create -o merge_request.assign="trevor" -o merge_request.remove_source_branch # Create a merge request, assign it to me, mark it as draft diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 5f25a04..7a79a69 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,4 +1,5 @@ { + "automkdir.nvim": { "branch": "main", "commit": "beeb2dd76f1c3ac776d901c43217a774f1f045de" }, "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, @@ -10,29 +11,26 @@ "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" }, "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" }, "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" }, - "codeium.vim": { "branch": "main", "commit": "fd440cd718742daab162241c5bd5857cd92f5f72" }, + "codeium.vim": { "branch": "main", "commit": "9286586f790f837c4c3032f2124559936e77e6ed" }, "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" }, "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, - "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, - "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" }, - "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, - "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, - "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" }, - "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, - "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, + "nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" }, + "nvim-tree.lua": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" }, + "nvim-treesitter": { "branch": "master", "commit": "1398b1ba4619cef240abd496b500b95819c8c496" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" }, + "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "sttusline": { "branch": "main", "commit": "133bb40d249e0167c89bb352ff8442b821fb07e9" }, "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, - "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, - "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" }, + "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" }, + "vim-rails": { "branch": "master", "commit": "3a155462d1c346e291595400ca238037d02a357f" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" }, "vimwiki": { "branch": "dev", "commit": "fde35bb87e45abe930eebef5ab99a16289e53789" }, diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 5eb8c64..da0db18 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -74,6 +74,3 @@ dap.configurations.ruby = { }, } -require("nvim-lightbulb").setup({ - autocmd = { enabled = true }, -}) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 3fcd80a..3df4f4e 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -82,45 +82,6 @@ require("lazy").setup({ } } }, - { - "sontungexpt/sttusline", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - event = { "BufEnter" }, - config = function(_, opts) - require("sttusline").setup { - statusline_color = "#504945", - - -- | 1 | 2 | 3 - -- recommended: 3 - laststatus = 3, - disabled = { - filetypes = { - "NvimTree", - -- "lazy", - }, - buftypes = { - -- "terminal", - }, - }, - components = { - "mode", - "filename", - "git-branch", - "git-diff", - "%=", - "diagnostics", - "lsps-formatters", - "indent", - "encoding", - "pos-cursor", - "pos-cursor-progress", - }, - } - end, - }, - "kosayoda/nvim-lightbulb", { "folke/trouble.nvim", dependencies = "nvim-tree/nvim-web-devicons", @@ -128,5 +89,6 @@ require("lazy").setup({ require("trouble").setup() end }, + "mateuszwieloch/automkdir.nvim", }) diff --git a/.config/nvim/lua/remap.lua b/.config/nvim/lua/remap.lua index 48569ad..da6b576 100644 --- a/.config/nvim/lua/remap.lua +++ b/.config/nvim/lua/remap.lua @@ -88,4 +88,4 @@ vim.keymap.set('n', 'gm', ':GitMessenger'); -- Nvim-tree vim.keymap.set("n", "nt", vim.cmd.NvimTreeToggle, {}) - +vim.keymap.set("n", "gp", "lua require('goto-preview').goto_preview_definition()", {noremap=true})