diff --git a/modules/home/default.nix b/modules/home/default.nix index 6638cf7..21dafb0 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -26,7 +26,6 @@ ++ [(import ./scripts)] # personal scripts ++ [(import ./spotify.nix)] ++ [(import ./starship.nix)] # shell prompt - ++ [(import ./libreoffice.nix)] ++ [(import ./qt.nix)] ++ [(import ./vscodium.nix)] # vscode forck ++ [(import ./waybar)] # status bar diff --git a/modules/home/libreoffice.nix b/modules/home/libreoffice.nix deleted file mode 100644 index 3bf0f5a..0000000 --- a/modules/home/libreoffice.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - libreoffice - hunspell - hunspellDicts.en_US - hunspellDicts.en_GB-ise - hunspellDicts.es_ES - ]; -} diff --git a/modules/home/packages.nix b/modules/home/packages.nix index d055311..b5216a8 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -24,6 +24,7 @@ inkscape kleopatra # Gpg GUI lazygit + libreoffice nemo-with-extensions # file manager jq nitch # systhem fetch util @@ -56,7 +57,6 @@ python3 cmatrix - caligula gparted # partition manager ffmpeg imv # image viewer diff --git a/modules/home/vscodium.nix b/modules/home/vscodium.nix index 920972e..b8fea3c 100644 --- a/modules/home/vscodium.nix +++ b/modules/home/vscodium.nix @@ -65,7 +65,18 @@ "editor.mouseWheelZoom" = true; "C_Cpp.autocompleteAddParentheses" = true; - "C_Cpp.formatting" = "clangFormat"; + "C_Cpp.formatting" = "vcFormat"; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction" = true; + "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType" = true; + "C_Cpp.vcFormat.space.beforeEmptySquareBrackets" = true; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.block" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.function" = "sameLine"; + "C_Cpp.vcFormat.newLine.beforeElse" = false; + "C_Cpp.vcFormat.newLine.beforeCatch" = false; + "C_Cpp.vcFormat.newLine.beforeOpenBrace.type" = "sameLine"; + "C_Cpp.vcFormat.space.betweenEmptyBraces" = true; + "C_Cpp.vcFormat.space.betweenEmptyLambdaBrackets" = true; + "C_Cpp.vcFormat.indent.caseLabels" = true; "C_Cpp.intelliSenseCacheSize" = 2048; "C_Cpp.intelliSenseMemoryLimit" = 2048; "C_Cpp.default.browse.path" = [