diff --git a/modules/programs/.#niri.nix b/modules/programs/.#niri.nix deleted file mode 120000 index 5689a4e..0000000 --- a/modules/programs/.#niri.nix +++ /dev/null @@ -1 +0,0 @@ -lucy@nerv.4230:1788254438 \ No newline at end of file diff --git a/modules/programs/niri.nix b/modules/programs/niri.nix index e4bd35f..079eec0 100644 --- a/modules/programs/niri.nix +++ b/modules/programs/niri.nix @@ -127,15 +127,15 @@ Mod+7 { focus-workspace 7; } Mod+8 { focus-workspace 8; } Mod+9 { focus-workspace 9; } - Mod+Ctrl+1 { move-column-to-workspace 1; } - Mod+Ctrl+2 { move-column-to-workspace 2; } - Mod+Ctrl+3 { move-column-to-workspace 3; } - Mod+Ctrl+4 { move-column-to-workspace 4; } - Mod+Ctrl+5 { move-column-to-workspace 5; } - Mod+Ctrl+6 { move-column-to-workspace 6; } - Mod+Ctrl+7 { move-column-to-workspace 7; } - Mod+Ctrl+8 { move-column-to-workspace 8; } - Mod+Ctrl+9 { move-column-to-workspace 9; } + Mod+Shift+1 { move-column-to-workspace 1; } + Mod+Shift+2 { move-column-to-workspace 2; } + Mod+Shift+3 { move-column-to-workspace 3; } + Mod+Shift+4 { move-column-to-workspace 4; } + Mod+Shift+5 { move-column-to-workspace 5; } + Mod+Shift+6 { move-column-to-workspace 6; } + Mod+Shift+7 { move-column-to-workspace 7; } + Mod+Shift+8 { move-column-to-workspace 8; } + Mod+Shift+9 { move-column-to-workspace 9; } Mod+BracketLeft { consume-or-expel-window-left; } Mod+BracketRight { consume-or-expel-window-right; } diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix index 6ea8222..480aa90 100644 --- a/modules/programs/nixcord.nix +++ b/modules/programs/nixcord.nix @@ -10,7 +10,9 @@ discord.enable = false; enable = true; vesktop.enable = true; - quickCss = builtins.readFile (config.scheme inputs.tt-discord); + # tt-discord's templates/config.yaml uses the filetype/output keys, which + # base16.nix can't read; give it the extension directly so it skips that file. + quickCss = builtins.readFile (config.scheme); config = { useQuickCss = true; plugins = {