From 5725eb3cba667d6f6f899ddd5ab06357be17728c Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Tue, 11 Mar 2025 19:28:33 +0100 Subject: [PATCH 1/3] Put LibreOffice into its own file --- modules/home/default.nix | 1 + modules/home/libreoffice.nix | 9 +++++++++ modules/home/packages.nix | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 modules/home/libreoffice.nix diff --git a/modules/home/default.nix b/modules/home/default.nix index 21dafb0..6638cf7 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -26,6 +26,7 @@ ++ [(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 new file mode 100644 index 0000000..3bf0f5a --- /dev/null +++ b/modules/home/libreoffice.nix @@ -0,0 +1,9 @@ +{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 b5216a8..9b8eb71 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -24,7 +24,6 @@ inkscape kleopatra # Gpg GUI lazygit - libreoffice nemo-with-extensions # file manager jq nitch # systhem fetch util From 329843cd0e5849fe28b5e9fb15f6f8796c1d9426 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Tue, 11 Mar 2025 19:30:03 +0100 Subject: [PATCH 2/3] Install caligula. Idea from https://mtlynch.io/nixos-pi4/ --- modules/home/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 9b8eb71..d055311 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -56,6 +56,7 @@ python3 cmatrix + caligula gparted # partition manager ffmpeg imv # image viewer From 5f3c337091d5c54374e59d86a5b96fbee3c2db10 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Tue, 11 Mar 2025 19:36:28 +0100 Subject: [PATCH 3/3] Change C config --- modules/home/vscodium.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/home/vscodium.nix b/modules/home/vscodium.nix index b8fea3c..920972e 100644 --- a/modules/home/vscodium.nix +++ b/modules/home/vscodium.nix @@ -65,18 +65,7 @@ "editor.mouseWheelZoom" = true; "C_Cpp.autocompleteAddParentheses" = true; - "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.formatting" = "clangFormat"; "C_Cpp.intelliSenseCacheSize" = 2048; "C_Cpp.intelliSenseMemoryLimit" = 2048; "C_Cpp.default.browse.path" = [