diff --git a/bin/sunhat b/bin/sunhat index 421533c..7c03af5 100755 --- a/bin/sunhat +++ b/bin/sunhat @@ -3,7 +3,7 @@ source $SUNHAT_PATH/bin/ascii.sh if [ $# -eq 0 ]; then - SUB=$(gum choose "theme" "font" "install" "update" --height 8 --header "" | tr '[:upper:]' '[:lower:]') + SUB=$(gum choose "theme" "font" "install" "update" "push" --height 8 --header "" | tr '[:upper:]' '[:lower:]') else SUB=$1 fi diff --git a/bin/sunhat-push b/bin/sunhat-push new file mode 100644 index 0000000..de9313c --- /dev/null +++ b/bin/sunhat-push @@ -0,0 +1,7 @@ +cd $SUNHAT_PATH +git pull +cp -r ~/Documents/Configs/. $SUNHAT_PATH/configs/dotfiles/ +git add -A +git commit -m "Update Configs" +git push +cd - diff --git a/configs/dotfiles/bashrc b/configs/dotfiles/bashrc new file mode 100644 index 0000000..a5b41aa --- /dev/null +++ b/configs/dotfiles/bashrc @@ -0,0 +1 @@ +source ~/.local/share/sunhat/defaults/bash/rc diff --git a/configs/dotfiles/forge/config/windows.json b/configs/dotfiles/forge/config/windows.json index 841aa3f..8c574c7 100644 --- a/configs/dotfiles/forge/config/windows.json +++ b/configs/dotfiles/forge/config/windows.json @@ -59,6 +59,10 @@ { "wmClass": "Ulauncher", "mode": "float" + }, + { + "wmClass": "com.nextcloud.desktopclient.nextcloud", + "mode": "float" } ] } \ No newline at end of file diff --git a/configs/dotfiles/nvim/lazy-lock.json b/configs/dotfiles/nvim/lazy-lock.json index 820fd53..38c8e32 100644 --- a/configs/dotfiles/nvim/lazy-lock.json +++ b/configs/dotfiles/nvim/lazy-lock.json @@ -1,37 +1,36 @@ { - "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, - "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" }, - "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" }, + "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot.vim": { "branch": "release", "commit": "25feddf8e3aa79f0573c8f43ddb13c44c530cfa5" }, - "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, - "image.nvim": { "branch": "master", "commit": "2a618c86d9f8fd9f7895d12b55ec2f31fd14fa05" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, + "image.nvim": { "branch": "master", "commit": "61c76515cfc3cdac8123ece9e9761b20c3dc1315" }, + "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "87701af045b3032515776abeb47eb8c2ddb5e679" }, + "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, "nerdcommenter": { "branch": "master", "commit": "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb" }, - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, - "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" }, - "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, - "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" }, + "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, + "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, + "refactoring.nvim": { "branch": "master", "commit": "8ef9cfb8199bed4be4d609cc4b5dbfb5416b3ca6" }, + "supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, - "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, - "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, + "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" }, + "trouble.nvim": { "branch": "main", "commit": "ad8ef38666834e9e438f84bd446657445bc2a71e" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, - "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" } -} \ No newline at end of file + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" } +} diff --git a/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua b/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua index 1eaf7d0..3addbb6 100644 --- a/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua +++ b/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua @@ -1,5 +1,5 @@ require("cloak").setup({ - enabled = true, + enabled = false, cloak_character = "*", -- The applied highlight group (colors) on the cloaking, see `:h highlight`. highlight_group = "Comment", diff --git a/configs/dotfiles/nvim/lua/gib_nvim/init.lua b/configs/dotfiles/nvim/lua/gib_nvim/init.lua index 32bad96..2f7abad 100644 --- a/configs/dotfiles/nvim/lua/gib_nvim/init.lua +++ b/configs/dotfiles/nvim/lua/gib_nvim/init.lua @@ -15,4 +15,3 @@ require("gib_nvim.treesitter") require("gib_nvim.trouble") require("gib_nvim.undotree") require("gib_nvim.barbar") -require("gib_nvim.toggleterm") diff --git a/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua b/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua index c853190..c581310 100644 --- a/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua +++ b/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua @@ -65,7 +65,18 @@ require("lazy").setup({ {'saadparwaiz1/cmp_luasnip'}, {'rafamadriz/friendly-snippets'}, { - 'github/copilot.vim' + --'github/copilot.vim' + 'supermaven-inc/supermaven-nvim', + config = function() + require('supermaven-nvim').setup({ + keymaps = { + accept_suggestion = '', + clear_suggestion = '', + accept_word = '', + }, + disable_inline_completion = false, -- for cmp + }) + end, }, { 'laytan/cloak.nvim' @@ -116,7 +127,4 @@ require("lazy").setup({ }, version = '^1.0.0', }, - { - 'akinsho/toggleterm.nvim', version = "*", config = true - }, }) diff --git a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua b/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua index 23093c4..a53cdff 100644 --- a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua +++ b/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua @@ -56,6 +56,7 @@ local cmp_select = {behavior = cmp.SelectBehavior.Select} cmp.setup({ sources = { + --{name = 'supermaven'}, {name = 'path'}, {name = 'nvim_lsp'}, {name = 'nvim_lua'}, diff --git a/configs/dotfiles/symlink_configs.sh b/configs/dotfiles/symlink_configs.sh new file mode 100755 index 0000000..65f1d25 --- /dev/null +++ b/configs/dotfiles/symlink_configs.sh @@ -0,0 +1,19 @@ +#!/bin/bash +#mv ~/.bashrc ./temp/.bashrc +#ln -s /home/gib/Documents/Configs/bashrc /home/gib/.bashrc +#mv ~/.config/espanso ./temp/espanso +#ln -s /home/gib/Documents/Configs/espanso /home/gib/.config/espanso +mv ~/.config/forge ./temp/forge +ln -s /home/gib/Documents/Configs/forge /home/gib/.config/forge +mv ~/.config/kitty ./temp/kitty +ln -s /home/gib/Documents/Configs/kitty /home/gib/.config/kitty +mv ~/.config/lobster ./temp/lobster +ln -s /home/gib/Documents/Configs/lobster /home/gib/.config/lobster +#mv ~/.config/neomutt ./temp/neomutt +#ln -s /home/gib/Documents/Configs/neomutt /home/gib/.config/neomutt +mv ~/.config/nvim ./temp/nvim +ln -s /home/gib/Documents/Configs/nvim /home/gib/.config/nvim +mv ~/.config/powerline ./temp/powerline +ln -s /home/gib/Documents/Configs/powerline /home/gib/.config/powerline +mv ~/.config/ranger ./temp/ranger +ln -s /home/gib/Documents/Configs/ranger /home/gib/.config/ranger