From a6f8e2f261330e2d83b1a3ededbe3dd65aecd735 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 2 Aug 2025 18:15:00 +0200 Subject: [PATCH] feat: update a bunch of stuff Signed-off-by: kjuulh --- .../private_clank-raw-front.prod.yaml | 19 -- .../private_clank.prod.yaml | 23 +- dot_config/gitnow/gitnow.toml | 2 +- dot_config/helix/config.toml | 9 + dot_config/helix/languages.toml | 32 +++ dot_config/nvim/LICENSE | 201 ------------- dot_config/nvim/README.md | 3 - dot_config/nvim/dot_gitignore | 8 - dot_config/nvim/dot_luarc.json | 77 ----- dot_config/nvim/dot_neoconf.json | 15 - dot_config/nvim/init.lua | 2 - dot_config/nvim/lazyvim.json | 9 - dot_config/nvim/lua/config/autocmds.lua | 3 - dot_config/nvim/lua/config/keymaps.lua | 12 - dot_config/nvim/lua/config/lazy.lua | 52 ---- dot_config/nvim/lua/config/options.lua | 5 - dot_config/nvim/lua/plugins/catppuccin.lua | 11 - dot_config/nvim/lua/plugins/copilot-cmp.lua | 6 - dot_config/nvim/lua/plugins/copilot.lua | 19 -- dot_config/nvim/lua/plugins/core.lua | 6 - dot_config/nvim/lua/plugins/crates.lua | 8 - dot_config/nvim/lua/plugins/example.lua | 267 ------------------ dot_config/nvim/lua/plugins/go.lua | 14 - dot_config/nvim/lua/plugins/lspconfig.lua | 122 -------- dot_config/nvim/lua/plugins/neoconf.lua | 3 - dot_config/nvim/lua/plugins/neorg.lua | 4 - dot_config/nvim/lua/plugins/noice.lua | 18 -- dot_config/nvim/lua/plugins/nvim-cmp.lua | 12 - dot_config/nvim/lua/plugins/nvim-dap.lua | 11 - dot_config/nvim/lua/plugins/ranger.lua | 9 - dot_config/nvim/lua/plugins/rust-tools.lua | 40 --- .../nvim/lua/plugins/sourcegraph-copilot.lua | 13 - dot_config/nvim/lua/plugins/tmux.lua | 6 - dot_config/nvim/lua/plugins/toggleterm.lua | 26 -- dot_config/nvim/lua/plugins/treesitter.lua | 35 --- .../nvim/lua/plugins/vim-wordmotion.lua | 3 - dot_config/nvim/lua/plugins/zen-mode.lua | 13 - dot_config/nvim/neoconf.json | 1 - dot_config/nvim/queries/hurl/highlights.scm | 33 --- dot_config/nvim/queries/hurl/injections.scm | 3 - dot_config/nvim/stylua.toml | 3 - dot_config/sway/config.d/input | 8 +- dot_config/zellij/config.kdl.tmpl | 24 +- dot_gitconfig.tmpl | 11 +- dot_gitconfig_front.tmpl | 6 +- dot_gitconfig_lw.tmpl | 8 - dot_zshrc.tmpl | 88 +----- .../private_executable_config.tmpl | 22 +- 48 files changed, 102 insertions(+), 1223 deletions(-) delete mode 100644 dot_config/clank-kubernetes-configs/private_clank-raw-front.prod.yaml delete mode 100644 dot_config/nvim/LICENSE delete mode 100644 dot_config/nvim/README.md delete mode 100644 dot_config/nvim/dot_gitignore delete mode 100644 dot_config/nvim/dot_luarc.json delete mode 100644 dot_config/nvim/dot_neoconf.json delete mode 100644 dot_config/nvim/init.lua delete mode 100644 dot_config/nvim/lazyvim.json delete mode 100644 dot_config/nvim/lua/config/autocmds.lua delete mode 100644 dot_config/nvim/lua/config/keymaps.lua delete mode 100644 dot_config/nvim/lua/config/lazy.lua delete mode 100644 dot_config/nvim/lua/config/options.lua delete mode 100644 dot_config/nvim/lua/plugins/catppuccin.lua delete mode 100644 dot_config/nvim/lua/plugins/copilot-cmp.lua delete mode 100644 dot_config/nvim/lua/plugins/copilot.lua delete mode 100644 dot_config/nvim/lua/plugins/core.lua delete mode 100644 dot_config/nvim/lua/plugins/crates.lua delete mode 100644 dot_config/nvim/lua/plugins/example.lua delete mode 100644 dot_config/nvim/lua/plugins/go.lua delete mode 100644 dot_config/nvim/lua/plugins/lspconfig.lua delete mode 100644 dot_config/nvim/lua/plugins/neoconf.lua delete mode 100644 dot_config/nvim/lua/plugins/neorg.lua delete mode 100644 dot_config/nvim/lua/plugins/noice.lua delete mode 100644 dot_config/nvim/lua/plugins/nvim-cmp.lua delete mode 100644 dot_config/nvim/lua/plugins/nvim-dap.lua delete mode 100644 dot_config/nvim/lua/plugins/ranger.lua delete mode 100644 dot_config/nvim/lua/plugins/rust-tools.lua delete mode 100644 dot_config/nvim/lua/plugins/sourcegraph-copilot.lua delete mode 100644 dot_config/nvim/lua/plugins/tmux.lua delete mode 100644 dot_config/nvim/lua/plugins/toggleterm.lua delete mode 100644 dot_config/nvim/lua/plugins/treesitter.lua delete mode 100644 dot_config/nvim/lua/plugins/vim-wordmotion.lua delete mode 100644 dot_config/nvim/lua/plugins/zen-mode.lua delete mode 100644 dot_config/nvim/neoconf.json delete mode 100644 dot_config/nvim/queries/hurl/highlights.scm delete mode 100644 dot_config/nvim/queries/hurl/injections.scm delete mode 100644 dot_config/nvim/stylua.toml delete mode 100644 dot_gitconfig_lw.tmpl diff --git a/dot_config/clank-kubernetes-configs/private_clank-raw-front.prod.yaml b/dot_config/clank-kubernetes-configs/private_clank-raw-front.prod.yaml deleted file mode 100644 index 8e3e2fa..0000000 --- a/dot_config/clank-kubernetes-configs/private_clank-raw-front.prod.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTURZek5UWTVNVGN3SGhjTk1qUXdNVEkzTVRJd01UVTNXaGNOTXpRd01USTBNVEl3TVRVMwpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTURZek5UWTVNVGN3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSQllLTkVHcW15NkdQUUVnbE1Cd29LSXNuVjJvSmZ1bmluTVpNOTJsbksKdXI1WTdtN094RHpTbmxFam5aZGJqRHZuWXIzZVJzNDdUVHlkYXJhYmhnd0ZvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWszdlJYRDlualgyRDB1RDVyV2E2CmFiQ1o1QTh3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnR29zVjR4MG90VnZraW4zNE94bWF0K1plTGc4NG11amsKR0ZtdFl0cWcrNlVDSVFEOG90RERoY29pMHVJVnorMys3QWphY1M5bDRJWTF0dGxKckIwVjdUSmJYUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - server: https://10.0.9.14:6443 - name: default -contexts: -- context: - cluster: default - user: default - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: default - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJRENYcG5rVW4vNnd3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekEyTXpVMk9URTNNQjRYRFRJME1ERXlOekV5TURFMU4xb1hEVEkxTURFeQpOakV5TVRZMU9Gb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJNOERUWWV2TXhvclhCaDIKYjU5ZHRLeHpKY0xILy9ERUNRbEJaWGdENEh2dXk2YWdReDZHWDVhdUZJN3V0M3R4S2FQLzA3SGdnVjJpVlhOLwo2WkE1UTlpalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCU1FuUFVubnlJclczU2tvME4wVFZnTmZLTzFSekFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQXhLbjd0NGI3TzV6OEVVRm0rbGhMSVVaMnlIVTRVVUwxTGljQ2gzWDJ2aUFDSVFDaEpqTnRMTkd5NGVUQwpaeTVLT1lWMWRZYldWaFN5Q2phTHNtR3hidFpRNHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZHpDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFM01EWXpOVFk1TVRjd0hoY05NalF3TVRJM01USXdNVFUzV2hjTk16UXdNVEkwTVRJd01UVTMKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFM01EWXpOVFk1TVRjd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUmpNR1FtRDhYVHZnSkxtMVAwS3RYUXc2MytVaGhVUjJPczhBbmtnSGt4ClgrWi9nSEdFYzFCbDJQUDBSa1JNT3pVZUFPQml4SjRwTHZiQ3l0Z3ZaNXdlbzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVrSnoxSjU4aUsxdDBwS05EZEUxWQpEWHlqdFVjd0NnWUlLb1pJemowRUF3SURTQUF3UlFJZ1RsN1JTWkx5dGlUSUVqUFV4UTBvdGswbUU1WHNrcmk1CngwZGk2eVAzUmdvQ0lRQ09zd1JodE5kNEh4cWZ3eFpnTTRyTEFMTnF3K1JVeXBQbDRhUFlTb1VVcHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU9MS0tYeFFNUzA3Ykc0V1h2dUdjOHV2YXUvV1UvdDU3NUljRk1NTlpPK1pvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFendOTmg2OHpHaXRjR0hadm4xMjBySE1sd3NmLzhNUUpDVUZsZUFQZ2UrN0xwcUJESG9aZgpscTRVanU2M2UzRXBvLy9Uc2VDQlhhSlZjMy9wa0RsRDJBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= diff --git a/dot_config/clank-kubernetes-configs/private_clank.prod.yaml b/dot_config/clank-kubernetes-configs/private_clank.prod.yaml index e04c163..b317a9b 100644 --- a/dot_config/clank-kubernetes-configs/private_clank.prod.yaml +++ b/dot_config/clank-kubernetes-configs/private_clank.prod.yaml @@ -1,3 +1,22 @@ +# apiVersion: v1 +# clusters: +# - cluster: +# certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTURrME1URTFPVFF3SGhjTk1qUXdNekF5TWpBek16RTBXaGNOTXpRd01qSTRNakF6TXpFMApXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTURrME1URTFPVFF3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSalZNMWEwUTJJeVBtdXAzZFlUZDNGTDhYY2hndFdrUVJONE92dU9VMXkKOVBDMVNDMHMrOEkwRTlCTFFjTXo3TktOUnA5aGM1YStWeE9rbDRqZkIwUUFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXNobTB4c0cxa1RVblU5cklyNEZHCjNPSjRsWjh3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQVBZRWFIeDU4dUhEalhNUldwMFlRWTJtR0xjaFdBeXkKRnZTdG1meWFrZVBwQWlBcEdrc25kUDJOOERuMUgzY3RPZFlYV1dFRyticjAvOVd3UG5zWUdCN3dEdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K +# server: https://10.0.10.6:6443 +# name: default +# contexts: +# - context: +# cluster: default +# user: default +# name: default +# current-context: default +# kind: Config +# preferences: {} +# users: +# - name: default +# user: +# client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJV2VnbElqemU4cll3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekE1TkRFeE5UazBNQjRYRFRJME1ETXdNakl3TXpNeE5Gb1hEVEkxTURNdwpNakl3TXpNeE5Gb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJEOThFRXVIR2tidGNtanUKS2F0RnZPaEtCUUw4OGFVUkd5TTZvUU0xRFpNM0pGSWtxZ01COUZFVGcvSjg5SmJicU9TM1N2eHF4VXcvNjM2YwpCblJPeE5PalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJvRnd3ZVRNN25FY2tHSDM5NWZZQkwrNHNRREFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQXBxMTl5NTJRbURXdU03RzMxcG9LMXZpYW0zenBkOFp5Wlg5NWhBUU1mOUlDSVFDR2FWQ1c5NkhiVGxqZQpORlBLZ3JRNk1EWlhhdkYrcEhxMmhBaHVzaENwMUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZURDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFM01EazBNVEUxT1RRd0hoY05NalF3TXpBeU1qQXpNekUwV2hjTk16UXdNakk0TWpBek16RTAKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFM01EazBNVEUxT1RRd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUUcrZi80M0Irb3JteisxZlo3d1JDYmdTbGM1dUJGZXdzNytUd3Q2eVptCm8wbCswU2owWVlxeGIzV0NUbTZIajV0ejVwTHBjRGd2QVowZG53b1VkRzJ2bzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVUwYUJjTUhrek81eEhKQmg5L2VYMgpBUy91TEVBd0NnWUlLb1pJemowRUF3SURTUUF3UmdJaEFQS1cvQWdWb1RXMUJTYStweFhYMTVpd080VXg2RnFjCmVPREY2RC9SaW1paUFpRUFsRGZTYUxsQUFjRVpnTlkwZlFLSGJuQVJSdXZqSEdKemhDdkIwRURyRXFjPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== +# client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU05SldRYTg3QkVveVUvTUxUZnNOaEJvVTlQSy9PWWlucW9vaG1KT21wdXFvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFUDN3UVM0Y2FSdTF5YU80cHEwVzg2RW9GQXZ6eHBSRWJJenFoQXpVTmt6Y2tVaVNxQXdIMApVUk9EOG56MGx0dW81TGRLL0dyRlREL3JmcHdHZEU3RTB3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= apiVersion: v1 clusters: - cluster: @@ -15,5 +34,5 @@ preferences: {} users: - name: default user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJV2VnbElqemU4cll3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekE1TkRFeE5UazBNQjRYRFRJME1ETXdNakl3TXpNeE5Gb1hEVEkxTURNdwpNakl3TXpNeE5Gb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJEOThFRXVIR2tidGNtanUKS2F0RnZPaEtCUUw4OGFVUkd5TTZvUU0xRFpNM0pGSWtxZ01COUZFVGcvSjg5SmJicU9TM1N2eHF4VXcvNjM2YwpCblJPeE5PalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJvRnd3ZVRNN25FY2tHSDM5NWZZQkwrNHNRREFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQXBxMTl5NTJRbURXdU03RzMxcG9LMXZpYW0zenBkOFp5Wlg5NWhBUU1mOUlDSVFDR2FWQ1c5NkhiVGxqZQpORlBLZ3JRNk1EWlhhdkYrcEhxMmhBaHVzaENwMUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZURDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFM01EazBNVEUxT1RRd0hoY05NalF3TXpBeU1qQXpNekUwV2hjTk16UXdNakk0TWpBek16RTAKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFM01EazBNVEUxT1RRd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUUcrZi80M0Irb3JteisxZlo3d1JDYmdTbGM1dUJGZXdzNytUd3Q2eVptCm8wbCswU2owWVlxeGIzV0NUbTZIajV0ejVwTHBjRGd2QVowZG53b1VkRzJ2bzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVUwYUJjTUhrek81eEhKQmg5L2VYMgpBUy91TEVBd0NnWUlLb1pJemowRUF3SURTUUF3UmdJaEFQS1cvQWdWb1RXMUJTYStweFhYMTVpd080VXg2RnFjCmVPREY2RC9SaW1paUFpRUFsRGZTYUxsQUFjRVpnTlkwZlFLSGJuQVJSdXZqSEdKemhDdkIwRURyRXFjPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU05SldRYTg3QkVveVUvTUxUZnNOaEJvVTlQSy9PWWlucW9vaG1KT21wdXFvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFUDN3UVM0Y2FSdTF5YU80cHEwVzg2RW9GQXZ6eHBSRWJJenFoQXpVTmt6Y2tVaVNxQXdIMApVUk9EOG56MGx0dW81TGRLL0dyRlREL3JmcHdHZEU3RTB3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrakNDQVRlZ0F3SUJBZ0lJSVdITTFQVzNudmN3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekE1TkRFeE5UazBNQjRYRFRJME1ETXdNakl3TXpNeE5Gb1hEVEkyTURZeQpOakEzTVRreU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGN3Z1RHFIdjljNmdOU2EKaEZJTjRJOHFKUGp0STRwRWpNZjcvUDh0bFdvaGE0Nm80VFozSVJoVWVKWVQrQjg2aHZ0RitCQ3A4cXNXOElxMworeFdNS3AyalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJvRnd3ZVRNN25FY2tHSDM5NWZZQkwrNHNRREFLQmdncWhrak9QUVFEQWdOSkFEQkcKQWlFQWpZQXZ5d01ETTNtTkpiZXVDckRPbHpSdC9NamU5cGI3cko3V3g0TG5YM3dDSVFEaE1PWmRuSk9TMVhJZAprMXEvTVUwb2tPSHNxdkxLbUdwa1BSNFNNVFZaUkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlCZURDQ0FSMmdBd0lCQWdJQkFEQUtCZ2dxaGtqT1BRUURBakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwClpXNTBMV05oUURFM01EazBNVEUxT1RRd0hoY05NalF3TXpBeU1qQXpNekUwV2hjTk16UXdNakk0TWpBek16RTAKV2pBak1TRXdId1lEVlFRRERCaHJNM010WTJ4cFpXNTBMV05oUURFM01EazBNVEUxT1RRd1dUQVRCZ2NxaGtqTwpQUUlCQmdncWhrak9QUU1CQndOQ0FBUUcrZi80M0Irb3JteisxZlo3d1JDYmdTbGM1dUJGZXdzNytUd3Q2eVptCm8wbCswU2owWVlxeGIzV0NUbTZIajV0ejVwTHBjRGd2QVowZG53b1VkRzJ2bzBJd1FEQU9CZ05WSFE4QkFmOEUKQkFNQ0FxUXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QWRCZ05WSFE0RUZnUVUwYUJjTUhrek81eEhKQmg5L2VYMgpBUy91TEVBd0NnWUlLb1pJemowRUF3SURTUUF3UmdJaEFQS1cvQWdWb1RXMUJTYStweFhYMTVpd080VXg2RnFjCmVPREY2RC9SaW1paUFpRUFsRGZTYUxsQUFjRVpnTlkwZlFLSGJuQVJSdXZqSEdKemhDdkIwRURyRXFjPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUgyYUlHUkVXVVdaK0ZaZTl5a290VGdNeGF5OTRnQngweC9uYjVjdHkvc05vQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFWHUrNE9vZS8xenFBMUpxRVVnM2dqeW9rK08wamlrU014L3Y4L3kyVmFpRnJqcWpoTm5jaApHRlI0bGhQNEh6cUcrMFg0RUtueXF4YndpcmY3Rll3cW5RPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= diff --git a/dot_config/gitnow/gitnow.toml b/dot_config/gitnow/gitnow.toml index f1e2d35..dedf875 100644 --- a/dot_config/gitnow/gitnow.toml +++ b/dot_config/gitnow/gitnow.toml @@ -7,7 +7,7 @@ post_clone_command = ["jj git init --colocate"] # duration = true [[providers.gitea]] -url = "https://git.front.kjuulh.io/api/v1" +url = "https://git.kjuulh.io/api/v1" access_token = { env = "GITEA_ACCESS_TOKEN" } current_user = "kjuulh" diff --git a/dot_config/helix/config.toml b/dot_config/helix/config.toml index ca10b58..b71a749 100644 --- a/dot_config/helix/config.toml +++ b/dot_config/helix/config.toml @@ -4,7 +4,16 @@ theme = "dracula_transparent" line-number = "relative" mouse = false true-color = true +end-of-line-diagnostics = "hint" +[editor.inline-diagnostics] +cursor-line = "warning" # show warnings and errors on the cursorline inline [editor.file-picker] hidden = false + +[keys.normal."space".v] +"c" = ":pipe-to voidpin remote copy" + +[keys.select."space".v] +"c" = ":pipe-to voidpin remote copy" diff --git a/dot_config/helix/languages.toml b/dot_config/helix/languages.toml index 1e996ad..ffbaaad 100644 --- a/dot_config/helix/languages.toml +++ b/dot_config/helix/languages.toml @@ -81,3 +81,35 @@ comment-token = "//" block-comment-tokens = { start = "/*", end = "*/" } language-servers = ["gopls"] indent = { tab-width = 2, unit = " " } + +[language-server.buf] +command = "buf" +args = ["beta", "lsp", "--timeout", "0"] + +[[language]] +name = "protobuf" +scope = "source.proto" +injection-regex = "proto" +file-types = ["proto"] +language-servers = ["buf"] +comment-token = "//" +block-comment-tokens = { start = "/*", end = "*/" } +indent = { tab-width = 2, unit = " " } +grammar = "proto" + +[[grammar]] +name = "proto" +source = { git = "https://github.com/sdoerner/tree-sitter-proto", rev = "778ab6ed18a7fcf82c83805a87d63376c51e80bc" } + +[[language]] +name = "noil" +scope = "source.noil" +injection-regex = "noil" +file-types = ["noil"] +auto-format = true +indent = { tab-width = 3, unit = " " } +formatter = { command = "noil", args = ["fmt"] } + +[[grammar]] +name = "noil" +source = { git = "https://git.front.kjuulh.io/kjuulh/tree-sitter-noil.git", rev = "2f295629439881d0b9e89108a1296881d0daf7b9" } diff --git a/dot_config/nvim/LICENSE b/dot_config/nvim/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/dot_config/nvim/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/dot_config/nvim/README.md b/dot_config/nvim/README.md deleted file mode 100644 index 23bcba3..0000000 --- a/dot_config/nvim/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Kjuulh Lazy git fork - - diff --git a/dot_config/nvim/dot_gitignore b/dot_config/nvim/dot_gitignore deleted file mode 100644 index cc5457a..0000000 --- a/dot_config/nvim/dot_gitignore +++ /dev/null @@ -1,8 +0,0 @@ -tt.* -.tests -doc/tags -debug -.repro -foo.* -*.log -data diff --git a/dot_config/nvim/dot_luarc.json b/dot_config/nvim/dot_luarc.json deleted file mode 100644 index 3462799..0000000 --- a/dot_config/nvim/dot_luarc.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "workspace.library": [ - "/Users/kah/.local/share/nvim/lazy/neodev.nvim/types/stable", - "/opt/homebrew/Cellar/neovim/0.9.5/share/nvim/runtime/lua", - "/Users/kah/.local/share/nvim/lazy/neo-tree.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/indent-blankline.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/cmp_luasnip/lua", - "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/ranger.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/mini.pairs/lua", - "/Users/kah/.local/share/nvim/lazy/mini.surround/lua", - "/Users/kah/.local/share/nvim/lazy/telescope-fzf-native.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/conform.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nui.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-ts-context-commentstring/lua", - "/Users/kah/.local/share/nvim/lazy/mini.comment/lua", - "/Users/kah/.local/share/nvim/lazy/gitsigns.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/mini.ai/lua", - "/Users/kah/.local/share/nvim/lazy/mason.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/vim-illuminate/lua", - "/Users/kah/.local/share/nvim/lazy/crates.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/mini.hipatterns/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-ts-autotag/lua", - "/Users/kah/.local/share/nvim/lazy/dashboard-nvim/lua", - "/Users/kah/.local/share/nvim/lazy/trouble.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/todo-comments.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/lazy.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/project.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/noice.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/which-key.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/sg.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-treesitter-textobjects/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-lspconfig/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-treesitter-context/lua", - "/Users/kah/.local/share/nvim/lazy/telescope.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/catppuccin/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-dap/lua", - "/Users/kah/.local/share/nvim/lazy/tokyonight.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/LazyVim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-dap-ui/lua", - "/Users/kah/.local/share/nvim/lazy/vim-startuptime/lua", - "/Users/kah/.local/share/nvim/lazy/tmux.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-dap-virtual-text/lua", - "/Users/kah/.local/share/nvim/lazy/zen-mode.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/toggleterm.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/rust-tools.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/plenary.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/neorg/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-spectre/lua", - "/Users/kah/.local/share/nvim/lazy/cmp-nvim-lsp/lua", - "/Users/kah/.local/share/nvim/lazy/mason-nvim-dap.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-lint/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-cmp/lua", - "/Users/kah/.local/share/nvim/lazy/persistence.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-notify/lua", - "/Users/kah/.local/share/nvim/lazy/cmp-buffer/lua", - "/Users/kah/.local/share/nvim/lazy/mason-lspconfig.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/flash.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/mini.indentscope/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-treesitter/lua", - "/Users/kah/.local/share/nvim/lazy/mini.bufremove/lua", - "/Users/kah/.local/share/nvim/lazy/cmp-path/lua", - "/Users/kah/.local/share/nvim/lazy/dressing.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/neodev.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/bufferline.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/nvim-web-devicons/lua", - "/Users/kah/.local/share/nvim/lazy/copilot-cmp/lua", - "/Users/kah/.local/share/nvim/lazy/go.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/lualine.nvim/lua", - "/Users/kah/.local/share/nvim/lazy/LuaSnip/lua", - "/Users/kah/.local/share/nvim/lazy/guihua.lua/lua", - "/Users/kah/.config/nvim/lua", - "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/types", - "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/types/lua", - "${3rd}/luv/library" - ] -} \ No newline at end of file diff --git a/dot_config/nvim/dot_neoconf.json b/dot_config/nvim/dot_neoconf.json deleted file mode 100644 index aa1b504..0000000 --- a/dot_config/nvim/dot_neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "sumneko_lua": { - "enabled": true - } - } - } -} diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua deleted file mode 100644 index 2514f9e..0000000 --- a/dot_config/nvim/init.lua +++ /dev/null @@ -1,2 +0,0 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json deleted file mode 100644 index 7fd2a72..0000000 --- a/dot_config/nvim/lazyvim.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extras": [ - - ], - "news": { - "NEWS.md": "7429" - }, - "version": 7 -} \ No newline at end of file diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua deleted file mode 100644 index 27e9e06..0000000 --- a/dot_config/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- Add any additional autocmds here diff --git a/dot_config/nvim/lua/config/keymaps.lua b/dot_config/nvim/lua/config/keymaps.lua deleted file mode 100644 index ea64e5a..0000000 --- a/dot_config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,12 +0,0 @@ --- Keymaps are automatically loaded on the VeryLazy event --- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua --- Add any additional keymaps here --- - -function _G.set_terminal_keymaps() - local opts = { buffer = 0 } - vim.keymap.set("t", "", [[]], opts) -end - --- if you only want these mappings for toggle term use term://*toggleterm#* instead -vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua deleted file mode 100644 index 09b3399..0000000 --- a/dot_config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,52 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", - lazypath }) -end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - --{ import = "lazyvim.plugins.extras.editor.flash" }, - --{ import = "lazyvim.plugins.extras.ui.mini-animate" }, - { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, - { import = "lazyvim.plugins.extras.util.project" }, - { import = "lazyvim.plugins.extras.dap.core" }, - - -- import any extras modules here - -- { import = "lazyvim.plugins.extras.lang.typescript" }, - -- { import = "lazyvim.plugins.extras.lang.json" }, - -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, - -- import/override with your plugins - { import = "plugins" }, - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false, -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver - }, - checker = { enabled = true }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", - -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/dot_config/nvim/lua/config/options.lua b/dot_config/nvim/lua/config/options.lua deleted file mode 100644 index 1978905..0000000 --- a/dot_config/nvim/lua/config/options.lua +++ /dev/null @@ -1,5 +0,0 @@ --- Options are automatically loaded before lazy.nvim startup --- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua --- Add any additional options here -vim.o.termguicolors = true ---vim.cmd'colorscheme yourfavcolorscheme' diff --git a/dot_config/nvim/lua/plugins/catppuccin.lua b/dot_config/nvim/lua/plugins/catppuccin.lua deleted file mode 100644 index 3f4a305..0000000 --- a/dot_config/nvim/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - "catppuccin/nvim", - lazy = true, - name = "catppuccin", - config = function() - require("catppuccin").setup({ - --flavour = "espresso" - --flavour = "macchiato" - }) - end -} diff --git a/dot_config/nvim/lua/plugins/copilot-cmp.lua b/dot_config/nvim/lua/plugins/copilot-cmp.lua deleted file mode 100644 index c15b743..0000000 --- a/dot_config/nvim/lua/plugins/copilot-cmp.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "zbirenbaum/copilot-cmp", - config = function() - require("copilot_cmp").setup() - end -} diff --git a/dot_config/nvim/lua/plugins/copilot.lua b/dot_config/nvim/lua/plugins/copilot.lua deleted file mode 100644 index df60110..0000000 --- a/dot_config/nvim/lua/plugins/copilot.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - "zbirenbaum/copilot.lua", - enabled = true, - cmd = "Copilot", - event = "InsertEnter", - config = function() - require("copilot").setup({ - suggestion = { enabled = true }, - panel = { enabled = true, auto_refresh = true }, - - --suggestion = { - -- auto_trigger = true, - -- keymap = { - -- accept = "", - -- } - --} - }) - end, -} diff --git a/dot_config/nvim/lua/plugins/core.lua b/dot_config/nvim/lua/plugins/core.lua deleted file mode 100644 index afcd204..0000000 --- a/dot_config/nvim/lua/plugins/core.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "LazyVim/LazyVim", - opts = { - colorscheme = "catppuccin" - } -} diff --git a/dot_config/nvim/lua/plugins/crates.lua b/dot_config/nvim/lua/plugins/crates.lua deleted file mode 100644 index 38d5ef2..0000000 --- a/dot_config/nvim/lua/plugins/crates.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - 'saecki/crates.nvim', - tag = 'v0.3.0', - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - require('crates').setup() - end, -} diff --git a/dot_config/nvim/lua/plugins/example.lua b/dot_config/nvim/lua/plugins/example.lua deleted file mode 100644 index bd8995a..0000000 --- a/dot_config/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,267 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under config.plugins will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - config = true, - }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } })) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "help", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore ans setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, - - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- they way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/go.lua b/dot_config/nvim/lua/plugins/go.lua deleted file mode 100644 index 5189f2d..0000000 --- a/dot_config/nvim/lua/plugins/go.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "ray-x/go.nvim", - dependencies = { -- optional packages - "ray-x/guihua.lua", - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - }, - config = function() - require("go").setup() - end, - event = { "CmdlineEnter" }, - ft = { "go", "gomod" }, - build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries -} diff --git a/dot_config/nvim/lua/plugins/lspconfig.lua b/dot_config/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 708da69..0000000 --- a/dot_config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,122 +0,0 @@ -return { - "neovim/nvim-lspconfig", - opts = { - ---@type lspconfig.options - servers = { - tailwindcss = { - filetypes = { - "css", - "scss", - "sass", - "html", - "javascriptreact", - "typescriptreact", - "rust", - "svelte", - }, - init_options = { - userLanguages = { - rust = "html" - } - }, - settings = { - includeLanguages = { - rust = "html", - } - }, - tailwindcss = { - experimental = { - classRegex = { - [[class= "([^"]*)]], - [[class: "([^"]*)]], - '~H""".*class="([^"]*)".*"""', - '~F""".*class="([^"]*)".*"""', - }, - }, - validate = true - } - }, - jsonls = { - on_new_config = function(new_config) - new_config.settings.json.schemas = new_config.settings.json.schemas or { - } - vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas()) - end, - settings = { - json = { - validate = { enable = true }, - schemas = { - { - description = "shuttle go plan", - fileMatch = { - "shuttle.yaml" - }, - name = "shuttle.yaml", - url = "file:///Users/kah/git/github.com/lunarway/lw-shuttle-go-plan/.schemastore/schema.json" - } - } - } - } - }, - yamlls = { - on_new_config = function(new_config) - new_config.settings.json.schemas = new_config.settings.json.schemas or { - } - vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas()) - end, - settings = { - yaml = { - validate = true, - schemas = { - ["file:///Users/kah/git/github.com/lunarway/lw-shuttle-go-plan/.schemastore/schema.json"] = "shuttle.yaml" - --{ - -- description = "shuttle go plan", - -- fileMatch = { - -- "shuttle.yaml" - -- }, - -- name = "shuttle.yaml", - -- url = - --} - } - } - } - }, - pylsp = { - settings = { - pylsp = { - plugins = { - autopep8 = { - enabled = false - }, - yapf = { - enabled = false - }, - pylint = { - enabled = true - }, - flake8 = { - enabled = true - }, - ["pylsp-mypy"] = { - enabled = true, - livemode = true - }, - ["pylsp-rope"] = { - enabled = true - }, - ["pyls-isort"] = { - enabled = true - }, - ["python-lsp-black"] = { - enabled = true - }, - ["pyls-memestra"] = { - enabled = true - }, - } - } - } - } - } - } -} diff --git a/dot_config/nvim/lua/plugins/neoconf.lua b/dot_config/nvim/lua/plugins/neoconf.lua deleted file mode 100644 index ff113b7..0000000 --- a/dot_config/nvim/lua/plugins/neoconf.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "folke/neoconf.nvim", -} diff --git a/dot_config/nvim/lua/plugins/neorg.lua b/dot_config/nvim/lua/plugins/neorg.lua deleted file mode 100644 index df94118..0000000 --- a/dot_config/nvim/lua/plugins/neorg.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "nvim-neorg/neorg", - ft = "norg" -} diff --git a/dot_config/nvim/lua/plugins/noice.lua b/dot_config/nvim/lua/plugins/noice.lua deleted file mode 100644 index ff65b25..0000000 --- a/dot_config/nvim/lua/plugins/noice.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - "folke/noice.nvim", - event = "VeryLazy", - opts = { - routes = { - { - filter = { - event = "msg_show", - kind = "", - --find = "written" - }, - opts = { - skip = true - } - } - } - } -} diff --git a/dot_config/nvim/lua/plugins/nvim-cmp.lua b/dot_config/nvim/lua/plugins/nvim-cmp.lua deleted file mode 100644 index 822049a..0000000 --- a/dot_config/nvim/lua/plugins/nvim-cmp.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - opts = function(_, opts) - local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { - { name = "copilot", group_index = 2 }, - { name = "cody", group_index = 2 }, - })) - - return opts - end, -} diff --git a/dot_config/nvim/lua/plugins/nvim-dap.lua b/dot_config/nvim/lua/plugins/nvim-dap.lua deleted file mode 100644 index ae4527c..0000000 --- a/dot_config/nvim/lua/plugins/nvim-dap.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - --{ - -- "mfussenegger/nvim-dap" - --}, - --{ - -- "rcarriga/nvim-dap-ui" - --}, - --{ - -- "theHamsta/nvim-dap-virtual-text" - --} -} diff --git a/dot_config/nvim/lua/plugins/ranger.lua b/dot_config/nvim/lua/plugins/ranger.lua deleted file mode 100644 index 199eb5f..0000000 --- a/dot_config/nvim/lua/plugins/ranger.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "kjuulh/ranger.nvim", - config = function() - require("ranger").setup() - end, - keys = { - { ".", "Ranger", "Opens the ranger file manager" }, - }, -} diff --git a/dot_config/nvim/lua/plugins/rust-tools.lua b/dot_config/nvim/lua/plugins/rust-tools.lua deleted file mode 100644 index 388aa7d..0000000 --- a/dot_config/nvim/lua/plugins/rust-tools.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - "simrat39/rust-tools.nvim", - config = function() - local rt = require("rust-tools") - - rt.setup({ - server = { - on_attach = function(_, bufnr) - -- Hover actions - vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) - -- Code action groups - vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) - end, - settings = { - ["rust-analyzer"] = { - imports = { - granularity = { - group = "module", - }, - prefix = "self", - }, - cargo = { - allFeatures = true, - buildScripts = { - enable = true, - }, - procMacro = { - enable = true, - } - }, - checkOnSave = { - allFeatures = true, - enable = true - } - }, - }, - }, - }) - end, -} diff --git a/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua b/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua deleted file mode 100644 index fb798fa..0000000 --- a/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "sourcegraph/sg.nvim", - enabled = false, - dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" }, - - -- If you have a recent version of lazy.nvim, you don't need to add this! - -- build = "nvim -l build/init.lua", - config = function() - require("sg").setup({}) - end, - }, -} diff --git a/dot_config/nvim/lua/plugins/tmux.lua b/dot_config/nvim/lua/plugins/tmux.lua deleted file mode 100644 index f8df942..0000000 --- a/dot_config/nvim/lua/plugins/tmux.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "aserowy/tmux.nvim", - config = function() - require("tmux").setup() - end -} diff --git a/dot_config/nvim/lua/plugins/toggleterm.lua b/dot_config/nvim/lua/plugins/toggleterm.lua deleted file mode 100644 index 4db7dfe..0000000 --- a/dot_config/nvim/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - "akinsho/toggleterm.nvim", - config = function() - require("toggleterm").setup({ - shading_factor = 2, - open_mapping = [[]], - insert_mapping = true, - terminal_mapping = true, - direction = "float", - float_opts = { - border = "curved", - highlights = { - border = "Normal", - background = "Normal", - }, - }, - }) - end, - keys = { - { - "t", - "ToggleTerm", - desc = "Open a terminal", - }, - }, -} diff --git a/dot_config/nvim/lua/plugins/treesitter.lua b/dot_config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 5548685..0000000 --- a/dot_config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,35 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - opts = function(_, _) - local parser_config = require "nvim-treesitter.parsers".get_parser_configs() - - - -- https://github.com/nvim-treesitter/nvim-treesitter/tree/master#adding-parsers - parser_config.hurl = { - install_info = { - url = "~/git/github.com/kjuulh/tree-sitter-hurl", - files = { "src/parser.c" }, - branch = "main", - generate_requires_npm = false, - requires_generate_from_grammar = false, - }, - filetype = "hurl", - } - - - vim.treesitter.language.register('xml', 'html') - vim.filetype.add({ - extension = { - xml = "html" - } - }) - - -- https://neovim.io/doc/user/lua.html#vim.filetype.add() - -- Search for vim.filetype.add - vim.filetype.add({ - extension = { - hurl = "hurl" - } - }) - end -} diff --git a/dot_config/nvim/lua/plugins/vim-wordmotion.lua b/dot_config/nvim/lua/plugins/vim-wordmotion.lua deleted file mode 100644 index d4be308..0000000 --- a/dot_config/nvim/lua/plugins/vim-wordmotion.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - "chaoren/vim-wordmotion", -} diff --git a/dot_config/nvim/lua/plugins/zen-mode.lua b/dot_config/nvim/lua/plugins/zen-mode.lua deleted file mode 100644 index 2c4fa69..0000000 --- a/dot_config/nvim/lua/plugins/zen-mode.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - "folke/zen-mode.nvim", - config = function() - require("zen-mode").setup { - plugins = { - kitty = { - enabled = true - } - } - } - end, - keys = { { "wz", "ZenMode", desc = "Toggle zen mode" } }, -} diff --git a/dot_config/nvim/neoconf.json b/dot_config/nvim/neoconf.json deleted file mode 100644 index 0967ef4..0000000 --- a/dot_config/nvim/neoconf.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/dot_config/nvim/queries/hurl/highlights.scm b/dot_config/nvim/queries/hurl/highlights.scm deleted file mode 100644 index 0d7e016..0000000 --- a/dot_config/nvim/queries/hurl/highlights.scm +++ /dev/null @@ -1,33 +0,0 @@ -[ - "GET" - "POST" - "PUT" - "DELETE" - "CONNECT" - "OPTIONS" - "TRACE" - "PATCH" - "LINK" - "UNLINK" - "PURGE" - "LOCK" - "UNLOCK" - "PROPFIND" - "VIEW" - ] @keyword - -[ - (url) -] @string - -[ - (response) -] @keyword.response - -[ - (status_code_pattern) -] @constant - -(comment) @comment - -(assert_literal) @constant.buildin diff --git a/dot_config/nvim/queries/hurl/injections.scm b/dot_config/nvim/queries/hurl/injections.scm deleted file mode 100644 index bf06a4c..0000000 --- a/dot_config/nvim/queries/hurl/injections.scm +++ /dev/null @@ -1,3 +0,0 @@ -(json_request_declaration) @json - -(text_body_declaration) @markdown diff --git a/dot_config/nvim/stylua.toml b/dot_config/nvim/stylua.toml deleted file mode 100644 index 5d6c50d..0000000 --- a/dot_config/nvim/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 2 -column_width = 120 \ No newline at end of file diff --git a/dot_config/sway/config.d/input b/dot_config/sway/config.d/input index a97703a..0042bf9 100644 --- a/dot_config/sway/config.d/input +++ b/dot_config/sway/config.d/input @@ -20,10 +20,10 @@ exec_always { # # Toggle between keyboard layouts. This example has the "us" and "gb" # # keyboard layouts, and uses Alt+Shift to toggle between them. -# input "type:keyboard" { -# xkb_layout "us,gb" -# xkb_options "grp:alt_shift_toggle" -# } +input "type:keyboard" { + xkb_layout "us,dk" + xkb_options "grp:alt_shift_toggle" +} # # Assign the same binding to "pkill -RTMIN+1 waybar" to send signal to # # the Waybar keyboard module (so the module shows the updated layout). # # This example uses Alt + left Shift. diff --git a/dot_config/zellij/config.kdl.tmpl b/dot_config/zellij/config.kdl.tmpl index 12c2057..918d667 100644 --- a/dot_config/zellij/config.kdl.tmpl +++ b/dot_config/zellij/config.kdl.tmpl @@ -2,7 +2,7 @@ keybinds { normal { // uncomment this and adjust key if using copy_on_select=false - // bind "Alt c" { Copy; } + bind "Alt c" { Copy; } } locked { bind "Ctrl g" { SwitchToMode "Normal"; } @@ -22,10 +22,10 @@ keybinds { } pane { bind "Ctrl p" { SwitchToMode "Normal"; } - bind "h" "Left" { MoveFocus "Left"; } - bind "l" "Right" { MoveFocus "Right"; } - bind "j" "Down" { MoveFocus "Down"; } - bind "k" "Up" { MoveFocus "Up"; } + bind "Ctrl h" "h" "Left" { MoveFocus "Left"; } + bind "Ctrl l" "l" "Right" { MoveFocus "Right"; } + bind "Ctrl j" "j" "Down" { MoveFocus "Down"; } + bind "Ctrl k" "k" "Up" { MoveFocus "Up"; } bind "p" { SwitchFocus; } bind "n" { NewPane; SwitchToMode "Normal"; } bind "d" { NewPane "Down"; SwitchToMode "Normal"; } @@ -33,7 +33,7 @@ keybinds { bind "x" { CloseFocus; SwitchToMode "Normal"; } bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; } bind "z" { TogglePaneFrames; SwitchToMode "Normal"; } - bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; } + bind "Ctrl w" "w" { ToggleFloatingPanes; SwitchToMode "Normal"; } bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; } bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;} } @@ -49,8 +49,8 @@ keybinds { tab { bind "Ctrl t" { SwitchToMode "Normal"; } bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; } - bind "h" "Left" "Up" "k" { GoToPreviousTab; } - bind "l" "Right" "Down" "j" { GoToNextTab; } + bind "Ctrl h" "h" "Left" "Up" "k" { GoToPreviousTab; } + bind "Ctrl l" "l" "Right" "Down" "j" { GoToNextTab; } bind "n" { NewTab; SwitchToMode "Normal"; } bind "x" { CloseTab; SwitchToMode "Normal"; } bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; } @@ -193,7 +193,7 @@ plugins { // - true // - false (Default) // -simplified_ui false +simplified_ui true // Choose the path to the default shell that zellij will use for opening new panes // Default: $SHELL @@ -277,11 +277,9 @@ default_layout "compact" // Examples: // // copy_command "xclip -selection clipboard" // x11 -{{ if (eq .display "wayland") }} + copy_command "wl-copy" // wayland -{{ else }} -copy_command "pbcopy" // osx -{{ end }} + // Choose the destination for copied text // Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard. diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 81a9eda..a55952d 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -1,9 +1,7 @@ [user] - signingkey = {{ .github_public_gpg }} - email = {{ .github_email }} name = {{ .github_name }} -[includeIf "gitdir:~/git/github.com/lunarway/"] - path = .gitconfig_lw + email = {{ .github_email }} + signingkey = {{ .github_public_key }} [includeIf "gitdir:~/Documents/vaults/kjuulh/"] path = .gitconfig_front [includeIf "gitdir:~/git/git.front.kjuulh.io/**"] @@ -29,10 +27,8 @@ excludeFile = cover.cov [push] default = current -{{ if .homebrew }} [gpg] - program = /opt/homebrew/bin/gpg -{{ end }} + format = ssh #[interactive] # diffFilter = delta --color-only # [add.interactive] @@ -56,7 +52,6 @@ [pager] difftool = true - [rerere] enabled = true [commit] diff --git a/dot_gitconfig_front.tmpl b/dot_gitconfig_front.tmpl index 2081b85..7213edb 100644 --- a/dot_gitconfig_front.tmpl +++ b/dot_gitconfig_front.tmpl @@ -1,11 +1,7 @@ [user] name = {{ .gitea_name }} email = {{ .gitea_email }} -{{ if .homebrew }} - signingkey = /Users/kah/.ssh/id_ed25519 -{{ else }} - signingkey = /home/kjuulh/.ssh/id_ed25519 -{{ end }} + signingkey = {{ .gitea_signing_key }} [gpg] format = ssh diff --git a/dot_gitconfig_lw.tmpl b/dot_gitconfig_lw.tmpl deleted file mode 100644 index 5c6e3b5..0000000 --- a/dot_gitconfig_lw.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -[user] - name = {{ .lunar_name }} - email = {{ .lunar_email }} - signingkey = {{ .github_signing_key }} -[gpg] - format = ssh -[url "ssh://git@github.com/"] - insteadOf = https://github.com/ diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index e6c46fd..c0cab77 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -10,13 +10,11 @@ setopt hist_ignore_space #. ~/.asdf/plugins/golang/set-env.zsh {{ end }} -LW_PATH=~/git/github.com/lunarway GOPATH=~/go GOBIN="$GOPATH/bin" PATH="$HOME/.asdf/shims/:$GOBIN:$PATH:$HOME/bin/:$HOME/.local/bin/:$HOME/.dotnet/tools:$HOME/.cargo/bin:$HOME/.yarn/bin:$HOME/Library/Application Support/Coursier/bin:${KREW_ROOT:-$HOME/.krew}/bin" {{ if .homebrew }} export PATH="/opt/homebrew/opt/libpq/bin:$HOME/.git-bins/:$PATH" -export PATH="/opt/homebrew/opt/openjdk/bin:$PATH:$(brew --prefix llvm)/bin:$(brew --prefix llvm)/lib" export PATH=/opt/homebrew/bin:$PATH export PATH="/Users/kah/.rustup/toolchains/nightly-aarch64-apple-darwin/bin:$PATH" export PATH="$GOBIN/:$PATH" @@ -24,35 +22,12 @@ export PATH="$GOBIN/:$PATH" export DAGGER_CLOUD_TOKEN={{.dagger_cloud_token | quote}} -export SHUTTLE_INTERACTIVE=true -export SHUTTLE_REMOTE_TRACING=remote -export SHUTTLE_REMOTE_TRACING_URL=https://shuttle-telemetry.dev.lunar.tech/publish -export SHUTTLE_GOLANG_ACTIONS=true - export GITHUB_TOKEN={{ .github_token | quote }} export GITHUB_USERNAME=kjuulh export GITHUB_ACCESS_TOKEN="$GITHUB_TOKEN" -export HOMEBREW_GITHUB_API_TOKEN="$GITHUB_ACCESS_TOKEN" -export GITHUB_LUNAR_CI_TOKEN="$GITHUB_ACCESS_TOKEN" -export RENOVATE_TOKEN={{ .renovate_token | quote }} export CLANK_KUBERNETES_CONFIGS={{ .clank_kubernetes_configs_path }} -# Toolkit -export SRC_ENDPOINT=https://lunar.sourcegraph.com -export SRC_ACCESS_TOKEN={{ .source_graph_token | quote }} -export GITHUB_FC_ROOT="$HOME/git/github.com" -export GITHUB_FC_ORGS="lunarway,kjuulh" - -export GITEA_FUZZY_CLONE_ROOT="$HOME/git/git.front.kjuulh.io" -export GITEA_FUZZY_CLONE_ORGS="kjuulh" - -{{ if .homebrew }} -export BITEME_ROOT="$HOME/Documents/vaults/kjuulh" -{{ else }} -export BITEME_ROOT="$HOME/Documents/obsidian" -{{ end }} - {{ if not .homebrew -}} alias hx="helix" export EDITOR=helix @@ -60,9 +35,6 @@ export EDITOR=helix HELIX_RUNTIME=/Users/kah/git/github.com/kjuulh/helix/runtime export EDITOR=hx {{ end -}} -export LW_DEFAULT_THEME='false' - -export HAMCTL_AUTH_TOKEN={{ .hamctl_token | quote }} fpath=("$HOME/.zsh_completions/" $fpath) {{ if .homebrew }} @@ -92,53 +64,10 @@ fi source ${ZIM_HOME}/init.zsh source ~/bin/zimfwupdate.sh -### Lunar Way Setup ### - -# Init zplug -#source ~/.zplug/init.zsh - -# Instruct zplug to use ssh for fetching plugins -#ZPLUG_PROTOCOL=ssh - -# Load default plugins from lw-zsh -#source ~/.zplug/repos/lunarway/lw-zsh/default-plugins.zsh - -# Load plugins using zplug -#zplug "lunarway/lw-zsh" -#zplug "lunarway/hubble-zsh" - -# Check for updates and install them -#if ! zplug check; then -# zplug install -#fi - -# Load all zplug plugins -#zplug load - -# Configure Lunar Way kubernetes setup -#k8s_init kah@lunar.app - -# Periodic updates -#lw_periodic_update - -### Theme overrides here - -## Dot files -alias config='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' - -## Dev hamctl -#alias devhamctl='HAMCTL_URL="https://some-url" go run github.com/lunarway/release-manager cmd/hamctl/main.go' - -{{ if .lunar }} -k8s_init kah@lunar.app admin -{{ end }} - -#k8s_init kah@lunar.app dev - -#eval "$(starship init zsh)" eval "$(zoxide init zsh)" eval "$(fuzzy-clone init zsh)" eval "$(gitnow init zsh)" +eval "$(non shell zsh)" # pnpm export PNPM_HOME="{{ .pnpm_home }}" @@ -148,8 +77,7 @@ export PATH="$PNPM_HOME:$PATH" alias ,="source ,cd" alias ,g="source ,ccd" - -export SHUTTLE_CACHE_DURATION_MIN=10080 +alias ,n="noil edit" #alias nvim=lvim alias cat=bat @@ -157,10 +85,9 @@ alias python=python3 alias pip=pip3 alias ll="eza -l -g --icons" alias ls="eza --icons" +alias m="mise run" -export LESS=-R -export _EXPERIMENTAL_DAGGER_TUI=yep export OPENAI_API_KEY={{ .openai_token | quote }} eval "$(starship init zsh)" @@ -182,20 +109,13 @@ export DRONE_HOST=https://ci.i.kjuulh.io export DRONE_USER=kjuulh export DRONE_TOKEN={{ .drone_token | quote }} export GITEA_ACCESS_TOKEN={{ .gitea_token | quote }} +export GITEA_TOKEN={{ .gitea_token | quote }} export GITEA_URL="https://git.i.kjuulh.io/api/v1" export GITEA_ORG="kjuulh" -# bun completions -[ -s "/Users/kah/.bun/_bun" ] && source "/Users/kah/.bun/_bun" - -# bun -export BUN_INSTALL="$HOME/.bun" -export PATH="$BUN_INSTALL/bin:$PATH" - export GITHUB_COMMITTER_EMAIL=contact@kjuulh export GITHUB_COMMITTER_NAME=kjuulh export SHUTTLE_EXTENSIONS_REGISTRY="git=git@github.com:kjuulh/shuttle-extensions.git" -export LUNARCTL_REGISTRY="git=git@github.com:lunarway/lunarctl-registry.git" export SHUTTLE_EXTENSIONS_GITHUB_ACCESS_TOKEN="$GITHUB_TOKEN" export CUDDLE_PLEASE_TOKEN=$GITEA_ACCESS_TOKEN diff --git a/private_dot_ssh/private_executable_config.tmpl b/private_dot_ssh/private_executable_config.tmpl index b6e04d5..2fe6f1f 100644 --- a/private_dot_ssh/private_executable_config.tmpl +++ b/private_dot_ssh/private_executable_config.tmpl @@ -3,17 +3,13 @@ {{ end -}} Host github.com + PubKeyAuthentication yes ForwardAgent yes {{ if .homebrew -}} UseKeychain yes {{ end -}} - IdentityFile ~/.ssh/github - -Host ssh.dev.azure.com IdentitiesOnly yes - IdentityFile ~/.ssh/id_lendify - HostkeyAlgorithms +ssh-rsa - PubkeyAcceptedAlgorithms +ssh-rsa + IdentityFile ~/.ssh/github Host front Hostname 10.0.9.0 @@ -33,6 +29,7 @@ Host ratchet Hostname 10.0.9.1 User kjuulh PubKeyAuthentication yes + IdentitiesOnly yes IdentityFile ~/.ssh/id_clank Host server @@ -333,3 +330,16 @@ Host deck PubKeyAuthentication yes IdentitiesOnly yes IdentityFile ~/.ssh/id_clank + +Host netbird + Hostname 138.199.210.108 + User root + PubKeyAuthentication yes + IdentitiesOnly yes + IdentityFile ~/.ssh/id_clank + +{{ if .homebrew }} +{{ else }} +Host * + SetEnv TERM=xterm-256color +{{ end }}