Compare commits

...

6 commits

6 changed files with 61 additions and 65 deletions

View file

@ -98,6 +98,11 @@
help = "wrapper for nixos-rebuild switch"; help = "wrapper for nixos-rebuild switch";
command = "sudo nixos-rebuild boot --flake . $@"; command = "sudo nixos-rebuild boot --flake . $@";
} }
{
name = "vim-startuptime";
help = "test vim startup time";
command = "${pkgs.lib.getExe pkgs.hyperfine} --warmup 5 --prepare 'sleep 2' 'vim -c exit'";
}
]; ];
packages = with pkgs; [ packages = with pkgs; [
stylua stylua

View file

@ -27,16 +27,19 @@
users.users.moritz.packages = [ pkgs.poetry ]; users.users.moritz.packages = [ pkgs.poetry ];
home-manager.users.moritz.services.kanshi.profiles = { home-manager.users.moritz.services.kanshi.settings = [
undocked = { {
outputs = [ profile.name = "undocked";
profile.outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
} }
]; ];
};
docked = { }
outputs = [ {
profile.name = "docked";
profile.outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
position = "640,1800"; # NOTE: 2160 / 1.2 = 1800 position = "640,1800"; # NOTE: 2160 / 1.2 = 1800
@ -47,8 +50,9 @@
position = "0,0"; position = "0,0";
} }
]; ];
};
}; }
];
services.kanata = { services.kanata = {
enable = true; enable = true;

View file

@ -46,6 +46,7 @@ in
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
vimAlias = true; vimAlias = true;
extraConfigLuaPre = readFile ./options.lua; extraConfigLuaPre = readFile ./options.lua;
luaLoader.enable = true;
performance = { performance = {
byteCompileLua = { byteCompileLua = {
enable = true; enable = true;

View file

@ -29,41 +29,6 @@ in
]; ];
} }
{ plugins.oil.enable = true; } { plugins.oil.enable = true; }
{
plugins = {
telescope = {
enable = true;
extensions.fzf-native.enable = true;
keymaps = {
"<leader>ff" = {
action = "find_files";
options.desc = "Find files";
};
"<leader>fb" = {
action = "buffers";
options.desc = "Find buffers";
};
"<leader>fl" = {
action = "current_buffer_fuzzy_find";
options.desc = "Search lines";
};
"<leader>fg" = {
action = "live_grep";
options.desc = "Live grep";
};
"<leader>fh" = {
action = "help_tags";
options.desc = "Help tags";
};
"<leader>fr" = {
action = "oldfiles";
options.desc = "Recent files";
};
};
};
web-devicons.enable = true;
};
}
{ plugins.nvim-autopairs.enable = true; } { plugins.nvim-autopairs.enable = true; }
{ plugins.vim-surround.enable = true; } { plugins.vim-surround.enable = true; }
{ {
@ -84,6 +49,10 @@ in
{ plugins.friendly-snippets.enable = true; } { plugins.friendly-snippets.enable = true; }
{ plugins.direnv.enable = true; } { plugins.direnv.enable = true; }
{ plugins.crates-nvim.enable = true; } { plugins.crates-nvim.enable = true; }
{
plugins.helpview.enable = true;
performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
}
]; ];
}; };
} }

View file

@ -0,0 +1,39 @@
_:
{
home-manager.users.moritz.programs.nixvim = {
plugins = {
telescope = {
enable = true;
extensions.fzf-native.enable = true;
keymaps = {
"<leader>ff" = {
action = "find_files";
options.desc = "Find files";
};
"<leader>fb" = {
action = "buffers";
options.desc = "Find buffers";
};
"<leader>fl" = {
action = "current_buffer_fuzzy_find";
options.desc = "Search lines";
};
"<leader>fg" = {
action = "live_grep";
options.desc = "Live grep";
};
"<leader>fh" = {
action = "help_tags";
options.desc = "Help tags";
};
"<leader>fr" = {
action = "oldfiles";
options.desc = "Recent files";
};
};
};
web-devicons.enable = true;
};
};
}

View file

@ -273,27 +273,5 @@ in
}; };
}; };
security.rtkit.enable = true; security.rtkit.enable = true;
home-manager.users.moritz.systemd.user.services =
let
units = [ "waybar" ];
mkAfter = _: {
Unit = {
After = [ "river-session.target" ];
Wants = [ "river-session.target" ];
};
};
in
lib.genAttrs units mkAfter;
systemd.user.services =
let
units = [ "pipewire" "xdg-desktop-portal" "wireplumber" ];
mkAfter = _: {
after = [ "river-session.target" ];
wants = [ "river-session.target" ];
};
in
lib.genAttrs units mkAfter;
}; };
} }