Resolve merge conflict in fish/config.fish

fish/config.fish

@@ -19,46 +19,47 @@ function yy
 	rm -f -- "$tmp"
 end
 
-# >>> conda initialize >>>
+# # >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
+# # !! Contents within this block are managed by 'conda init' !!
-if test -f /home/enrique/miniconda3/bin/conda
+# if test -f /home/enrique/miniconda3/bin/conda
-    eval /home/enrique/miniconda3/bin/conda "shell.fish" "hook" $argv | source
+#     eval /home/enrique/miniconda3/bin/conda "shell.fish" "hook" $argv | source
-else
+# else
-    if test -f "/home/enrique/miniconda3/etc/fish/conf.d/conda.fish"
+#     if test -f "/home/enrique/miniconda3/etc/fish/conf.d/conda.fish"
-        . "/home/enrique/miniconda3/etc/fish/conf.d/conda.fish"
+#         . "/home/enrique/miniconda3/etc/fish/conf.d/conda.fish"
-    else
+#     else
-        set -x PATH "/home/enrique/miniconda3/bin" $PATH
+#         set -x PATH "/home/enrique/miniconda3/bin" $PATH
-    end
+#     end
-end
+# end
-# <<< conda initialize <<<
+# # <<< conda initialize <<<
-conda deactivate
+# conda deactivate
 
 ## EVALS ##
 # eval (/home/linuxbrew/.linuxbrew/bin/brew shellenv)
 starship init fish | source
-fzf --fish | source
+# fzf --fish | source
 
 
 ## ALIASES ##
 alias zy "sudo zypper"
 alias zypper 'sudo zypper'
 alias srcfish 'source ~/.config/fish/config.fish'
-alias pull-st 'bash ~/bin/pull-st.sh'
+# alias pull-st 'bash ~/bin/pull-st.sh'
-alias push-st 'bash ~/bin/push-st.sh'
+# alias push-st 'bash ~/bin/push-st.sh'
-alias sentinel 'ssh -X admin@100.88.99.193 "/publico/sentinel"'
+# alias sentinel 'ssh -X admin@100.88.99.193 "/publico/sentinel"'
-alias glowp 'glow -p'
+# alias glowp 'glow -p'
-alias glows 'glow -s dracula'
+# alias glows 'glow -s dracula'
-alias mdcht 'glow -s ~/Projects/Qt-Learning/Notes/xx-MarkDown-CheatSheet.md'
+# alias mdcht 'glow -s ~/Projects/Qt-Learning/Notes/xx-MarkDown-CheatSheet.md'
 alias nv 'nvim'
-alias aemu '~/Android/Sdk/emulator/emulator -avd API30_Flutter &'
+alias sunv 'sudoedit'
+# alias aemu '~/Android/Sdk/emulator/emulator -avd API30_Flutter &'
 ## EXPORTS ##
 set -Ux EDITOR nvim
 set -Ux MICRO_TRUECOLOR 1
-fish_add_path -g -p ~/flutter-dev/flutter/bin
+# fish_add_path -g -p ~/flutter-dev/flutter/bin
-fish_add_path -g -p /opt/android-studio/bin
+# fish_add_path -g -p /opt/android-studio/bin
-fish_add_path -g -p ~/.pub-cache/bin
+# fish_add_path -g -p ~/.pub-cache/bin
-fish_add_path -g -p /usr/local/bin
+# fish_add_path -g -p /usr/local/bin
-fish_add_path -g -p ~/.local/bin
+# fish_add_path -g -p ~/.local/bin
 
 
 

nvim/lazy-lock.json

@@ -20,7 +20,7 @@
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
   "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
-  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
@@ -38,6 +38,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
   "nvim-treesitter": { "branch": "master", "commit": "6a3c6a42a6e24414bdf337b05a84a0ea013dd155" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },

nvim/lua/enrique/plugins/osc52.lua

@@ -0,0 +1,15 @@
+return {
+  "ojroques/nvim-osc52",
+  config = function()
+    require('osc52').setup {
+      max_length = 0,      -- Maximum length of selection (0 for no limit)
+      silent = false,      -- Show message when copied
+      trim = false,        -- Trim surrounding whitespaces before copy
+    }
+    
+    -- Key mappings
+    vim.keymap.set('n', '<leader>y', require('osc52').copy_operator, {expr = true})
+vim.keymap.set('n', '<leader>yy', '<leader>y_', {remap = true})
+vim.keymap.set('v', '<leader>y', require('osc52').copy_visual)
+  end,
+}

starship.toml

@@ -34,7 +34,7 @@ show_always = true
 [hostname]
 ssh_only = true
 ssh_symbol = '🌐 '
-style = 'bold dimmed green'
+style = 'bold red'
 format = 'in [$ssh_symbol$hostname]($style) ❯ '
 
 [directory]