servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(nvim): Move image.nvim's configuration based on neovide or nvim

Browse Source
This commit is contained in:
Uttarayan Mondal
2024-04-01 18:50:57 +05:30
parent 531ec40c7c
commit fcca258139
6 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/home.nix
View File

@@ -288,6 +288,7 @@ in {
base_url = "https://pass.uttarayan.me"; base_url = "https://pass.uttarayan.me";
pinentry = pinentry =
if device.isMac if device.isMac
# then pkgs.pinentry_mac
then pkgs.pinentry-curses then pkgs.pinentry-curses
else pkgs.pinentry-gnome3; else pkgs.pinentry-gnome3;
}; };

2
common/kitty.nix
View File

@@ -10,6 +10,8 @@
background = "#000000"; background = "#000000";
shell = "${pkgs.fish}/bin/fish"; shell = "${pkgs.fish}/bin/fish";
hide_window_decorations = "yes"; hide_window_decorations = "yes";
# font_family = "Hasklug Nerd Font Mono";
# font_size = 13.0;
}; };
shellIntegration.enableFishIntegration = true; shellIntegration.enableFishIntegration = true;
theme = "Catppuccin-Mocha"; theme = "Catppuccin-Mocha";

2
darwin/skhd.nix
View File

@@ -4,7 +4,7 @@
enable = true; enable = true;
skhdConfig = '' skhdConfig = ''
# open terminal, blazingly fast compared to iTerm/Hyper # open terminal, blazingly fast compared to iTerm/Hyper
alt - return : open -a Kitty.app alt - return : open -na Kitty.app
# alt - return : $\{pkgs.wezterm}/bin/wezterm-gui # alt - return : $\{pkgs.wezterm}/bin/wezterm-gui
shift + alt - return: pkill mpv shift + alt - return: pkill mpv

26
flake.lock generated
View File

@@ -1007,11 +1007,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711604890, "lastModified": 1711625603,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1188,7 +1188,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-3uLOkyXHp0DPx4PvGh3wvDy+o2RNujbPwdx9j1E/X8Y=", "narHash": "sha256-5rfWdpmB/76KcuUEr4qMjRk35Bm6hdzRyMNgiqCxDSU=",
"path": "./neovim", "path": "./neovim",
"type": "path" "type": "path"
}, },
@@ -1279,11 +1279,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711591334, "lastModified": 1711763326,
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1492,11 +1492,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1711630555, "lastModified": 1711888895,
"narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", "rev": "db6b61f117c83943f15289ced03674f81d08256a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1620,11 +1620,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711519547, "lastModified": 1711760932,
"narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
"type": "github" "type": "github"
}, },
"original": { "original": {

24
neovim/flake.lock generated
View File

@@ -237,11 +237,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711604890, "lastModified": 1711625603,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -282,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711591334, "lastModified": 1711763326,
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -324,11 +324,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1711630555, "lastModified": 1711888895,
"narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", "rev": "db6b61f117c83943f15289ced03674f81d08256a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -392,11 +392,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711519547, "lastModified": 1711760932,
"narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
"type": "github" "type": "github"
}, },
"original": { "original": {

89
neovim/nvim.nix
View File

@@ -38,11 +38,13 @@ in rec {
lsp.autoAttach = true; lsp.autoAttach = true;
}; };
image = { # Check extraConfigLua for the actual setup
enable = true; # For disabling when using neovide
backend = "kitty"; # image = {
tmuxShowOnlyInActiveWindow = true; # enable = true;
}; # backend = "kitty";
# tmuxShowOnlyInActiveWindow = true;
# };
mini = { mini = {
enable = true; enable = true;
@@ -120,6 +122,20 @@ in rec {
telescope = { telescope = {
enable = true; enable = true;
extraOptions = {
defaults = {
layout_strategy = "vertical";
layout_config = {
preview_height = 0.7;
vertical = {
size = {
width = "95%";
height = "95%";
};
};
};
};
};
extensions = { extensions = {
undo.enable = true; undo.enable = true;
ui-select.enable = true; ui-select.enable = true;
@@ -419,35 +435,40 @@ in rec {
blend = 10, blend = 10,
}) })
require('neorg').setup({ local load = {
load = { ["core.defaults"] = {},
["core.defaults"] = {}, ["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } }, ["core.concealer"] = {
["core.concealer"] = { config = { icon_preset = "diamond" }
config = { icon_preset = "diamond" } },
}, ["core.keybinds"] = {
["core.integrations.image"] = { -- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
config = { config = {
tmux_show_only_in_active_window = true, default_keybinds = true,
} neorg_leader = "<leader>n",
}, },
["core.keybinds"] = { },
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua ["core.dirman"] = {
config = { config = {
default_keybinds = true, default_workspace = "Notes",
neorg_leader = "<leader>n", workspaces = {
}, Notes = "~/Nextcloud/Notes",
}, Work = "~/Nextcloud/Work",
["core.dirman"] = {
config = {
default_workspace = "Notes",
workspaces = {
Notes = "~/Nextcloud/Notes",
Work = "~/Nextcloud/Work",
}
} }
} }
} }
}
if not vim.g.neovide then
load["core.integrations.image"] = {
config = {
tmux_show_only_in_active_window = true,
}
}
end
require('neorg').setup({
load = load,
}) })
require('chatgpt').setup({ require('chatgpt').setup({
@@ -474,6 +495,7 @@ in rec {
if not vim.g.neovide then if not vim.g.neovide then
require('neoscroll').setup() require('neoscroll').setup()
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
else else
vim.o.guifont = "Hasklug Nerd Font Mono:h13" vim.o.guifont = "Hasklug Nerd Font Mono:h13"
end end
@@ -517,7 +539,7 @@ in rec {
end, end,
}) })
end) end)
vim.g.rustaceanvim.tools = { enable_clippy = false }; vim.g.rustaceanvim["tools"] = { enable_clippy = false };
''; '';
package = pkgs.neovim-nightly; package = pkgs.neovim-nightly;
opts = { opts = {
@@ -537,7 +559,7 @@ in rec {
# undodir = "${config.xdg.cacheHome}/undodir"; # undodir = "${config.xdg.cacheHome}/undodir";
undofile = true; undofile = true;
viewoptions = "cursor,folds"; viewoptions = "cursor,folds";
concealcursor = "n"; # concealcursor = "n";
foldlevelstart = 99; foldlevelstart = 99;
}; };
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
@@ -546,6 +568,7 @@ in rec {
neorg-telescope neorg-telescope
# Wut # Wut
image-nvim
ChatGPT-nvim ChatGPT-nvim
# UI and UX # UI and UX