diff --git a/common/kitty.nix b/common/kitty.nix index fe886d1e..f2d5dd96 100644 --- a/common/kitty.nix +++ b/common/kitty.nix @@ -18,6 +18,9 @@ # font_size = 13.0; }; shellIntegration.enableFishIntegration = true; + darwinLaunchOptions = [ + "--single-instance" + ]; theme = "Catppuccin-Mocha"; }; } diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 1b93f50c..cb573281 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -12,7 +12,7 @@ build-users-group = nixbld extra-nix-path = nixpkgs=flake:nixpkgs ''; - package = pkgs.nix; + # package = pkgs.nixVersions.nix_2_21; }; # security.pam.enableSudoTouchIdAuth = true; diff --git a/neovim/nvim.nix b/neovim/nvim.nix index bc850217..d2551a75 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -451,13 +451,6 @@ in rec { } } - if not vim.g.neovide then - load["core.integrations.image"] = { - config = { - tmux_show_only_in_active_window = true, - } - } - end require('neorg').setup({ load = load, @@ -488,8 +481,14 @@ in rec { if not vim.g.neovide then require('neoscroll').setup() require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true}) + load["core.integrations.image"] = { + config = { + tmux_show_only_in_active_window = true, + } + } else vim.o.guifont = "Hasklug Nerd Font Mono:h13" + vim.g.neovide_cursor_vfx_mode = "railgun" end