From c5638f2174b6fb8dc963ae1f62de0f2eef3c3d60 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 21 Oct 2024 15:26:05 +0800 Subject: [PATCH] users/foo-dogsquared: enable Neorg for NixVim setup and add Oils for Unix as part of dev't setup --- .../modules/programs/nixvim/note-taking.nix | 40 +++++++++---------- .../modules/setups/development.nix | 11 ++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/note-taking.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/note-taking.nix index 363fce3d..9b0a54c1 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/note-taking.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/note-taking.nix @@ -2,7 +2,7 @@ { # The main star of the show. - plugins.neorg.enable = false; + plugins.neorg.enable = true; # Set it up, set it up, set it up. plugins.neorg.extraOptions = { @@ -18,9 +18,7 @@ "core.concealer" = helpers.emptyTable; # Dear diary... - "core.journal".config = { - strategy = "flat"; - }; + "core.journal".config = { strategy = "flat"; }; # Norg ripping a page from org-mode. "core.ui.calendar" = helpers.emptyTable; @@ -42,22 +40,24 @@ }; # Install the common text markup tree-sitter grammars. - plugins.treesitter.grammarPackages = with config.plugins.treesitter.package.builtGrammars; [ - bibtex - cooklang - latex - ledger - markdown - markdown_inline - org - po - pod - rst - tsx - ] - # Install the tree-sitter parsers required for the core.defaults Neorg - # module. - ++ lib.optionals (config.plugins.neorg.extraOptions ? load."core.defaults") + plugins.treesitter.grammarPackages = + with config.plugins.treesitter.package.builtGrammars; + [ + bibtex + cooklang + latex + ledger + markdown + markdown_inline + org + po + pod + rst + tsx + ] + # Install the tree-sitter parsers required for the core.defaults Neorg + # module. + ++ lib.optionals (config.plugins.neorg.extraOptions ? load."core.defaults") (with pkgs.tree-sitter-grammars; [ tree-sitter-norg tree-sitter-norg-meta diff --git a/configs/home-manager/foo-dogsquared/modules/setups/development.nix b/configs/home-manager/foo-dogsquared/modules/setups/development.nix index aecf6633..c8d2dd2e 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/development.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/development.nix @@ -3,8 +3,7 @@ let userCfg = config.users.foo-dogsquared; cfg = userCfg.setups.development; -in -{ +in { options.users.foo-dogsquared.setups.development.enable = lib.mkEnableOption "foo-dogsquared's software development setup"; @@ -44,6 +43,7 @@ in dt # Get that functional gawk. recode # Convert between different encodings. go-migrate # Go potential migraines. + oils-for-unix # Rev them up, reverent admin. ]; } @@ -85,9 +85,10 @@ in }) (lib.mkIf (userCfg.setups.desktop.enable && pkgs.stdenv.isLinux) { - home.packages = with pkgs; [ - d-spy # Some GNOME dev probably developed this. - ]; + home.packages = with pkgs; + [ + d-spy # Some GNOME dev probably developed this. + ]; }) ]); }