diff --git a/common/home.nix b/common/home.nix index ddf02e79..2081ff48 100644 --- a/common/home.nix +++ b/common/home.nix @@ -288,6 +288,7 @@ in { base_url = "https://pass.uttarayan.me"; pinentry = if device.isMac + # then pkgs.pinentry_mac then pkgs.pinentry-curses else pkgs.pinentry-gnome3; }; diff --git a/common/kitty.nix b/common/kitty.nix index 4676d63a..37d198aa 100644 --- a/common/kitty.nix +++ b/common/kitty.nix @@ -10,6 +10,8 @@ background = "#000000"; shell = "${pkgs.fish}/bin/fish"; hide_window_decorations = "yes"; + # font_family = "Hasklug Nerd Font Mono"; + # font_size = 13.0; }; shellIntegration.enableFishIntegration = true; theme = "Catppuccin-Mocha"; diff --git a/darwin/skhd.nix b/darwin/skhd.nix index f1259845..5a705fa9 100644 --- a/darwin/skhd.nix +++ b/darwin/skhd.nix @@ -4,7 +4,7 @@ enable = true; skhdConfig = '' # 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 shift + alt - return: pkill mpv diff --git a/flake.lock b/flake.lock index 250ece38..a6208e17 100644 --- a/flake.lock +++ b/flake.lock @@ -1007,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1711604890, - "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -1188,7 +1188,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-3uLOkyXHp0DPx4PvGh3wvDy+o2RNujbPwdx9j1E/X8Y=", + "narHash": "sha256-5rfWdpmB/76KcuUEr4qMjRk35Bm6hdzRyMNgiqCxDSU=", "path": "./neovim", "type": "path" }, @@ -1279,11 +1279,11 @@ ] }, "locked": { - "lastModified": 1711591334, - "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -1492,11 +1492,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711630555, - "narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", + "lastModified": 1711888895, + "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", "owner": "nix-community", "repo": "nixvim", - "rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", + "rev": "db6b61f117c83943f15289ced03674f81d08256a", "type": "github" }, "original": { @@ -1620,11 +1620,11 @@ ] }, "locked": { - "lastModified": 1711519547, - "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", + "lastModified": 1711760932, + "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", + "rev": "c11e43aed6f17336c25cd120eac886b96c455731", "type": "github" }, "original": { diff --git a/neovim/flake.lock b/neovim/flake.lock index 4f55ccc7..a395db1b 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1711604890, - "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1711591334, - "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711630555, - "narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", + "lastModified": 1711888895, + "narHash": "sha256-Hykv2DGC5EHzZ89+54w/zkit+CVGLRcdIgOWnB4zW5k=", "owner": "nix-community", "repo": "nixvim", - "rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", + "rev": "db6b61f117c83943f15289ced03674f81d08256a", "type": "github" }, "original": { @@ -392,11 +392,11 @@ ] }, "locked": { - "lastModified": 1711519547, - "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", + "lastModified": 1711760932, + "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", + "rev": "c11e43aed6f17336c25cd120eac886b96c455731", "type": "github" }, "original": { diff --git a/neovim/nvim.nix b/neovim/nvim.nix index 06e83f66..60ae9522 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -38,11 +38,13 @@ in rec { lsp.autoAttach = true; }; - image = { - enable = true; - backend = "kitty"; - tmuxShowOnlyInActiveWindow = true; - }; + # Check extraConfigLua for the actual setup + # For disabling when using neovide + # image = { + # enable = true; + # backend = "kitty"; + # tmuxShowOnlyInActiveWindow = true; + # }; mini = { enable = true; @@ -120,6 +122,20 @@ in rec { telescope = { enable = true; + extraOptions = { + defaults = { + layout_strategy = "vertical"; + layout_config = { + preview_height = 0.7; + vertical = { + size = { + width = "95%"; + height = "95%"; + }; + }; + }; + }; + }; extensions = { undo.enable = true; ui-select.enable = true; @@ -419,35 +435,40 @@ in rec { blend = 10, }) - require('neorg').setup({ - load = { - ["core.defaults"] = {}, - ["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } }, - ["core.concealer"] = { - config = { icon_preset = "diamond" } - }, - ["core.integrations.image"] = { - config = { - tmux_show_only_in_active_window = true, - } - }, - ["core.keybinds"] = { - -- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua - config = { - default_keybinds = true, - neorg_leader = "n", - }, - }, - ["core.dirman"] = { - config = { - default_workspace = "Notes", - workspaces = { - Notes = "~/Nextcloud/Notes", - Work = "~/Nextcloud/Work", - } + local load = { + ["core.defaults"] = {}, + ["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } }, + ["core.concealer"] = { + config = { icon_preset = "diamond" } + }, + ["core.keybinds"] = { + -- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua + config = { + default_keybinds = true, + neorg_leader = "n", + }, + }, + ["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({ @@ -474,6 +495,7 @@ in rec { if not vim.g.neovide then require('neoscroll').setup() + require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true}) else vim.o.guifont = "Hasklug Nerd Font Mono:h13" end @@ -517,7 +539,7 @@ in rec { end, }) end) - vim.g.rustaceanvim.tools = { enable_clippy = false }; + vim.g.rustaceanvim["tools"] = { enable_clippy = false }; ''; package = pkgs.neovim-nightly; opts = { @@ -537,7 +559,7 @@ in rec { # undodir = "${config.xdg.cacheHome}/undodir"; undofile = true; viewoptions = "cursor,folds"; - concealcursor = "n"; + # concealcursor = "n"; foldlevelstart = 99; }; extraPlugins = with pkgs.vimPlugins; [ @@ -546,6 +568,7 @@ in rec { neorg-telescope # Wut + image-nvim ChatGPT-nvim # UI and UX