.bash_aliases

@@ -15,4 +15,3 @@ 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"

.bashrc

@@ -7,8 +7,6 @@ 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

.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 -p --
+        hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
         last = log -1 HEAD
         maindiff = "!git log --no-merges develop ^main"
         noci = -o ci.skip
-        pf = push --force-with-lease
+        pf = push --force
         # 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

.config/nvim/init.lua

@@ -1,23 +1,8 @@
-require('options')
 require('plugins') -- Install plugins with Lazy
+require('options') -- Basic vim options
+require('appearance') -- Appearance
 require('completion') -- Completion
 require('lsp') -- LSP
 require('remap') -- Keymaps
 require('tree') -- Nvim-tree
 require('treesitter') -- Treesitter
-require('appearance') -- Appearance
-
-require('telescope').setup{
-  defaults = {
-    vimgrep_arguments = {
-      'rg',
-      '--color=never',
-      '--no-heading',
-      '--with-filename',
-      '--line-number',
-      '--column',
-      '--smart-case',
-      '--hidden',
-    }
-  }
-}

.config/nvim/lazy-lock.json

@@ -1,5 +1,4 @@
 {
-  "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" },
@@ -11,26 +10,26 @@
   "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" },
   "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" },
   "cmp_kitty": { "branch": "main", "commit": "a0716db2efb4c452600ef1e4a3ca610889279118" },
-  "codeium.vim": { "branch": "main", "commit": "9286586f790f837c4c3032f2124559936e77e6ed" },
+  "codeium.vim": { "branch": "main", "commit": "fd440cd718742daab162241c5bd5857cd92f5f72" },
+  "feline.nvim": { "branch": "main", "commit": "6cfbe0608d2552a7d947c6f521670b10379fbe42" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
   "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
+  "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" },
-  "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
+  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
   "nvim-html-css": { "branch": "main", "commit": "c072b05c56a40d3ec7874fa487723e6bef5d97f8" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
-  "nvim-tree.lua": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" },
+  "nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "1398b1ba4619cef240abd496b500b95819c8c496" },
+  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
-  "nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" },
+  "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
-  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
-  "vim-fugitive": { "branch": "master", "commit": "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc" },
+  "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
-  "vim-rails": { "branch": "master", "commit": "3a155462d1c346e291595400ca238037d02a357f" },
+  "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" },
   "vimwiki": { "branch": "dev", "commit": "fde35bb87e45abe930eebef5ab99a16289e53789" },

.config/nvim/lua/options.lua

@@ -7,7 +7,6 @@ set.expandtab = true
 set.number = true
 set.relativenumber = true
 set.cursorline = true
-set.termguicolors = true
 
 -- Improve terminal setup
 vim.api.nvim_command("autocmd TermOpen * startinsert")

.config/nvim/lua/plugins.lua

@@ -46,6 +46,7 @@ require("lazy").setup({
   "kdheepak/cmp-latex-symbols",
   "hrsh7th/cmp-emoji",
   "Jezda1337/nvim-html-css",
+
   -- LSP setup
   "neovim/nvim-lspconfig",
   -- Icons for Treesitter/nvim-tree
@@ -71,8 +72,6 @@ require("lazy").setup({
   "Eandrju/cellular-automaton.nvim",
   -- Auto disable search highlight
   "romainl/vim-cool",
-  -- Wiki
-  "vimwiki/vimwiki",
   -- Focus on current buffer
   {
     "folke/zen-mode.nvim",
@@ -81,14 +80,6 @@ require("lazy").setup({
         tmux = { enabled = true },
       }
     }
-  },
+  }
-  {
-    "folke/trouble.nvim",
-    dependencies = "nvim-tree/nvim-web-devicons",
-    config = function()
-      require("trouble").setup()
-    end
-  },
-  "mateuszwieloch/automkdir.nvim",
 })
 

.config/nvim/lua/remap.lua

@@ -88,4 +88,4 @@ vim.keymap.set('n', '<leader>gm', ':GitMessenger<CR>');
 -- Nvim-tree
 vim.keymap.set("n", "<leader>nt", vim.cmd.NvimTreeToggle, {})
 
-vim.keymap.set("n", "<leader>gp", "<cmd>lua require('goto-preview').goto_preview_definition()<CR>", {noremap=true})
+

.tmux.conf

@@ -7,8 +7,8 @@ bind-key C-o last-window
 set-option -g prefix C-o
 unbind-key C-b
 
-set -g default-terminal "tmux-256color"
+set -g default-terminal "tmux"
-set-option -sa terminal-features ',xterm-kitty:RGB'
+set -as terminal-features ",kitty:RGB"
 
 set -g history-limit 10000
 
@@ -16,9 +16,6 @@ set -g history-file ~/.dotfiles/.tmux_history
 
 set -g window-size smallest
 
-set-option -sg escape-time 10
-set-option -sg focus-events on
-
 bind-key j select-pane -D
 bind-key k select-pane -U
 bind-key l select-pane -R