diff --git a/README.md b/README.md index 33c2b63..07c80ba 100644 --- a/README.md +++ b/README.md @@ -193,7 +193,7 @@ | ScreenLock | betterlockscreen/i3lock | | Notification | Dunst | | Files | Thunar, Ranger | -| Images | qView, imv, feh | +| Images | imv, qView, feh | | Video | mpv with plugins | | Music | Strawberry, Picard, Mousai, spek | | Browsers | Librewolf, Firefox, Chromium | @@ -204,7 +204,7 @@ | DM | LightDM | | Compositor | Нет. Мб будет стоковый picom | | Screenshare | OBS, Screenkey, ksnip | -| Code Editor | VSCode, JetBrains, nixvim, helix | +| Code Editor | Codium | | Video Editor | Blender | | Fetch | fastfetch | | Torrent | qBittorrent | diff --git a/archive/default-apps.nix b/archive/default-apps.nix index da31f94..f1a11fa 100644 --- a/archive/default-apps.nix +++ b/archive/default-apps.nix @@ -28,17 +28,17 @@ "x-scheme-handler/https" = [ "librewolf.desktop" ]; "x-scheme-handler/unknown" = [ "librewolf.desktop" ]; # Images - "image/*" = [ "qview.desktop" "imv.desktop" ]; + "image/*" = [ "imv.desktop" "qview.desktop" ]; "image/avif" = [ "imv.desktop" "qview.desktop" ]; - "image/gif" = [ "qview.desktop" "imv.desktop" ]; - "image/jpeg" = [ "qview.desktop" "imv.desktop" ]; # Обычный jpeg, прогрузка сверху вниз - "image/pjpeg" = [ "qview.desktop" "imv.desktop" ]; # Сначала размытый и постепенной лучше видно, для медленного инета - "image/apng" = [ "qview.desktop" "imv.desktop" ]; # Анимированный png - "image/png" = [ "qview.desktop" "imv.desktop" ]; - "image/svg+xml" = [ "qview.desktop" "imv.desktop" ]; - "image/webp" = [ "qview.desktop" "imv.desktop" ]; - "image/x-icon" = [ "qview.desktop" "imv.desktop" ]; - "image/vnd.microsoft.icon" = [ "qview.desktop" "imv.desktop" ]; + "image/gif" = [ "imv.desktop" "qview.desktop" ]; + "image/jpeg" = [ "imv.desktop" "qview.desktop" ]; # Обычный jpeg, прогрузка сверху вниз + "image/pjpeg" = [ "imv.desktop" "qview.desktop" ]; # Сначала размытый и постепенной лучше видно, для медленного инета + "image/apng" = [ "imv.desktop" "qview.desktop" ]; # Анимированный png + "image/png" = [ "imv.desktop" "qview.desktop" ]; + "image/svg+xml" = [ "imv.desktop" "qview.desktop" ]; + "image/webp" = [ "imv.desktop" "qview.desktop" ]; + "image/x-icon" = [ "imv.desktop" "qview.desktop" ]; + "image/vnd.microsoft.icon" = [ "imv.desktop" "qview.desktop" ]; # Video "video/*" = [ "mpv.desktop" ]; "video/mp4" = [ "mpv.desktop" ]; @@ -89,17 +89,17 @@ associations.added = { # Дополнительные приложения для нужного файла. Будет в меню "Открыть с помощью" # Images - "image/*" = [ "qview.desktop" "imv.desktop" ]; + "image/*" = [ "imv.desktop" "qview.desktop" ]; "image/avif" = [ "imv.desktop" "qview.desktop" ]; - "image/gif" = [ "qview.desktop" "imv.desktop" ]; - "image/jpeg" = [ "qview.desktop" "imv.desktop" ]; # Обычный jpeg, прогрузка сверху вниз - "image/pjpeg" = [ "qview.desktop" "imv.desktop" ]; # Сначала размытый и постепенной лучше видно, для медленного инета - "image/apng" = [ "qview.desktop" "imv.desktop" ]; # Анимированный png - "image/png" = [ "qview.desktop" "imv.desktop" ]; - "image/svg+xml" = [ "qview.desktop" "imv.desktop" ]; - "image/webp" = [ "qview.desktop" "imv.desktop" ]; - "image/x-icon" = [ "qview.desktop" "imv.desktop" ]; - "image/vnd.microsoft.icon" = [ "qview.desktop" "imv.desktop" ]; + "image/gif" = [ "imv.desktop" "qview.desktop" ]; + "image/jpeg" = [ "imv.desktop" "qview.desktop" ]; # Обычный jpeg, прогрузка сверху вниз + "image/pjpeg" = [ "imv.desktop" "qview.desktop" ]; # Сначала размытый и постепенной лучше видно, для медленного инета + "image/apng" = [ "imv.desktop" "qview.desktop" ]; # Анимированный png + "image/png" = [ "imv.desktop" "qview.desktop" ]; + "image/svg+xml" = [ "imv.desktop" "qview.desktop" ]; + "image/webp" = [ "imv.desktop" "qview.desktop" ]; + "image/x-icon" = [ "imv.desktop" "qview.desktop" ]; + "image/vnd.microsoft.icon" = [ "imv.desktop" "qview.desktop" ]; # Text "text/*" = [ "nvim.desktop" "codium.desktop" ]; # Надо ли заменять nvim и всё что ниже на NixVim? "text/css" = [ "nvim.desktop" "codium.desktop" ]; @@ -118,4 +118,4 @@ "application/yaml" = [ "nvim.desktop" "codium.desktop" ]; }; }; -} \ No newline at end of file +} diff --git a/nixos/home.nix b/nixos/home.nix index 70a877b..620b0c3 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -16,10 +16,6 @@ # то не получится ставить расширения. Потому что там софт ставится от рута и vscode # будет пытаться установить расширения в каталог nix store, куда нельзя что либо ставить без рута. packages = with pkgs; [ - #vscode # Мб надо в home.packages писать, чтоб расширения ставились без рута - #jetbrains-toolbox # Мб надо через home.packages писать - jetbrains.pycharm-professional - jetbrains.goland vscodium ]; diff --git a/nixos/packages.nix b/nixos/packages.nix index ef3b1c5..2c85e7f 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -454,11 +454,6 @@ neovim - # Закинул в home.nix - # vscode - # jetbrains-toolbox - # zed-editor - ########### ## Icons ## ########### diff --git a/nvim/init.lua b/nvim/init.lua index 89ef35c..77d43f1 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -102,6 +102,9 @@ require('lazy').setup({ -- Plugins for color highlight require 'custom.plugins.colorizer', + -- Multicursor plugin + require 'custom.plugins.multicursor', + -- Autoformat markdown tables { 'Kicamon/markdown-table-mode.nvim', diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 2e9a9b1..3e8a677 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -16,6 +16,7 @@ "gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" }, "gruvbox.nvim": { "branch": "main", "commit": "a933d8666dad9363dc6908ae72cfc832299c2f59" }, "guihua.lua": { "branch": "master", "commit": "3bce83823fe59fe438b0484777e56250153aaebf" }, + "hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" }, "image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, @@ -29,6 +30,7 @@ "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.nvim": { "branch": "main", "commit": "a8b1d74f45dadf3554c0eed784c6ccd8ade67883" }, "monokai-pro.nvim": { "branch": "master", "commit": "872f774303f79416000e8049630052f4124d9534" }, + "multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" }, diff --git a/nvim/lua/custom/plugins/golang.lua b/nvim/lua/custom/plugins/golang.lua index 686e44c..6c1aea3 100644 --- a/nvim/lua/custom/plugins/golang.lua +++ b/nvim/lua/custom/plugins/golang.lua @@ -9,7 +9,9 @@ return { 'nvim-treesitter/nvim-treesitter', }, config = function() - require('go').setup() + require('go').setup { + tag_options = '', + } vim.keymap.set({ 'n' }, 'gta', ':GoAddTag', { desc = '[G]o [T]ag [A]dd' }) vim.keymap.set({ 'n' }, 'gtr', ':GoRmTag', { desc = '[G]o [T]ag [R]emove' }) vim.keymap.set({ 'n' }, 'gs', ':GoFillStruct', { desc = '[G]o fill [S]truct' }) diff --git a/nvim/lua/custom/plugins/multicursor.lua b/nvim/lua/custom/plugins/multicursor.lua new file mode 100644 index 0000000..a5876d6 --- /dev/null +++ b/nvim/lua/custom/plugins/multicursor.lua @@ -0,0 +1,21 @@ +-- Multicursor + +return { + { + 'smoka7/multicursors.nvim', + event = 'VeryLazy', + dependencies = { + 'nvimtools/hydra.nvim', + }, + opts = {}, + cmd = { 'MCstart', 'MCvisual', 'MCclear', 'MCpattern', 'MCvisualPattern', 'MCunderCursor' }, + keys = { + { + mode = { 'v', 'n' }, + 'm', + 'MCstart', + desc = 'Create a selection for selected text or word under the cursor', + }, + }, + }, +} diff --git a/nvim/lua/custom/sessions.lua b/nvim/lua/custom/sessions.lua index d22b5b6..55f58da 100644 --- a/nvim/lua/custom/sessions.lua +++ b/nvim/lua/custom/sessions.lua @@ -98,18 +98,18 @@ vim.api.nvim_create_autocmd('User', { nested = true, }) --- vim.keymap.set('n', '', function() +-- vim.keymap.set('n', '', function() -- restore_session() -- end, { desc = 'Restore session' }) -- Session delete -vim.keymap.set('n', 'Sd', function() +vim.keymap.set('n', 'Sd', function() local name = session_name() require('mini.sessions').delete(name) print('💾 Session Deleted: ' .. name) end, { desc = '[S]ession [D]elete' }) -- Session create -vim.keymap.set('n', 'Sc', function() +vim.keymap.set('n', 'Sc', function() save_session() end, { desc = '[S]ession [C]reate' }) diff --git a/shit/mimeapps.list b/shit/mimeapps.list index dd14fd1..716fd4b 100644 --- a/shit/mimeapps.list +++ b/shit/mimeapps.list @@ -4,17 +4,17 @@ application/x-sh=nvim.desktop;codium.desktop application/x-shellscript=nvim.desktop;codium.desktop application/xml=nvim.desktop;codium.desktop application/yaml=nvim.desktop;codium.desktop -image/*=com.interversehq.qView.desktop;imv.desktop -image/apng=com.interversehq.qView.desktop;imv.desktop +image/*=imv.desktop;com.interversehq.qView.desktop +image/apng=imv.desktop;com.interversehq.qView.desktop image/avif=imv.desktop -image/gif=com.interversehq.qView.desktop;imv.desktop -image/jpeg=;com.interversehq.qView.desktop;imv.desktop; -image/pjpeg=com.interversehq.qView.desktop;imv.desktop -image/png=com.interversehq.qView.desktop;imv.desktop;; -image/svg+xml=com.interversehq.qView.desktop;imv.desktop -image/vnd.microsoft.icon=com.interversehq.qView.desktop;imv.desktop -image/webp=com.interversehq.qView.desktop;imv.desktop -image/x-icon=com.interversehq.qView.desktop;imv.desktop +image/gif=imv.desktop;com.interversehq.qView.desktop +image/jpeg=imv.desktop;com.interversehq.qView.desktop +image/pjpeg=imv.desktop;com.interversehq.qView.desktop +image/png=imv.desktop;com.interversehq.qView.desktop +image/svg+xml=imv.desktop;com.interversehq.qView.desktop +image/vnd.microsoft.icon=imv.desktop;com.interversehq.qView.desktop +image/webp=imv.desktop;com.interversehq.qView.desktop +image/x-icon=imv.desktop;com.interversehq.qView.desktop text/*=nvim.desktop;codium.desktop text/css=nvim.desktop;codium.desktop text/csv=nvim.desktop;codium.desktop @@ -54,17 +54,17 @@ audio/webm=mpv.desktop audio/x-matroska=mpv.desktop audio/x-mpegurl=mpv.desktop audio/x-opus+ogg=mpv.desktop -image/*=com.interversehq.qView.desktop;imv.desktop -image/apng=com.interversehq.qView.desktop;imv.desktop +image/*=imv.desktop;com.interversehq.qView.desktop +image/apng=imv.desktop;com.interversehq.qView.desktop image/avif=imv.desktop -image/gif=com.interversehq.qView.desktop;imv.desktop -image/jpeg=com.interversehq.qView.desktop;imv.desktop -image/pjpeg=com.interversehq.qView.desktop;imv.desktop -image/png=com.interversehq.com.interversehq.qView.desktop -image/svg+xml=com.interversehq.qView.desktop;imv.desktop -image/vnd.microsoft.icon=com.interversehq.qView.desktop;imv.desktop -image/webp=com.interversehq.qView.desktop;imv.desktop -image/x-icon=com.interversehq.qView.desktop;imv.desktop +image/gif=imv.desktop;com.interversehq.qView.desktop +image/jpeg=imv.desktop;com.interversehq.qView.desktop +image/pjpeg=imv.desktop;com.interversehq.qView.desktop +image/png=imv.desktop;com.interversehq.qView.desktop +image/svg+xml=imv.desktop;com.interversehq.qView.desktop +image/vnd.microsoft.icon=imv.desktop;com.interversehq.qView.desktop +image/webp=imv.desktop;com.interversehq.qView.desktop +image/x-icon=imv.desktop;com.interversehq.qView.desktop inode/directory=dolphin.desktop text/*=nvim.desktop;codium.desktop text/css=nvim.desktop;codium.desktop