nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Compare commits

base: nki:b96dd59552f58856371ca8b068224ca4c72d2c44
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test
..
compare: nki:331e17df534ece38f2d3cfaea1960b2ea2909247
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test

No commits in common. "b96dd59552f58856371ca8b068224ca4c72d2c44" and "331e17df534ece38f2d3cfaea1960b2ea2909247" have entirely different histories.
b96dd59552 ... 331e17df53

3 changed files with 22 additions and 25 deletions
Show stats Expand all files Collapse all files

40
home/modules/programs/my-niri.nix
View file

@ -331,26 +331,26 @@ in
# #
# For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on # For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
# will all refer to the 3rd workspace. # will all refer to the 3rd workspace.
"Mod+1" = lib.mkIf cfg.workspaces."01".fixed { action = focus-workspace (cfg.workspaces."01".name); }; "Mod+1".action = focus-workspace (cfg.workspaces."01".name);
"Mod+2" = lib.mkIf cfg.workspaces."02".fixed { action = focus-workspace (cfg.workspaces."02".name); }; "Mod+2".action = focus-workspace (cfg.workspaces."02".name);
"Mod+3" = lib.mkIf cfg.workspaces."03".fixed { action = focus-workspace (cfg.workspaces."03".name); }; "Mod+3".action = focus-workspace (cfg.workspaces."03".name);
"Mod+4" = lib.mkIf cfg.workspaces."04".fixed { action = focus-workspace (cfg.workspaces."04".name); }; "Mod+4".action = focus-workspace (cfg.workspaces."04".name);
"Mod+5" = lib.mkIf cfg.workspaces."05".fixed { action = focus-workspace (cfg.workspaces."05".name); }; "Mod+5".action = focus-workspace (cfg.workspaces."05".name);
"Mod+6" = lib.mkIf cfg.workspaces."06".fixed { action = focus-workspace (cfg.workspaces."06".name); }; "Mod+6".action = focus-workspace (cfg.workspaces."06".name);
"Mod+7" = lib.mkIf cfg.workspaces."07".fixed { action = focus-workspace (cfg.workspaces."07".name); }; "Mod+7".action = focus-workspace (cfg.workspaces."07".name);
"Mod+8" = lib.mkIf cfg.workspaces."08".fixed { action = focus-workspace (cfg.workspaces."08".name); }; "Mod+8".action = focus-workspace (cfg.workspaces."08".name);
"Mod+9" = lib.mkIf cfg.workspaces."09".fixed { action = focus-workspace (cfg.workspaces."09".name); }; "Mod+9".action = focus-workspace (cfg.workspaces."09".name);
"Mod+0" = lib.mkIf cfg.workspaces."10".fixed { action = focus-workspace (cfg.workspaces."10".name); }; "Mod+0".action = focus-workspace (cfg.workspaces."10".name);
"Mod+Shift+1" = lib.mkIf cfg.workspaces."01".fixed { action = move-column-to-workspace (cfg.workspaces."01".name); }; "Mod+Shift+1".action = move-column-to-workspace (cfg.workspaces."01".name);
"Mod+Shift+2" = lib.mkIf cfg.workspaces."02".fixed { action = move-column-to-workspace (cfg.workspaces."02".name); }; "Mod+Shift+2".action = move-column-to-workspace (cfg.workspaces."02".name);
"Mod+Shift+3" = lib.mkIf cfg.workspaces."03".fixed { action = move-column-to-workspace (cfg.workspaces."03".name); }; "Mod+Shift+3".action = move-column-to-workspace (cfg.workspaces."03".name);
"Mod+Shift+4" = lib.mkIf cfg.workspaces."04".fixed { action = move-column-to-workspace (cfg.workspaces."04".name); }; "Mod+Shift+4".action = move-column-to-workspace (cfg.workspaces."04".name);
"Mod+Shift+5" = lib.mkIf cfg.workspaces."05".fixed { action = move-column-to-workspace (cfg.workspaces."05".name); }; "Mod+Shift+5".action = move-column-to-workspace (cfg.workspaces."05".name);
"Mod+Shift+6" = lib.mkIf cfg.workspaces."06".fixed { action = move-column-to-workspace (cfg.workspaces."06".name); }; "Mod+Shift+6".action = move-column-to-workspace (cfg.workspaces."06".name);
"Mod+Shift+7" = lib.mkIf cfg.workspaces."07".fixed { action = move-column-to-workspace (cfg.workspaces."07".name); }; "Mod+Shift+7".action = move-column-to-workspace (cfg.workspaces."07".name);
"Mod+Shift+8" = lib.mkIf cfg.workspaces."08".fixed { action = move-column-to-workspace (cfg.workspaces."08".name); }; "Mod+Shift+8".action = move-column-to-workspace (cfg.workspaces."08".name);
"Mod+Shift+9" = lib.mkIf cfg.workspaces."09".fixed { action = move-column-to-workspace (cfg.workspaces."09".name); }; "Mod+Shift+9".action = move-column-to-workspace (cfg.workspaces."09".name);
"Mod+Shift+0" = lib.mkIf cfg.workspaces."10".fixed { action = move-column-to-workspace (cfg.workspaces."10".name); }; "Mod+Shift+0".action = move-column-to-workspace (cfg.workspaces."10".name);
"Mod+asciicircum".action = focus-workspace (cfg.workspaces."99".name); "Mod+asciicircum".action = focus-workspace (cfg.workspaces."99".name);
"Mod+Shift+asciicircum".action = move-column-to-workspace (cfg.workspaces."99".name); "Mod+Shift+asciicircum".action = move-column-to-workspace (cfg.workspaces."99".name);

3
home/nki-framework.nix
View file

@ -47,9 +47,6 @@
}; };
}; };
programs.my-niri.enable = true; programs.my-niri.enable = true;
programs.my-niri.workspaces = lib.genAttrs [ "04" "05" "06" "07" "08" "09" ] (_: {
fixed = false;
});
programs.niri.settings = { programs.niri.settings = {
input.keyboard.xkb.options = "ctrl:swapcaps"; input.keyboard.xkb.options = "ctrl:swapcaps";
}; };

4
packages/common/nki-kakoune/lsp.nix
View file

@ -264,11 +264,11 @@ let
(lib.mapAttrsToList (_: serv: serv.package or null) config.languageServers); (lib.mapAttrsToList (_: serv: serv.package or null) config.languageServers);
in in
{ {
extraPaths = lib.makeBinPath (serverPackages ++ [ kak-lsp ]); extraPaths = lib.makeBinPath serverPackages;
plugin = writeTextDir "share/kak/autoload/kak-lsp.kak" '' plugin = writeTextDir "share/kak/autoload/kak-lsp.kak" ''
hook global KakBegin .* %{ hook global KakBegin .* %{
try %{ try %{
eval %sh{kak-lsp --kakoune --config ${kak-lsp-config} -s $kak_session} eval %sh{${lib.getExe kak-lsp} --kakoune --config ${kak-lsp-config} -s $kak_session}
} }
lsp-enable lsp-enable