mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-17 02:25:12 -05:00
feat: switched back to hyprland
This commit is contained in:
parent
dd99b3a827
commit
b0dc23c7c0
144 changed files with 1347 additions and 477 deletions
|
@ -1,17 +1,16 @@
|
|||
{pkgs, ...}: {
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
catppuccin.catppuccin-vsc
|
||||
eamodio.gitlens
|
||||
elmtooling.elm-ls-vscode
|
||||
esbenp.prettier-vscode
|
||||
haskell.haskell
|
||||
james-yu.latex-workshop
|
||||
jnoortheen.nix-ide
|
||||
kamadorueda.alejandra
|
||||
mattn.lisp
|
||||
mkhl.direnv
|
||||
pkief.material-icon-theme
|
||||
streetsidesoftware.code-spell-checker
|
||||
tamasfe.even-better-toml
|
||||
];
|
||||
}
|
||||
{pkgs, ...}:
|
||||
with pkgs.vscode-extensions; [
|
||||
catppuccin.catppuccin-vsc
|
||||
eamodio.gitlens
|
||||
elmtooling.elm-ls-vscode
|
||||
esbenp.prettier-vscode
|
||||
haskell.haskell
|
||||
james-yu.latex-workshop
|
||||
jnoortheen.nix-ide
|
||||
kamadorueda.alejandra
|
||||
mattn.lisp
|
||||
mkhl.direnv
|
||||
pkief.material-icon-theme
|
||||
streetsidesoftware.code-spell-checker
|
||||
tamasfe.even-better-toml
|
||||
]
|
||||
|
|
|
@ -1,29 +1,27 @@
|
|||
{
|
||||
keybindings = [
|
||||
{
|
||||
key = "ctrl+shift+s";
|
||||
command = "editor.action.insertCursorAtEndOfEachLineSelected";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+a";
|
||||
command = "editor.action.quickFix";
|
||||
when = "editorHasCodeActionsProvider && textInputFocus && !editorReadonly";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+f";
|
||||
command = "editor.action.formatDocument";
|
||||
when = "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+tab";
|
||||
command = "editor.action.indentationToSpaces";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+d";
|
||||
command = "editor.action.deleteLines";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
];
|
||||
}
|
||||
[
|
||||
{
|
||||
key = "ctrl+shift+s";
|
||||
command = "editor.action.insertCursorAtEndOfEachLineSelected";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+a";
|
||||
command = "editor.action.quickFix";
|
||||
when = "editorHasCodeActionsProvider && textInputFocus && !editorReadonly";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+f";
|
||||
command = "editor.action.formatDocument";
|
||||
when = "editorHasDocumentFormattingProvider && editorTextFocus && !editorReadonly && !inCompositeEditor";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+tab";
|
||||
command = "editor.action.indentationToSpaces";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
{
|
||||
key = "ctrl+shift+d";
|
||||
command = "editor.action.deleteLines";
|
||||
when = "textInputFocus";
|
||||
}
|
||||
]
|
||||
|
|
|
@ -6,27 +6,25 @@
|
|||
}: let
|
||||
inherit (flake.config.aesthetics.themes.theme) font;
|
||||
in {
|
||||
userSettings = {
|
||||
"git.confirmSync" = false;
|
||||
"editor.insertSpaces" = false;
|
||||
"files.autoSave" = "afterDelay";
|
||||
"git.enableSmartCommit" = true;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = lib.getExe pkgs.nil;
|
||||
"nix.formatterPath" = lib.getExe pkgs.alejandra;
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"workbench.startupEditor" = "none";
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"workbench.statusBar.visible" = false;
|
||||
"editor.multiCursorLimit" = 700000;
|
||||
"elmLS.disableElmLSDiagnostics" = true;
|
||||
"elmLS.elmReviewDiagnostics" = "warning";
|
||||
"editor.wordWrap" = "on";
|
||||
"editor.fontSize" = 14;
|
||||
"editor.fontFamily" = "'${font}', 'monospace', monospace";
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"terminal.integrated.fontFamily" = "'${font}', 'monospace', monospace";
|
||||
"editor.fontLigatures" = true;
|
||||
};
|
||||
"git.confirmSync" = false;
|
||||
"editor.insertSpaces" = false;
|
||||
"files.autoSave" = "afterDelay";
|
||||
"git.enableSmartCommit" = true;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = lib.getExe pkgs.nil;
|
||||
"nix.formatterPath" = lib.getExe pkgs.alejandra;
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"workbench.startupEditor" = "none";
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"workbench.statusBar.visible" = false;
|
||||
"editor.multiCursorLimit" = 700000;
|
||||
"elmLS.disableElmLSDiagnostics" = true;
|
||||
"elmLS.elmReviewDiagnostics" = "warning";
|
||||
"editor.wordWrap" = "on";
|
||||
"editor.fontSize" = 14;
|
||||
"editor.fontFamily" = "'${font}', 'monospace', monospace";
|
||||
"terminal.integrated.fontSize" = 14;
|
||||
"terminal.integrated.fontFamily" = "'${font}', 'monospace', monospace";
|
||||
"editor.fontLigatures" = true;
|
||||
}
|
||||
|
|
|
@ -7,13 +7,15 @@
|
|||
programs = {
|
||||
vscode = let
|
||||
configPath = ./config;
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
}
|
||||
// (import (configPath + /keybindings.nix))
|
||||
// (import (configPath + /extensions.nix)) {inherit pkgs;}
|
||||
// (import (configPath + /userSettings.nix)) {inherit pkgs lib flake;};
|
||||
keybindingsPath = import (configPath + "/keybindings.nix");
|
||||
extensionsPath = import (configPath + "/extensions.nix") {inherit pkgs;};
|
||||
userSettingsPath = import (configPath + "/userSettings.nix") {inherit pkgs lib flake;};
|
||||
in {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
keybindings = keybindingsPath;
|
||||
extensions = extensionsPath;
|
||||
userSettings = userSettingsPath;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue