nvim: add neovide
This commit is contained in:
parent
67271f3ab9
commit
e2d4143c2a
4 changed files with 90 additions and 62 deletions
|
@ -137,12 +137,13 @@ in
|
||||||
# Emacs
|
# Emacs
|
||||||
windowrulev2 = opaque, class:^emacs$
|
windowrulev2 = opaque, class:^emacs$
|
||||||
|
|
||||||
|
|
||||||
# Fullscreen Applications
|
# Fullscreen Applications
|
||||||
# ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
|
${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
|
||||||
|
|
||||||
${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]}
|
${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]}
|
||||||
|
|
||||||
|
${mkRules ["tile" "opaque"] ["class:^neovide$"]}
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||||
$mainMod = SUPER
|
$mainMod = SUPER
|
||||||
$windowMod = ALT
|
$windowMod = ALT
|
||||||
|
|
|
@ -19,7 +19,16 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager.users.moritz.programs.neovim = {
|
home-manager.users.moritz = {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
(
|
||||||
|
if config.my.programs.hyprland.enable
|
||||||
|
then neovide-hyprland
|
||||||
|
else neovide
|
||||||
|
)
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.neovim-nightly;
|
package = pkgs.neovim-nightly;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
@ -81,4 +90,5 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,6 @@ vim.opt.backupdir = { vim.fn.stdpath("state") .. "/nvim/backup//" } -- don't sto
|
||||||
vim.opt.clipboard = "unnamedplus" -- sync with system clipboard
|
vim.opt.clipboard = "unnamedplus" -- sync with system clipboard
|
||||||
vim.opt.conceallevel = 2
|
vim.opt.conceallevel = 2
|
||||||
vim.opt.expandtab = true -- spaces instead of tabs
|
vim.opt.expandtab = true -- spaces instead of tabs
|
||||||
vim.opt.guifont = "Fira Code Nerd Font:h1"
|
|
||||||
vim.opt.ignorecase = true
|
vim.opt.ignorecase = true
|
||||||
vim.opt.mouse = "a" -- mouse for all modes
|
vim.opt.mouse = "a" -- mouse for all modes
|
||||||
vim.opt.number = true
|
vim.opt.number = true
|
||||||
|
@ -33,6 +32,11 @@ vim.opt.updatetime = 300
|
||||||
vim.opt_local.spell = true
|
vim.opt_local.spell = true
|
||||||
vim.opt_local.spelllang = { "en", "de_20" } -- all English regions and new German spelling
|
vim.opt_local.spelllang = { "en", "de_20" } -- all English regions and new German spelling
|
||||||
|
|
||||||
|
if vim.g.neovide then
|
||||||
|
vim.opt.guifont = "Fira Code Nerd Font:h10"
|
||||||
|
vim.g.neovide_scale_factor = 0.7
|
||||||
|
end
|
||||||
|
|
||||||
require("catppuccin").setup({
|
require("catppuccin").setup({
|
||||||
compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- fix issue of writing to nix store
|
compile_path = vim.fn.stdpath("cache") .. "/catppuccin", -- fix issue of writing to nix store
|
||||||
integrations = {
|
integrations = {
|
||||||
|
|
|
@ -56,6 +56,19 @@ in
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
neovide-hyprland = final.symlinkJoin {
|
||||||
|
name = "neovide-hyprland-${final.neovide.version}";
|
||||||
|
paths = [ final.neovide ];
|
||||||
|
nativeBuildInputs = [ final.makeWrapper ];
|
||||||
|
postBuild = ''
|
||||||
|
rm $out/bin/neovide
|
||||||
|
makeWrapper ${final.neovide}/bin/neovide $out/bin/neovide --set WINIT_UNIX_BACKEND x11
|
||||||
|
'';
|
||||||
|
meta = final.neovide.meta // {
|
||||||
|
mainProgram = "neovide";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
master = import inputs.master {
|
master = import inputs.master {
|
||||||
inherit (prev) system;
|
inherit (prev) system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|
Loading…
Reference in a new issue