Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@

packages.md-oxide = pkgs.callPackage ./pkgs/oxide.nix {inherit npins;};
packages.neovim = pkgs.callPackage ./nvim.nix {inherit self';};
packages.default = self'.packages.neovim;
packages.neovide = pkgs.callPackage ./nvide.nix {inherit self' inputs;};
packages.default = pkgs.symlinkJoin {
name = self'.packages.neovim.name;
paths = [self'.packages.neovim self'.packages.neovide];
meta.mainProgram = self'.packages.neovim.meta.mainProgram;
};

devShells.default = let
emmy-lua-code-style = inputs'.nixpkgs-emmy.legacyPackages.emmy-lua-code-style.overrideAttrs (_: {
Expand All @@ -37,7 +42,7 @@
pkgs.mkShell {
packages = builtins.attrValues {
inherit (pkgs) nil stylua npins alejandra;
inherit (self'.packages) neovim;
inherit (self'.packages) neovim neovide;
inherit emmy-lua-code-style;
};

Expand Down Expand Up @@ -65,6 +70,9 @@
parts.url = "github:hercules-ci/flake-parts";
parts.inputs.nixpkgs-lib.follows = "nixpkgs";

wrapper-manager.url = "github:viperml/wrapper-manager";
wrapper-manager.inputs.nixpkgs.follows = "nixpkgs";

gen-luarc.url = "github:mrcjkb/nix-gen-luarc-json";
gen-luarc.inputs.nixpkgs.follows = "nixpkgs";
gen-luarc.inputs.flake-parts.follows = "parts";
Expand Down
20 changes: 20 additions & 0 deletions nvide.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
neovide,
self',
inputs,
pkgs,
lib,
}:
(inputs.wrapper-manager.lib {
inherit pkgs;
modules = [
{
wrappers.neovide.basePackage = neovide;
wrappers.neovide.flags = ["--neovim-bin" (lib.getExe self'.packages.neovim) "--fork"];
}
];
})
.config
.build
.packages
.neovide
2 changes: 2 additions & 0 deletions plugins/nobbz/lua/nobbz/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ rs("trouble") -- load trouble
rs("ufo") -- set up ufo
rs("whichkey") -- set up whichkey, which provides help as you type

if vim.g.neovide then rs("neovide") end

lazy.add_specs({
{ "startuptime", command = "StartUptime", after = rf("nobbz.startuptime"), },
})
Expand Down
22 changes: 22 additions & 0 deletions plugins/nobbz/lua/nobbz/neovide.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
vim.o.guifont = "Departure Mono:11"

vim.g.neovide_scale_factor = 0.6

local base_factor = 1.1

local function neovide_scale_factor(factor)
vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * factor
end

local function scale_up()
neovide_scale_factor(base_factor)
end

local function scale_down()
neovide_scale_factor(1 / base_factor)
end

WK.add({
{ "<C-+>", scale_up, desc = "increase font scale", },
{ "<C-->", scale_down, desc = "decrease font scale", },
})