diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2104f0e..beab9a8 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -5,7 +5,18 @@ if status --is-login end if status is-interactive - alias ls="lsd" + set -x XDG_CONFIG_HOME "$HOME/.config" + set -x XDG_STATE_HOME "$HOME/.local/state" + set -x XDG_CACHE_HOME "$HOME/.cache" + + set -x DOCKER_CONFIG "$XDG_CONFIG_HOME/docker" + set -x CARGO_HOME "$XDG_DATA_HOME/cargo" + set -x RUSTUP_HOME "$XDG_DATA_HOME/rustup" + set -x WINEPREFIX "$XDG_DATA_HOME/wine" + set -x JUPYTER_CONFIG_DIR "$XDG_CONFIG_HOME/jupyter" + set -x ANDROID_HOME "$XDG_DATA_HOME/android" + + alias ls="lsd" alias v="vim" alias nv="nvim" diff --git a/.config/nvim/lua/core/plugins.lua b/.config/nvim/lua/core/plugins.lua index d337542..04a4ee8 100644 --- a/.config/nvim/lua/core/plugins.lua +++ b/.config/nvim/lua/core/plugins.lua @@ -19,11 +19,18 @@ require("lazy").setup({ }, -- Colorchemes + -- { + -- "gbprod/nord.nvim", + -- priority = 1000, + -- config = function() + -- vim.cmd.colorscheme "nord" + -- end + -- }, + { - "gbprod/nord.nvim", - priority = 1000, + "ray-x/aurora", config = function() - vim.cmd.colorscheme "nord" + vim.cmd.colorscheme "aurora" end }, -- { diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 3f9e3e9..0ba708c 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -7,15 +7,15 @@ end cmp.setup({ mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.select_prev_item(), [""] = cmp.mapping.complete(), [""] = cmp.mapping.confirm({select = false}), }), completion = { - -- autocomplete = true, + autocomplete = false, completeopt = "menu,menuone,noinsert", winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None", }, diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 2674533..b403eb1 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -21,10 +21,12 @@ nvim_treesitter_configs.setup { lookahead = true, keymaps = { -- You can use the capture groups defined in textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner" + ['aa'] = '@parameter.outer', + ['ia'] = '@parameter.inner', + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', } }, move = { diff --git a/Pictures/wallpapers/Anime/wallhaven-42xjrm_1920x1080 (1).png b/Pictures/wallpapers/Anime/wallhaven-42xjrm_1920x1080.png similarity index 100% rename from Pictures/wallpapers/Anime/wallhaven-42xjrm_1920x1080 (1).png rename to Pictures/wallpapers/Anime/wallhaven-42xjrm_1920x1080.png diff --git a/Pictures/wallpapers/Nord/wallhaven-83z511_1920x1080.png b/Pictures/wallpapers/Nord/wallhaven-83z511_1920x1080.png deleted file mode 100644 index caac498..0000000 Binary files a/Pictures/wallpapers/Nord/wallhaven-83z511_1920x1080.png and /dev/null differ