comparing 125885e3c4f566b13e685ee5b32f8da8e57c8c7f and main on banana.tngl.sh/dotfiles

+12

.config/mimeapps.list

···

       1
       1
       +
       [Added Associations]

     

       2
       2
       +
       application/x-keepass2=keepassxc.desktop;

     

       3
       3
       +
       image/jpeg=okularApplication_kimgio.desktop;

     

       4
       4
       +
       image/png=okularApplication_kimgio.desktop;

     

       5
       5
       +
       x-scheme-handler/tonsite=org.telegram.desktop.desktop;

     

       6
       6
       +
       

     

       7
       7
       +
       [Default Applications]

     

       8
       8
       +
       application/x-keepass2=keepassxc.desktop;

     

       9
       9
       +
       image/jpeg=okularApplication_kimgio.desktop

     

       10
       10
       +
       image/png=okularApplication_kimgio.desktop

     

       11
       11
       +
       x-scheme-handler/tonsite=org.telegram.desktop.desktop

     

       12
       12
       +
       inode/directory=org.kde.dolphin.desktop

+17 -18

.config/niri/config.kdl

···

       34
       34
        
           mouse {

     

       35
       35
        
               // off

     

       36
       36
        
               // natural-scroll

     

       37
       37
       -
               // accel-speed 0.2

     

       38
       38
       -
               // accel-profile "flat"

     

       37
       37
       +
               accel-speed -0.65

     

       38
       38
       +
               accel-profile "flat"

     

       39
       39
        
               // scroll-method "no-scroll"

     

       40
       40
        
           }

     

       41
       41
        
       

     
···

       121
       121
        
           // off

     

       122
       122
        
       }

     

       123
       123
        
       

     

       124
       124
       -
       

     

       125
       124
        
       // https://yalter.github.io/niri/Configuration:-Window-Rules

     

       126
       125
        
       window-rule {

     

       127
       127
       -
          match app-id=r#"^org\.wezfurlong\.wezterm$"#

     

       128
       128
       -
           default-column-width {}

     

       126
       126
       +
           match app-id=r#"firefox$"# title="^Picture-in-Picture$"

     

       127
       127
       +
           open-floating true

     

       129
       128
        
       }

     

       130
       130
       -
       

     

       131
       129
        
       window-rule {

     

       132
       132
       -
          match app-id=r#"firefox$"# title="^Picture-in-Picture$"

     

       133
       133
       -
           open-floating true

     

       130
       130
       +
           match app-id=r#"firefox$"#

     

       131
       131
       +
           open-maximized true

     

       134
       132
        
       }

     

       135
       135
       -
       

     

       136
       136
       -
       

     

       137
       137
       -
       // Example: block out two password managers from screen capture.

     

       138
       138
       -
       // (This example rule is commented out with a "/-" in front.)

     

       139
       139
       -
       /-window-rule {

     

       133
       133
       +
       window-rule {

     

       134
       134
       +
           match app-id=r#"discord$"#

     

       135
       135
       +
           open-maximized true

     

       136
       136
       +
           block-out-from "screen-capture"

     

       137
       137
       +
       }

     

       138
       138
       +
       window-rule {

     

       139
       139
       +
           match app-id=r#"jetbrains-idea$"#

     

       140
       140
       +
           open-maximized true

     

       141
       141
       +
       }

     

       142
       142
       +
       window-rule {

     

       140
       143
        
           match app-id=r#"^org\.keepassxc\.KeePassXC$"#

     

       141
       141
       -
           match app-id=r#"^org\.gnome\.World\.Secrets$"#

     

       142
       142
       -
       

     

       143
       144
        
           block-out-from "screen-capture"

     

       144
       144
       -
       

     

       145
       145
       -
           // Use this instead if you want them visible on third-party screenshot tools.

     

       146
       146
       -
           // block-out-from "screencast"

     

       147
       145
        
       }

     

       148
       146
        
       

     

       149
       147
        
       window-rule {

     
···

       287
       285
        
       

     

       288
       286
        
           Mod+W { toggle-column-tabbed-display; }

     

       289
       287
        
       

     

       288
       288
       +
           Mod+P {screenshot;}

     

       290
       289
        
           Print { screenshot; }

     

       291
       290
        
           Ctrl+Print { screenshot-screen; }

     

       292
       291
        
           Alt+Print { screenshot-window; }

-46

.config/nvim/lazy-lock.json

···

       1
       1
       -
       {

     

       2
       2
       -
         "CopilotChat.nvim": { "branch": "main", "commit": "16d897fd43d07e3b54478ccdb2f8a16e4df4f45a" },

     

       3
       3
       -
         "LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" },

     

       4
       4
       -
         "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },

     

       5
       5
       -
         "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },

     

       6
       6
       -
         "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" },

     

       7
       7
       -
         "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },

     

       8
       8
       -
         "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },

     

       9
       9
       -
         "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },

     

       10
       10
       -
         "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },

     

       11
       11
       -
         "copilot.lua": { "branch": "master", "commit": "96e1bb1963f351700bf6737ef3695e8a0b90b12a" },

     

       12
       12
       -
         "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },

     

       13
       13
       -
         "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },

     

       14
       14
       -
         "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },

     

       15
       15
       -
         "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },

     

       16
       16
       -
         "live-server.nvim": { "branch": "main", "commit": "e8a34bc37fc565c678addbb352a59aa6c1842c2b" },

     

       17
       17
       -
         "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },

     

       18
       18
       -
         "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },

     

       19
       19
       -
         "mason-lspconfig.nvim": { "branch": "main", "commit": "cab00668464d2914d0752b86168b4a431cc93eb2" },

     

       20
       20
       -
         "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },

     

       21
       21
       -
         "mdx.nvim": { "branch": "main", "commit": "464a74be368dce212cff02f6305845dc7f209ab3" },

     

       22
       22
       -
         "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },

     

       23
       23
       -
         "noice.nvim": { "branch": "main", "commit": "203f74adaae11d47440a667555b4af9156be807b" },

     

       24
       24
       -
         "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },

     

       25
       25
       -
         "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },

     

       26
       26
       -
         "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },

     

       27
       27
       -
         "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" },

     

       28
       28
       -
         "nvim-lspconfig": { "branch": "master", "commit": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0" },

     

       29
       29
       -
         "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },

     

       30
       30
       -
         "nvim-treesitter": { "branch": "master", "commit": "13c7caf8a602488b37cdefe8543c4cfdd5947d9d" },

     

       31
       31
       -
         "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },

     

       32
       32
       -
         "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },

     

       33
       33
       -
         "oil.nvim": { "branch": "master", "commit": "8ea40b5506115b6d355e304dd9ee5089f7d78601" },

     

       34
       34
       -
         "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },

     

       35
       35
       -
         "pretty_hover": { "branch": "master", "commit": "be693c8f32e1b096765bfe4db2ca341cc2f409d4" },

     

       36
       36
       -
         "render-markdown.nvim": { "branch": "main", "commit": "bff12b4655d1537cf0f10859fcd63ef2cec65010" },

     

       37
       37
       -
         "smear-cursor.nvim": { "branch": "main", "commit": "b9377c0508712c113d73d4ea94190a49b47ac18d" },

     

       38
       38
       -
         "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },

     

       39
       39
       -
         "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },

     

       40
       40
       -
         "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "b6ed8038dfd256eb963a2c79cb30f0f4683551a0" },

     

       41
       41
       -
         "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },

     

       42
       42
       -
         "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },

     

       43
       43
       -
         "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },

     

       44
       44
       -
         "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" },

     

       45
       45
       -
         "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }

     

       46
       46
       -
       }

+8 -2

.config/nvim/lua/plugins/lspconfig.lua

···

       35
       35
        
               config = function()

     

       36
       36
        
                   local capabilities = require("cmp_nvim_lsp").default_capabilities()

     

       37
       37
        
                   local lspconfig = require("lspconfig")

     

       38
       38
       -
                   local opts = { capabilities = capabilities }

     

       38
       38
       +
                   local opts = { 

     

       39
       39
       +
                       capabilities = capabilities

     

       40
       40
       +
                   }

     

       39
       41
        
                   lspconfig.lua_ls.setup(opts)

     

       40
       42
        
                   lspconfig.rust_analyzer.setup(opts)

     

       41
       41
       -
                   lspconfig.html.setup(opts)

     

       43
       43
       +
                   lspconfig.html.setup({

     

       44
       44
       +
                       capabilities = capabilities,

     

       45
       45
       +
                       filetypes = { "html", "templ"}

     

       46
       46
       +
                   })

     

       42
       47
        
                   lspconfig.astro.setup(opts)

     

       43
       48
        
                   lspconfig.cssls.setup(opts)

     

       44
       49
        
                   lspconfig.tailwindcss.setup({

     

       45
       50
        
                       capabilities = capabilities,

     

       51
       51
       +
                       filetypes = { "templ", "astro", "javascript", "typescript", "react" },

     

       46
       52
        
                       settings = {

     

       47
       53
        
                           tailwindCSS = {

     

       48
       54
        
                               experimental = {

.config/nvim/lua/plugins/treesitter.lua

···

       34
       34
        
               "davidmh/mdx.nvim",

     

       35
       35
        
               config = true,

     

       36
       36
        
           },

     

       37
       37
       +
           {

     

       38
       38
       +
               "joerdav/templ.vim"

     

       39
       39
       +
           }

     

       37
       40
        
       }

-36

.config/nvim/lua/plugins/vibe-coding.lua

···

       1
       1
       -
       return {

     

       2
       2
       -
           {

     

       3
       3
       -
               "zbirenbaum/copilot.lua", -- not actually the offical copilot plugin by ms

     

       4
       4
       -
               config = function()

     

       5
       5
       -
                   require("copilot").setup({

     

       6
       6
       -
                       suggestion = { enabled = false },

     

       7
       7
       -
                       panel = { enabled = false },

     

       8
       8
       -
                   })

     

       9
       9
       -
               end,

     

       10
       10
       -
           },

     

       11
       11
       -
           {

     

       12
       12
       -
               {

     

       13
       13
       -
                   "CopilotC-Nvim/CopilotChat.nvim",

     

       14
       14
       -
                   dependencies = {

     

       15
       15
       -
                       { "nvim-lua/plenary.nvim", branch = "master" },

     

       16
       16
       -
                   },

     

       17
       17
       -
                   opts = {

     

       18
       18
       -
                       -- See Configuration section for options

     

       19
       19
       -
                   },

     

       20
       20
       -
                   keys = {

     

       21
       21
       -
                       { "<leader>ai", ":CopilotChat<CR>", mode = "n", desc = "Chat with Copilot [A][I]" },

     

       22
       22
       -
                       { "<leader>am", ":CopilotChatModels<CR>", mode = "n", desc = "Pick Copilot [A]i [M]odel to use" },

     

       23
       23
       -
                       { "<leader>ae", ":CopilotChatExplain<CR>", mode = "v", desc = "Ask Copilot [A]i to [E]xplain code" },

     

       24
       24
       -
                       { "<leader>af", ":CopilotChatReview<CR>", mode = "v", desc = "Ask Copilot [A]i to [R]eview the code" },

     

       25
       25
       -
                       { "<leader>ao", ":CopilotChatOptimise<CR>", mode = "v", desc = "Ask Copilot [A]i to [O]timise code" },

     

       26
       26
       -
                       { "<leader>af", ":CopilotChatFix<CR>", mode = "v", desc = "Ask Copilot [A]i to [F]ix any errors" },

     

       27
       27
       -
                   },

     

       28
       28
       -
               },

     

       29
       29
       -
           },

     

       30
       30
       -
           {

     

       31
       31
       -
               "zbirenbaum/copilot-cmp",

     

       32
       32
       -
               config = function()

     

       33
       33
       -
                   require("copilot_cmp").setup()

     

       34
       34
       -
               end,

     

       35
       35
       -
           },

     

       36
       36
       -
       }

+6 -1

.zshrc

···

       23
       23
        
       path ~/.scripts

     

       24
       24
        
       path ~/bin

     

       25
       25
        
       path ~/.local/bin

     

       26
       26
       +
       path ~/.cargo/bin

     

       27
       27
       +
       path ~/go/bin

     

       28
       28
       +
       path /snap/bin

     

       26
       29
        
       path /usr/local/bin

     

       27
       30
        
       path /usr/local/go/bin

     

       28
       28
       -
       path ~/.cargo/bin

     

       29
       31
        
       path $BUN_INSTALL/bin

     

       30
       32
        
       

     

       31
       33
        
       alias dotfiles="cd ~/.dotfiles"

     
···

       47
       49
        
       alias gu="git pull --rebase"

     

       48
       50
        
       alias cls="clear"

     

       49
       51
        
       

     

       52
       52
       +
       export NVM_DIR="$HOME/.nvm"

     

       53
       53
       +
       [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  

     

       54
       54
       +
       [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"

     

       50
       55
        
       [ -s "/home/$HOME/.bun/_bun" ] && source "/home/$HOME/.bun/_bun"

     

       51
       56
        
       

     

       52
       57
        
       eval "$(starship init zsh)"

Compare changes