diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 11b8324c1..cd468e16a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,7 +23,8 @@ Also make sure to read the guidelines found at - [ ] Code formatted with `./format`. -- [ ] Code tested through `nix-shell --pure tests -A run.all` or `nix develop --ignore-environment .#all` using Flakes. +- [ ] Code tested through `nix-shell --pure tests -A run.all` + or `nix build --reference-lock-file flake.lock ./tests#test-all` using Flakes. - [ ] Test cases updated/added. See [example](https://github.com/nix-community/home-manager/commit/f3fbb50b68df20da47f9b0def5607857fcc0d021#diff-b61a6d542f9036550ba9c401c80f00ef). diff --git a/.github/labeler.yml b/.github/labeler.yml index cab1b5438..e41e05a14 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -25,6 +25,15 @@ - modules/programs/neovim.nix - tests/modules/programs/neovim/**/* +"program: firefox": + - changed-files: + - any-glob-to-any-file: + - modules/programs/firefox/**/* + - tests/modules/programs/firefox/**/* + - modules/misc/mozilla-messaging-hosts.nix + - modules/programs/floorp.nix + - modules/programs/librewolf.nix + "shell": - changed-files: - any-glob-to-any-file: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff67b6760..e4189723a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,6 @@ jobs: - run: ./format -c - run: nix-shell --show-trace . -A install - run: yes | home-manager -I home-manager=. uninstall - - run: nix-shell --show-trace --arg enableBig false --pure tests -A run.all - # Somebody please help us fix the macos tests. - if: matrix.os != 'macos-latest' + - run: nix-shell -j auto --show-trace --arg enableBig false --pure tests -A run.all + env: + GC_INITIAL_HEAP_SIZE: 4294967296 diff --git a/default.nix b/default.nix index 541a5a388..abf4e678b 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,12 @@ { pkgs ? import { } }: -rec { +let + path = builtins.path { + path = ./.; + name = "home-manager-source"; + }; + +in rec { docs = let releaseInfo = pkgs.lib.importJSON ./release.json; in with import ./docs { inherit pkgs; @@ -12,12 +18,13 @@ rec { jsonModuleMaintainers = jsonModuleMaintainers; # Unstable, mainly for CI. }; - home-manager = pkgs.callPackage ./home-manager { path = toString ./.; }; + home-manager = pkgs.callPackage ./home-manager { inherit path; }; install = pkgs.callPackage ./home-manager/install.nix { inherit home-manager; }; nixos = import ./nixos; + lib = import ./lib { inherit (pkgs) lib; }; - path = ./.; + inherit path; } diff --git a/docs/manual/contributing/tests.md b/docs/manual/contributing/tests.md index bc3956ae3..41eec3447 100644 --- a/docs/manual/contributing/tests.md +++ b/docs/manual/contributing/tests.md @@ -29,10 +29,16 @@ through $ nix-shell --pure tests -A run.alacritty-empty-settings ``` -However, those invocations will impurely source the system's nixpkgs, -and may cause failures. To run against the nixpkgs from the flake.lock, +However, those invocations will impurely source the system's Nixpkgs, +and may cause failures. To run against the Nixpkgs from the `flake.lock` file, use instead e.g. ``` shell -$ nix develop --ignore-environment .#all +$ nix build --reference-lock-file flake.lock ./tests#test-all +``` + +or + +``` shell +$ nix build --reference-lock-file flake.lock ./tests#test-alacritty-empty-settings ``` diff --git a/docs/manual/installation/nixos.md b/docs/manual/installation/nixos.md index 6c9807ee8..6ec201638 100644 --- a/docs/manual/installation/nixos.md +++ b/docs/manual/installation/nixos.md @@ -42,9 +42,15 @@ home-manager.users.eve = { pkgs, ... }: { home.packages = [ pkgs.atool pkgs.httpie ]; programs.bash.enable = true; - # The state version is required and should stay at the version you - # originally installed. - home.stateVersion = "24.11"; + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "24.05"; # Please read the comment before changing. + }; ``` diff --git a/docs/manual/nix-flakes.md b/docs/manual/nix-flakes.md index 93f71feb8..bd33120c6 100644 --- a/docs/manual/nix-flakes.md +++ b/docs/manual/nix-flakes.md @@ -30,6 +30,7 @@ nix-flakes/prerequisites.md nix-flakes/standalone.md nix-flakes/nixos.md nix-flakes/nix-darwin.md +nix-flakes/flake-parts.md ``` diff --git a/docs/manual/nix-flakes/flake-parts.md b/docs/manual/nix-flakes/flake-parts.md new file mode 100644 index 000000000..b314bef3c --- /dev/null +++ b/docs/manual/nix-flakes/flake-parts.md @@ -0,0 +1,39 @@ +# flake-parts module {#sec-flakes-flake-parts-module} + +When using [flake-parts](https://flake.parts) +you may wish to import Home Manager's flake module, +`flakeModules.home-manager`. + +``` nix +{ + description = "flake-parts configuration"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; + + outputs = inputs@{ flake-parts, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { + imports = [ + # Import home-manager's flake module + inputs.home-manager.flakeModules.home-manager + ]; + flake = { + # Define `homeModules`, `homeConfigurations`, + # `nixosConfigurations`, etc here + }; + # See flake.parts for more features, such as `perSystem` + }; +} +``` + +The flake module defines the `flake.homeModules` and `flake.homeConfigurations` +options, allowing them to be properly merged if they are defined in multiple +modules. + +If you are only defining `homeModules` and/or `homeConfigurations` once in a +single module, flake-parts should work fine without importing +`flakeModules.home-manager`. diff --git a/docs/release-notes/rl-2505.md b/docs/release-notes/rl-2505.md index 5d47f2c69..588ce5b47 100644 --- a/docs/release-notes/rl-2505.md +++ b/docs/release-notes/rl-2505.md @@ -17,6 +17,11 @@ This release has the following notable changes: The `"suggest"` alternative will remain for a while longer but may also be deprecated for removal in the future. +- The Home Manager test suite has been removed from the main Nix Flake + since it caused unnecessary evaluations and downloads. Instead the + tests are available through a Nix Flake file inside the `tests` + directory. See [](#sec-tests) for example commands. + ## State Version Changes {#sec-release-25.05-state-version-changes} The state version in this release includes the changes below. These diff --git a/flake-module.nix b/flake-module.nix new file mode 100644 index 000000000..cc5f1551a --- /dev/null +++ b/flake-module.nix @@ -0,0 +1,33 @@ +{ lib, flake-parts-lib, moduleLocation, ... }: +let inherit (lib) toString mapAttrs mkOption types; +in { + options = { + flake = flake-parts-lib.mkSubmoduleOptions { + homeConfigurations = mkOption { + type = types.lazyAttrsOf types.raw; + default = { }; + description = '' + Instantiated Home Manager configurations. + + `homeConfigurations` is for specific installations. If you want to expose + reusable configurations, add them to `homeModules` in the form of modules, so + that you can reference them in this or another flake's `homeConfigurations`. + ''; + }; + homeModules = mkOption { + type = types.lazyAttrsOf types.deferredModule; + default = { }; + apply = mapAttrs (k: v: { + _class = "homeManager"; + _file = "${toString moduleLocation}#homeModules.${k}"; + imports = [ v ]; + }); + description = '' + Home Manager modules. + + You may use this for reusable pieces of configuration, service modules, etc. + ''; + }; + }; + }; +} diff --git a/flake.lock b/flake.lock index 7672c2194..dd029164e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a90f89c0..918507dde 100644 --- a/flake.nix +++ b/flake.nix @@ -6,24 +6,22 @@ outputs = { self, nixpkgs, ... }: { nixosModules = rec { - home-manager = import ./nixos; + home-manager = ./nixos; default = home-manager; }; - # deprecated in Nix 2.8 - nixosModule = self.nixosModules.default; darwinModules = rec { - home-manager = import ./nix-darwin; + home-manager = ./nix-darwin; + default = home-manager; + }; + + flakeModules = rec { + home-manager = ./flake-module.nix; default = home-manager; }; - # unofficial; deprecated in Nix 2.8 - darwinModule = self.darwinModules.default; templates = { - standalone = { - path = ./templates/standalone; - description = "Standalone setup"; - }; + default = self.templates.standalone; nixos = { path = ./templates/nixos; description = "Home Manager as a NixOS module,"; @@ -32,69 +30,16 @@ path = ./templates/nix-darwin; description = "Home Manager as a nix-darwin module,"; }; + standalone = { + path = ./templates/standalone; + description = "Standalone setup"; + }; }; - defaultTemplate = self.templates.standalone; - - lib = { - hm = (import ./modules/lib/stdlib-extended.nix nixpkgs.lib).hm; - homeManagerConfiguration = { modules ? [ ], pkgs, lib ? pkgs.lib - , extraSpecialArgs ? { }, check ? true - # Deprecated: - , configuration ? null, extraModules ? null, stateVersion ? null - , username ? null, homeDirectory ? null, system ? null }@args: - let - msgForRemovedArg = '' - The 'homeManagerConfiguration' arguments - - - 'configuration', - - 'username', - - 'homeDirectory' - - 'stateVersion', - - 'extraModules', and - - 'system' - - have been removed. Instead use the arguments 'pkgs' and - 'modules'. See the 22.11 release notes for more: https://nix-community.github.io/home-manager/release-notes.xhtml#sec-release-22.11-highlights - ''; - - throwForRemovedArgs = v: - let - used = builtins.filter (n: (args.${n} or null) != null) [ - "configuration" - "username" - "homeDirectory" - "stateVersion" - "extraModules" - "system" - ]; - msg = msgForRemovedArg + '' - - - Deprecated args passed: '' - + builtins.concatStringsSep " " used; - in lib.throwIf (used != [ ]) msg v; - - in throwForRemovedArgs (import ./modules { - inherit pkgs lib check extraSpecialArgs; - configuration = { ... }: { - imports = modules ++ [{ programs.home-manager.path = "${./.}"; }]; - nixpkgs = { - config = nixpkgs.lib.mkDefault pkgs.config; - inherit (pkgs) overlays; - }; - }; - }); - }; + lib = import ./lib { inherit (nixpkgs) lib; }; } // (let forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; in { - devShells = forAllSystems (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - tests = import ./tests { inherit pkgs; }; - in tests.run); - formatter = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; in pkgs.linkFarm "format" [{ @@ -105,23 +50,12 @@ packages = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; - lib = pkgs.lib; releaseInfo = nixpkgs.lib.importJSON ./release.json; docs = import ./docs { inherit pkgs; inherit (releaseInfo) release isReleaseBranch; }; - hmPkg = pkgs.callPackage ./home-manager { path = "${./.}"; }; - - testPackages = let - tests = import ./tests { inherit pkgs; }; - renameTestPkg = n: lib.nameValuePair "test-${n}"; - in lib.mapAttrs' renameTestPkg tests.build; - - integrationTestPackages = let - tests = import ./tests/integration { inherit pkgs; }; - renameTestPkg = n: lib.nameValuePair "integration-test-${n}"; - in lib.mapAttrs' renameTestPkg tests; + hmPkg = pkgs.callPackage ./home-manager { path = "${self}"; }; in { default = hmPkg; home-manager = hmPkg; @@ -129,8 +63,6 @@ docs-html = docs.manual.html; docs-json = docs.options.json; docs-manpages = docs.manPages; - } // testPackages // integrationTestPackages); - - defaultPackage = forAllSystems (system: self.packages.${system}.default); + }); }); } diff --git a/home-manager/default.nix b/home-manager/default.nix index 50fda77e5..6b594c4fd 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -16,12 +16,12 @@ let in runCommand "home-manager" { preferLocalBuild = true; nativeBuildInputs = [ gettext ]; - meta = with lib; { + meta = { mainProgram = "home-manager"; description = "A user environment configurator"; - maintainers = [ maintainers.rycee ]; - platforms = platforms.unix; - license = licenses.mit; + maintainers = [ lib.maintainers.rycee ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } '' install -v -D -m755 ${./home-manager} $out/bin/home-manager diff --git a/home-manager/po/bg.po b/home-manager/po/bg.po new file mode 100644 index 000000000..8d3df163d --- /dev/null +++ b/home-manager/po/bg.po @@ -0,0 +1,262 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Home Manager contributors +# This file is distributed under the same license as the Home Manager package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Home Manager\n" +"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" +"POT-Creation-Date: 2025-01-03 09:09+0100\n" +"PO-Revision-Date: 2025-01-30 16:22+0000\n" +"Last-Translator: Kiril Pan \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.10-dev\n" + +#. translators: For example: "home-manager: missing argument for --cores" +#: home-manager/home-manager:16 +msgid "%s: missing argument for %s" +msgstr "%s: липсващ аргумент за %s" + +#: home-manager/home-manager:69 +msgid "No configuration file found at %s" +msgstr "Не е намерен конфигурационен файл на %s" + +#. translators: The first '%s' specifier will be replaced by either +#. 'home.nix' or 'flake.nix'. +#: home-manager/home-manager:86 home-manager/home-manager:90 +#: home-manager/home-manager:189 +msgid "" +"Keeping your Home Manager %s in %s is deprecated,\n" +"please move it to %s" +msgstr "" +"Запазването на Вашия Домоуправител %s в %s \n" +"е остаряла практика, моля преместете го в %s" + +#: home-manager/home-manager:97 +msgid "No configuration file found. Please create one at %s" +msgstr "Конфигурационният файл не намерен. Моля създайте такъв в %s" + +#: home-manager/home-manager:112 +msgid "Home Manager not found at %s." +msgstr "Home Manager не е открит в %s." + +#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. +#: home-manager/home-manager:120 +msgid "" +"The fallback Home Manager path %s has been deprecated and a file/directory " +"was found there." +msgstr "" +"Изборът на резервната локация на Home Manager в %s е остаряла практика и " +"файлът/директорията беше намерен/а там." + +#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. +#: home-manager/home-manager:123 +msgid "" +"To remove this warning, do one of the following.\n" +"\n" +"1. Explicitly tell Home Manager to use the path, for example by adding\n" +"\n" +" { programs.home-manager.path = \"%s\"; }\n" +"\n" +" to your configuration.\n" +"\n" +" If you import Home Manager directly, you can use the `path` parameter\n" +"\n" +" pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n" +"\n" +" when calling the Home Manager package.\n" +"\n" +"2. Remove the deprecated path.\n" +"\n" +" $ rm -r \"%s\"" +msgstr "" +"За да премахнете това предупреждение, направенете една от следните опции:\n" +"\n" +"1. Изрично наредете на Home Manager да ползва локацията, като например " +"добавите:\n" +"\n" +" { programs.home-manager.path = \"%s\"; }\n" +"\n" +" в конфигурацията си.\n" +"\n" +" Ако импортирате Home Manager директно, можете да ползвате `path` " +"параметъра.\n" +"\n" +" pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n" +"\n" +" Когато повиквате Home Manager пакета.\n" +"\n" +"2. Премахнате остарялата локация.\n" +"\n" +" $ rm -r \"%s\"" + +#: home-manager/home-manager:151 +msgid "Sanity checking Nix" +msgstr "Разумна проверка на Nix" + +#: home-manager/home-manager:171 +msgid "Could not find suitable profile directory, tried %s and %s" +msgstr "Не е намерена подходяща профилна директория, пробвани са %s и %s" + +#. translators: Here "flake" is a noun that refers to the Nix Flakes feature. +#: home-manager/home-manager:226 +msgid "Can't inspect options of a flake configuration" +msgstr "Опциите на флейк конфигурацията не могат да бъдат прегледани" + +#: home-manager/home-manager:301 home-manager/home-manager:324 +#: home-manager/home-manager:1061 +msgid "%s: unknown option '%s'" +msgstr "%s: непозната опция '%s'" + +#: home-manager/home-manager:306 home-manager/home-manager:1062 +msgid "Run '%s --help' for usage help" +msgstr "Изпълнете командата '%s --help' за повече информация" + +#: home-manager/home-manager:332 home-manager/home-manager:437 +msgid "The file %s already exists, leaving it unchanged..." +msgstr "Файлът %s вече съществува, пропускане на промениете му..." + +#: home-manager/home-manager:334 home-manager/home-manager:439 +msgid "Creating %s..." +msgstr "Създаване на %s..." + +#: home-manager/home-manager:481 +msgid "Creating initial Home Manager generation..." +msgstr "Създаване на първоначалната Home Manager генерация..." + +#. translators: The "%s" specifier will be replaced by a file path. +#: home-manager/home-manager:486 +msgid "" +"All done! The home-manager tool should now be installed and you can edit\n" +"\n" +" %s\n" +"\n" +"to configure Home Manager. Run 'man home-configuration.nix' to\n" +"see all available options." +msgstr "" +"Всичко е готово! Инструментът home-manager е инсталиран и Вие можете да " +"редактирате\n" +"\n" +"....%s\n" +"\n" +"за да конфигурате Home Manager. Изпълнете командата 'man home-" +"configuration.nix'\n" +"за да видите всички налични опции." + +#. translators: The "%s" specifier will be replaced by a URL. +#: home-manager/home-manager:491 +msgid "" +"Uh oh, the installation failed! Please create an issue at\n" +"\n" +" %s\n" +"\n" +"if the error seems to be the fault of Home Manager." +msgstr "" +"О не, инсталацията се провали! Моля създайте запитване на\n" +"\n" +"....%s\n" +"\n" +"ако смятате, че грешката се дължи на Home Manager." + +#. translators: Here "flake" is a noun that refers to the Nix Flakes feature. +#: home-manager/home-manager:502 +msgid "Can't instantiate a flake configuration" +msgstr "Флейк конфигурацията не може да се инстанцира" + +#: home-manager/home-manager:578 +msgid "" +"There is %d unread and relevant news item.\n" +"Read it by running the command \"%s news\"." +msgid_plural "" +"There are %d unread and relevant news items.\n" +"Read them by running the command \"%s news\"." +msgstr[0] "" +"Има %d непрочетена релевантна новина.\n" +"Прочетете я като изпълните \"%s news\" командата." +msgstr[1] "" +"Има %d непрочетени релевантни новини.\n" +"Прочетете ги като изпълните \"%s news\" командата." + +#: home-manager/home-manager:592 +msgid "Unknown \"news.display\" setting \"%s\"." +msgstr "Непозната \"news.display\" настройка \"%s\"." + +#: home-manager/home-manager:600 +#, sh-format +msgid "Please set the $EDITOR or $VISUAL environment variable" +msgstr "Моля задайте $EDITOR или $VISUAL променливите на средата" + +#: home-manager/home-manager:618 +msgid "Cannot run build in read-only directory" +msgstr "" +"Компилацията не може да се стартира в директория предназначена само за четене" + +#: home-manager/home-manager:699 +msgid "No generation with ID %s" +msgstr "Не е намерена генерация с ID %s" + +#: home-manager/home-manager:701 +msgid "Cannot remove the current generation %s" +msgstr "Не може да бъде премахната сегашната генерация %s" + +#: home-manager/home-manager:703 +msgid "Removing generation %s" +msgstr "Премахване генерацията %s" + +#: home-manager/home-manager:724 +msgid "No generations to expire" +msgstr "Няма изтичащи генерации" + +#: home-manager/home-manager:735 +msgid "No home-manager packages seem to be installed." +msgstr "Изглежда няма нито един инсталиран home-manager пакет." + +#: home-manager/home-manager:820 +msgid "Unknown argument %s" +msgstr "Непознат аргумент %s" + +#: home-manager/home-manager:845 +msgid "This will remove Home Manager from your system." +msgstr "Това ще премахне Home Manager от системата Ви." + +#: home-manager/home-manager:848 +msgid "This is a dry run, nothing will actually be uninstalled." +msgstr "Това е сухо изпълнение - нищо няма да бъде деинсталирано." + +#: home-manager/home-manager:852 +msgid "Really uninstall Home Manager?" +msgstr "Наистина ли искате да деинсталирате Home Manager?" + +#: home-manager/home-manager:858 +msgid "Switching to empty Home Manager configuration..." +msgstr "Превключване към празна Home Manager конфигурация..." + +#: home-manager/home-manager:873 +msgid "Yay!" +msgstr "Ура!" + +#: home-manager/home-manager:878 +msgid "Home Manager is uninstalled but your home.nix is left untouched." +msgstr "" +"Home Manager бе деинсталиран но Вашия home.nix файл е оставен непроменен." + +#: home-manager/home-manager:1101 +msgid "expire-generations expects one argument, got %d." +msgstr "expire-generations очаква един аргумент, получил е %d." + +#: home-manager/home-manager:1123 +msgid "Unknown command: %s" +msgstr "Непозната команда: %s" + +#: home-manager/install.nix:18 +msgid "This derivation is not buildable, please run it using nix-shell." +msgstr "" +"Тази деривация не може да се компилира, моля стартирайте я ползвайки nix-" +"shell." diff --git a/home-manager/po/tok.po b/home-manager/po/tok.po new file mode 100644 index 000000000..3def9a8e6 --- /dev/null +++ b/home-manager/po/tok.po @@ -0,0 +1,216 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Home Manager contributors +# This file is distributed under the same license as the Home Manager package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Home Manager\n" +"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" +"POT-Creation-Date: 2025-01-03 09:09+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: tok\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. translators: For example: "home-manager: missing argument for --cores" +#: home-manager/home-manager:16 +msgid "%s: missing argument for %s" +msgstr "" + +#: home-manager/home-manager:69 +msgid "No configuration file found at %s" +msgstr "" + +#. translators: The first '%s' specifier will be replaced by either +#. 'home.nix' or 'flake.nix'. +#: home-manager/home-manager:86 home-manager/home-manager:90 +#: home-manager/home-manager:189 +msgid "" +"Keeping your Home Manager %s in %s is deprecated,\n" +"please move it to %s" +msgstr "" + +#: home-manager/home-manager:97 +msgid "No configuration file found. Please create one at %s" +msgstr "" + +#: home-manager/home-manager:112 +msgid "Home Manager not found at %s." +msgstr "" + +#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. +#: home-manager/home-manager:120 +msgid "" +"The fallback Home Manager path %s has been deprecated and a file/directory " +"was found there." +msgstr "" + +#. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. +#: home-manager/home-manager:123 +msgid "" +"To remove this warning, do one of the following.\n" +"\n" +"1. Explicitly tell Home Manager to use the path, for example by adding\n" +"\n" +" { programs.home-manager.path = \"%s\"; }\n" +"\n" +" to your configuration.\n" +"\n" +" If you import Home Manager directly, you can use the `path` parameter\n" +"\n" +" pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n" +"\n" +" when calling the Home Manager package.\n" +"\n" +"2. Remove the deprecated path.\n" +"\n" +" $ rm -r \"%s\"" +msgstr "" + +#: home-manager/home-manager:151 +msgid "Sanity checking Nix" +msgstr "" + +#: home-manager/home-manager:171 +msgid "Could not find suitable profile directory, tried %s and %s" +msgstr "" + +#. translators: Here "flake" is a noun that refers to the Nix Flakes feature. +#: home-manager/home-manager:226 +msgid "Can't inspect options of a flake configuration" +msgstr "" + +#: home-manager/home-manager:301 home-manager/home-manager:324 +#: home-manager/home-manager:1061 +msgid "%s: unknown option '%s'" +msgstr "" + +#: home-manager/home-manager:306 home-manager/home-manager:1062 +msgid "Run '%s --help' for usage help" +msgstr "" + +#: home-manager/home-manager:332 home-manager/home-manager:437 +msgid "The file %s already exists, leaving it unchanged..." +msgstr "" + +#: home-manager/home-manager:334 home-manager/home-manager:439 +msgid "Creating %s..." +msgstr "" + +#: home-manager/home-manager:481 +msgid "Creating initial Home Manager generation..." +msgstr "" + +#. translators: The "%s" specifier will be replaced by a file path. +#: home-manager/home-manager:486 +msgid "" +"All done! The home-manager tool should now be installed and you can edit\n" +"\n" +" %s\n" +"\n" +"to configure Home Manager. Run 'man home-configuration.nix' to\n" +"see all available options." +msgstr "" + +#. translators: The "%s" specifier will be replaced by a URL. +#: home-manager/home-manager:491 +msgid "" +"Uh oh, the installation failed! Please create an issue at\n" +"\n" +" %s\n" +"\n" +"if the error seems to be the fault of Home Manager." +msgstr "" + +#. translators: Here "flake" is a noun that refers to the Nix Flakes feature. +#: home-manager/home-manager:502 +msgid "Can't instantiate a flake configuration" +msgstr "" + +#: home-manager/home-manager:578 +msgid "" +"There is %d unread and relevant news item.\n" +"Read it by running the command \"%s news\"." +msgid_plural "" +"There are %d unread and relevant news items.\n" +"Read them by running the command \"%s news\"." +msgstr[0] "" +msgstr[1] "" + +#: home-manager/home-manager:592 +msgid "Unknown \"news.display\" setting \"%s\"." +msgstr "" + +#: home-manager/home-manager:600 +#, sh-format +msgid "Please set the $EDITOR or $VISUAL environment variable" +msgstr "" + +#: home-manager/home-manager:618 +msgid "Cannot run build in read-only directory" +msgstr "" + +#: home-manager/home-manager:699 +msgid "No generation with ID %s" +msgstr "" + +#: home-manager/home-manager:701 +msgid "Cannot remove the current generation %s" +msgstr "" + +#: home-manager/home-manager:703 +msgid "Removing generation %s" +msgstr "" + +#: home-manager/home-manager:724 +msgid "No generations to expire" +msgstr "" + +#: home-manager/home-manager:735 +msgid "No home-manager packages seem to be installed." +msgstr "" + +#: home-manager/home-manager:820 +msgid "Unknown argument %s" +msgstr "" + +#: home-manager/home-manager:845 +msgid "This will remove Home Manager from your system." +msgstr "" + +#: home-manager/home-manager:848 +msgid "This is a dry run, nothing will actually be uninstalled." +msgstr "" + +#: home-manager/home-manager:852 +msgid "Really uninstall Home Manager?" +msgstr "" + +#: home-manager/home-manager:858 +msgid "Switching to empty Home Manager configuration..." +msgstr "" + +#: home-manager/home-manager:873 +msgid "Yay!" +msgstr "" + +#: home-manager/home-manager:878 +msgid "Home Manager is uninstalled but your home.nix is left untouched." +msgstr "" + +#: home-manager/home-manager:1101 +msgid "expire-generations expects one argument, got %d." +msgstr "" + +#: home-manager/home-manager:1123 +msgid "Unknown command: %s" +msgstr "" + +#: home-manager/install.nix:18 +msgid "This derivation is not buildable, please run it using nix-shell." +msgstr "" diff --git a/home-manager/po/zh_Hant.po b/home-manager/po/zh_Hant.po index bf113567a..60520bcda 100644 --- a/home-manager/po/zh_Hant.po +++ b/home-manager/po/zh_Hant.po @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: Home Manager\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2024-02-16 22:01+0000\n" -"Last-Translator: Robert Helgesson \n" -"Language-Team: Chinese (Traditional) \n" +"PO-Revision-Date: 2025-03-07 18:58+0000\n" +"Last-Translator: 807 \n" +"Language-Team: Chinese (Traditional Han script) \n" "Language: zh_Hant\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.4\n" +"X-Generator: Weblate 5.10.3-dev\n" #. translators: For example: "home-manager: missing argument for --cores" #: home-manager/home-manager:16 msgid "%s: missing argument for %s" -msgstr "" +msgstr "%s: 缺少參數 %s" #: home-manager/home-manager:69 msgid "No configuration file found at %s" @@ -36,6 +36,8 @@ msgid "" "Keeping your Home Manager %s in %s is deprecated,\n" "please move it to %s" msgstr "" +"保持你的 Home Manager 在 %s 中，%s 已被拋棄，\n" +"請將它移動到 %s" #: home-manager/home-manager:97 msgid "No configuration file found. Please create one at %s" @@ -43,14 +45,14 @@ msgstr "未找到配置檔案。請在 %s 處建立一份" #: home-manager/home-manager:112 msgid "Home Manager not found at %s." -msgstr "" +msgstr "在 %s 中找不到 Home Manager。" #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. #: home-manager/home-manager:120 msgid "" "The fallback Home Manager path %s has been deprecated and a file/directory " "was found there." -msgstr "" +msgstr "備用的 Home Manager 路徑 %s 已被拋棄，但一個檔案/資料夾在這被找到。" #. translators: This message will be seen by very few users that likely are familiar with English. So feel free to leave this untranslated. #: home-manager/home-manager:123 @@ -73,6 +75,23 @@ msgid "" "\n" " $ rm -r \"%s\"" msgstr "" +"要消除這個警告，請做以下其中一步。\n" +"\n" +"1. 告訴Home Manager去使用路徑，例如加入\n" +"\n" +" { programs.home-manager.path = \"%s\"; }\n" +"\n" +" 到你的配置中。\n" +"\n" +" 如果你想要直接引入Home Manager， 請你使用 `path` 參數r\n" +"\n" +" pkgs.callPackage /path/to/home-manager-package { path = \"%s\"; }\n" +"\n" +" 當呼叫 Home Manager 模組。\n" +"\n" +"2. 刪除無效的路徑\n" +"\n" +" $ rm -r \"%s\"" #: home-manager/home-manager:151 msgid "Sanity checking Nix" @@ -80,7 +99,7 @@ msgstr "正在進行 Nix 完整性檢查" #: home-manager/home-manager:171 msgid "Could not find suitable profile directory, tried %s and %s" -msgstr "" +msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s" #. translators: Here "flake" is a noun that refers to the Nix Flakes feature. #: home-manager/home-manager:226 @@ -98,11 +117,11 @@ msgstr "執行 ‘%s --help’ 獲取用法幫助" #: home-manager/home-manager:332 home-manager/home-manager:437 msgid "The file %s already exists, leaving it unchanged..." -msgstr "" +msgstr "檔案 %s 已經存在，不更改它..." #: home-manager/home-manager:334 home-manager/home-manager:439 msgid "Creating %s..." -msgstr "" +msgstr "創建 %s 中..." #: home-manager/home-manager:481 msgid "Creating initial Home Manager generation..." @@ -163,11 +182,11 @@ msgstr "未知的 “news.display” 設定項 “%s”。" #: home-manager/home-manager:600 #, sh-format msgid "Please set the $EDITOR or $VISUAL environment variable" -msgstr "" +msgstr "請設定 $EDITOR 或 $VISUAL 環境變數" #: home-manager/home-manager:618 msgid "Cannot run build in read-only directory" -msgstr "無法在只讀目錄中執行構建" +msgstr "無法在唯讀目錄中執行構建" #: home-manager/home-manager:699 msgid "No generation with ID %s" diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 000000000..5d0eb5f41 --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,49 @@ +{ lib }: { + hm = (import ../modules/lib/stdlib-extended.nix lib).hm; + homeManagerConfiguration = { modules ? [ ], pkgs, lib ? pkgs.lib + , extraSpecialArgs ? { }, check ? true + # Deprecated: + , configuration ? null, extraModules ? null, stateVersion ? null + , username ? null, homeDirectory ? null, system ? null }@args: + let + msgForRemovedArg = '' + The 'homeManagerConfiguration' arguments + + - 'configuration', + - 'username', + - 'homeDirectory' + - 'stateVersion', + - 'extraModules', and + - 'system' + + have been removed. Instead use the arguments 'pkgs' and + 'modules'. See the 22.11 release notes for more: https://nix-community.github.io/home-manager/release-notes.xhtml#sec-release-22.11-highlights + ''; + + throwForRemovedArgs = v: + let + used = builtins.filter (n: (args.${n} or null) != null) [ + "configuration" + "username" + "homeDirectory" + "stateVersion" + "extraModules" + "system" + ]; + msg = msgForRemovedArg + '' + + + Deprecated args passed: '' + builtins.concatStringsSep " " used; + in lib.throwIf (used != [ ]) msg v; + + in throwForRemovedArgs (import ../modules { + inherit pkgs lib check extraSpecialArgs; + configuration = { ... }: { + imports = modules ++ [{ programs.home-manager.path = "${../.}"; }]; + nixpkgs = { + config = lib.mkDefault pkgs.config; + inherit (pkgs) overlays; + }; + }; + }); +} diff --git a/modules/accounts/calendar.nix b/modules/accounts/calendar.nix index 86f1b38c5..d71d4dff3 100644 --- a/modules/accounts/calendar.nix +++ b/modules/accounts/calendar.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ config, lib, ... }: let + inherit (lib) mkOption types; cfg = config.accounts.calendar; @@ -70,7 +68,7 @@ let }; }; - calendarOpts = { name, config, ... }: { + calendarOpts = { name, ... }: { options = { name = mkOption { type = types.str; @@ -125,7 +123,7 @@ in { type = types.str; example = ".calendar"; apply = p: - if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; + if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; description = '' The base directory in which to save calendars. May be a relative path, in which case it is relative the home @@ -144,15 +142,15 @@ in { description = "List of calendars."; }; }; - config = mkIf (cfg.accounts != { }) { + config = lib.mkIf (cfg.accounts != { }) { assertions = let - primaries = - catAttrs "name" (filter (a: a.primary) (attrValues cfg.accounts)); + primaries = lib.catAttrs "name" + (lib.filter (a: a.primary) (lib.attrValues cfg.accounts)); in [{ - assertion = length primaries <= 1; + assertion = lib.length primaries <= 1; message = "Must have at most one primary calendar account but found " - + toString (length primaries) + ", namely " - + concatStringsSep ", " primaries; + + toString (lib.length primaries) + ", namely " + + lib.concatStringsSep ", " primaries; }]; }; } diff --git a/modules/accounts/contacts.nix b/modules/accounts/contacts.nix index d00f5d071..b5d93f21f 100644 --- a/modules/accounts/contacts.nix +++ b/modules/accounts/contacts.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let + inherit (lib) mkOption types; cfg = config.accounts.contact; @@ -78,7 +77,7 @@ let }; }; - contactOpts = { name, config, ... }: { + contactOpts = { name, ... }: { options = { name = mkOption { type = types.str; @@ -114,7 +113,7 @@ in { basePath = mkOption { type = types.str; apply = p: - if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; + if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; description = '' The base directory in which to save contacts. May be a relative path, in which case it is relative the home diff --git a/modules/accounts/email.nix b/modules/accounts/email.nix index f3996195d..2395f7e39 100644 --- a/modules/accounts/email.nix +++ b/modules/accounts/email.nix @@ -1,8 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let + inherit (lib) mkDefault mkIf mkOption types; cfg = config.accounts.email; @@ -49,7 +48,7 @@ let default = '' -- ''; - example = literalExpression '' + example = lib.literalExpression '' ~*~*~*~*~*~*~*~*~*~*~*~ ''; description = '' @@ -60,7 +59,7 @@ let command = mkOption { type = with types; nullOr path; default = null; - example = literalExpression '' + example = lib.literalExpression '' pkgs.writeScript "signature" "echo This is my signature" ''; description = "A command that generates a signature."; @@ -247,6 +246,7 @@ let "fastmail.com" "yandex.com" "outlook.office365.com" + "migadu.com" ]; default = "plain"; description = '' @@ -267,10 +267,26 @@ let }; aliases = mkOption { - type = types.listOf (types.strMatching ".*@.*"); + description = "Alternative identities of this account."; default = [ ]; example = [ "webmaster@example.org" "admin@example.org" ]; - description = "Alternative email addresses of this account."; + type = types.listOf (types.oneOf [ + (types.strMatching ".*@.*") + (types.submodule { + options = { + realName = mkOption { + type = types.str; + example = "Jane Doe"; + description = "Name displayed when sending mails."; + }; + address = mkOption { + type = types.strMatching ".*@.*"; + example = "jane.doe@example.org"; + description = "The email address of this identity."; + }; + }; + }) + ]); }; realName = mkOption { @@ -291,7 +307,7 @@ let passwordCommand = mkOption { type = types.nullOr (types.either types.str (types.listOf types.str)); default = null; - apply = p: if isString p then splitString " " p else p; + apply = p: if lib.isString p then lib.splitString " " p else p; example = "secret-tool lookup email me@example.org"; description = '' A command, which when run writes the account password on @@ -390,10 +406,10 @@ let }; }; - config = mkMerge [ + config = lib.mkMerge [ { name = name; - maildir = mkOptionDefault { path = "${name}"; }; + maildir = lib.mkOptionDefault { path = "${name}"; }; } (mkIf (config.flavor == "yandex.com") { @@ -450,6 +466,20 @@ let }; }) + (mkIf (config.flavor == "migadu.com") { + userName = mkDefault config.address; + + imap = { + host = "imap.migadu.com"; + port = 993; + }; + + smtp = { + host = "smtp.migadu.com"; + port = 465; + }; + }) + (mkIf (config.flavor == "gmail.com") { userName = mkDefault config.address; @@ -495,7 +525,7 @@ in { default = "${config.home.homeDirectory}/Maildir"; defaultText = "Maildir"; apply = p: - if hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; + if lib.hasPrefix "/" p then p else "${config.home.homeDirectory}/${p}"; description = '' The base directory for account maildir directories. May be a relative path (e.g. the user setting this value as "MyMaildir"), @@ -514,13 +544,14 @@ in { config = mkIf (cfg.accounts != { }) { assertions = [ (let - primaries = - catAttrs "name" (filter (a: a.primary) (attrValues cfg.accounts)); + primaries = lib.catAttrs "name" + (lib.filter (a: a.primary) (lib.attrValues cfg.accounts)); in { - assertion = length primaries == 1; + assertion = lib.length primaries == 1; message = "Must have exactly one primary mail account but found " - + toString (length primaries) + optionalString (length primaries > 1) - (", namely " + concatStringsSep ", " primaries); + + toString (lib.length primaries) + + lib.optionalString (lib.length primaries > 1) + (", namely " + lib.concatStringsSep ", " primaries); }) ]; }; diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix index 42c259455..ee8edbbb6 100644 --- a/modules/config/home-cursor.nix +++ b/modules/config/home-cursor.nix @@ -1,13 +1,17 @@ { config, options, lib, pkgs, ... }: -with lib; - let + inherit (lib) + mkEnableOption mkOption mkIf mkMerge mkDefault mkAliasOptionModule types + literalExpression escapeShellArg hm getAttrFromPath any optional; cfg = config.home.pointerCursor; + opts = options.home.pointerCursor; pointerCursorModule = types.submodule { options = { + enable = mkEnableOption "cursor config generation"; + package = mkOption { type = types.package; example = literalExpression "pkgs.vanilla-dmz"; @@ -46,6 +50,14 @@ let ''; }; + dotIcons = { + enable = mkEnableOption '' + `.icons` config generation for {option}`home.pointerCursor` + '' // { + default = true; + }; + }; + hyprcursor = { enable = mkEnableOption "hyprcursor config generation"; @@ -56,6 +68,11 @@ let description = "The cursor size for hyprcursor."; }; }; + + sway = { + enable = mkEnableOption + "sway config generation for {option}`home.pointerCursor`"; + }; }; }; @@ -78,7 +95,7 @@ let }; in { - meta.maintainers = [ maintainers.league ]; + meta.maintainers = [ lib.maintainers.league ]; imports = [ (mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [ @@ -102,17 +119,6 @@ in { "x11" "defaultCursor" ]) - - ({ ... }: { - warnings = optional (any (x: - getAttrFromPath - ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ]) - options) [ "package" "name" "size" "defaultCursor" ]) '' - The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed - in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x11.enable` - to generate x11 specific cursor configurations. You can refer to the documentation for more details. - ''; - }) ]; options = { @@ -120,7 +126,7 @@ in { type = types.nullOr pointerCursorModule; default = null; description = '' - Cursor configuration. Set to `null` to disable. + Cursor configuration. Top-level options declared under this submodule are backend independent options. Options declared under namespaces such as `x11` @@ -139,63 +145,107 @@ in { }; }; - config = mkIf (cfg != null) (mkMerge [ + config = let + # Check if enable option was explicitly defined by the user + enableDefined = any (x: x ? enable) opts.definitions; + + # Determine if cursor configuration should be enabled + enable = if enableDefined then cfg.enable else cfg != null; + in mkMerge [ + (mkIf enable (mkMerge [ + { + assertions = [ + (hm.assertions.assertPlatform "home.pointerCursor" pkgs + lib.platforms.linux) + ]; + + home.packages = [ cfg.package defaultIndexThemePackage ]; + + home.sessionVariables = { + XCURSOR_SIZE = mkDefault cfg.size; + XCURSOR_THEME = mkDefault cfg.name; + }; + + # Set directory to look for cursors in, needed for some applications + # that are unable to find cursors otherwise. See: + # https://github.com/nix-community/home-manager/issues/2812 + # https://wiki.archlinux.org/title/Cursor_themes#Environment_variable + home.sessionSearchVariables.XCURSOR_PATH = + [ "${config.home.profileDirectory}/share/icons" ]; + + # Add cursor icon link to $XDG_DATA_HOME/icons as well for redundancy. + xdg.dataFile."icons/default/index.theme".source = + "${defaultIndexThemePackage}/share/icons/default/index.theme"; + xdg.dataFile."icons/${cfg.name}".source = + "${cfg.package}/share/icons/${cfg.name}"; + } + + (mkIf cfg.dotIcons.enable { + # Add symlink of cursor icon directory to $HOME/.icons, needed for + # backwards compatibility with some applications. See: + # https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html + home.file.".icons/default/index.theme".source = + "${defaultIndexThemePackage}/share/icons/default/index.theme"; + home.file.".icons/${cfg.name}".source = + "${cfg.package}/share/icons/${cfg.name}"; + }) + + (mkIf cfg.x11.enable { + xsession.profileExtra = '' + ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${ + toString cfg.size + } + ''; + + xresources.properties = { + "Xcursor.theme" = cfg.name; + "Xcursor.size" = cfg.size; + }; + }) + + (mkIf cfg.gtk.enable { + gtk.cursorTheme = mkDefault { inherit (cfg) package name size; }; + }) + + (mkIf cfg.hyprcursor.enable { + home.sessionVariables = { + HYPRCURSOR_THEME = cfg.name; + HYPRCURSOR_SIZE = if cfg.hyprcursor.size != null then + cfg.hyprcursor.size + else + cfg.size; + }; + }) + + (mkIf cfg.sway.enable { + wayland.windowManager.sway = { + config = { + seat = { + "*" = { + xcursor_theme = + "${cfg.name} ${toString config.gtk.cursorTheme.size}"; + }; + }; + }; + }; + }) + ])) + { - assertions = [ - (hm.assertions.assertPlatform "home.pointerCursor" pkgs platforms.linux) - ]; + warnings = (optional (any (x: + getAttrFromPath + ([ "xsession" "pointerCursor" ] ++ [ x ] ++ [ "isDefined" ]) + options) [ "package" "name" "size" "defaultCursor" ]) '' + The option `xsession.pointerCursor` has been merged into `home.pointerCursor` and will be removed + in the future. Please change to set `home.pointerCursor` directly and enable `home.pointerCursor.x11.enable` + to generate x11 specific cursor configurations. You can refer to the documentation for more details. + '') ++ (optional (opts.highestPrio != (lib.mkOptionDefault { }).priority + && cfg == null) '' + Setting home.pointerCursor to null is deprecated. + Please update your configuration to explicitly set: - home.packages = [ cfg.package defaultIndexThemePackage ]; - - # Set directory to look for cursors in, needed for some applications - # that are unable to find cursors otherwise. See: - # https://github.com/nix-community/home-manager/issues/2812 - # https://wiki.archlinux.org/title/Cursor_themes#Environment_variable - home.sessionVariables = { - XCURSOR_PATH = mkDefault ("$XCURSOR_PATH\${XCURSOR_PATH:+:}" - + "${config.home.profileDirectory}/share/icons"); - XCURSOR_SIZE = mkDefault cfg.size; - XCURSOR_THEME = mkDefault cfg.name; - }; - - # Add symlink of cursor icon directory to $HOME/.icons, needed for - # backwards compatibility with some applications. See: - # https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html - home.file.".icons/default/index.theme".source = - "${defaultIndexThemePackage}/share/icons/default/index.theme"; - home.file.".icons/${cfg.name}".source = - "${cfg.package}/share/icons/${cfg.name}"; - - # Add cursor icon link to $XDG_DATA_HOME/icons as well for redundancy. - xdg.dataFile."icons/default/index.theme".source = - "${defaultIndexThemePackage}/share/icons/default/index.theme"; - xdg.dataFile."icons/${cfg.name}".source = - "${cfg.package}/share/icons/${cfg.name}"; + home.pointerCursor.enable = false; + ''); } - - (mkIf cfg.x11.enable { - xsession.profileExtra = '' - ${pkgs.xorg.xsetroot}/bin/xsetroot -xcf ${cursorPath} ${ - toString cfg.size - } - ''; - - xresources.properties = { - "Xcursor.theme" = cfg.name; - "Xcursor.size" = cfg.size; - }; - }) - - (mkIf cfg.gtk.enable { - gtk.cursorTheme = mkDefault { inherit (cfg) package name size; }; - }) - - (mkIf cfg.hyprcursor.enable { - home.sessionVariables = { - HYPRCURSOR_THEME = cfg.name; - HYPRCURSOR_SIZE = - if cfg.hyprcursor.size != null then cfg.hyprcursor.size else cfg.size; - }; - }) - ]); + ]; } diff --git a/modules/config/i18n.nix b/modules/config/i18n.nix index 2efb53d62..409227236 100644 --- a/modules/config/i18n.nix +++ b/modules/config/i18n.nix @@ -17,8 +17,6 @@ { lib, pkgs, config, ... }: -with lib; - let inherit (config.i18n) glibcLocales; @@ -27,19 +25,19 @@ let archivePath = "${glibcLocales}/lib/locale/locale-archive"; # lookup the version of glibcLocales and set the appropriate environment vars - localeVars = if versionAtLeast version "2.27" then { + localeVars = if lib.versionAtLeast version "2.27" then { LOCALE_ARCHIVE_2_27 = archivePath; - } else if versionAtLeast version "2.11" then { + } else if lib.versionAtLeast version "2.11" then { LOCALE_ARCHIVE_2_11 = archivePath; } else { }; in { - meta.maintainers = with maintainers; [ midchildan ]; + meta.maintainers = with lib.maintainers; [ midchildan ]; options = { - i18n.glibcLocales = mkOption { - type = types.path; + i18n.glibcLocales = lib.mkOption { + type = lib.types.path; description = '' Customized `glibcLocales` package providing the `LOCALE_ARCHIVE_*` environment variable. @@ -50,7 +48,7 @@ in { will be set to {var}`i18n.glibcLocales` from the system configuration. ''; - example = literalExpression '' + example = lib.literalExpression '' pkgs.glibcLocales.override { allLocales = false; locales = [ "en_US.UTF-8/UTF-8" ]; @@ -58,11 +56,11 @@ in { ''; # NB. See nixos/default.nix for NixOS default. default = pkgs.glibcLocales; - defaultText = literalExpression "pkgs.glibcLocales"; + defaultText = lib.literalExpression "pkgs.glibcLocales"; }; }; - config = mkIf pkgs.stdenv.hostPlatform.isLinux { + config = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { # For shell sessions. home.sessionVariables = localeVars; diff --git a/modules/default.nix b/modules/default.nix index 6c54148ab..05d2a504c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,16 +5,14 @@ # Extra arguments passed to specialArgs. , extraSpecialArgs ? { } }: -with lib; - let collectFailed = cfg: - map (x: x.message) (filter (x: !x.assertion) cfg.assertions); + map (x: x.message) (lib.filter (x: !x.assertion) cfg.assertions); showWarnings = res: let f = w: x: builtins.trace "warning: ${w}" x; - in fold f res res.config.warnings; + in lib.fold f res res.config.warnings; extendedLib = import ./lib/stdlib-extended.nix lib; @@ -32,7 +30,7 @@ let moduleChecks = raw: showWarnings (let failed = collectFailed raw.config; - failedStr = concatStringsSep "\n" (map (x: "- ${x}") failed); + failedStr = lib.concatStringsSep "\n" (map (x: "- ${x}") failed); in if failed == [ ] then raw else @@ -52,8 +50,8 @@ let activation-script = module.config.home.activationPackage; newsDisplay = rawModule.config.news.display; - newsEntries = sort (a: b: a.time > b.time) - (filter (a: a.condition) rawModule.config.news.entries); + newsEntries = lib.sort (a: b: a.time > b.time) + (lib.filter (a: a.condition) rawModule.config.news.entries); inherit (module._module.args) pkgs; diff --git a/modules/files.nix b/modules/files.nix index 8c047bbeb..d359979db 100644 --- a/modules/files.nix +++ b/modules/files.nix @@ -1,10 +1,8 @@ { pkgs, config, lib, ... }: -with lib; - let - cfg = filterAttrs (n: f: f.enable) config.home.file; + cfg = lib.filterAttrs (n: f: f.enable) config.home.file; homeDirectory = config.home.homeDirectory; @@ -25,14 +23,14 @@ in { options = { - home.file = mkOption { + home.file = lib.mkOption { description = "Attribute set of files to link into the user home."; default = {}; type = fileType "home.file" "{env}`HOME`" homeDirectory; }; - home-files = mkOption { - type = types.package; + home-files = lib.mkOption { + type = lib.types.package; internal = true; description = "Package to contain all home files"; }; @@ -42,11 +40,11 @@ in assertions = [( let dups = - attrNames - (filterAttrs (n: v: v > 1) - (foldAttrs (acc: v: acc + v) 0 - (mapAttrsToList (n: v: { ${v.target} = 1; }) cfg))); - dupsStr = concatStringsSep ", " dups; + lib.attrNames + (lib.filterAttrs (n: v: v > 1) + (lib.foldAttrs (acc: v: acc + v) 0 + (lib.mapAttrsToList (n: v: { ${v.target} = 1; }) cfg))); + dupsStr = lib.concatStringsSep ", " dups; in { assertion = dups == []; message = '' @@ -64,22 +62,22 @@ in lib.file.mkOutOfStoreSymlink = path: let pathStr = toString path; - name = hm.strings.storeFileName (baseNameOf pathStr); + name = lib.hm.strings.storeFileName (baseNameOf pathStr); in - pkgs.runCommandLocal name {} ''ln -s ${escapeShellArg pathStr} $out''; + pkgs.runCommandLocal name {} ''ln -s ${lib.escapeShellArg pathStr} $out''; # This verifies that the links we are about to create will not # overwrite an existing file. - home.activation.checkLinkTargets = hm.dag.entryBefore ["writeBoundary"] ( + home.activation.checkLinkTargets = lib.hm.dag.entryBefore ["writeBoundary"] ( let # Paths that should be forcibly overwritten by Home Manager. # Caveat emptor! forcedPaths = - concatMapStringsSep " " (p: ''"$HOME"/${escapeShellArg p}'') - (mapAttrsToList (n: v: v.target) - (filterAttrs (n: v: v.force) cfg)); + lib.concatMapStringsSep " " (p: ''"$HOME"/${lib.escapeShellArg p}'') + (lib.mapAttrsToList (n: v: v.target) + (lib.filterAttrs (n: v: v.force) cfg)); - storeDir = escapeShellArg builtins.storeDir; + storeDir = lib.escapeShellArg builtins.storeDir; check = pkgs.substituteAll { src = ./files/check-link-targets.sh; @@ -118,7 +116,7 @@ in # and a failure during the intermediate state FA ∩ FB will not # result in lost links because this set of links are in both the # source and target generation. - home.activation.linkGeneration = hm.dag.entryAfter ["writeBoundary"] ( + home.activation.linkGeneration = lib.hm.dag.entryAfter ["writeBoundary"] ( let link = pkgs.writeShellScript "link" '' ${config.lib.bash.initHomeManagerLib} @@ -151,7 +149,7 @@ in # A symbolic link whose target path matches this pattern will be # considered part of a Home Manager generation. - homeFilePattern="$(readlink -e ${escapeShellArg builtins.storeDir})/*-home-manager-files/*" + homeFilePattern="$(readlink -e ${lib.escapeShellArg builtins.storeDir})/*-home-manager-files/*" newGenFiles="$1" shift 1 @@ -216,9 +214,9 @@ in '' ); - home.activation.checkFilesChanged = hm.dag.entryBefore ["linkGeneration"] ( + home.activation.checkFilesChanged = lib.hm.dag.entryBefore ["linkGeneration"] ( let - homeDirArg = escapeShellArg homeDirectory; + homeDirArg = lib.escapeShellArg homeDirectory; in '' function _cmp() { if [[ -d $1 && -d $2 ]]; then @@ -228,31 +226,31 @@ in fi } declare -A changedFiles - '' + concatMapStrings (v: + '' + lib.concatMapStrings (v: let - sourceArg = escapeShellArg (sourceStorePath v); - targetArg = escapeShellArg v.target; + sourceArg = lib.escapeShellArg (sourceStorePath v); + targetArg = lib.escapeShellArg v.target; in '' _cmp ${sourceArg} ${homeDirArg}/${targetArg} \ && changedFiles[${targetArg}]=0 \ || changedFiles[${targetArg}]=1 - '') (filter (v: v.onChange != "") (attrValues cfg)) + '') (lib.filter (v: v.onChange != "") (lib.attrValues cfg)) + '' unset -f _cmp '' ); - home.activation.onFilesChange = hm.dag.entryAfter ["linkGeneration"] ( - concatMapStrings (v: '' - if (( ''${changedFiles[${escapeShellArg v.target}]} == 1 )); then + home.activation.onFilesChange = lib.hm.dag.entryAfter ["linkGeneration"] ( + lib.concatMapStrings (v: '' + if (( ''${changedFiles[${lib.escapeShellArg v.target}]} == 1 )); then if [[ -v DRY_RUN || -v VERBOSE ]]; then - echo "Running onChange hook for" ${escapeShellArg v.target} + echo "Running onChange hook for" ${lib.escapeShellArg v.target} fi if [[ ! -v DRY_RUN ]]; then ${v.onChange} fi fi - '') (filter (v: v.onChange != "") (attrValues cfg)) + '') (lib.filter (v: v.onChange != "") (lib.attrValues cfg)) ); # Symlink directories and files that have the right execute bit. @@ -324,10 +322,10 @@ in fi fi } - '' + concatStrings ( - mapAttrsToList (n: v: '' + '' + lib.concatStrings ( + lib.mapAttrsToList (n: v: '' insertFile ${ - escapeShellArgs [ + lib.escapeShellArgs [ (sourceStorePath v) v.target (if v.executable == null diff --git a/modules/home-environment.nix b/modules/home-environment.nix index fffb3b1cf..9d792ca31 100644 --- a/modules/home-environment.nix +++ b/modules/home-environment.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mkOption types; inherit (config.home) stateVersion; @@ -114,7 +113,7 @@ let layout = mkOption { type = with types; nullOr str; default = - if versionAtLeast config.home.stateVersion "19.09" + if lib.versionAtLeast config.home.stateVersion "19.09" then null else "us"; defaultText = literalExpression "null"; @@ -148,7 +147,7 @@ let variant = mkOption { type = with types; nullOr str; default = - if versionAtLeast config.home.stateVersion "19.09" + if lib.versionAtLeast config.home.stateVersion "19.09" then null else ""; defaultText = literalExpression "null"; @@ -167,10 +166,10 @@ let in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; imports = [ - (mkRemovedOptionModule [ "home" "sessionVariableSetter" ] '' + (lib.mkRemovedOptionModule [ "home" "sessionVariableSetter" ] '' Session variables are now always set through the shell. This is done automatically if the shell configuration is managed by Home Manager. If not, then you must source the @@ -223,7 +222,7 @@ in home.keyboard = mkOption { type = types.nullOr keyboardSubModule; - default = if versionAtLeast stateVersion "21.11" then null else { }; + default = if lib.versionAtLeast stateVersion "21.11" then null else { }; defaultText = literalExpression '' "{ }" for state version < 21.11, "null" for state version ≥ 21.11 @@ -310,7 +309,7 @@ in ".git/safe/../../bin" ]; description = '' - Extra directories to add to {env}`PATH`. + Extra directories to prepend to {env}`PATH`. These directories are added to the {env}`PATH` variable in a double-quoted context, so expressions like `$HOME` are @@ -320,6 +319,27 @@ in ''; }; + home.sessionSearchVariables = mkOption { + default = { }; + type = with types; attrsOf (listOf str); + example = { + MANPATH = [ + "$HOME/.npm-packages/man" + "\${xdg.configHome}/.local/share/man" + ]; + }; + description = '' + Extra directories to prepend to arbitrary PATH-like + environment variables (e.g.: {env}`MANPATH`). The values + will be concatenated by `:`. + These directories are added to the environment variable in a + double-quoted context, so expressions like `$HOME` are + expanded by the shell. However, since expressions like `~` or + `*` are escaped, they will end up in the environment + verbatim. + ''; + }; + home.sessionVariablesExtra = mkOption { type = types.lines; default = ""; @@ -355,7 +375,7 @@ in home.emptyActivationPath = mkOption { internal = true; type = types.bool; - default = versionAtLeast stateVersion "22.11"; + default = lib.versionAtLeast stateVersion "22.11"; defaultText = literalExpression '' false for state version < 22.11, true for state version ≥ 22.11 @@ -370,7 +390,7 @@ in }; home.activation = mkOption { - type = hm.types.dagOf types.str; + type = lib.hm.types.dagOf types.str; default = {}; example = literalExpression '' { @@ -475,7 +495,7 @@ in ''; }; - home.preferXdgDirectories = mkEnableOption "" // { + home.preferXdgDirectories = lib.mkEnableOption "" // { description = '' Whether to make programs use XDG directories whenever supported. ''; @@ -502,7 +522,7 @@ in config.home.enableNixpkgsReleaseCheck && hmRelease != nixpkgsRelease; in - optional releaseMismatch '' + lib.optional releaseMismatch '' You are using Home Manager version ${hmRelease} and @@ -520,11 +540,11 @@ in ''; home.username = - mkIf (versionOlder config.home.stateVersion "20.09") - (mkDefault (builtins.getEnv "USER")); + lib.mkIf (lib.versionOlder config.home.stateVersion "20.09") + (lib.mkDefault (builtins.getEnv "USER")); home.homeDirectory = - mkIf (versionOlder config.home.stateVersion "20.09") - (mkDefault (builtins.getEnv "HOME")); + lib.mkIf (lib.versionOlder config.home.stateVersion "20.09") + (lib.mkDefault (builtins.getEnv "HOME")); home.profileDirectory = if config.submoduleSupport.enable @@ -540,7 +560,7 @@ in home.sessionVariables = let - maybeSet = n: v: optionalAttrs (v != null) { ${n} = v; }; + maybeSet = n: v: lib.optionalAttrs (v != null) { ${n} = v; }; in (maybeSet "LANG" cfg.language.base) // @@ -576,17 +596,24 @@ in export __HM_SESS_VARS_SOURCED=1 ${config.lib.shell.exportAll cfg.sessionVariables} - '' + lib.optionalString (cfg.sessionPath != [ ]) '' - export PATH="$PATH''${PATH:+:}${concatStringsSep ":" cfg.sessionPath}" - '' + cfg.sessionVariablesExtra; + '' + lib.concatStringsSep "\n" + (lib.mapAttrsToList + (env: values: config.lib.shell.export + env + (config.lib.shell.prependToVar ":" env values)) + cfg.sessionSearchVariables) + "\n" + + cfg.sessionVariablesExtra; }; + home.sessionSearchVariables.PATH = + lib.mkIf (cfg.sessionPath != [ ]) cfg.sessionPath; + home.packages = [ config.home.sessionVariablesPackage ]; # The entry acting as a boundary between the activation script's "check" and # the "write" phases. This is where we commit to attempting to actually # activate the configuration. - home.activation.writeBoundary = hm.dag.entryAnywhere '' + home.activation.writeBoundary = lib.hm.dag.entryAnywhere '' if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then _i "Creating new profile generation" run nix-env $VERBOSE_ARG --profile "$genProfilePath" --set "$newGenPath" @@ -610,7 +637,7 @@ in # In case the user has moved from a user-install of Home Manager # to a submodule managed one we attempt to uninstall the # `home-manager-path` package if it is installed. - home.activation.installPackages = hm.dag.entryAfter ["writeBoundary"] ( + home.activation.installPackages = lib.hm.dag.entryAfter ["writeBoundary"] ( if config.submoduleSupport.externalPackageInstall then '' @@ -676,10 +703,10 @@ in _iNote "Activating %s" "${res.name}" ${res.data} ''; - sortedCommands = hm.dag.topoSort cfg.activation; + sortedCommands = lib.hm.dag.topoSort cfg.activation; activationCmds = if sortedCommands ? result then - concatStringsSep "\n" (map mkCmd sortedCommands.result) + lib.concatStringsSep "\n" (map mkCmd sortedCommands.result) else abort ("Dependency cycle in activation script: " + builtins.toJSON sortedCommands); @@ -708,7 +735,7 @@ in else ":$(${pkgs.coreutils}/bin/dirname $(${pkgs.coreutils}/bin/readlink -m $(type -p nix-env)))" ) - + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH"; + + lib.optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH"; activationScript = pkgs.writeShellScript "activation-script" '' set -eu @@ -722,8 +749,8 @@ in ${builtins.readFile ./lib-bash/activation-init.sh} if [[ ! -v SKIP_SANITY_CHECKS ]]; then - checkUsername ${escapeShellArg config.home.username} - checkHomeDirectory ${escapeShellArg config.home.homeDirectory} + checkUsername ${lib.escapeShellArg config.home.username} + checkHomeDirectory ${lib.escapeShellArg config.home.homeDirectory} fi # Create a temporary GC root to prevent collection during activation. @@ -732,7 +759,7 @@ in ${activationCmds} - ${optionalString (!config.uninstall) '' + ${lib.optionalString (!config.uninstall) '' # Create the "current generation" GC root. run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" diff --git a/modules/i18n/input-method/default.nix b/modules/i18n/input-method/default.nix index 5e3a89b33..d6a1beb8e 100644 --- a/modules/i18n/input-method/default.nix +++ b/modules/i18n/input-method/default.nix @@ -1,6 +1,5 @@ { config, pkgs, lib, ... }: -with lib; let cfg = config.i18n.inputMethod; @@ -26,9 +25,9 @@ in { options.i18n = { inputMethod = { - enabled = mkOption { - type = types.nullOr - (types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]); + enabled = lib.mkOption { + type = lib.types.nullOr + (lib.types.enum [ "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]); default = null; example = "fcitx5"; description = '' @@ -61,9 +60,9 @@ in { ''; }; - package = mkOption { + package = lib.mkOption { internal = true; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; default = null; description = '' The input method method package. @@ -72,9 +71,10 @@ in { }; }; - config = mkIf (cfg.enabled != null) { + config = lib.mkIf (cfg.enabled != null) { assertions = [ - (hm.assertions.assertPlatform "i18n.inputMethod" pkgs platforms.linux) + (lib.hm.assertions.assertPlatform "i18n.inputMethod" pkgs + lib.platforms.linux) { assertion = cfg.enabled != "fcitx"; message = "fcitx has been removed, please use fcitx5 instead"; @@ -84,5 +84,5 @@ in { home.packages = [ cfg.package gtk2Cache gtk3Cache ]; }; - meta.maintainers = with lib; [ hm.maintainers.kranzes ]; + meta.maintainers = [ lib.hm.maintainers.kranzes ]; } diff --git a/modules/i18n/input-method/fcitx5.nix b/modules/i18n/input-method/fcitx5.nix index 3c2d1c191..be239b30f 100644 --- a/modules/i18n/input-method/fcitx5.nix +++ b/modules/i18n/input-method/fcitx5.nix @@ -1,42 +1,61 @@ { config, pkgs, lib, ... }: -with lib; - let im = config.i18n.inputMethod; cfg = im.fcitx5; - fcitx5Package = - pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; }; + fcitx5Package = cfg.fcitx5-with-addons.override { inherit (cfg) addons; }; in { options = { i18n.inputMethod.fcitx5 = { - addons = mkOption { - type = with types; listOf package; + fcitx5-with-addons = lib.mkOption { + type = lib.types.package; + default = pkgs.libsForQt5.fcitx5-with-addons; + example = lib.literalExpression "pkgs.kdePackages.fcitx5-with-addons"; + description = '' + The fcitx5 package to use. + ''; + }; + addons = lib.mkOption { + type = with lib.types; listOf package; default = [ ]; - example = literalExpression "with pkgs; [ fcitx5-rime ]"; + example = lib.literalExpression "with pkgs; [ fcitx5-rime ]"; description = '' Enabled Fcitx5 addons. ''; }; + + waylandFrontend = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Use the Wayland input method frontend. + See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland). + ''; + }; }; }; - config = mkIf (im.enabled == "fcitx5") { + config = lib.mkIf (im.enabled == "fcitx5") { i18n.inputMethod.package = fcitx5Package; - home.sessionVariables = { - GLFW_IM_MODULE = "ibus"; # IME support in kitty - GTK_IM_MODULE = "fcitx"; - QT_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - QT_PLUGIN_PATH = - "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}"; + home = { + sessionVariables = { + GLFW_IM_MODULE = "ibus"; # IME support in kitty + XMODIFIERS = "@im=fcitx"; + } // lib.optionalAttrs (!cfg.waylandFrontend) { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + }; + + sessionSearchVariables.QT_PLUGIN_PATH = + [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ]; }; systemd.user.services.fcitx5-daemon = { Unit = { Description = "Fcitx5 input method editor"; PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; }; Service.ExecStart = "${fcitx5Package}/bin/fcitx5"; Install.WantedBy = [ "graphical-session.target" ]; diff --git a/modules/i18n/input-method/hime.nix b/modules/i18n/input-method/hime.nix index 7b5700a9d..2d6f4d500 100644 --- a/modules/i18n/input-method/hime.nix +++ b/modules/i18n/input-method/hime.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: -with lib; { - config = mkIf (config.i18n.inputMethod.enabled == "hime") { +{ + config = lib.mkIf (config.i18n.inputMethod.enabled == "hime") { i18n.inputMethod.package = pkgs.hime; home.sessionVariables = { diff --git a/modules/i18n/input-method/nabi.nix b/modules/i18n/input-method/nabi.nix index 01f9f7911..a060f4800 100644 --- a/modules/i18n/input-method/nabi.nix +++ b/modules/i18n/input-method/nabi.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: -with lib; { - config = mkIf (config.i18n.inputMethod.enabled == "nabi") { +{ + config = lib.mkIf (config.i18n.inputMethod.enabled == "nabi") { i18n.inputMethod.package = pkgs.nabi; home.sessionVariables = { diff --git a/modules/i18n/input-method/uim.nix b/modules/i18n/input-method/uim.nix index e7890352c..8dcfe3238 100644 --- a/modules/i18n/input-method/uim.nix +++ b/modules/i18n/input-method/uim.nix @@ -1,14 +1,13 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.i18n.inputMethod.uim; in { options = { i18n.inputMethod.uim = { - toolbar = mkOption { - type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ]; + toolbar = lib.mkOption { + type = + lib.types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ]; default = "gtk"; example = "gtk-systray"; description = '' @@ -19,7 +18,7 @@ in { }; - config = mkIf (config.i18n.inputMethod.enabled == "uim") { + config = lib.mkIf (config.i18n.inputMethod.enabled == "uim") { i18n.inputMethod.package = pkgs.uim; home.sessionVariables = { diff --git a/modules/launchd/launchd.nix b/modules/launchd/launchd.nix index 9c9b54452..98024c584 100644 --- a/modules/launchd/launchd.nix +++ b/modules/launchd/launchd.nix @@ -25,9 +25,11 @@ { config, lib, ... }: -with lib; +let + inherit (lib) types mkOption; # added by Home Manager -{ + launchdTypes = import ./types.nix { inherit config lib; }; +in { freeformType = with types; attrsOf anything; # added by Home Manager options = { @@ -118,7 +120,7 @@ with lib; }; LimitLoadToSessionType = mkOption { - type = types.nullOr types.str; + type = types.nullOr (types.oneOf [ types.str (types.listOf types.str) ]); default = null; description = '' This configuration file only applies to sessions of the type specified. This key is used in concert @@ -369,60 +371,26 @@ with lib; StartCalendarInterval = mkOption { default = null; - example = { + example = [{ Hour = 2; Minute = 30; - }; + }]; description = '' - This optional key causes the job to be started every calendar interval as specified. Missing arguments - are considered to be wildcard. The semantics are much like `crontab(5)`. Unlike cron which skips job - invocations when the computer is asleep, launchd will start the job the next time the computer wakes + This optional key causes the job to be started every calendar interval as specified. The semantics are + much like {manpage}`crontab(5)`: Missing attributes are considered to be wildcard. Unlike cron which skips + job invocations when the computer is asleep, launchd will start the job the next time the computer wakes up. If multiple intervals transpire before the computer is woken, those events will be coalesced into - one event upon wake from sleep. + one event upon waking from sleep. + + ::: {.important} + The list must not be empty and must not contain duplicate entries (attrsets which compare equally). + ::: + + ::: {.caution} + Since missing attrs become wildcards, an empty attrset effectively means "every minute". + ::: ''; - type = types.nullOr (types.listOf (types.submodule { - options = { - Minute = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - The minute on which this job will be run. - ''; - }; - - Hour = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - The hour on which this job will be run. - ''; - }; - - Day = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - The day on which this job will be run. - ''; - }; - - Weekday = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - The weekday on which this job will be run (0 and 7 are Sunday). - ''; - }; - - Month = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - The month on which this job will be run. - ''; - }; - }; - })); + type = types.nullOr launchdTypes.StartCalendarInterval; }; StandardInPath = mkOption { @@ -669,22 +637,22 @@ with lib; resource limits based on what kind of job it is. If left unspecified, the system will apply light resource limits to the job, throttling its CPU usage and I/O bandwidth. The following are valid values: - Background - : Background jobs are generally processes that do work that was not directly requested by the user. - The resource limits applied to Background jobs are intended to prevent them from disrupting the - user experience. + Background + : Background jobs are generally processes that do work that was not directly requested by the user. + The resource limits applied to Background jobs are intended to prevent them from disrupting the + user experience. - Standard - : Standard jobs are equivalent to no ProcessType being set. + Standard + : Standard jobs are equivalent to no ProcessType being set. - Adaptive - : Adaptive jobs move between the Background and Interactive classifications based on activity over - XPC connections. See {manpage}`xpc_transaction_begin(3)` for details. + Adaptive + : Adaptive jobs move between the Background and Interactive classifications based on activity over + XPC connections. See `xpc_transaction_begin(3)` for details. - Interactive - : Interactive jobs run with the same resource limitations as apps, that is to say, none. Interactive - jobs are critical to maintaining a responsive user experience, and this key should only be - used if an app's ability to be responsive depends on it, and cannot be made Adaptive. + Interactive + : Interactive jobs run with the same resource limitations as apps, that is to say, none. Interactive + jobs are critical to maintaining a responsive user experience, and this key should only be + used if an app's ability to be responsive depends on it, and cannot be made Adaptive. ''; }; @@ -706,6 +674,15 @@ with lib; ''; }; + LowPriorityBackgroundIO = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + This optional key specifies whether the kernel should consider this daemon to be low priority when + doing file system I/O when the process is throttled with the Darwin-background classification. + ''; + }; + LaunchOnlyOnce = mkOption { type = types.nullOr types.bool; default = null; @@ -717,7 +694,7 @@ with lib; MachServices = mkOption { default = null; - example = { ResetAtClose = true; }; + example = { "org.nixos.service" = { ResetAtClose = true; }; }; description = '' This optional key is used to specify Mach services to be registered with the Mach bootstrap sub-system. Each key in this dictionary should be the name of service to be advertised. The value of the key must @@ -726,31 +703,32 @@ with lib; Finally, for the job itself, the values will be replaced with Mach ports at the time of check-in with launchd. ''; - type = types.nullOr (types.submodule { - options = { - ResetAtClose = mkOption { - type = types.nullOr types.bool; - default = null; - description = '' - If this boolean is false, the port is recycled, thus leaving clients to remain oblivious to the - demand nature of job. If the value is set to true, clients receive port death notifications when - the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up() - calls, so that clients can trust that after receiving a port death notification, - the new port will have already been recreated. Setting the value to true should be done with - care. Not all clients may be able to handle this behavior. The default value is false. - ''; - }; + type = types.nullOr (types.attrsOf (types.either types.bool + (types.submodule { + options = { + ResetAtClose = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + If this boolean is false, the port is recycled, thus leaving clients to remain oblivious to the + demand nature of job. If the value is set to true, clients receive port death notifications when + the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up() + calls, so that clients can trust that after receiving a port death notification, + the new port will have already been recreated. Setting the value to true should be done with + care. Not all clients may be able to handle this behavior. The default value is false. + ''; + }; - HideUntilCheckIn = mkOption { - type = types.nullOr types.bool; - default = null; - description = '' - Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has - checked in with launchd. - ''; + HideUntilCheckIn = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has + checked in with launchd. + ''; + }; }; - }; - }); + }))); }; LaunchEvents = mkOption { @@ -778,6 +756,26 @@ with lib; }; }; + ServiceIPC = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + This optional key specifies whether the job participates in advanced + communication with launchd. The default is false. This flag is + incompatible with the inetdCompatibility key. + ''; + }; + + SessionCreate = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + This key specifies that the job should be spawned into a new security + audit session rather than the default session for the context is belongs + to. See auditon(2) for details. + ''; + }; + Sockets = mkOption { default = null; description = '' diff --git a/modules/launchd/types.nix b/modules/launchd/types.nix new file mode 100644 index 000000000..fadf46cb5 --- /dev/null +++ b/modules/launchd/types.nix @@ -0,0 +1,121 @@ +# launchd option type from nix-darwin +# +# Original code from https://github.com/LnL7/nix-darwin/commit/861af0fc94df9454f4e92d6892f75588763164bb + +{ lib, ... }: + +let + inherit (lib) imap1 types mkOption showOption mergeDefinitions; + inherit (builtins) map filter length deepSeq throw toString concatLists; + inherit (lib.options) showDefs; + wildcardText = lib.literalMD "`*`"; + + /* * + A type of list which does not allow duplicate elements. The base/inner + list type to use (e.g. `types.listOf` or `types.nonEmptyListOf`) is passed + via argument `listType`, which must be the final type and not a function. + + NOTE: The extra check for duplicates is quadratic and strict, so use this + type sparingly and only: + + * when needed, and + * when the list is expected to be recursively short (e.g. < 10 elements) + and shallow (i.e. strict evaluation of the list won't take too long) + + The implementation of this function is similar to that of + `types.nonEmptyListOf`. + */ + types'.uniqueList = listType: + listType // { + description = "unique ${ + types.optionDescriptionPhrase (class: class == "noun") listType + }"; + substSubModules = m: types'.uniqueList (listType.substSubModules m); + # This has been taken from the implementation of `types.listOf`, but has + # been modified to throw on duplicates. This check cannot be done in the + # `check` fn as this check is deep/strict, and because `check` runs + # prior to merging. + merge = loc: defs: + let + # Each element of `dupes` is a list. When there are duplicates, + # later lists will be duplicates of earlier lists, so just throw on + # the first set of duplicates found so that we don't have duplicate + # error msgs. + checked = filter (li: + if length li > 1 then + throw '' + The option `${ + showOption loc + }' contains duplicate entries after merging: + ${showDefs li}'' + else + false) dupes; + dupes = + map (def: filter (def': def'.value == def.value) merged) merged; + merged = filter (x: x ? value) (concatLists (imap1 (n: def: + imap1 (m: el: + let + inherit (def) file; + loc' = loc + ++ [ "[definition ${toString n}-entry ${toString m}]" ]; + in (mergeDefinitions loc' listType.nestedTypes.elemType [{ + inherit file; + value = el; + }]).optionalValue // { + inherit loc' file; + }) def.value) defs)); + in deepSeq checked (map (x: x.value) merged); + }; +in { + StartCalendarInterval = let + CalendarIntervalEntry = types.submodule { + options = { + Minute = mkOption { + type = types.nullOr (types.ints.between 0 59); + default = null; + defaultText = wildcardText; + description = '' + The minute on which this job will be run. + ''; + }; + + Hour = mkOption { + type = types.nullOr (types.ints.between 0 23); + default = null; + defaultText = wildcardText; + description = '' + The hour on which this job will be run. + ''; + }; + + Day = mkOption { + type = types.nullOr (types.ints.between 1 31); + default = null; + defaultText = wildcardText; + description = '' + The day on which this job will be run. + ''; + }; + + Weekday = mkOption { + type = types.nullOr (types.ints.between 0 7); + default = null; + defaultText = wildcardText; + description = '' + The weekday on which this job will be run (0 and 7 are Sunday). + ''; + }; + + Month = mkOption { + type = types.nullOr (types.ints.between 1 12); + default = null; + defaultText = wildcardText; + description = '' + The month on which this job will be run. + ''; + }; + }; + }; + in types.either CalendarIntervalEntry + (types'.uniqueList (types.nonEmptyListOf CalendarIntervalEntry)); +} diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index 7ee9e1df9..e70fcce1d 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -5,7 +5,6 @@ # are expected to be follow the same format as described in [1]. # # [1] https://github.com/NixOS/nixpkgs/blob/fca0d6e093c82b31103dc0dacc48da2a9b06e24b/maintainers/maintainer-list.nix#LC1 - { aabccd021 = { name = "Muhamad Abdurahman"; @@ -79,6 +78,12 @@ github = "considerate"; githubId = 217918; }; + damidoug = { + email = "contact@damidoug.dev"; + github = "damidoug"; + githubId = 75175586; + name = "Douglas Damiano"; + }; danjujan = { name = "Jan Schmitz"; email = "44864658+danjujan@users.noreply.github.com"; @@ -107,6 +112,12 @@ github = "diniamo"; githubId = 55629891; }; + dsoverlord = { + name = "Kirill Zakharov"; + email = "dsoverlord@vk.com"; + github = "dsoverlord"; + githubId = 78819443; + }; dwagenk = { email = "dwagenk@mailbox.org"; github = "dwagenk"; @@ -478,6 +489,12 @@ github = "mainrs"; githubId = 5113257; }; + mikilio = { + name = "mikilio"; + email = "official.mikilio+dev@gmail.com"; + github = "mikilio"; + githubId = 86004375; + }; kmaasrud = { name = "Knut Magnus Aasrud"; email = "km@aasrud.com"; @@ -550,6 +567,13 @@ githubId = 1545895; name = "Nicola Squartini"; }; + timon-schelling = { + name = "Timon Schelling"; + email = "me@timon.zip"; + github = "timon-schelling"; + githubId = 36821505; + matrix = "@timon:beeper.com"; + }; toastal = { email = "toastal+nix@posteo.net"; matrix = "@toastal:matrix.org"; @@ -578,6 +602,11 @@ github = "pedorich-n"; githubId = 15573098; }; + PopeRigby = { + name = "PopeRigby"; + github = "poperigby"; + githubId = 20866468; + }; liyangau = { name = "Li Yang"; email = "d@aufomm.com"; @@ -628,4 +657,38 @@ github = "ALameLlama"; githubId = 55490546; }; + ckgxrg = { + name = "ckgxrg"; + email = "ckgxrg@ckgxrg.io"; + github = "ckgxrg-salt"; + githubId = 165614491; + }; + HPsaucii = { + name = "Holly Powell"; + email = "me@hpsaucii.dev"; + github = "HPsaucii"; + githubId = 126502193; + keys = [{ + longkeyid = "rsa4096/0xEDB2C634166AE6AD"; + fingerprint = "AD32 73D4 5E0E 9478 E826 543F EDB2 C634 166A E6AD"; + }]; + }; + folliehiyuki = { + name = "Hoang Nguyen"; + email = "folliekazetani@protonmail.com"; + github = "folliehiyuki"; + githubId = 67634026; + }; + "3ulalia" = { + name = "Eulalia del Sol"; + email = "3ulalia@proton.me"; + github = "3ulalia"; + githubId = "179992797"; + }; + ipsavitsky = { + name = "Ilya Savitsky"; + email = "ipsavitsky234@gmail.com"; + github = "ipsavitsky"; + githubId = 33558632; + }; } diff --git a/modules/lib/nushell.nix b/modules/lib/nushell.nix index e831380cd..5ef5ad36d 100644 --- a/modules/lib/nushell.nix +++ b/modules/lib/nushell.nix @@ -1,7 +1,9 @@ { lib }: rec { mkNushellInline = expr: lib.setType "nushell-inline" { inherit expr; }; - toNushell = { indent ? "", multiline ? true, asBindings ? false }@args: + isNushellInline = lib.isType "nushell-inline"; + + toNushell = { indent ? "", multiline ? true, asBindings ? false, }@args: v: let innerIndent = "${indent} "; @@ -18,7 +20,6 @@ asBindings = false; }; concatItems = lib.concatStringsSep introSpace; - isNushellInline = lib.isType "nushell-inline"; generatedBindings = assert lib.assertMsg (badVarNames == [ ]) "Bad Nushell variable names: ${ diff --git a/modules/lib/shell.nix b/modules/lib/shell.nix index 5e5743f51..04f9135cf 100644 --- a/modules/lib/shell.nix +++ b/modules/lib/shell.nix @@ -1,6 +1,30 @@ { lib }: -rec { +let + + mkShellIntegrationOption = name: + { config, baseName ? name, extraDescription ? "" }: + let attrName = "enable${baseName}Integration"; + in lib.mkOption { + default = config.home.shell.${attrName}; + defaultText = lib.literalMD "[](#opt-home.shell.${attrName})"; + example = false; + description = "Whether to enable ${name} integration.${ + lib.optionalString (extraDescription != "") + ("\n\n" + extraDescription) + }"; + type = lib.types.bool; + }; + +in rec { + # Produces a Bourne shell like statement that prepend new values to + # an possibly existing variable, using sep(arator). + # Example: + # prependToVar ":" "PATH" [ "$HOME/bin" "$HOME/.local/bin" ] + # => "$HOME/bin:$HOME/.local/bin:${PATH:+:}\$PATH" + prependToVar = sep: n: v: + "${lib.concatStringsSep sep v}\${${n}:+${sep}}\$${n}"; + # Produces a Bourne shell like variable export statement. export = n: v: ''export ${n}="${toString v}"''; @@ -8,4 +32,10 @@ rec { # assignment, this function produces a string containing an export # statement for each set entry. exportAll = vars: lib.concatStringsSep "\n" (lib.mapAttrsToList export vars); + + mkBashIntegrationOption = mkShellIntegrationOption "Bash"; + mkFishIntegrationOption = mkShellIntegrationOption "Fish"; + mkIonIntegrationOption = mkShellIntegrationOption "Ion"; + mkNushellIntegrationOption = mkShellIntegrationOption "Nushell"; + mkZshIntegrationOption = mkShellIntegrationOption "Zsh"; } diff --git a/modules/manual.nix b/modules/manual.nix index 23963c3c0..02a5c2c77 100644 --- a/modules/manual.nix +++ b/modules/manual.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.manual; @@ -13,8 +11,8 @@ let in { options = { - manual.html.enable = mkOption { - type = types.bool; + manual.html.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to install the HTML manual. This also installs the @@ -23,8 +21,8 @@ in { ''; }; - manual.manpages.enable = mkOption { - type = types.bool; + manual.manpages.enable = lib.mkOption { + type = lib.types.bool; default = true; example = false; description = '' @@ -37,8 +35,8 @@ in { ''; }; - manual.json.enable = mkOption { - type = types.bool; + manual.json.enable = lib.mkOption { + type = lib.types.bool; default = false; example = true; description = '' @@ -52,10 +50,10 @@ in { }; config = { - home.packages = mkMerge [ - (mkIf cfg.html.enable [ docs.manual.html docs.manual.htmlOpenTool ]) - (mkIf cfg.manpages.enable [ docs.manPages ]) - (mkIf cfg.json.enable [ docs.options.json ]) + home.packages = lib.mkMerge [ + (lib.mkIf cfg.html.enable [ docs.manual.html docs.manual.htmlOpenTool ]) + (lib.mkIf cfg.manpages.enable [ docs.manPages ]) + (lib.mkIf cfg.json.enable [ docs.options.json ]) ]; }; diff --git a/modules/misc/dconf.nix b/modules/misc/dconf.nix index b4863a139..39eceb42e 100644 --- a/modules/misc/dconf.nix +++ b/modules/misc/dconf.nix @@ -1,29 +1,29 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) types; cfg = config.dconf; - toDconfIni = generators.toINI { mkKeyValue = mkIniKeyValue; }; + toDconfIni = lib.generators.toINI { mkKeyValue = mkIniKeyValue; }; - mkIniKeyValue = key: value: "${key}=${toString (hm.gvariant.mkValue value)}"; + mkIniKeyValue = key: value: + "${key}=${toString (lib.hm.gvariant.mkValue value)}"; # The dconf keys managed by this configuration. We store this as part of the # generation state to be able to reset keys that become unmanaged during # switch. stateDconfKeys = pkgs.writeText "dconf-keys.json" (builtins.toJSON - (concatLists (mapAttrsToList - (dir: entries: mapAttrsToList (key: _: "/${dir}/${key}") entries) + (lib.concatLists (lib.mapAttrsToList + (dir: entries: lib.mapAttrsToList (key: _: "/${dir}/${key}") entries) cfg.settings))); in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options = { dconf = { - enable = mkOption { + enable = lib.mkOption { type = types.bool; # While technically dconf on darwin could work, our activation step # requires dbus, which only *lightly* supports Darwin in general, and @@ -43,10 +43,10 @@ in { ''; }; - settings = mkOption { - type = with types; attrsOf (attrsOf hm.types.gvariant); + settings = lib.mkOption { + type = with types; attrsOf (attrsOf lib.hm.types.gvariant); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "org/gnome/calculator" = { button-mode = "programming"; @@ -75,7 +75,7 @@ in { }; }; - config = mkIf (cfg.enable && cfg.settings != { }) { + config = lib.mkIf (cfg.enable && cfg.settings != { }) { # Make sure the dconf directory exists. xdg.configFile."dconf/.keep".source = builtins.toFile "keep" ""; @@ -84,53 +84,54 @@ in { ln -s ${stateDconfKeys} $out/state/${stateDconfKeys.name} ''; - home.activation.dconfSettings = hm.dag.entryAfter [ "installPackages" ] (let - iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings); + home.activation.dconfSettings = lib.hm.dag.entryAfter [ "installPackages" ] + (let + iniFile = pkgs.writeText "hm-dconf.ini" (toDconfIni cfg.settings); - statePath = "state/${stateDconfKeys.name}"; + statePath = "state/${stateDconfKeys.name}"; - cleanup = pkgs.writeShellScript "dconf-cleanup" '' - set -euo pipefail + cleanup = pkgs.writeShellScript "dconf-cleanup" '' + set -euo pipefail - ${config.lib.bash.initHomeManagerLib} + ${config.lib.bash.initHomeManagerLib} - PATH=${makeBinPath [ pkgs.dconf pkgs.jq ]}''${PATH:+:}$PATH + PATH=${lib.makeBinPath [ pkgs.dconf pkgs.jq ]}''${PATH:+:}$PATH - oldState="$1" - newState="$2" + oldState="$1" + newState="$2" - # Can't do cleanup if we don't know the old state. - if [[ ! -f $oldState ]]; then - exit 0 + # Can't do cleanup if we don't know the old state. + if [[ ! -f $oldState ]]; then + exit 0 + fi + + # Reset all keys that are present in the old generation but not the new + # one. + jq -r -n \ + --slurpfile old "$oldState" \ + --slurpfile new "$newState" \ + '($old[] - $new[])[]' \ + | while read -r key; do + verboseEcho "Resetting dconf key \"$key\"" + run $DCONF_DBUS_RUN_SESSION dconf reset "$key" + done + ''; + in '' + if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then + export DCONF_DBUS_RUN_SESSION="" + else + export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon" fi - # Reset all keys that are present in the old generation but not the new - # one. - jq -r -n \ - --slurpfile old "$oldState" \ - --slurpfile new "$newState" \ - '($old[] - $new[])[]' \ - | while read -r key; do - verboseEcho "Resetting dconf key \"$key\"" - run $DCONF_DBUS_RUN_SESSION dconf reset "$key" - done - ''; - in '' - if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then - export DCONF_DBUS_RUN_SESSION="" - else - export DCONF_DBUS_RUN_SESSION="${pkgs.dbus}/bin/dbus-run-session --dbus-daemon=${pkgs.dbus}/bin/dbus-daemon" - fi + if [[ -v oldGenPath ]]; then + ${cleanup} \ + "$oldGenPath/${statePath}" \ + "$newGenPath/${statePath}" + fi - if [[ -v oldGenPath ]]; then - ${cleanup} \ - "$oldGenPath/${statePath}" \ - "$newGenPath/${statePath}" - fi + run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile} - run $DCONF_DBUS_RUN_SESSION ${pkgs.dconf}/bin/dconf load / < ${iniFile} - - unset DCONF_DBUS_RUN_SESSION - ''); + unset DCONF_DBUS_RUN_SESSION + ''); }; } diff --git a/modules/misc/debug.nix b/modules/misc/debug.nix index fc0d8946a..eb9d85655 100644 --- a/modules/misc/debug.nix +++ b/modules/misc/debug.nix @@ -1,10 +1,8 @@ -{ config, pkgs, lib, ... }: - -with lib; +{ config, lib, ... }: { options.home = { - enableDebugInfo = mkEnableOption "" // { + enableDebugInfo = lib.mkEnableOption "" // { description = '' Some Nix packages provide debug symbols for {command}`gdb` in the `debug` output. @@ -15,12 +13,11 @@ with lib; }; }; - config = mkIf config.home.enableDebugInfo { + config = lib.mkIf config.home.enableDebugInfo { home.extraOutputsToInstall = [ "debug" ]; - home.sessionVariables = { - NIX_DEBUG_INFO_DIRS = - "$NIX_DEBUG_INFO_DIRS\${NIX_DEBUG_INFO_DIRS:+:}${config.home.profileDirectory}/lib/debug"; + home.sessionSearchVariables = { + NIX_DEBUG_INFO_DIRS = [ "${config.home.profileDirectory}/lib/debug" ]; }; }; } diff --git a/modules/misc/editorconfig.nix b/modules/misc/editorconfig.nix index a6dfb570a..56505850a 100644 --- a/modules/misc/editorconfig.nix +++ b/modules/misc/editorconfig.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.editorconfig; @@ -9,12 +7,12 @@ let iniFormat = pkgs.formats.ini { }; in { - meta.maintainers = with maintainers; [ loicreynier ]; + meta.maintainers = with lib.maintainers; [ loicreynier ]; options.editorconfig = { - enable = mkEnableOption "EditorConfig home configuration file"; + enable = lib.mkEnableOption "EditorConfig home configuration file"; - settings = mkOption { + settings = lib.mkOption { type = iniFormat.type; default = { }; description = '' @@ -23,7 +21,7 @@ in { it must not be added here. See for documentation. ''; - example = literalExpression '' + example = lib.literalExpression '' { "*" = { charset = "utf-8"; @@ -39,9 +37,9 @@ in { }; }; - config = mkIf (cfg.enable && cfg.settings != { }) { + config = lib.mkIf (cfg.enable && cfg.settings != { }) { home.file.".editorconfig".text = let - renderedSettings = generators.toINIWithGlobalSection { } { + renderedSettings = lib.generators.toINIWithGlobalSection { } { globalSection = { root = true; }; sections = cfg.settings; }; diff --git a/modules/misc/fontconfig.nix b/modules/misc/fontconfig.nix index 9bc6ac47b..09906a440 100644 --- a/modules/misc/fontconfig.nix +++ b/modules/misc/fontconfig.nix @@ -4,8 +4,6 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.fonts.fontconfig; @@ -13,10 +11,10 @@ let profileDirectory = config.home.profileDirectory; in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; imports = [ - (mkRenamedOptionModule [ "fonts" "fontconfig" "enableProfileFonts" ] [ + (lib.mkRenamedOptionModule [ "fonts" "fontconfig" "enableProfileFonts" ] [ "fonts" "fontconfig" "enable" @@ -25,8 +23,8 @@ in { options = { fonts.fontconfig = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable fontconfig configuration. This will, for @@ -38,8 +36,8 @@ in { }; defaultFonts = { - monospace = mkOption { - type = with types; listOf str; + monospace = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = '' Per-user default monospace font(s). Multiple fonts may be listed in @@ -47,8 +45,8 @@ in { ''; }; - sansSerif = mkOption { - type = with types; listOf str; + sansSerif = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = '' Per-user default sans serif font(s). Multiple fonts may be listed @@ -56,8 +54,8 @@ in { ''; }; - serif = mkOption { - type = with types; listOf str; + serif = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = '' Per-user default serif font(s). Multiple fonts may be listed in @@ -65,8 +63,8 @@ in { ''; }; - emoji = mkOption { - type = with types; listOf str; + emoji = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = '' Per-user default emoji font(s). Multiple fonts may be listed in @@ -83,7 +81,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { home.packages = [ # Make sure that buildEnv creates a real directory path so that we avoid # trying to write to a read-only location. @@ -105,7 +103,7 @@ in { EOF - ${getBin pkgs.fontconfig}/bin/fc-cache -f + ${lib.getBin pkgs.fontconfig}/bin/fc-cache -f rm -f $out/lib/fontconfig/cache/CACHEDIR.TAG rmdir --ignore-fail-on-non-empty -p $out/lib/fontconfig/cache @@ -147,12 +145,12 @@ in { "fontconfig/conf.d/52-hm-default-fonts.conf".text = let genDefault = fonts: name: - optionalString (fonts != [ ]) '' + lib.optionalString (fonts != [ ]) '' ${name} ${ - concatStringsSep "" (map (font: '' + lib.concatStringsSep "" (map (font: '' ${font} '') fonts) } diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index 65ed1de2f..f6ee95a19 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -1,29 +1,30 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let + inherit (lib) literalExpression mkOption optionalAttrs types; cfg = config.gtk; cfg2 = config.gtk.gtk2; cfg3 = config.gtk.gtk3; cfg4 = config.gtk.gtk4; - toGtk3Ini = generators.toINI { + toGtk3Ini = lib.generators.toINI { mkKeyValue = key: value: - let value' = if isBool value then boolToString value else toString value; - in "${escape [ "=" ] key}=${value'}"; + let + value' = + if lib.isBool value then lib.boolToString value else toString value; + in "${lib.escape [ "=" ] key}=${value'}"; }; formatGtk2Option = n: v: let - v' = if isBool v then - boolToString value - else if isString v then + v' = if lib.isBool v then + lib.boolToString lib.value + else if lib.isString v then ''"${v}"'' else toString v; - in "${escape [ "=" ] n} = ${v'}"; + in "${lib.escape [ "=" ] n} = ${v'}"; themeType = types.submodule { options = { @@ -100,20 +101,20 @@ let }; in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; imports = [ - (mkRemovedOptionModule [ "gtk" "gtk3" "waylandSupport" ] '' + (lib.mkRemovedOptionModule [ "gtk" "gtk3" "waylandSupport" ] '' This options is not longer needed and can be removed. '') ]; options = { gtk = { - enable = mkEnableOption "GTK 2/3 configuration"; + enable = lib.mkEnableOption "GTK 2/3 configuration"; font = mkOption { - type = types.nullOr hm.types.fontType; + type = types.nullOr lib.hm.types.fontType; default = null; description = '' The font to use in GTK+ 2/3 applications. @@ -219,7 +220,7 @@ in { }; }; - config = mkIf cfg.enable (let + config = lib.mkIf cfg.enable (let gtkIni = optionalAttrs (cfg.font != null) { gtk-font-name = let fontSize = if cfg.font.size != null then cfg.font.size else 10; @@ -258,18 +259,17 @@ in { }; optionalPackage = opt: - optional (opt != null && opt.package != null) opt.package; + lib.optional (opt != null && opt.package != null) opt.package; in { - home.packages = concatMap optionalPackage [ + home.packages = lib.concatMap optionalPackage [ cfg.font cfg.theme cfg.iconTheme cfg.cursorTheme ]; - home.file.${cfg2.configLocation}.text = - concatMapStrings (l: l + "\n") (mapAttrsToList formatGtk2Option gtkIni) - + cfg2.extraConfig + "\n"; + home.file.${cfg2.configLocation}.text = lib.concatMapStrings (l: l + "\n") + (lib.mapAttrsToList formatGtk2Option gtkIni) + cfg2.extraConfig + "\n"; home.sessionVariables.GTK2_RC_FILES = cfg2.configLocation; @@ -277,16 +277,17 @@ in { toGtk3Ini { Settings = gtkIni // cfg3.extraConfig; }; xdg.configFile."gtk-3.0/gtk.css" = - mkIf (cfg3.extraCss != "") { text = cfg3.extraCss; }; + lib.mkIf (cfg3.extraCss != "") { text = cfg3.extraCss; }; - xdg.configFile."gtk-3.0/bookmarks" = mkIf (cfg3.bookmarks != [ ]) { - text = concatMapStrings (l: l + "\n") cfg3.bookmarks; + xdg.configFile."gtk-3.0/bookmarks" = lib.mkIf (cfg3.bookmarks != [ ]) { + text = lib.concatMapStrings (l: l + "\n") cfg3.bookmarks; }; xdg.configFile."gtk-4.0/settings.ini".text = toGtk3Ini { Settings = gtkIni // cfg4.extraConfig; }; - xdg.configFile."gtk-4.0/gtk.css" = mkIf (gtk4Css != "") { text = gtk4Css; }; + xdg.configFile."gtk-4.0/gtk.css" = + lib.mkIf (gtk4Css != "") { text = gtk4Css; }; dconf.settings."org/gnome/desktop/interface" = dconfIni; }); diff --git a/modules/misc/mozilla-messaging-hosts.nix b/modules/misc/mozilla-messaging-hosts.nix new file mode 100644 index 000000000..09a4188f1 --- /dev/null +++ b/modules/misc/mozilla-messaging-hosts.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +let + inherit (pkgs.stdenv) isDarwin; + + cfg = config.mozilla; + + defaultPaths = [ + # Link a .keep file to keep the directory around + (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "") + ]; + + thunderbirdNativeMessagingHostsPath = if isDarwin then + "Library/Mozilla/NativeMessagingHosts" + else + ".mozilla/native-messaging-hosts"; + + firefoxNativeMessagingHostsPath = if isDarwin then + "Library/Application Support/Mozilla/NativeMessagingHosts" + else + ".mozilla/native-messaging-hosts"; +in { + meta.maintainers = with lib.maintainers; [ + booxter + rycee + lib.hm.maintainers.bricked + ]; + + options.mozilla = { + firefoxNativeMessagingHosts = lib.mkOption { + internal = true; + type = with lib.types; listOf package; + default = [ ]; + description = '' + List of Firefox native messaging hosts to configure. + ''; + }; + + thunderbirdNativeMessagingHosts = lib.mkOption { + internal = true; + type = with lib.types; listOf package; + default = [ ]; + description = '' + List of Thunderbird native messaging hosts to configure. + ''; + }; + }; + + config = lib.mkIf (cfg.firefoxNativeMessagingHosts != [ ] + || cfg.thunderbirdNativeMessagingHosts != [ ]) { + home.file = if isDarwin then + let + firefoxNativeMessagingHostsJoined = pkgs.symlinkJoin { + name = "ff-native-messaging-hosts"; + paths = defaultPaths ++ cfg.firefoxNativeMessagingHosts; + }; + thunderbirdNativeMessagingHostsJoined = pkgs.symlinkJoin { + name = "th-native-messaging-hosts"; + paths = defaultPaths ++ cfg.thunderbirdNativeMessagingHosts; + }; + in { + "${thunderbirdNativeMessagingHostsPath}" = + lib.mkIf (cfg.thunderbirdNativeMessagingHosts != [ ]) { + source = + "${thunderbirdNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts"; + recursive = true; + }; + + "${firefoxNativeMessagingHostsPath}" = + lib.mkIf (cfg.firefoxNativeMessagingHosts != [ ]) { + source = + "${firefoxNativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts"; + recursive = true; + }; + } + else + let + nativeMessagingHostsJoined = pkgs.symlinkJoin { + name = "mozilla-native-messaging-hosts"; + # on Linux, the directory is shared between Firefox and Thunderbird; merge both into one + paths = defaultPaths ++ cfg.firefoxNativeMessagingHosts + ++ cfg.thunderbirdNativeMessagingHosts; + }; + in { + "${firefoxNativeMessagingHostsPath}" = { + source = + "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts"; + recursive = true; + }; + }; + }; +} diff --git a/modules/misc/news.nix b/modules/misc/news.nix index 7a3604be9..a3fb800f0 100644 --- a/modules/misc/news.nix +++ b/modules/misc/news.nix @@ -1,6 +1,8 @@ -{ config, lib, options, pkgs, ... }: -with lib; +{ config, lib, pkgs, ... }: + let + inherit (lib) mkOption types; + cfg = config.news; hostPlatform = pkgs.stdenv.hostPlatform; @@ -39,10 +41,12 @@ let }; }; - config = { id = mkDefault (builtins.hashString "sha256" config.message); }; + config = { + id = lib.mkDefault (builtins.hashString "sha256" config.message); + }; }); in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options = { news = { @@ -1653,6 +1657,23 @@ in { ''; } + { + time = "2024-05-21T20:22:57+00:00"; + condition = config.programs.git.signing != { }; + message = '' + The Git module now supports signing via SSH and X.509 keys, in addition to OpenPGP/GnuPG, + via the `programs.git.signing.format` option. + + The format defaults to `openpgp` for now, due to backwards compatibility reasons — this is + not guaranteed to last! GPG users should manually set `programs.git.signing.format` to + `openpgp` as soon as possible. + + Accordingly, `programs.git.signing.gpgPath` has been renamed to the more generic option + `programs.git.signing.signer` as not everyone uses GPG. + Please migrate to the new option to suppress the generated warning. + ''; + } + { time = "2024-05-25T14:36:03+00:00"; message = '' @@ -1700,6 +1721,16 @@ in { ''; } + { + time = "2024-08-18T11:42:08+00:00"; + message = '' + A new module is available: 'programs.lapce'. + + Lightning-fast and Powerful Code Editor written in Rust. + See https://lapce.dev/ for more. + ''; + } + { time = "2024-09-13T08:58:17+00:00"; condition = hostPlatform.isLinux; @@ -1864,8 +1895,8 @@ in { { time = "2024-12-08T17:22:13+00:00"; condition = let - usingMbsync = any (a: a.mbsync.enable) - (attrValues config.accounts.email.accounts); + usingMbsync = lib.any (a: a.mbsync.enable) + (lib.attrValues config.accounts.email.accounts); in usingMbsync; message = '' isync/mbsync 1.5.0 has changed several things. @@ -1946,6 +1977,7 @@ in { speed, features, or native UIs. Ghostty provides all three. ''; } + { time = "2025-01-04T15:00:00+00:00"; condition = hostPlatform.isLinux; @@ -1960,6 +1992,154 @@ in { as well as wf-shell. ''; } + + { + time = "2025-01-21T17:28:13+00:00"; + condition = with config.programs.yazi; enable && enableFishIntegration; + message = '' + Yazi's fish shell integration wrapper now calls the 'yazi' executable + directly, ignoring any shell aliases with the same name. + + Your configuration may break if you rely on the wrapper calling a + 'yazi' alias. + ''; + } + + { + time = "2025-01-29T17:34:53+00:00"; + condition = config.programs.firefox.enable; + message = '' + The Firefox module now provides a + 'programs.firefox.profiles..preConfig' option. + + It allows extra preferences to be added to 'user.js' before the + options specified in 'programs.firefox.profiles..settings', so + that they can be overwritten. + ''; + } + + { + time = "2025-01-29T19:11:20+00:00"; + condition = hostPlatform.isDarwin; + message = '' + A new module is available: 'programs.aerospace'. + + AeroSpace is an i3-like tiling window manager for macOS. + See https://github.com/nikitabobko/AeroSpace for more. + ''; + } + + { + time = "2025-01-30T09:18:55+00:00"; + condition = hostPlatform.isLinux; + message = '' + A new module is available: 'services.linux-wallpaperengine'. + + Reproduce the background functionality of Wallpaper Engine on Linux + systems. + ''; + } + + { + time = "2025-02-07T22:31:45+00:00"; + message = '' + All 'programs..enableIntegration' values now default + to the new 'home.shell.enableIntegration' options, which + inherit from the new the 'home.shell.enableShellIntegration' option. + + The following inconsistent default values change from 'false' to + 'true': + + - programs.zellij.enableBashIntegration + - programs.zellij.enableFishIntegration + - programs.zellij.enableZshIntegration + ''; + } + + { + time = "2025-02-11T15:25:26+00:00"; + message = '' + A new module is available: 'programs.git-worktree-switcher'. + + git-worktree-switcher allows you to quickly switch git worktrees. + It includes shell completions for Bash, Fish and Zsh. + See https://github.com/mateusauler/git-worktree-switcher for more. + ''; + } + + { + time = "2025-02-20T18:39:31+00:00"; + condition = hostPlatform.isLinux; + message = '' + A new module is available: 'programs.swayimg'. + + swayimg is a fully customizable and lightweight image viewer for + Wayland based display servers. + See https://github.com/artemsen/swayimg for more. + ''; + } + + { + time = "2025-02-16T17:00:00+00:00"; + message = '' + A new module is available: 'services.wluma'. + + Wluma is a tool for Wayland compositors to automatically adjust + screen brightness based on the screen contents and amount of ambient light around you. + ''; + } + + { + time = "2025-02-21T16:53:20+00:00"; + message = '' + A new module is available: 'programs.earthly'. + + Earthly is a build configuration framework utilizing buildkit and + Dockerfile-like syntax for fast builds and simplicity. + ''; + } + + { + time = "2025-02-22T16:53:20+00:00"; + message = '' + A new module is available: 'programs.jqp'. + + A TUI playground for experimenting with `jq`. + ''; + } + + { + time = "2025-02-22T16:46:56+00:00"; + condition = hostPlatform.isLinux; + message = '' + A new module is available: 'services.wpaperd'. + + This replaces the existing module, 'programs.wpaperd', and adds a + systemd service to ensure its execution. + ''; + } + + { + time = "2025-01-26T16:40:00+00:00"; + message = '' + A new module is available: 'programs.mods' + + mods is a command line AI tool that is highly configurable and allows + querying AI models hosted locally or by other services (OpenAI, + Cohere, Groq). + ''; + } + + { + time = "2025-03-11T02:34:43+00:00"; + condition = config.programs.zsh.enable; + message = '' + A new module is available: 'programs.zsh.initContent'. + + initContent option allows you to set the content of the zshrc file, + you can use `lib.mkOrder` to specify the order of the content you want to insert. + ''; + } ]; }; } diff --git a/modules/misc/nixpkgs-disabled.nix b/modules/misc/nixpkgs-disabled.nix index ab0f35df7..b7e143d97 100644 --- a/modules/misc/nixpkgs-disabled.nix +++ b/modules/misc/nixpkgs-disabled.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.nixpkgs; @@ -17,28 +15,28 @@ let let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; - in lhs // rhs // optionalAttrs (lhs ? packageOverrides) { + in lhs // rhs // lib.optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs - // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs; - } // optionalAttrs (lhs ? perlPackageOverrides) { + // optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs; + } // lib.optionalAttrs (lhs ? perlPackageOverrides) { perlPackageOverrides = pkgs: optCall lhs.perlPackageOverrides pkgs - // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs; + // optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; }; # Copied from nixpkgs.nix. - configType = mkOptionType { + configType = lib.mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; check = x: let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false; in traceXIfNot isConfig; - merge = args: fold (def: mergeConfig def.value) { }; + merge = args: lib.fold (def: mergeConfig def.value) { }; }; # Copied from nixpkgs.nix. - overlayType = mkOptionType { + overlayType = lib.mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; check = builtins.isFunction; @@ -46,28 +44,36 @@ let }; in { - meta.maintainers = with maintainers; [ thiagokokada ]; + meta.maintainers = with lib.maintainers; [ thiagokokada ]; options.nixpkgs = { - config = mkOption { + config = lib.mkOption { default = null; - type = types.nullOr configType; + type = lib.types.nullOr configType; visible = false; }; - overlays = mkOption { + overlays = lib.mkOption { default = null; - type = types.nullOr (types.listOf overlayType); + type = lib.types.nullOr (lib.types.listOf overlayType); visible = false; }; }; config = { - assertions = [{ - assertion = cfg.config == null || cfg.overlays == null; - message = '' - `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled. - ''; - }]; + assertions = [ + # TODO: Re-enable assertion after 25.05 (&&) + { + assertion = cfg.config == null || cfg.overlays == null; + message = '' + `nixpkgs` options are disabled when `home-manager.useGlobalPkgs` is enabled. + ''; + } + ]; + + warnings = lib.optional ((cfg.config != null) || (cfg.overlays != null)) '' + You have set either `nixpkgs.config` or `nixpkgs.overlays` while using `home-manager.useGlobalPkgs`. + This will soon not be possible. Please remove all `nixpkgs` options when using `home-manager.useGlobalPkgs`. + ''; }; } diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index efbbba96c..b21e97db9 100644 --- a/modules/misc/nixpkgs.nix +++ b/modules/misc/nixpkgs.nix @@ -2,8 +2,6 @@ { config, lib, pkgs, pkgsPath, ... }: -with lib; - let isConfig = x: builtins.isAttrs x || builtins.isFunction x; @@ -14,40 +12,40 @@ let let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; - in lhs // rhs // optionalAttrs (lhs ? packageOverrides) { + in lhs // rhs // lib.optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs - // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs; - } // optionalAttrs (lhs ? perlPackageOverrides) { + // optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs; + } // lib.optionalAttrs (lhs ? perlPackageOverrides) { perlPackageOverrides = pkgs: optCall lhs.perlPackageOverrides pkgs - // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs; + // optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; }; - configType = mkOptionType { + configType = lib.mkOptionType { name = "nixpkgs-config"; description = "nixpkgs config"; check = x: let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false; in traceXIfNot isConfig; - merge = args: fold (def: mergeConfig def.value) { }; + merge = args: lib.fold (def: mergeConfig def.value) { }; }; - overlayType = mkOptionType { + overlayType = lib.mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; - check = builtins.isFunction; + check = lib.isFunction; merge = lib.mergeOneOption; }; - _pkgs = import pkgsPath (filterAttrs (n: v: v != null) config.nixpkgs); + _pkgs = import pkgsPath (lib.filterAttrs (n: v: v != null) config.nixpkgs); in { options.nixpkgs = { - config = mkOption { + config = lib.mkOption { default = null; example = { allowBroken = true; }; - type = types.nullOr configType; + type = lib.types.nullOr configType; description = '' The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set @@ -72,9 +70,9 @@ in { ''; }; - overlays = mkOption { + overlays = lib.mkOption { default = null; - example = literalExpression '' + example = lib.literalExpression '' [ (final: prev: { openssh = prev.openssh.override { @@ -85,7 +83,7 @@ in { }) ] ''; - type = types.nullOr (types.listOf overlayType); + type = lib.types.nullOr (lib.types.listOf overlayType); description = '' List of overlays to use with the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to @@ -105,8 +103,8 @@ in { ''; }; - system = mkOption { - type = types.str; + system = lib.mkOption { + type = lib.types.str; example = "i686-linux"; internal = true; description = '' @@ -123,7 +121,7 @@ in { _module.args = { # We use a no-op override to make sure that the option can be merged without evaluating # `_pkgs`, see https://github.com/nix-community/home-manager/pull/993 - pkgs = mkOverride modules.defaultOverridePriority _pkgs; + pkgs = lib.mkOverride lib.modules.defaultOverridePriority _pkgs; pkgs_i686 = if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then _pkgs.pkgsi686Linux diff --git a/modules/misc/numlock.nix b/modules/misc/numlock.nix index 88032417f..e453a0951 100644 --- a/modules/misc/numlock.nix +++ b/modules/misc/numlock.nix @@ -1,25 +1,24 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.xsession.numlock; in { - meta.maintainers = [ maintainers.evanjs ]; + meta.maintainers = [ lib.maintainers.evanjs ]; - options = { xsession.numlock.enable = mkEnableOption "Num Lock"; }; + options = { xsession.numlock.enable = lib.mkEnableOption "Num Lock"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ - (hm.assertions.assertPlatform "xsession.numlock" pkgs platforms.linux) + (lib.hm.assertions.assertPlatform "xsession.numlock" pkgs + lib.platforms.linux) ]; systemd.user.services.numlockx = { Unit = { Description = "NumLockX"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/misc/pam.nix b/modules/misc/pam.nix index 22a5daf0d..bf0af355f 100644 --- a/modules/misc/pam.nix +++ b/modules/misc/pam.nix @@ -1,18 +1,16 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let cfg = config.pam; in { - meta.maintainers = with maintainers; [ rycee veehaitch ]; + meta.maintainers = with lib.maintainers; [ rycee veehaitch ]; options = { - pam.sessionVariables = mkOption { + pam.sessionVariables = lib.mkOption { default = { }; - type = types.attrs; + type = lib.types.attrs; example = { EDITOR = "vim"; }; description = '' Environment variables that will be set for the PAM session. @@ -25,10 +23,10 @@ in { }; pam.yubico.authorizedYubiKeys = { - ids = mkOption { - type = with types; + ids = lib.mkOption { + type = with lib.types; let - yubiKeyId = addCheck str (s: stringLength s == 12) // { + yubiKeyId = addCheck str (s: lib.stringLength s == 12) // { name = "yubiKeyId"; description = "string of length 12"; }; @@ -41,8 +39,8 @@ in { ''; }; - path = mkOption { - type = types.str; + path = lib.mkOption { + type = lib.types.str; default = ".yubico/authorized_yubikeys"; description = '' File path to write the authorized YubiKeys, @@ -52,16 +50,16 @@ in { }; }; - config = mkMerge [ - (mkIf (cfg.sessionVariables != { }) { - home.file.".pam_environment".text = concatStringsSep "\n" - (mapAttrsToList (n: v: ''${n} OVERRIDE="${toString v}"'') + config = lib.mkMerge [ + (lib.mkIf (cfg.sessionVariables != { }) { + home.file.".pam_environment".text = lib.concatStringsSep "\n" + (lib.mapAttrsToList (n: v: ''${n} OVERRIDE="${toString v}"'') cfg.sessionVariables) + "\n"; }) - (mkIf (cfg.yubico.authorizedYubiKeys.ids != [ ]) { + (lib.mkIf (cfg.yubico.authorizedYubiKeys.ids != [ ]) { home.file.${cfg.yubico.authorizedYubiKeys.path}.text = - concatStringsSep ":" + lib.concatStringsSep ":" ([ config.home.username ] ++ cfg.yubico.authorizedYubiKeys.ids); }) ]; diff --git a/modules/misc/qt.nix b/modules/misc/qt.nix index 3152e0091..41cd660fc 100644 --- a/modules/misc/qt.nix +++ b/modules/misc/qt.nix @@ -13,6 +13,11 @@ let libsForQt5.plasma-integration libsForQt5.systemsettings ]; + kde6 = [ + kdePackages.kio + kdePackages.plasma-integration + kdePackages.systemsettings + ]; lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ]; qtct = [ libsForQt5.qt5ct qt6Packages.qt6ct ]; }; @@ -21,6 +26,7 @@ let styleNames = { gtk = "gtk2"; qtct = "qt5ct"; + kde6 = "kde"; }; # Maps known lowercase style names to style packages. Non-exhaustive. @@ -75,6 +81,8 @@ in { [ "libsForQt5" "qt5ct" ] [ "libsForQt5" "qtstyleplugins" ] [ "libsForQt5" "systemsettings" ] + [ "kdePackages" "plasma-integration" ] + [ "kdePackages" "systemsettings" ] [ "lxqt" "lxqt-config" ] [ "lxqt" "lxqt-qtplugin" ] [ "qt6Packages" "qt6ct" ] @@ -114,7 +122,10 @@ in { applications `kde` - : Use Qt settings from Plasma + : Use Qt settings from Plasma 5 + + `kde6` + : Use Qt settings from Plasma 6 ''; }; package = lib.mkOption { @@ -131,8 +142,8 @@ in { }; in lib.mkOption { type = with lib.types; - nullOr - (either (enum [ "gtk" "gtk3" "gnome" "adwaita" "lxqt" "qtct" "kde" ]) + nullOr (either + (enum [ "gtk" "gtk3" "gnome" "adwaita" "lxqt" "qtct" "kde" "kde6" ]) (lib.types.submodule { options = newOption; })); default = null; description = '' @@ -218,13 +229,10 @@ in { inherit (config.home) profileDirectory; qtVersions = with pkgs; [ qt5 qt6 ]; makeQtPath = prefix: - lib.concatStringsSep ":" (map (qt: "${profileDirectory}/${qt.qtbase.${prefix}}") qtVersions); in { - QT_PLUGIN_PATH = "$QT_PLUGIN_PATH\${QT_PLUGIN_PATH:+:}" - + (makeQtPath "qtPluginPrefix"); - QML2_IMPORT_PATH = "$QML2_IMPORT_PATH\${QML2_IMPORT_PATH:+:}" - + (makeQtPath "qtQmlPrefix"); + QT_PLUGIN_PATH = makeQtPath "qtPluginPrefix"; + QML2_IMPORT_PATH = makeQtPath "qtQmlPrefix"; }; in lib.mkIf cfg.enable { @@ -248,19 +256,14 @@ in { home = { sessionVariables = envVars; - # home.sessionVariables does not support setting the same environment - # variable to different values. - # Since some other modules may set the QT_PLUGIN_PATH or QML2_IMPORT_PATH - # to their own value, e.g.: fcitx5, we avoid conflicts by setting - # the values in home.sessionVariablesExtra instead. - sessionVariablesExtra = '' - export QT_PLUGIN_PATH=${envVarsExtra.QT_PLUGIN_PATH} - export QML2_IMPORT_PATH=${envVarsExtra.QML2_IMPORT_PATH} - ''; + sessionSearchVariables = envVarsExtra; }; # Apply theming also to apps started by systemd. - systemd.user.sessionVariables = envVars // envVarsExtra; + systemd.user.sessionVariables = envVars // { + QT_PLUGIN_PATH = lib.concatStringsSep ":" envVarsExtra.QT_PLUGIN_PATH; + QML2_IMPORT_PATH = lib.concatStringsSep ":" envVarsExtra.QML2_IMPORT_PATH; + }; home.packages = (lib.findFirst (x: x != [ ]) [ ] [ (lib.optionals (platformTheme.package != null) diff --git a/modules/misc/shell.nix b/modules/misc/shell.nix new file mode 100644 index 000000000..7ef8bbfc7 --- /dev/null +++ b/modules/misc/shell.nix @@ -0,0 +1,43 @@ +{ config, lib, ... }: + +{ + options.home.shell = { + enableShellIntegration = lib.mkOption { + type = lib.types.bool; + default = true; + example = false; + description = '' + Whether to globally enable shell integration for all supported shells. + + Individual shell integrations can be overridden with their respective + `shell.enableIntegration` option. For example, the following + declaration globally disables shell integration for Bash: + + ```nix + home.shell.enableBashIntegration = false; + ``` + ''; + }; + + enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { + inherit config; + baseName = "Shell"; + }; + enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { + inherit config; + baseName = "Shell"; + }; + enableIonIntegration = lib.hm.shell.mkIonIntegrationOption { + inherit config; + baseName = "Shell"; + }; + enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { + inherit config; + baseName = "Shell"; + }; + enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { + inherit config; + baseName = "Shell"; + }; + }; +} diff --git a/modules/misc/specialisation.nix b/modules/misc/specialisation.nix index dc5f78e14..95adc998f 100644 --- a/modules/misc/specialisation.nix +++ b/modules/misc/specialisation.nix @@ -1,27 +1,25 @@ { config, name, extendModules, lib, ... }: -with lib; - { imports = - [ (mkRenamedOptionModule [ "specialization" ] [ "specialisation" ]) ]; + [ (lib.mkRenamedOptionModule [ "specialization" ] [ "specialisation" ]) ]; - options.specialisation = mkOption { - type = types.attrsOf (types.submodule { + options.specialisation = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule { options = { - configuration = mkOption { + configuration = lib.mkOption { type = let extended = extendModules { modules = [{ # Prevent infinite recursion - specialisation = mkOverride 0 { }; + specialisation = lib.mkOverride 0 { }; # If used inside the NixOS/nix-darwin module, we get conflicting definitions # of `name` inside the specialisation: one is the user name coming from the # NixOS module definition and the other is `configuration`, the name of this # option. Thus we need to explicitly wire the former into the module arguments. # See discussion at https://github.com/nix-community/home-manager/issues/3716 - _module.args.name = mkForce name; + _module.args.name = lib.mkForce name; }]; }; in extended.type; @@ -70,14 +68,21 @@ with lib; ''; }; - config = mkIf (config.specialisation != { }) { + config = lib.mkIf (config.specialisation != { }) { + assertions = map (n: { + assertion = !lib.hasInfix "/" n; + message = + " in specialisation. cannot contain a forward slash."; + }) (lib.attrNames config.specialisation); + home.extraBuilderCommands = let link = n: v: let pkg = v.configuration.home.activationPackage; - in "ln -s ${pkg} $out/specialisation/${n}"; + in "ln -s ${pkg} $out/specialisation/${lib.escapeShellArg n}"; in '' mkdir $out/specialisation - ${concatStringsSep "\n" (mapAttrsToList link config.specialisation)} + ${lib.concatStringsSep "\n" + (lib.mapAttrsToList link config.specialisation)} ''; }; } diff --git a/modules/misc/submodule-support.nix b/modules/misc/submodule-support.nix index 82fbc0a30..b42bc4870 100644 --- a/modules/misc/submodule-support.nix +++ b/modules/misc/submodule-support.nix @@ -1,13 +1,11 @@ { lib, ... }: -with lib; - { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options.submoduleSupport = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; internal = true; description = '' @@ -16,8 +14,8 @@ with lib; ''; }; - externalPackageInstall = mkOption { - type = types.bool; + externalPackageInstall = lib.mkOption { + type = lib.types.bool; default = false; internal = true; description = '' @@ -39,9 +37,9 @@ with lib; # module system can not inform modules about their non-existence; see # https://github.com/NixOS/nixpkgs/issues/311709#issuecomment-2110861842 _module.args = { - osConfig = mkDefault null; - nixosConfig = mkDefault null; - darwinConfig = mkDefault null; + osConfig = lib.mkDefault null; + nixosConfig = lib.mkDefault null; + darwinConfig = lib.mkDefault null; }; }; } diff --git a/modules/misc/tmpfiles.nix b/modules/misc/tmpfiles.nix index 9fa072b89..f9debf543 100644 --- a/modules/misc/tmpfiles.nix +++ b/modules/misc/tmpfiles.nix @@ -1,16 +1,14 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.systemd.user.tmpfiles; in { - meta.maintainers = [ maintainers.dawidsowa ]; + meta.maintainers = [ lib.maintainers.dawidsowa ]; - options.systemd.user.tmpfiles.rules = mkOption { - type = types.listOf types.str; + options.systemd.user.tmpfiles.rules = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "L /home/user/Documents - - - - /mnt/data/Documents" ]; description = '' @@ -21,10 +19,10 @@ in { ''; }; - config = mkIf (cfg.rules != [ ]) { + config = lib.mkIf (cfg.rules != [ ]) { assertions = [ - (hm.assertions.assertPlatform "systemd.user.tmpfiles" pkgs - platforms.linux) + (lib.hm.assertions.assertPlatform "systemd.user.tmpfiles" pkgs + lib.platforms.linux) ]; xdg.configFile = { @@ -32,7 +30,7 @@ in { text = '' # This file is created automatically and should not be modified. # Please change the option ‘systemd.user.tmpfiles.rules’ instead. - ${concatStringsSep "\n" cfg.rules} + ${lib.concatStringsSep "\n" cfg.rules} ''; onChange = "${pkgs.systemd}/bin/systemd-tmpfiles --user --create"; }; diff --git a/modules/misc/uninstall.nix b/modules/misc/uninstall.nix index 3086d21b8..4fe26326e 100644 --- a/modules/misc/uninstall.nix +++ b/modules/misc/uninstall.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let diff --git a/modules/misc/version.nix b/modules/misc/version.nix index 176901f3e..3c7317360 100644 --- a/modules/misc/version.nix +++ b/modules/misc/version.nix @@ -1,12 +1,13 @@ { config, lib, ... }: -with lib; +let + inherit (lib) types; -let releaseInfo = lib.importJSON ../../release.json; + releaseInfo = lib.importJSON ../../release.json; in { options = { - home.stateVersion = mkOption { + home.stateVersion = lib.mkOption { type = types.enum [ "18.09" "19.03" @@ -39,20 +40,20 @@ in { }; home.version = { - full = mkOption { + full = lib.mkOption { internal = true; readOnly = true; type = types.str; default = let inherit (config.home.version) release revision; - suffix = - optionalString (revision != null) "+${substring 0 8 revision}"; + suffix = lib.optionalString (revision != null) + "+${lib.substring 0 8 revision}"; in "${release}${suffix}"; example = "22.11+213a0629"; description = "The full Home Manager version."; }; - release = mkOption { + release = lib.mkOption { internal = true; readOnly = true; type = types.str; @@ -61,7 +62,7 @@ in { description = "The Home Manager release."; }; - isReleaseBranch = mkOption { + isReleaseBranch = lib.mkOption { internal = true; readOnly = true; type = types.bool; @@ -72,11 +73,14 @@ in { ''; }; - revision = mkOption { + revision = lib.mkOption { internal = true; type = types.nullOr types.str; default = let gitRepo = "${toString ./../..}/.git"; - in if pathIsGitRepo gitRepo then commitIdFromGitRepo gitRepo else null; + in if lib.pathIsGitRepo gitRepo then + lib.commitIdFromGitRepo gitRepo + else + null; description = '' The Git revision from which this Home Manager configuration was built. ''; diff --git a/modules/misc/vte.nix b/modules/misc/vte.nix index fbe38c016..c734fd448 100644 --- a/modules/misc/vte.nix +++ b/modules/misc/vte.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options.programs = let description = '' @@ -12,13 +10,17 @@ with lib; directory. ''; in { - bash.enableVteIntegration = mkEnableOption "" // { inherit description; }; + bash.enableVteIntegration = lib.mkEnableOption "" // { + inherit description; + }; - zsh.enableVteIntegration = mkEnableOption "" // { inherit description; }; + zsh.enableVteIntegration = lib.mkEnableOption "" // { + inherit description; + }; }; - config = mkMerge [ - (mkIf config.programs.bash.enableVteIntegration { + config = lib.mkMerge [ + (lib.mkIf config.programs.bash.enableVteIntegration { # Unfortunately we have to do a little dance here to fix two # problems with the upstream vte.sh file: # @@ -42,7 +44,7 @@ with lib; ''; }) - (mkIf config.programs.zsh.enableVteIntegration { + (lib.mkIf config.programs.zsh.enableVteIntegration { programs.zsh.initExtra = '' . ${pkgs.vte}/etc/profile.d/vte.sh ''; diff --git a/modules/misc/xdg-autostart.nix b/modules/misc/xdg-autostart.nix new file mode 100644 index 000000000..f6b8b7e24 --- /dev/null +++ b/modules/misc/xdg-autostart.nix @@ -0,0 +1,40 @@ +{ config, lib, ... }: +let + inherit (builtins) baseNameOf listToAttrs map unsafeDiscardStringContext; + inherit (lib) literalExpression mkEnableOption mkIf mkOption types; + + cfg = config.xdg.autostart; + + /* "/nix/store/x-foo/application.desktop" -> { + name = "autostart/application.desktop"; + value = { source = "/nix/store/x-foo/application.desktop"; }; + } + */ + mapDesktopEntry = entry: { + name = "autostart/${unsafeDiscardStringContext (baseNameOf entry)}"; + value.source = entry; + }; +in { + meta.maintainers = with lib.maintainers; [ Scrumplex ]; + + options.xdg.autostart = { + enable = mkEnableOption "creation of XDG autostart entries"; + + entries = mkOption { + type = with types; listOf path; + description = '' + Paths to desktop files that should be linked to `XDG_CONFIG_HOME/autostart` + ''; + default = [ ]; + example = literalExpression '' + [ + "''${pkgs.evolution}/share/applications/org.gnome.Evolution.desktop" + ] + ''; + }; + }; + + config = mkIf (cfg.enable && cfg.entries != [ ]) { + xdg.configFile = listToAttrs (map mapDesktopEntry cfg.entries); + }; +} diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix index 1aab6ffe7..1bc3ef6b5 100644 --- a/modules/misc/xdg-desktop-entries.nix +++ b/modules/misc/xdg-desktop-entries.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mkOption types; + desktopEntry = { imports = [ - (mkRemovedOptionModule [ "extraConfig" ] + (lib.mkRemovedOptionModule [ "extraConfig" ] "The `extraConfig` option of `xdg.desktopEntries` has been removed following a change in Nixpkgs.") - (mkRemovedOptionModule [ "fileValidation" ] + (lib.mkRemovedOptionModule [ "fileValidation" ] "Validation of the desktop file is always enabled.") ]; options = { @@ -172,12 +172,12 @@ let type exec icon comment terminal genericName startupNotify noDisplay prefersNonDefaultGPU actions; desktopName = config.name; - mimeTypes = optionals (config.mimeType != null) config.mimeType; - categories = optionals (config.categories != null) config.categories; + mimeTypes = lib.optionals (config.mimeType != null) config.mimeType; + categories = lib.optionals (config.categories != null) config.categories; extraConfig = config.settings; }; in { - meta.maintainers = [ hm.maintainers.cwyc ]; + meta.maintainers = [ lib.hm.maintainers.cwyc ]; options.xdg.desktopEntries = mkOption { description = '' @@ -203,13 +203,16 @@ in { ''; }; - config = mkIf (config.xdg.desktopEntries != { }) { + config = lib.mkIf (config.xdg.desktopEntries != { }) { assertions = [ - (hm.assertions.assertPlatform "xdg.desktopEntries" pkgs platforms.linux) - ] ++ flatten (catAttrs "assertions" (attrValues config.xdg.desktopEntries)); + (lib.hm.assertions.assertPlatform "xdg.desktopEntries" pkgs + lib.platforms.linux) + ] ++ lib.flatten + (lib.catAttrs "assertions" (lib.attrValues config.xdg.desktopEntries)); - home.packages = (map hiPrio # we need hiPrio to override existing entries - (attrsets.mapAttrsToList makeFile config.xdg.desktopEntries)); + home.packages = + (map lib.hiPrio # we need hiPrio to override existing entries + (lib.attrsets.mapAttrsToList makeFile config.xdg.desktopEntries)); }; } diff --git a/modules/misc/xdg-mime-apps.nix b/modules/misc/xdg-mime-apps.nix index 39eea478e..6efa43b11 100644 --- a/modules/misc/xdg-mime-apps.nix +++ b/modules/misc/xdg-mime-apps.nix @@ -1,16 +1,15 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.xdg.mimeApps; strListOrSingleton = with types; - coercedTo (either (listOf str) str) toList (listOf str); + coercedTo (either (listOf str) str) lib.toList (listOf str); in { - meta.maintainers = with maintainers; [ euxane ]; + meta.maintainers = with lib.maintainers; [ euxane ]; options.xdg.mimeApps = { enable = mkOption { @@ -29,7 +28,7 @@ in { associations.added = mkOption { type = types.attrsOf strListOrSingleton; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "mimetype1" = [ "foo1.desktop" "foo2.desktop" "foo3.desktop" ]; "mimetype2" = "foo4.desktop"; @@ -56,7 +55,7 @@ in { defaultApplications = mkOption { type = types.attrsOf strListOrSingleton; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "mimetype1" = [ "default1.desktop" "default2.desktop" ]; } @@ -71,22 +70,22 @@ in { }; }; - config = mkMerge [ + config = lib.mkMerge [ { # Given a package that installs .desktop files in the usual location, # return a mapping from mime types to lists of desktop file names. This is # suitable for use with `xdg.mimeApps.defaultApplications`. lib.xdg.mimeAssociations = let processLines = str: - zipAttrs - (filter (e: e != null) (map processLine (splitString "\n" str))); + lib.zipAttrs (lib.filter (e: e != null) + (map processLine (lib.splitString "\n" str))); processLine = str: let - entry = splitString ";" str; - k = elemAt entry 0; - v = elemAt entry 1; - in if length entry == 2 then { ${k} = v; } else null; + entry = lib.splitString ";" str; + k = lib.elemAt entry 0; + v = lib.elemAt entry 1; + in if lib.length entry == 2 then { ${k} = v; } else null; associations = ps: pkgs.runCommand "mime-assoc" { inherit ps; } '' @@ -100,17 +99,19 @@ in { in p: processLines (builtins.readFile (associations p)); } - (mkIf cfg.enable { - assertions = - [ (hm.assertions.assertPlatform "xdg.mimeApps" pkgs platforms.linux) ]; + (lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "xdg.mimeApps" pkgs + lib.platforms.linux) + ]; # Deprecated but still used by some applications. xdg.dataFile."applications/mimeapps.list".source = config.xdg.configFile."mimeapps.list".source; xdg.configFile."mimeapps.list".text = - let joinValues = mapAttrs (n: concatStringsSep ";"); - in generators.toINI { } { + let joinValues = lib.mapAttrs (n: lib.concatStringsSep ";"); + in lib.generators.toINI { } { "Added Associations" = joinValues cfg.associations.added; "Removed Associations" = joinValues cfg.associations.removed; "Default Applications" = joinValues cfg.defaultApplications; diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg-mime.nix index 78b569fa5..fa22f96df 100644 --- a/modules/misc/xdg-mime.nix +++ b/modules/misc/xdg-mime.nix @@ -1,11 +1,10 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.xdg.mime; - inherit (lib) getExe getExe'; + + inherit (lib) getExe getExe' mkOption types; in { options = { @@ -13,8 +12,8 @@ in { enable = mkOption { type = types.bool; default = pkgs.stdenv.hostPlatform.isLinux; - defaultText = - literalExpression "true if host platform is Linux, false otherwise"; + defaultText = lib.literalExpression + "true if host platform is Linux, false otherwise"; description = '' Whether to install programs and files to support the XDG Shared MIME-info specification and XDG MIME Applications @@ -29,22 +28,23 @@ in { sharedMimeInfoPackage = mkOption { type = types.package; default = pkgs.shared-mime-info; - defaultText = literalExpression "pkgs.shared-mime-info"; + defaultText = lib.literalExpression "pkgs.shared-mime-info"; description = "The package to use when running update-mime-database."; }; desktopFileUtilsPackage = mkOption { type = types.package; default = pkgs.desktop-file-utils; - defaultText = literalExpression "pkgs.desktop-file-utils"; + defaultText = lib.literalExpression "pkgs.desktop-file-utils"; description = "The package to use when running update-desktop-database."; }; }; }; - config = mkIf cfg.enable { - assertions = - [ (hm.assertions.assertPlatform "xdg.mime" pkgs platforms.linux) ]; + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "xdg.mime" pkgs lib.platforms.linux) + ]; home.packages = [ # Explicitly install package to provide basic mime types. @@ -63,15 +63,19 @@ in { if [[ -w $out/share/mime && -w $out/share/mime/packages && -d $out/share/mime/packages ]]; then XDG_DATA_DIRS=$out/share \ PKGSYSTEM_ENABLE_FSYNC=0 \ - ${getExe cfg.sharedMimeInfoPackage} \ - -V $out/share/mime > /dev/null + ${ + getExe + (cfg.sharedMimeInfoPackage.__spliced.buildHost or cfg.sharedMimeInfoPackage) + } -V $out/share/mime > /dev/null fi if [[ -w $out/share/applications ]]; then - ${getExe' cfg.desktopFileUtilsPackage "update-desktop-database"} \ - $out/share/applications + ${ + getExe' + (cfg.desktopFileUtilsPackage.__spliced.buildHost or cfg.desktopFileUtilsPackage) + "update-desktop-database" + } $out/share/applications fi ''; }; - } diff --git a/modules/misc/xdg-system-dirs.nix b/modules/misc/xdg-system-dirs.nix index 0be5e26d2..d02cff71d 100644 --- a/modules/misc/xdg-system-dirs.nix +++ b/modules/misc/xdg-system-dirs.nix @@ -1,33 +1,32 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) types; cfg = config.xdg.systemDirs; - configDirs = concatStringsSep ":" cfg.config; + configDirs = lib.concatStringsSep ":" cfg.config; - dataDirs = concatStringsSep ":" cfg.data; + dataDirs = lib.concatStringsSep ":" cfg.data; in { - meta.maintainers = with maintainers; [ tadfisher ]; + meta.maintainers = with lib.maintainers; [ tadfisher ]; options.xdg.systemDirs = { - config = mkOption { + config = lib.mkOption { type = types.listOf types.str; default = [ ]; - example = literalExpression ''[ "/etc/xdg" ]''; + example = lib.literalExpression ''[ "/etc/xdg" ]''; description = '' Directory names to add to {env}`XDG_CONFIG_DIRS` in the user session. ''; }; - data = mkOption { + data = lib.mkOption { type = types.listOf types.str; default = [ ]; - example = literalExpression ''[ "/usr/share" "/usr/local/share" ]''; + example = lib.literalExpression ''[ "/usr/share" "/usr/local/share" ]''; description = '' Directory names to add to {env}`XDG_DATA_DIRS` in the user session. @@ -35,14 +34,15 @@ in { }; }; - config = mkMerge [ - (mkIf (cfg.config != [ ] || cfg.data != [ ]) { + config = lib.mkMerge [ + (lib.mkIf (cfg.config != [ ] || cfg.data != [ ]) { assertions = [ - (hm.assertions.assertPlatform "xdg.systemDirs" pkgs platforms.linux) + (lib.hm.assertions.assertPlatform "xdg.systemDirs" pkgs + lib.platforms.linux) ]; }) - (mkIf (cfg.config != [ ]) { + (lib.mkIf (cfg.config != [ ]) { home.sessionVariables.XDG_CONFIG_DIRS = "${configDirs}\${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}"; @@ -50,7 +50,7 @@ in { "${configDirs}\${XDG_CONFIG_DIRS:+:$XDG_CONFIG_DIRS}"; }) - (mkIf (cfg.data != [ ]) { + (lib.mkIf (cfg.data != [ ]) { home.sessionVariables.XDG_DATA_DIRS = "${dataDirs}\${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"; diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg-user-dirs.nix index 5281203b9..b693118ad 100644 --- a/modules/misc/xdg-user-dirs.nix +++ b/modules/misc/xdg-user-dirs.nix @@ -1,16 +1,15 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mkOption types; cfg = config.xdg.userDirs; in { - meta.maintainers = with maintainers; [ euxane ]; + meta.maintainers = with lib.maintainers; [ euxane ]; imports = [ - (mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [ + (lib.mkRenamedOptionModule [ "xdg" "userDirs" "publishShare" ] [ "xdg" "userDirs" "publicShare" @@ -108,11 +107,11 @@ in { }; createDirectories = - mkEnableOption "automatic creation of the XDG user directories"; + lib.mkEnableOption "automatic creation of the XDG user directories"; }; config = let - directories = (filterAttrs (n: v: !isNull v) { + directories = (lib.filterAttrs (n: v: !isNull v) { XDG_DESKTOP_DIR = cfg.desktop; XDG_DOCUMENTS_DIR = cfg.documents; XDG_DOWNLOAD_DIR = cfg.download; @@ -122,24 +121,26 @@ in { XDG_TEMPLATES_DIR = cfg.templates; XDG_VIDEOS_DIR = cfg.videos; }) // cfg.extraConfig; - in mkIf cfg.enable { - assertions = - [ (hm.assertions.assertPlatform "xdg.userDirs" pkgs platforms.linux) ]; + in lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "xdg.userDirs" pkgs lib.platforms.linux) + ]; xdg.configFile."user-dirs.dirs".text = let # For some reason, these need to be wrapped with quotes to be valid. - wrapped = mapAttrs (_: value: ''"${value}"'') directories; - in generators.toKeyValue { } wrapped; + wrapped = lib.mapAttrs (_: value: ''"${value}"'') directories; + in lib.generators.toKeyValue { } wrapped; xdg.configFile."user-dirs.conf".text = "enabled=False"; home.sessionVariables = directories; - home.activation.createXdgUserDirectories = mkIf cfg.createDirectories (let - directoriesList = attrValues directories; - mkdir = - (dir: ''[[ -L "${dir}" ]] || run mkdir -p $VERBOSE_ARG "${dir}"''); - in lib.hm.dag.entryAfter [ "linkGeneration" ] - (strings.concatMapStringsSep "\n" mkdir directoriesList)); + home.activation.createXdgUserDirectories = lib.mkIf cfg.createDirectories + (let + directoriesList = lib.attrValues directories; + mkdir = + (dir: ''[[ -L "${dir}" ]] || run mkdir -p $VERBOSE_ARG "${dir}"''); + in lib.hm.dag.entryAfter [ "linkGeneration" ] + (lib.strings.concatMapStringsSep "\n" mkdir directoriesList)); }; } diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix index b916e88fb..e309462e7 100644 --- a/modules/misc/xdg.nix +++ b/modules/misc/xdg.nix @@ -1,8 +1,7 @@ -{ options, config, lib, pkgs, ... }: - -with lib; +{ config, lib, pkgs, ... }: let + inherit (lib) mkOptionDefault mkIf mkOption types; cfg = config.xdg; @@ -22,7 +21,16 @@ let in { options.xdg = { - enable = mkEnableOption "management of XDG base directories"; + enable = lib.mkEnableOption "management of XDG base directories"; + + cacheFile = mkOption { + type = fileType "xdg.cacheFile" "{var}`xdg.cacheHome`" cfg.cacheHome; + default = { }; + description = '' + Attribute set of files to link into the user's XDG + cache home. + ''; + }; cacheHome = mkOption { type = types.path; @@ -98,7 +106,7 @@ in { }; }; - config = mkMerge [ + config = lib.mkMerge [ (let variables = { XDG_CACHE_HOME = cfg.cacheHome; @@ -107,10 +115,10 @@ in { XDG_STATE_HOME = cfg.stateHome; }; in mkIf cfg.enable { - xdg.cacheHome = mkDefault defaultCacheHome; - xdg.configHome = mkDefault defaultConfigHome; - xdg.dataHome = mkDefault defaultDataHome; - xdg.stateHome = mkDefault defaultStateHome; + xdg.cacheHome = mkOptionDefault defaultCacheHome; + xdg.configHome = mkOptionDefault defaultConfigHome; + xdg.dataHome = mkOptionDefault defaultDataHome; + xdg.stateHome = mkOptionDefault defaultStateHome; home.sessionVariables = variables; systemd.user.sessionVariables = @@ -118,31 +126,41 @@ in { }) # Legacy non-deterministic setup. - (mkIf (!cfg.enable && versionOlder config.home.stateVersion "20.09") { + (mkIf (!cfg.enable && lib.versionOlder config.home.stateVersion "20.09") { xdg.cacheHome = - mkDefault (getEnvFallback "XDG_CACHE_HOME" defaultCacheHome); + mkOptionDefault (getEnvFallback "XDG_CACHE_HOME" defaultCacheHome); xdg.configHome = - mkDefault (getEnvFallback "XDG_CONFIG_HOME" defaultConfigHome); - xdg.dataHome = mkDefault (getEnvFallback "XDG_DATA_HOME" defaultDataHome); + mkOptionDefault (getEnvFallback "XDG_CONFIG_HOME" defaultConfigHome); + xdg.dataHome = + mkOptionDefault (getEnvFallback "XDG_DATA_HOME" defaultDataHome); + xdg.stateHome = + mkOptionDefault (getEnvFallback "XDG_STATE_HOME" defaultStateHome); }) # "Modern" deterministic setup. - (mkIf (!cfg.enable && versionAtLeast config.home.stateVersion "20.09") { - xdg.cacheHome = mkDefault defaultCacheHome; - xdg.configHome = mkDefault defaultConfigHome; - xdg.dataHome = mkDefault defaultDataHome; - xdg.stateHome = mkDefault defaultStateHome; + (mkIf (!cfg.enable && lib.versionAtLeast config.home.stateVersion "20.09") { + xdg.cacheHome = mkOptionDefault defaultCacheHome; + xdg.configHome = mkOptionDefault defaultConfigHome; + xdg.dataHome = mkOptionDefault defaultDataHome; + xdg.stateHome = mkOptionDefault defaultStateHome; }) { - home.file = mkMerge [ - (mapAttrs' (name: file: nameValuePair "${cfg.configHome}/${name}" file) + home.file = lib.mkMerge [ + (lib.mapAttrs' + (name: file: lib.nameValuePair "${cfg.cacheHome}/${name}" file) + cfg.cacheFile) + (lib.mapAttrs' + (name: file: lib.nameValuePair "${cfg.configHome}/${name}" file) cfg.configFile) - (mapAttrs' (name: file: nameValuePair "${cfg.dataHome}/${name}" file) + (lib.mapAttrs' + (name: file: lib.nameValuePair "${cfg.dataHome}/${name}" file) cfg.dataFile) - (mapAttrs' (name: file: nameValuePair "${cfg.stateHome}/${name}" file) + (lib.mapAttrs' + (name: file: lib.nameValuePair "${cfg.stateHome}/${name}" file) cfg.stateFile) { "${cfg.cacheHome}/.keep".text = ""; } + { "${cfg.stateHome}/.keep".text = ""; } ]; } ]; diff --git a/modules/misc/xfconf.nix b/modules/misc/xfconf.nix index 087040085..b95413676 100644 --- a/modules/misc/xfconf.nix +++ b/modules/misc/xfconf.nix @@ -1,8 +1,7 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.xfconf; @@ -51,12 +50,12 @@ let "-s" v ] else if builtins.isList v then - [ "-a" ] ++ concatMap withType v + [ "-a" ] ++ lib.concatMap withType v else throw "unexpected xfconf type: ${builtins.typeOf v}"; in { - meta.maintainers = [ maintainers.chuangzhu ]; + meta.maintainers = [ lib.maintainers.chuangzhu ]; options.xfconf = { enable = mkOption { @@ -81,7 +80,7 @@ in { description = "xfconf settings"; }; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { xfce4-session = { "startup/ssh-agent/enabled" = false; @@ -99,16 +98,16 @@ in { }; }; - config = mkIf (cfg.enable && cfg.settings != { }) { + config = lib.mkIf (cfg.enable && cfg.settings != { }) { assertions = - [ (hm.assertions.assertPlatform "xfconf" pkgs platforms.linux) ]; + [ (lib.hm.assertions.assertPlatform "xfconf" pkgs lib.platforms.linux) ]; - home.activation.xfconfSettings = hm.dag.entryAfter [ "installPackages" ] + home.activation.xfconfSettings = lib.hm.dag.entryAfter [ "installPackages" ] (let mkCommand = channel: property: value: '' run ${pkgs.xfce.xfconf}/bin/xfconf-query \ ${ - escapeShellArgs ([ "-c" channel "-p" "/${property}" ] + lib.escapeShellArgs ([ "-c" channel "-p" "/${property}" ] ++ (if value == null then [ "-r" ] else @@ -116,13 +115,12 @@ in { } ''; - commands = mapAttrsToList - (channel: properties: mapAttrsToList (mkCommand channel) properties) - cfg.settings; + commands = lib.mapAttrsToList (channel: properties: + lib.mapAttrsToList (mkCommand channel) properties) cfg.settings; load = pkgs.writeShellScript "load-xfconf" '' ${config.lib.bash.initHomeManagerLib} - ${concatMapStrings concatStrings commands} + ${lib.concatMapStrings lib.concatStrings commands} ''; in '' if [[ -v DBUS_SESSION_BUS_ADDRESS ]]; then diff --git a/modules/modules.nix b/modules/modules.nix index 2aae09eb1..9226ed63b 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -9,8 +9,6 @@ # If disabled, the pkgs attribute passed to this function is used instead. , useNixpkgsModule ? true }: -with lib; - let modules = [ @@ -30,18 +28,21 @@ let ./misc/fontconfig.nix ./misc/gtk.nix ./misc/lib.nix + ./misc/mozilla-messaging-hosts.nix ./misc/news.nix ./misc/nixgl.nix ./misc/numlock.nix ./misc/pam.nix ./misc/qt.nix ./misc/qt/kconfig.nix + ./misc/shell.nix ./misc/specialisation.nix ./misc/submodule-support.nix ./misc/tmpfiles.nix ./misc/uninstall.nix ./misc/version.nix ./misc/vte.nix + ./misc/xdg-autostart.nix ./misc/xdg-desktop-entries.nix ./misc/xdg-mime-apps.nix ./misc/xdg-mime.nix @@ -52,6 +53,7 @@ let ./misc/xfconf.nix ./programs/abook.nix ./programs/aerc.nix + ./programs/aerospace.nix ./programs/afew.nix ./programs/alacritty.nix ./programs/alot.nix @@ -86,6 +88,7 @@ let ./programs/dircolors.nix ./programs/direnv.nix ./programs/discocss.nix + ./programs/earthly.nix ./programs/eclipse.nix ./programs/emacs.nix ./programs/eww.nix @@ -107,6 +110,7 @@ let ./programs/ghostty.nix ./programs/git-cliff.nix ./programs/git-credential-oauth.nix + ./programs/git-worktree-switcher.nix ./programs/git.nix ./programs/gitui.nix ./programs/gnome-shell.nix @@ -134,6 +138,7 @@ let ./programs/java.nix ./programs/jetbrains-remote.nix ./programs/jq.nix + ./programs/jqp.nix ./programs/jujutsu.nix ./programs/joshuto.nix ./programs/joplin-desktop.nix @@ -146,6 +151,7 @@ let ./programs/kitty.nix ./programs/kodi.nix ./programs/kubecolor.nix + ./programs/lapce.nix ./programs/lazygit.nix ./programs/ledger.nix ./programs/less.nix @@ -163,6 +169,7 @@ let ./programs/mercurial.nix ./programs/micro.nix ./programs/mise.nix + ./programs/mods.nix ./programs/mpv.nix ./programs/mr.nix ./programs/msmtp.nix @@ -231,6 +238,7 @@ let ./programs/sqls.nix ./programs/ssh.nix ./programs/starship.nix + ./programs/swayimg.nix ./programs/swaylock.nix ./programs/swayr.nix ./programs/taskwarrior.nix @@ -246,6 +254,7 @@ let ./programs/tmate.nix ./programs/tmux.nix ./programs/tofi.nix + ./programs/todoman.nix ./programs/topgrade.nix ./programs/translate-shell.nix ./programs/urxvt.nix @@ -253,6 +262,7 @@ let ./programs/vifm.nix ./programs/vim-vint.nix ./programs/vim.nix + ./programs/vinegar.nix ./programs/vscode.nix ./programs/vscode/haskell.nix ./programs/pywal.nix @@ -262,7 +272,6 @@ let ./programs/wezterm.nix ./programs/wlogout.nix ./programs/wofi.nix - ./programs/wpaperd.nix ./programs/xmobar.nix ./programs/xplr.nix ./programs/yambar.nix @@ -295,6 +304,7 @@ let ./services/cliphist.nix ./services/clipman.nix ./services/clipmenu.nix + ./services/clipse.nix ./services/comodoro.nix ./services/conky.nix ./services/copyq.nix @@ -329,8 +339,10 @@ let ./services/keybase.nix ./services/keynav.nix ./services/lieer.nix + ./services/linux-wallpaperengine.nix ./services/listenbrainz-mpd.nix ./services/lorri.nix + ./services/macos-remap-keys ./services/mako.nix ./services/mbsync.nix ./services/megasync.nix @@ -345,6 +357,7 @@ let ./services/nextcloud-client.nix ./services/nix-gc.nix ./services/notify-osd.nix + ./services/ollama.nix ./services/opensnitch-ui.nix ./services/osmscout-server.nix ./services/owncloud-client.nix @@ -387,6 +400,7 @@ let ./services/taffybar.nix ./services/tahoe-lafs.nix ./services/taskwarrior-sync.nix + ./services/tldr-update.nix ./services/trayer.nix ./services/trayscale.nix ./services/twmn.nix @@ -408,13 +422,16 @@ let ./services/window-managers/wayfire.nix ./services/window-managers/xmonad.nix ./services/wlsunset.nix + ./services/wluma.nix ./services/wob.nix + ./services/wpaperd.nix ./services/xcape.nix ./services/xembed-sni-proxy.nix ./services/xidlehook.nix ./services/xscreensaver.nix ./services/xsettingsd.nix ./services/xsuspender.nix + ./services/yubikey-agent.nix ./systemd.nix ./targets/darwin ./targets/generic-linux.nix @@ -425,28 +442,28 @@ let (pkgs.path + "/nixos/modules/misc/assertions.nix") (pkgs.path + "/nixos/modules/misc/meta.nix") - (mkRemovedOptionModule [ "services" "password-store-sync" ] '' + (lib.mkRemovedOptionModule [ "services" "password-store-sync" ] '' Use services.git-sync instead. '') - (mkRemovedOptionModule [ "services" "keepassx" ] '' + (lib.mkRemovedOptionModule [ "services" "keepassx" ] '' KeePassX is no longer maintained. '') - ] ++ optional useNixpkgsModule ./misc/nixpkgs.nix - ++ optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix; + ] ++ lib.optional useNixpkgsModule ./misc/nixpkgs.nix + ++ lib.optional (!useNixpkgsModule) ./misc/nixpkgs-disabled.nix; pkgsModule = { config, ... }: { config = { _module.args.baseModules = modules; _module.args.pkgsPath = lib.mkDefault - (if versionAtLeast config.home.stateVersion "20.09" then + (if lib.versionAtLeast config.home.stateVersion "20.09" then pkgs.path else ); _module.args.pkgs = lib.mkDefault pkgs; _module.check = check; lib = lib.hm; - } // optionalAttrs useNixpkgsModule { - nixpkgs.system = mkDefault pkgs.stdenv.hostPlatform.system; + } // lib.optionalAttrs useNixpkgsModule { + nixpkgs.system = lib.mkDefault pkgs.stdenv.hostPlatform.system; }; }; diff --git a/modules/po/bg.po b/modules/po/bg.po new file mode 100644 index 000000000..f2bcc905f --- /dev/null +++ b/modules/po/bg.po @@ -0,0 +1,93 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Home Manager contributors +# This file is distributed under the same license as the Home Manager Modules package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Home Manager Modules\n" +"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" +"POT-Creation-Date: 2025-01-03 09:09+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: modules/files.nix:188 +msgid "Creating home file links in %s" +msgstr "" + +#: modules/files.nix:201 +msgid "Cleaning up orphan links from %s" +msgstr "" + +#: modules/home-environment.nix:591 +msgid "Creating new profile generation" +msgstr "" + +#: modules/home-environment.nix:594 +msgid "No change so reusing latest profile generation" +msgstr "" + +#: modules/home-environment.nix:643 +msgid "" +"Oops, Nix failed to install your new Home Manager profile!\n" +"\n" +"Perhaps there is a conflict with a package that was installed using\n" +"\"%s\"? Try running\n" +"\n" +" %s\n" +"\n" +"and if there is a conflicting package you can remove it with\n" +"\n" +" %s\n" +"\n" +"Then try activating your Home Manager configuration again." +msgstr "" + +#: modules/home-environment.nix:676 +msgid "Activating %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:22 +msgid "Migrating profile from %s to %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:54 +msgid "Could not find suitable profile directory, tried %s and %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:106 +msgid "Error: USER is set to \"%s\" but we expect \"%s\"" +msgstr "" + +#: modules/lib-bash/activation-init.sh:115 +msgid "Error: HOME is set to \"%s\" but we expect \"%s\"" +msgstr "" + +#: modules/lib-bash/activation-init.sh:132 +msgid "Starting Home Manager activation" +msgstr "" + +#: modules/lib-bash/activation-init.sh:136 +msgid "Sanity checking Nix" +msgstr "" + +#: modules/lib-bash/activation-init.sh:149 +msgid "This is a dry run" +msgstr "" + +#: modules/lib-bash/activation-init.sh:153 +msgid "This is a live run" +msgstr "" + +#: modules/lib-bash/activation-init.sh:159 +msgid "Using Nix version: %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:162 +msgid "Activation variables:" +msgstr "" diff --git a/modules/po/ca.po b/modules/po/ca.po index 80021463c..fde4fece4 100644 --- a/modules/po/ca.po +++ b/modules/po/ca.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-12-10 15:58+0000\n" -"Last-Translator: Nara Díaz Viñolas \n" +"PO-Revision-Date: 2025-02-19 21:00+0000\n" +"Last-Translator: Alejandro Masó Bonilla \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.3-dev\n" +"X-Generator: Weblate 5.10.1-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "Netejant enllaços orfes de %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Creant una nova generació per al nou perfil" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "No hi ha canvis llavors s'utilitzarà la generació anterior" #: modules/home-environment.nix:643 msgid "" @@ -55,13 +55,13 @@ msgstr "" "Potser hi ha un conflicte amb un paquet instal·lat mitjançant\n" "\"%s\"? Prova d'executar\n" "\n" -" %s\n" +". . . . %s\n" "\n" "i si hi ha un paquet conflictiu el pots eliminar amb\n" "\n" -" %s\n" +". . . . %s\n" "\n" -"i després provar d'activar la teva configuració de Home Manager de nou." +"Després provar d'activar la teva configuració de Home Manager de nou." #: modules/home-environment.nix:676 msgid "Activating %s" @@ -86,7 +86,7 @@ msgstr "Error: HOME està configurat a \"%s\", però s'esperava \"%s\"" #: modules/lib-bash/activation-init.sh:132 msgid "Starting Home Manager activation" -msgstr "Començant activació de Home Manager" +msgstr "Començant l'activació de Home Manager" #: modules/lib-bash/activation-init.sh:136 msgid "Sanity checking Nix" @@ -102,7 +102,7 @@ msgstr "Execució en viu" #: modules/lib-bash/activation-init.sh:159 msgid "Using Nix version: %s" -msgstr "Utilitzant versió de Nix: %s" +msgstr "Utilitzant la versió de Nix: %s" #: modules/lib-bash/activation-init.sh:162 msgid "Activation variables:" diff --git a/modules/po/cs.po b/modules/po/cs.po index c7049413f..485425172 100644 --- a/modules/po/cs.po +++ b/modules/po/cs.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-12-08 12:04+0000\n" -"Last-Translator: David Houdek \n" +"PO-Revision-Date: 2025-01-22 01:25+0000\n" +"Last-Translator: Dark Templar \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 5.3-dev\n" +"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,7 +29,7 @@ msgstr "Čištění osiřelých linků z %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Vytváření nových generací profilu" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" diff --git a/modules/po/da.po b/modules/po/da.po index 5ab26890d..c8ec04871 100644 --- a/modules/po/da.po +++ b/modules/po/da.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-09-27 11:02+0000\n" -"Last-Translator: Emil Heilbo \n" +"PO-Revision-Date: 2025-01-18 01:23+0000\n" +"Last-Translator: Rasmus Enevoldsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.1-dev\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "Oprydder forældreløse links fra %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Laver ny profil generation" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "Ingen ændring, så genbruger den tidligste profil generation" #: modules/home-environment.nix:643 msgid "" diff --git a/modules/po/es.po b/modules/po/es.po index 33eee711c..d10ce440d 100644 --- a/modules/po/es.po +++ b/modules/po/es.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-05-27 12:11+0000\n" -"Last-Translator: gallegonovato \n" +"PO-Revision-Date: 2025-01-30 12:43+0000\n" +"Last-Translator: Gavagai53 \n" "Language-Team: Spanish \n" "Language: es\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.18-dev\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "Limpiando vínculos huérfanos de %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Creando nueva generación de perfil" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "No hubo cambio, así que reusando la última generación de perfil" #: modules/home-environment.nix:643 msgid "" diff --git a/modules/po/pt.po b/modules/po/pt.po index 84ef27231..aea710aa5 100644 --- a/modules/po/pt.po +++ b/modules/po/pt.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-10-19 04:00+0000\n" -"Last-Translator: SrGesus \n" +"PO-Revision-Date: 2025-02-07 22:02+0000\n" +"Last-Translator: Bruno Fragoso \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 5.1\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "A limpar links órfãos do directório %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Criando nova geração de perfil" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "Reutilizando última geração de perfil devido a não existirem alterações" #: modules/home-environment.nix:643 msgid "" diff --git a/modules/po/ru.po b/modules/po/ru.po index d3c20b3fb..271de0d68 100644 --- a/modules/po/ru.po +++ b/modules/po/ru.po @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-12-11 16:06+0000\n" -"Last-Translator: Blezz Rot \n" +"PO-Revision-Date: 2025-01-31 17:29+0000\n" +"Last-Translator: Vladimir \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 5.3-dev\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -30,11 +30,11 @@ msgstr "Удаляю устаревшие ссылки из %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Создание нового поколения профиля" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "Изменений нет, повторно исползуем последнее поколение профиля" #: modules/home-environment.nix:643 msgid "" diff --git a/modules/po/sv.po b/modules/po/sv.po index 13ae0058b..69c910b01 100644 --- a/modules/po/sv.po +++ b/modules/po/sv.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-05-27 12:11+0000\n" -"Last-Translator: Robert Helgesson \n" +"PO-Revision-Date: 2025-02-08 08:17+0000\n" +"Last-Translator: bittin1ddc447d824349b2 \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.18-dev\n" +"X-Generator: Weblate 5.10-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "Rensar bort överflödiga länkar från %s" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "Skapar ny profilgeneration" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "Ingen förändring så återanvänder senaste profilgeneration" #: modules/home-environment.nix:643 msgid "" diff --git a/modules/po/tok.po b/modules/po/tok.po new file mode 100644 index 000000000..d20bb2b51 --- /dev/null +++ b/modules/po/tok.po @@ -0,0 +1,93 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Home Manager contributors +# This file is distributed under the same license as the Home Manager Modules package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Home Manager Modules\n" +"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" +"POT-Creation-Date: 2025-01-03 09:09+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: tok\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: modules/files.nix:188 +msgid "Creating home file links in %s" +msgstr "" + +#: modules/files.nix:201 +msgid "Cleaning up orphan links from %s" +msgstr "" + +#: modules/home-environment.nix:591 +msgid "Creating new profile generation" +msgstr "" + +#: modules/home-environment.nix:594 +msgid "No change so reusing latest profile generation" +msgstr "" + +#: modules/home-environment.nix:643 +msgid "" +"Oops, Nix failed to install your new Home Manager profile!\n" +"\n" +"Perhaps there is a conflict with a package that was installed using\n" +"\"%s\"? Try running\n" +"\n" +" %s\n" +"\n" +"and if there is a conflicting package you can remove it with\n" +"\n" +" %s\n" +"\n" +"Then try activating your Home Manager configuration again." +msgstr "" + +#: modules/home-environment.nix:676 +msgid "Activating %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:22 +msgid "Migrating profile from %s to %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:54 +msgid "Could not find suitable profile directory, tried %s and %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:106 +msgid "Error: USER is set to \"%s\" but we expect \"%s\"" +msgstr "" + +#: modules/lib-bash/activation-init.sh:115 +msgid "Error: HOME is set to \"%s\" but we expect \"%s\"" +msgstr "" + +#: modules/lib-bash/activation-init.sh:132 +msgid "Starting Home Manager activation" +msgstr "" + +#: modules/lib-bash/activation-init.sh:136 +msgid "Sanity checking Nix" +msgstr "" + +#: modules/lib-bash/activation-init.sh:149 +msgid "This is a dry run" +msgstr "" + +#: modules/lib-bash/activation-init.sh:153 +msgid "This is a live run" +msgstr "" + +#: modules/lib-bash/activation-init.sh:159 +msgid "Using Nix version: %s" +msgstr "" + +#: modules/lib-bash/activation-init.sh:162 +msgid "Activation variables:" +msgstr "" diff --git a/modules/po/zh_Hant.po b/modules/po/zh_Hant.po index 7c8e14619..dab8fd3c8 100644 --- a/modules/po/zh_Hant.po +++ b/modules/po/zh_Hant.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Home Manager Modules\n" "Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n" "POT-Creation-Date: 2025-01-03 09:09+0100\n" -"PO-Revision-Date: 2023-01-08 11:50+0000\n" -"Last-Translator: Eric Ho \n" -"Language-Team: Chinese (Traditional) \n" +"PO-Revision-Date: 2025-03-07 18:58+0000\n" +"Last-Translator: 807 \n" +"Language-Team: Chinese (Traditional Han script) \n" "Language: zh_Hant\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.15.1-dev\n" +"X-Generator: Weblate 5.10.3-dev\n" #: modules/files.nix:188 msgid "Creating home file links in %s" @@ -29,11 +29,11 @@ msgstr "正在從 %s 清理孤立連結" #: modules/home-environment.nix:591 msgid "Creating new profile generation" -msgstr "" +msgstr "正在建立新一代的配置文件中" #: modules/home-environment.nix:594 msgid "No change so reusing latest profile generation" -msgstr "" +msgstr "為發生改變，請重新使用新一代的配置文件" #: modules/home-environment.nix:643 msgid "" @@ -69,19 +69,19 @@ msgstr "正在啟用 %s" #: modules/lib-bash/activation-init.sh:22 msgid "Migrating profile from %s to %s" -msgstr "" +msgstr "正在從 %S 配置文件轉移到 %s 中" #: modules/lib-bash/activation-init.sh:54 msgid "Could not find suitable profile directory, tried %s and %s" -msgstr "" +msgstr "找不到合適的 profile 目錄，已經嘗試 %s 和 %s" #: modules/lib-bash/activation-init.sh:106 msgid "Error: USER is set to \"%s\" but we expect \"%s\"" -msgstr "" +msgstr "錯誤：USER 被設定為 「%s」但我們希望是 「%s」" #: modules/lib-bash/activation-init.sh:115 msgid "Error: HOME is set to \"%s\" but we expect \"%s\"" -msgstr "" +msgstr "錯誤：HOME 被設定為 「%s」但我們預期得到 「%s」" #: modules/lib-bash/activation-init.sh:132 msgid "Starting Home Manager activation" diff --git a/modules/programs/aerc-accounts.nix b/modules/programs/aerc-accounts.nix index 04f0165a0..8ebfef0bb 100644 --- a/modules/programs/aerc-accounts.nix +++ b/modules/programs/aerc-accounts.nix @@ -134,8 +134,9 @@ in { oauthParams = { auth, params }: if useOauth auth && params != null && params != { } then - "?" + builtins.concatStringsSep "&" lib.attrsets.mapAttrsToList - (k: v: k + "=" + lib.strings.escapeURL v) params + "?" + builtins.concatStringsSep "&" + (lib.attrsets.mapAttrsToList (k: v: k + "=" + lib.strings.escapeURL v) + (lib.attrsets.filterAttrs (k: v: v != null) params)) else ""; diff --git a/modules/programs/aerc.nix b/modules/programs/aerc.nix index 7a48d91a5..477bfddfd 100644 --- a/modules/programs/aerc.nix +++ b/modules/programs/aerc.nix @@ -38,7 +38,7 @@ in { enable = mkEnableOption "aerc"; - package = mkPackageOption pkgs "aerc" { }; + package = mkPackageOption pkgs "aerc" { nullable = true; }; extraAccounts = mkOption { type = sectionsOrLines; @@ -193,7 +193,7 @@ in { ''; }]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file = { "${configDir}/accounts.conf" = mkIf genAccountsConf { diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix new file mode 100644 index 000000000..bb66fee4d --- /dev/null +++ b/modules/programs/aerospace.nix @@ -0,0 +1,240 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkOption types; + cfg = config.programs.aerospace; + + tomlFormat = pkgs.formats.toml { }; + + # filterAttrsRecursive supporting lists, as well. + filterListAndAttrsRecursive = pred: set: + lib.listToAttrs (lib.concatMap (name: + let v = set.${name}; + in if pred v then + [ + (lib.nameValuePair name (if lib.isAttrs v then + filterListAndAttrsRecursive pred v + else if lib.isList v then + (map (i: + if lib.isAttrs i then filterListAndAttrsRecursive pred i else i) + (lib.filter pred v)) + else + v)) + ] + else + [ ]) (lib.attrNames set)); + filterNulls = filterListAndAttrsRecursive (v: v != null); +in { + meta.maintainers = with lib.hm.maintainers; [ damidoug ]; + + options.programs.aerospace = { + enable = lib.mkEnableOption "AeroSpace window manager"; + + package = lib.mkPackageOption pkgs "aerospace" { nullable = true; }; + + userSettings = mkOption { + type = types.submodule { + freeformType = tomlFormat.type; + options = { + start-at-login = lib.mkOption { + type = types.bool; + default = false; + description = "Start AeroSpace at login."; + }; + after-login-command = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + You can use it to add commands that run after login to macOS user session. + 'start-at-login' needs to be 'true' for 'after-login-command' to work. + ''; + }; + after-startup-command = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + You can use it to add commands that run after AeroSpace startup. + 'after-startup-command' is run after 'after-login-command' + ''; + example = [ "layout tiles" ]; + }; + enable-normalization-flatten-containers = mkOption { + type = types.bool; + default = true; + description = + ''Containers that have only one child are "flattened".''; + }; + enable-normalization-opposite-orientation-for-nested-containers = + mkOption { + type = types.bool; + default = true; + description = + "Containers that nest into each other must have opposite orientations."; + }; + accordion-padding = mkOption { + type = types.int; + default = 30; + description = "Padding between windows in an accordion container."; + }; + default-root-container-layout = mkOption { + type = types.enum [ "tiles" "accordion" ]; + default = "tiles"; + description = "Default layout for the root container."; + }; + default-root-container-orientation = mkOption { + type = types.enum [ "horizontal" "vertical" "auto" ]; + default = "auto"; + description = "Default orientation for the root container."; + }; + on-window-detected = mkOption { + type = types.listOf (types.submodule { + options = { + "if" = mkOption { + type = types.submodule { + options = { + app-id = mkOption { + type = with types; nullOr str; + default = null; + description = "The application ID to match (optional)."; + }; + workspace = mkOption { + type = with types; nullOr str; + default = null; + description = "The workspace name to match (optional)."; + }; + window-title-regex-substring = mkOption { + type = with types; nullOr str; + default = null; + description = + "Substring to match in the window title (optional)."; + }; + app-name-regex-substring = mkOption { + type = with types; nullOr str; + default = null; + description = + "Regex substring to match the app name (optional)."; + }; + during-aerospace-startup = mkOption { + type = with types; nullOr bool; + default = null; + description = + "Whether to match during aerospace startup (optional)."; + }; + }; + }; + default = { }; + description = "Conditions for detecting a window."; + }; + check-further-callbacks = mkOption { + type = with types; nullOr bool; + default = null; + description = + "Whether to check further callbacks after this rule (optional)."; + }; + run = mkOption { + type = with types; oneOf [ str (listOf str) ]; + example = [ "move-node-to-workspace m" "resize-node" ]; + description = + "Commands to execute when the conditions match (required)."; + }; + }; + }); + default = [ ]; + example = [{ + "if" = { + app-id = "Another.Cool.App"; + workspace = "cool-workspace"; + window-title-regex-substring = "Title"; + app-name-regex-substring = "CoolApp"; + during-aerospace-startup = false; + }; + check-further-callbacks = false; + run = [ "move-node-to-workspace m" "resize-node" ]; + }]; + description = + "Commands to run every time a new window is detected with optional conditions."; + }; + workspace-to-monitor-force-assignment = mkOption { + type = with types; + nullOr (attrsOf (oneOf [ int str (listOf str) ])); + default = null; + description = '' + Map workspaces to specific monitors. + Left-hand side is the workspace name, and right-hand side is the monitor pattern. + ''; + example = { + "1" = 1; # First monitor from left to right. + "2" = "main"; # Main monitor. + "3" = "secondary"; # Secondary monitor (non-main). + "4" = "built-in"; # Built-in display. + "5" = + "^built-in retina display$"; # Regex for the built-in retina display. + "6" = [ "secondary" "dell" ]; # Match first pattern in the list. + }; + }; + on-focus-changed = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ "move-mouse monitor-lazy-center" ]; + description = + "Commands to run every time focused window or workspace changes."; + }; + on-focused-monitor-changed = mkOption { + type = with types; listOf str; + default = [ "move-mouse monitor-lazy-center" ]; + description = "Commands to run every time focused monitor changes."; + }; + exec-on-workspace-change = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ + "/bin/bash" + "-c" + "sketchybar --trigger aerospace_workspace_change FOCUSED=$AEROSPACE_FOCUSED_WORKSPACE" + ]; + description = "Commands to run every time workspace changes."; + }; + key-mapping.preset = mkOption { + type = types.enum [ "qwerty" "dvorak" ]; + default = "qwerty"; + description = "Keymapping preset."; + }; + }; + }; + default = { }; + example = lib.literalExpression '' + { + gaps = { + outer.left = 8; + outer.bottom = 8; + outer.top = 8; + outer.right = 8; + }; + mode.main.binding = { + alt-h = "focus left"; + alt-j = "focus down"; + alt-k = "focus up"; + alt-l = "focus right"; + }; + } + ''; + description = '' + AeroSpace configuration, see + + for supported values. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "programs.aerospace" pkgs + lib.platforms.darwin) + ]; + + home = { + packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + file.".config/aerospace/aerospace.toml".source = + tomlFormat.generate "aerospace" (filterNulls cfg.userSettings); + }; + }; +} diff --git a/modules/programs/alot.nix b/modules/programs/alot.nix index 10dec7c0c..243215746 100644 --- a/modules/programs/alot.nix +++ b/modules/programs/alot.nix @@ -132,7 +132,7 @@ in { ''; }; - package = mkPackageOption pkgs "alot" { }; + package = mkPackageOption pkgs "alot" { nullable = true; }; hooks = mkOption { type = types.lines; @@ -231,7 +231,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."alot/config".text = configFile; diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix index b57cc142a..50e088b12 100644 --- a/modules/programs/atuin.nix +++ b/modules/programs/atuin.nix @@ -23,33 +23,26 @@ in { description = "The package to use for atuin."; }; - enableBashIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Atuin's Bash integration. This will bind - `ctrl-r` to open the Atuin history. - ''; + enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { + inherit config; + extraDescription = + "If enabled, this will bind `ctrl-r` to open the Atuin history."; }; - enableZshIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Atuin's Zsh integration. - - If enabled, this will bind `ctrl-r` and the up-arrow - key to open the Atuin history. - ''; + enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { + inherit config; + extraDescription = + "If enabled, this will bind the up-arrow key to open the Atuin history."; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Atuin's Fish integration. + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - If enabled, this will bind the up-arrow key to open the Atuin history. + enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { + inherit config; + extraDescription = '' + If enabled, this will bind `ctrl-r` and the up-arrow key to open the + Atuin history. ''; }; @@ -89,14 +82,6 @@ in { ''; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; - daemon = { enable = mkEnableOption "Atuin daemon"; @@ -211,6 +196,13 @@ in { }; }) (mkIf isDarwin { + programs.atuin.settings = { + daemon = { + socket_path = + lib.mkDefault "${config.xdg.dataHome}/atuin/daemon.sock"; + }; + }; + launchd.agents.atuin-daemon = { enable = true; config = { diff --git a/modules/programs/autojump.nix b/modules/programs/autojump.nix index e8bf6b437..3177001c8 100644 --- a/modules/programs/autojump.nix +++ b/modules/programs/autojump.nix @@ -13,29 +13,14 @@ in { options.programs.autojump = { enable = mkEnableOption "autojump"; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/bacon.nix b/modules/programs/bacon.nix index ad2e9b5b8..528be2a06 100644 --- a/modules/programs/bacon.nix +++ b/modules/programs/bacon.nix @@ -19,7 +19,7 @@ in { options.programs.bacon = { enable = mkEnableOption "bacon, a background rust code checker"; - package = mkPackageOption pkgs "bacon" { }; + package = mkPackageOption pkgs "bacon" { nullable = true; }; settings = mkOption { type = settingsFormat.type; @@ -38,7 +38,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${configDir}/prefs.toml" = mkIf (cfg.settings != { }) { source = settingsFormat.generate "prefs.toml" cfg.settings; diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix index 3a367b9e7..e9cf983dd 100644 --- a/modules/programs/bash.nix +++ b/modules/programs/bash.nix @@ -29,7 +29,10 @@ in { programs.bash = { enable = mkEnableOption "GNU Bourne-Again SHell"; - package = mkPackageOption pkgs "bash" { default = "bashInteractive"; }; + package = mkPackageOption pkgs "bash" { + nullable = true; + default = "bashInteractive"; + }; enableCompletion = mkOption { type = types.bool; @@ -51,7 +54,7 @@ in { }; historySize = mkOption { - type = types.int; + type = types.nullOr types.int; default = 10000; description = "Number of history lines to keep in memory."; }; @@ -63,7 +66,7 @@ in { }; historyFileSize = mkOption { - type = types.int; + type = types.nullOr types.int; default = 100000; description = "Number of history lines to keep on file."; }; @@ -180,19 +183,22 @@ in { sessionVarsStr = config.lib.shell.exportAll cfg.sessionVariables; - historyControlStr = concatStringsSep "\n" - (mapAttrsToList (n: v: "${n}=${v}") ({ - HISTFILESIZE = toString cfg.historyFileSize; - HISTSIZE = toString cfg.historySize; - } // optionalAttrs (cfg.historyFile != null) { - HISTFILE = ''"${cfg.historyFile}"''; - } // optionalAttrs (cfg.historyControl != [ ]) { - HISTCONTROL = concatStringsSep ":" cfg.historyControl; - } // optionalAttrs (cfg.historyIgnore != [ ]) { - HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore); - })); + historyControlStr = (concatStringsSep "\n" + (mapAttrsToList (n: v: "${n}=${v}") + (optionalAttrs (cfg.historyFileSize != null) { + HISTFILESIZE = toString cfg.historyFileSize; + } // optionalAttrs (cfg.historySize != null) { + HISTSIZE = toString cfg.historySize; + } // optionalAttrs (cfg.historyFile != null) { + HISTFILE = ''"${cfg.historyFile}"''; + } // optionalAttrs (cfg.historyControl != [ ]) { + HISTCONTROL = concatStringsSep ":" cfg.historyControl; + } // optionalAttrs (cfg.historyIgnore != [ ]) { + HISTIGNORE = escapeShellArg (concatStringsSep ":" cfg.historyIgnore); + }) ++ optional (cfg.historyFile != null) + ''mkdir -p "$(dirname "$HISTFILE")"'')); in mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file.".bash_profile".source = writeBashScript "bash_profile" '' # include .profile if it exists diff --git a/modules/programs/bat.nix b/modules/programs/bat.nix index 5d09145af..fce1f5e63 100644 --- a/modules/programs/bat.nix +++ b/modules/programs/bat.nix @@ -1,28 +1,25 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) literalExpression mkEnableOption mkOption mkIf types; cfg = config.programs.bat; toConfigFile = attrs: let inherit (builtins) isBool attrNames; - nonBoolFlags = filterAttrs (_: v: !(isBool v)) attrs; - enabledBoolFlags = filterAttrs (_: v: isBool v && v) attrs; + nonBoolFlags = lib.filterAttrs (_: v: !(isBool v)) attrs; + enabledBoolFlags = lib.filterAttrs (_: v: isBool v && v) attrs; - keyValuePairs = generators.toKeyValue { + keyValuePairs = lib.generators.toKeyValue { mkKeyValue = k: v: "--${k}=${lib.escapeShellArg v}"; listsAsDuplicateKeys = true; } nonBoolFlags; - switches = concatMapStrings (k: '' + switches = lib.concatMapStrings (k: '' --${k} '') (attrNames enabledBoolFlags); in keyValuePairs + switches; - in { - meta.maintainers = [ ]; + meta.maintainers = with lib.maintainers; [ khaneliman ]; options.programs.bat = { enable = mkEnableOption "bat, a cat clone with wings"; @@ -50,7 +47,7 @@ in { ''; }; - package = mkPackageOption pkgs "bat" { }; + package = lib.mkPackageOption pkgs "bat" { }; themes = mkOption { type = types.attrsOf (types.either types.lines (types.submodule { @@ -122,15 +119,15 @@ in { }; }; - config = mkIf cfg.enable (mkMerge [ - (mkIf (any isString (attrValues cfg.themes)) { + config = mkIf cfg.enable (lib.mkMerge [ + (mkIf (lib.any lib.isString (lib.attrValues cfg.themes)) { warnings = ['' Using programs.bat.themes as a string option is deprecated and will be removed in the future. Please change to using it as an attribute set instead. '']; }) - (mkIf (any isString (attrValues cfg.syntaxes)) { + (mkIf (lib.any lib.isString (lib.attrValues cfg.syntaxes)) { warnings = ['' Using programs.bat.syntaxes as a string option is deprecated and will be removed in the future. Please change to using it as an attribute set @@ -140,18 +137,18 @@ in { { home.packages = [ cfg.package ] ++ cfg.extraPackages; - xdg.configFile = mkMerge ([({ + xdg.configFile = lib.mkMerge ([{ "bat/config" = mkIf (cfg.config != { }) { text = toConfigFile cfg.config; }; - })] ++ (flip mapAttrsToList cfg.themes (name: val: { - "bat/themes/${name}.tmTheme" = if isString val then { + }] ++ (lib.flip lib.mapAttrsToList cfg.themes (name: val: { + "bat/themes/${name}.tmTheme" = if lib.isString val then { text = val; } else { source = if isNull val.file then "${val.src}" else "${val.src}/${val.file}"; }; - })) ++ (flip mapAttrsToList cfg.syntaxes (name: val: { - "bat/syntaxes/${name}.sublime-syntax" = if isString val then { + })) ++ (lib.flip lib.mapAttrsToList cfg.syntaxes (name: val: { + "bat/syntaxes/${name}.sublime-syntax" = if lib.isString val then { text = val; } else { source = @@ -162,9 +159,9 @@ in { # NOTE: run `bat cache --build` in an empty directory to work # around failure when ~/cache exists # https://github.com/sharkdp/bat/issues/1726 - home.activation.batCache = hm.dag.entryAfter [ "linkGeneration" ] '' + home.activation.batCache = lib.hm.dag.entryAfter [ "linkGeneration" ] '' ( - export XDG_CACHE_HOME=${escapeShellArg config.xdg.cacheHome} + export XDG_CACHE_HOME=${lib.escapeShellArg config.xdg.cacheHome} verboseEcho "Rebuilding bat theme cache" cd "${pkgs.emptyDirectory}" run ${lib.getExe cfg.package} cache --build diff --git a/modules/programs/bemenu.nix b/modules/programs/bemenu.nix index f90067216..6c6e793ff 100644 --- a/modules/programs/bemenu.nix +++ b/modules/programs/bemenu.nix @@ -12,7 +12,7 @@ in { options.programs.bemenu = { enable = mkEnableOption "bemenu"; - package = mkPackageOption pkgs "bemenu" { }; + package = mkPackageOption pkgs "bemenu" { nullable = true; }; settings = mkOption { type = with types; attrsOf (oneOf [ str number bool ]); @@ -44,7 +44,7 @@ in { assertions = [ (hm.assertions.assertPlatform "programs.bemenu" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.sessionVariables = mkIf (cfg.settings != { }) { BEMENU_OPTS = cli.toGNUCommandLineShell { } cfg.settings; diff --git a/modules/programs/borgmatic.nix b/modules/programs/borgmatic.nix index 97a1d54ce..92f171c27 100644 --- a/modules/programs/borgmatic.nix +++ b/modules/programs/borgmatic.nix @@ -243,7 +243,7 @@ in { programs.borgmatic = { enable = mkEnableOption "Borgmatic"; - package = mkPackageOption pkgs "borgmatic" { }; + package = mkPackageOption pkgs "borgmatic" { nullable = true; }; backups = mkOption { type = types.attrsOf configModule; @@ -292,6 +292,6 @@ in { text = writeConfig config; }) cfg.backups; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; }; } diff --git a/modules/programs/boxxy.nix b/modules/programs/boxxy.nix index 566a11e7e..dc6c1cbdc 100644 --- a/modules/programs/boxxy.nix +++ b/modules/programs/boxxy.nix @@ -84,7 +84,7 @@ in { options.programs.boxxy = { enable = mkEnableOption "boxxy: Boxes in badly behaving applications"; - package = mkPackageOption pkgs "boxxy" { }; + package = mkPackageOption pkgs "boxxy" { nullable = true; }; rules = mkOption { type = types.listOf boxxyRulesOpts; @@ -102,7 +102,7 @@ in { settingsFormat.generate "boxxy-config.yaml" { rules = cfg.rules; }; }; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; }; meta.maintainers = with lib.hm.maintainers; [ nikp123 ]; diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix index c1ce94776..c19534f1a 100644 --- a/modules/programs/broot.nix +++ b/modules/programs/broot.nix @@ -154,37 +154,17 @@ in { options.programs.broot = { enable = mkEnableOption "Broot, a better way to navigate directories"; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; package = mkOption { type = types.package; @@ -228,9 +208,9 @@ in { programs.broot.settings = builtins.fromJSON (builtins.readFile (pkgs.runCommand "default-conf.json" { - nativeBuildInputs = [ pkgs.hjson ]; + nativeBuildInputs = [ pkgs.hjson-go ]; } - "hjson -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out")); + "hjson-cli -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out")); programs.bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash"); diff --git a/modules/programs/btop.nix b/modules/programs/btop.nix index e30a9f43e..61c7f795a 100644 --- a/modules/programs/btop.nix +++ b/modules/programs/btop.nix @@ -1,14 +1,10 @@ { config, lib, pkgs, ... }: - -with lib; - let - cfg = config.programs.btop; finalConfig = let - toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault { + toKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { mkValueString = v: with builtins; if isBool v then @@ -21,19 +17,18 @@ let }; in '' ${toKeyValue cfg.settings} - ${optionalString (cfg.extraConfig != "") cfg.extraConfig} + ${lib.optionalString (cfg.extraConfig != "") cfg.extraConfig} ''; - in { - meta.maintainers = [ hm.maintainers.GaetanLepage ]; + meta.maintainers = with lib.maintainers; [ GaetanLepage khaneliman ]; options.programs.btop = { - enable = mkEnableOption "btop"; + enable = lib.mkEnableOption "btop"; - package = mkPackageOption pkgs "btop" { }; + package = lib.mkPackageOption pkgs "btop" { nullable = true; }; - settings = mkOption { - type = with types; attrsOf (oneOf [ bool float int str ]); + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ bool float int str ]); default = { }; example = { color_theme = "Default"; @@ -46,8 +41,8 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra lines added to the {file}`btop.conf` file. @@ -55,10 +50,10 @@ in { }; }; - config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + config = lib.mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."btop/btop.conf" = - mkIf (cfg.settings != { }) { text = finalConfig; }; + lib.mkIf (cfg.settings != { }) { text = finalConfig; }; }; } diff --git a/modules/programs/bun.nix b/modules/programs/bun.nix index f186982e2..ffc9167ef 100644 --- a/modules/programs/bun.nix +++ b/modules/programs/bun.nix @@ -9,7 +9,7 @@ in { options.programs.bun = { enable = lib.mkEnableOption "Bun JavaScript runtime"; - package = lib.mkPackageOption pkgs "bun" { }; + package = lib.mkPackageOption pkgs "bun" { nullable = true; }; settings = lib.mkOption { type = tomlFormat.type; @@ -42,7 +42,13 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + warnings = lib.optional (cfg.package == null && cfg.enableGitIntegration) '' + You have enabled git integration for `bun` but have not set `package`. + + Git integration will not be configured. + ''; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile.".bunfig.toml" = lib.mkIf (cfg.settings != { }) { source = tomlFormat.generate "bun-config" cfg.settings; @@ -50,10 +56,12 @@ in { # https://bun.sh/docs/install/lockfile#how-do-i-git-diff-bun-s-lockfile programs.git.attributes = - lib.mkIf cfg.enableGitIntegration [ "*.lockb binary diff=lockb" ]; - programs.git.extraConfig.diff.lockb = lib.mkIf cfg.enableGitIntegration { - textconv = lib.getExe cfg.package; - binary = true; - }; + lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) + [ "*.lockb binary diff=lockb" ]; + programs.git.extraConfig.diff.lockb = + lib.mkIf (cfg.enableGitIntegration && (cfg.package != null)) { + textconv = lib.getExe cfg.package; + binary = true; + }; }; } diff --git a/modules/programs/carapace.nix b/modules/programs/carapace.nix index c31e2feed..09cc55635 100644 --- a/modules/programs/carapace.nix +++ b/modules/programs/carapace.nix @@ -16,21 +16,17 @@ in { package = mkPackageOption pkgs "carapace" { }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/cava.nix b/modules/programs/cava.nix index 63173248f..946656b06 100644 --- a/modules/programs/cava.nix +++ b/modules/programs/cava.nix @@ -14,7 +14,7 @@ in { options.programs.cava = { enable = mkEnableOption "Cava audio visualizer"; - package = mkPackageOption pkgs "cava" { }; + package = mkPackageOption pkgs "cava" { nullable = true; }; settings = mkOption { type = iniFmt.type; @@ -39,7 +39,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."cava/config" = mkIf (cfg.settings != { }) { text = '' diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier.nix index 0b57cf8e2..8ba05de93 100644 --- a/modules/programs/cavalier.nix +++ b/modules/programs/cavalier.nix @@ -16,7 +16,7 @@ in { options.programs.cavalier = { enable = mkEnableOption "Cava audio visualizer GUI"; - package = mkPackageOption pkgs "cavalier" { }; + package = mkPackageOption pkgs "cavalier" { nullable = true; }; settings = { general = mkOption { @@ -81,7 +81,7 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = { "Nickvision Cavalier/config.json" = mkIf (cfg.settings.general != { }) { diff --git a/modules/programs/chromium.nix b/modules/programs/chromium.nix index 0a02311b7..ffb488fc9 100644 --- a/modules/programs/chromium.nix +++ b/modules/programs/chromium.nix @@ -137,6 +137,18 @@ let List of ${name} dictionaries to install. ''; }; + nativeMessagingHosts = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression '' + [ + pkgs.kdePackages.plasma-browser-integration + ] + ''; + description = '' + List of ${name} native messaging hosts to install. + ''; + }; }; browserConfig = cfg: @@ -178,6 +190,11 @@ let value.source = pkg; }; + nativeMessagingHostsJoined = pkgs.symlinkJoin { + name = "${drvName}-native-messaging-hosts"; + paths = cfg.nativeMessagingHosts; + }; + package = if cfg.commandLineArgs != [ ] then cfg.package.override { commandLineArgs = concatStringsSep " " cfg.commandLineArgs; @@ -189,7 +206,14 @@ let home.packages = [ package ]; home.file = optionalAttrs (!isProprietaryChrome) (listToAttrs ((map extensionJson cfg.extensions) - ++ (map dictionary cfg.dictionaries))); + ++ (map dictionary cfg.dictionaries)) // { + "${configDir}/NativeMessagingHosts" = + lib.mkIf (cfg.nativeMessagingHosts != [ ]) { + source = + "${nativeMessagingHostsJoined}/etc/chromium/native-messaging-hosts"; + recursive = true; + }; + }); }; in { diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro.nix index fba0bce86..af59261ef 100644 --- a/modules/programs/comodoro.nix +++ b/modules/programs/comodoro.nix @@ -10,7 +10,7 @@ in { options.programs.comodoro = { enable = lib.mkEnableOption "Comodoro, a CLI to manage your time"; - package = lib.mkPackageOption pkgs "comodoro" { }; + package = lib.mkPackageOption pkgs "comodoro" { nullable = true; }; settings = lib.mkOption { type = lib.types.submodule { freeformType = tomlFormat.type; }; @@ -23,7 +23,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."comodoro/config.toml".source = tomlFormat.generate "comodoro-config.toml" cfg.settings; diff --git a/modules/programs/darcs.nix b/modules/programs/darcs.nix index a2a45cba4..263d668fe 100644 --- a/modules/programs/darcs.nix +++ b/modules/programs/darcs.nix @@ -13,7 +13,7 @@ in { programs.darcs = { enable = mkEnableOption "darcs"; - package = mkPackageOption pkgs "darcs" { }; + package = mkPackageOption pkgs "darcs" { nullable = true; }; author = mkOption { type = types.listOf types.str; @@ -36,7 +36,7 @@ in { }; config = mkIf cfg.enable (mkMerge [ - { home.packages = [ cfg.package ]; } + { home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; } (mkIf (cfg.author != [ ]) { home.file.".darcs/author".text = diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix index de4610893..240be4a27 100644 --- a/modules/programs/dircolors.nix +++ b/modules/programs/dircolors.nix @@ -19,29 +19,14 @@ in { ''; }; - enableBashIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Fish integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = mkOption { type = with types; attrsOf str; @@ -69,155 +54,168 @@ in { }; }; - config = mkIf cfg.enable { - # Add default settings from `dircolors --print-database`. - programs.dircolors.settings = { - RESET = mkDefault "0"; - DIR = mkDefault "01;34"; - LINK = mkDefault "01;36"; - MULTIHARDLINK = mkDefault "00"; - FIFO = mkDefault "40;33"; - SOCK = mkDefault "01;35"; - DOOR = mkDefault "01;35"; - BLK = mkDefault "40;33;01"; - CHR = mkDefault "40;33;01"; - ORPHAN = mkDefault "40;31;01"; - MISSING = mkDefault "00"; - SETUID = mkDefault "37;41"; - SETGID = mkDefault "30;43"; - CAPABILITY = mkDefault "30;41"; - STICKY_OTHER_WRITABLE = mkDefault "30;42"; - OTHER_WRITABLE = mkDefault "34;42"; - STICKY = mkDefault "37;44"; - EXEC = mkDefault "01;32"; - ".tar" = mkDefault "01;31"; - ".tgz" = mkDefault "01;31"; - ".arc" = mkDefault "01;31"; - ".arj" = mkDefault "01;31"; - ".taz" = mkDefault "01;31"; - ".lha" = mkDefault "01;31"; - ".lz4" = mkDefault "01;31"; - ".lzh" = mkDefault "01;31"; - ".lzma" = mkDefault "01;31"; - ".tlz" = mkDefault "01;31"; - ".txz" = mkDefault "01;31"; - ".tzo" = mkDefault "01;31"; - ".t7z" = mkDefault "01;31"; - ".zip" = mkDefault "01;31"; - ".z" = mkDefault "01;31"; - ".dz" = mkDefault "01;31"; - ".gz" = mkDefault "01;31"; - ".lrz" = mkDefault "01;31"; - ".lz" = mkDefault "01;31"; - ".lzo" = mkDefault "01;31"; - ".xz" = mkDefault "01;31"; - ".zst" = mkDefault "01;31"; - ".tzst" = mkDefault "01;31"; - ".bz2" = mkDefault "01;31"; - ".bz" = mkDefault "01;31"; - ".tbz" = mkDefault "01;31"; - ".tbz2" = mkDefault "01;31"; - ".tz" = mkDefault "01;31"; - ".deb" = mkDefault "01;31"; - ".rpm" = mkDefault "01;31"; - ".jar" = mkDefault "01;31"; - ".war" = mkDefault "01;31"; - ".ear" = mkDefault "01;31"; - ".sar" = mkDefault "01;31"; - ".rar" = mkDefault "01;31"; - ".alz" = mkDefault "01;31"; - ".ace" = mkDefault "01;31"; - ".zoo" = mkDefault "01;31"; - ".cpio" = mkDefault "01;31"; - ".7z" = mkDefault "01;31"; - ".rz" = mkDefault "01;31"; - ".cab" = mkDefault "01;31"; - ".wim" = mkDefault "01;31"; - ".swm" = mkDefault "01;31"; - ".dwm" = mkDefault "01;31"; - ".esd" = mkDefault "01;31"; - ".jpg" = mkDefault "01;35"; - ".jpeg" = mkDefault "01;35"; - ".mjpg" = mkDefault "01;35"; - ".mjpeg" = mkDefault "01;35"; - ".gif" = mkDefault "01;35"; - ".bmp" = mkDefault "01;35"; - ".pbm" = mkDefault "01;35"; - ".pgm" = mkDefault "01;35"; - ".ppm" = mkDefault "01;35"; - ".tga" = mkDefault "01;35"; - ".xbm" = mkDefault "01;35"; - ".xpm" = mkDefault "01;35"; - ".tif" = mkDefault "01;35"; - ".tiff" = mkDefault "01;35"; - ".png" = mkDefault "01;35"; - ".svg" = mkDefault "01;35"; - ".svgz" = mkDefault "01;35"; - ".mng" = mkDefault "01;35"; - ".pcx" = mkDefault "01;35"; - ".mov" = mkDefault "01;35"; - ".mpg" = mkDefault "01;35"; - ".mpeg" = mkDefault "01;35"; - ".m2v" = mkDefault "01;35"; - ".mkv" = mkDefault "01;35"; - ".webm" = mkDefault "01;35"; - ".ogm" = mkDefault "01;35"; - ".mp4" = mkDefault "01;35"; - ".m4v" = mkDefault "01;35"; - ".mp4v" = mkDefault "01;35"; - ".vob" = mkDefault "01;35"; - ".qt" = mkDefault "01;35"; - ".nuv" = mkDefault "01;35"; - ".wmv" = mkDefault "01;35"; - ".asf" = mkDefault "01;35"; - ".rm" = mkDefault "01;35"; - ".rmvb" = mkDefault "01;35"; - ".flc" = mkDefault "01;35"; - ".avi" = mkDefault "01;35"; - ".fli" = mkDefault "01;35"; - ".flv" = mkDefault "01;35"; - ".gl" = mkDefault "01;35"; - ".dl" = mkDefault "01;35"; - ".xcf" = mkDefault "01;35"; - ".xwd" = mkDefault "01;35"; - ".yuv" = mkDefault "01;35"; - ".cgm" = mkDefault "01;35"; - ".emf" = mkDefault "01;35"; - ".ogv" = mkDefault "01;35"; - ".ogx" = mkDefault "01;35"; - ".aac" = mkDefault "00;36"; - ".au" = mkDefault "00;36"; - ".flac" = mkDefault "00;36"; - ".m4a" = mkDefault "00;36"; - ".mid" = mkDefault "00;36"; - ".midi" = mkDefault "00;36"; - ".mka" = mkDefault "00;36"; - ".mp3" = mkDefault "00;36"; - ".mpc" = mkDefault "00;36"; - ".ogg" = mkDefault "00;36"; - ".ra" = mkDefault "00;36"; - ".wav" = mkDefault "00;36"; - ".oga" = mkDefault "00;36"; - ".opus" = mkDefault "00;36"; - ".spx" = mkDefault "00;36"; - ".xspf" = mkDefault "00;36"; - }; + config = let + dircolorsPath = if config.home.preferXdgDirectories then + "${config.xdg.configHome}/dir_colors" + else + "~/.dir_colors"; - home.file.".dir_colors".text = concatStringsSep "\n" ([ ] + dircolorsConfig = concatStringsSep "\n" ([ ] ++ mapAttrsToList formatLine cfg.settings ++ [ "" ] ++ optional (cfg.extraConfig != "") cfg.extraConfig); + in mkIf cfg.enable (mkMerge [ + { + # Add default settings from `dircolors --print-database`. + programs.dircolors.settings = { + RESET = mkDefault "0"; + DIR = mkDefault "01;34"; + LINK = mkDefault "01;36"; + MULTIHARDLINK = mkDefault "00"; + FIFO = mkDefault "40;33"; + SOCK = mkDefault "01;35"; + DOOR = mkDefault "01;35"; + BLK = mkDefault "40;33;01"; + CHR = mkDefault "40;33;01"; + ORPHAN = mkDefault "40;31;01"; + MISSING = mkDefault "00"; + SETUID = mkDefault "37;41"; + SETGID = mkDefault "30;43"; + CAPABILITY = mkDefault "30;41"; + STICKY_OTHER_WRITABLE = mkDefault "30;42"; + OTHER_WRITABLE = mkDefault "34;42"; + STICKY = mkDefault "37;44"; + EXEC = mkDefault "01;32"; + ".tar" = mkDefault "01;31"; + ".tgz" = mkDefault "01;31"; + ".arc" = mkDefault "01;31"; + ".arj" = mkDefault "01;31"; + ".taz" = mkDefault "01;31"; + ".lha" = mkDefault "01;31"; + ".lz4" = mkDefault "01;31"; + ".lzh" = mkDefault "01;31"; + ".lzma" = mkDefault "01;31"; + ".tlz" = mkDefault "01;31"; + ".txz" = mkDefault "01;31"; + ".tzo" = mkDefault "01;31"; + ".t7z" = mkDefault "01;31"; + ".zip" = mkDefault "01;31"; + ".z" = mkDefault "01;31"; + ".dz" = mkDefault "01;31"; + ".gz" = mkDefault "01;31"; + ".lrz" = mkDefault "01;31"; + ".lz" = mkDefault "01;31"; + ".lzo" = mkDefault "01;31"; + ".xz" = mkDefault "01;31"; + ".zst" = mkDefault "01;31"; + ".tzst" = mkDefault "01;31"; + ".bz2" = mkDefault "01;31"; + ".bz" = mkDefault "01;31"; + ".tbz" = mkDefault "01;31"; + ".tbz2" = mkDefault "01;31"; + ".tz" = mkDefault "01;31"; + ".deb" = mkDefault "01;31"; + ".rpm" = mkDefault "01;31"; + ".jar" = mkDefault "01;31"; + ".war" = mkDefault "01;31"; + ".ear" = mkDefault "01;31"; + ".sar" = mkDefault "01;31"; + ".rar" = mkDefault "01;31"; + ".alz" = mkDefault "01;31"; + ".ace" = mkDefault "01;31"; + ".zoo" = mkDefault "01;31"; + ".cpio" = mkDefault "01;31"; + ".7z" = mkDefault "01;31"; + ".rz" = mkDefault "01;31"; + ".cab" = mkDefault "01;31"; + ".wim" = mkDefault "01;31"; + ".swm" = mkDefault "01;31"; + ".dwm" = mkDefault "01;31"; + ".esd" = mkDefault "01;31"; + ".jpg" = mkDefault "01;35"; + ".jpeg" = mkDefault "01;35"; + ".mjpg" = mkDefault "01;35"; + ".mjpeg" = mkDefault "01;35"; + ".gif" = mkDefault "01;35"; + ".bmp" = mkDefault "01;35"; + ".pbm" = mkDefault "01;35"; + ".pgm" = mkDefault "01;35"; + ".ppm" = mkDefault "01;35"; + ".tga" = mkDefault "01;35"; + ".xbm" = mkDefault "01;35"; + ".xpm" = mkDefault "01;35"; + ".tif" = mkDefault "01;35"; + ".tiff" = mkDefault "01;35"; + ".png" = mkDefault "01;35"; + ".svg" = mkDefault "01;35"; + ".svgz" = mkDefault "01;35"; + ".mng" = mkDefault "01;35"; + ".pcx" = mkDefault "01;35"; + ".mov" = mkDefault "01;35"; + ".mpg" = mkDefault "01;35"; + ".mpeg" = mkDefault "01;35"; + ".m2v" = mkDefault "01;35"; + ".mkv" = mkDefault "01;35"; + ".webm" = mkDefault "01;35"; + ".ogm" = mkDefault "01;35"; + ".mp4" = mkDefault "01;35"; + ".m4v" = mkDefault "01;35"; + ".mp4v" = mkDefault "01;35"; + ".vob" = mkDefault "01;35"; + ".qt" = mkDefault "01;35"; + ".nuv" = mkDefault "01;35"; + ".wmv" = mkDefault "01;35"; + ".asf" = mkDefault "01;35"; + ".rm" = mkDefault "01;35"; + ".rmvb" = mkDefault "01;35"; + ".flc" = mkDefault "01;35"; + ".avi" = mkDefault "01;35"; + ".fli" = mkDefault "01;35"; + ".flv" = mkDefault "01;35"; + ".gl" = mkDefault "01;35"; + ".dl" = mkDefault "01;35"; + ".xcf" = mkDefault "01;35"; + ".xwd" = mkDefault "01;35"; + ".yuv" = mkDefault "01;35"; + ".cgm" = mkDefault "01;35"; + ".emf" = mkDefault "01;35"; + ".ogv" = mkDefault "01;35"; + ".ogx" = mkDefault "01;35"; + ".aac" = mkDefault "00;36"; + ".au" = mkDefault "00;36"; + ".flac" = mkDefault "00;36"; + ".m4a" = mkDefault "00;36"; + ".mid" = mkDefault "00;36"; + ".midi" = mkDefault "00;36"; + ".mka" = mkDefault "00;36"; + ".mp3" = mkDefault "00;36"; + ".mpc" = mkDefault "00;36"; + ".ogg" = mkDefault "00;36"; + ".ra" = mkDefault "00;36"; + ".wav" = mkDefault "00;36"; + ".oga" = mkDefault "00;36"; + ".opus" = mkDefault "00;36"; + ".spx" = mkDefault "00;36"; + ".xspf" = mkDefault "00;36"; + }; - programs.bash.initExtra = mkIf cfg.enableBashIntegration '' - eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors) - ''; + programs.bash.initExtra = mkIf cfg.enableBashIntegration '' + eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath}) + ''; - programs.fish.shellInit = mkIf cfg.enableFishIntegration '' - eval (${pkgs.coreutils}/bin/dircolors -c ~/.dir_colors) - ''; + programs.fish.shellInit = mkIf cfg.enableFishIntegration '' + eval (${pkgs.coreutils}/bin/dircolors -c ${dircolorsPath}) + ''; - # Set `LS_COLORS` before Oh My Zsh and `initExtra`. - programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration '' - eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors) - ''; - }; + # Set `LS_COLORS` before Oh My Zsh and `initExtra`. + programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration '' + eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath}) + ''; + } + (mkIf (!config.home.preferXdgDirectories) { + home.file.".dir_colors".text = dircolorsConfig; + }) + (mkIf config.home.preferXdgDirectories { + xdg.configFile.dir_colors.text = dircolorsConfig; + }) + ]); } diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix index 37899c4a2..a387a4bc7 100644 --- a/modules/programs/direnv.nix +++ b/modules/programs/direnv.nix @@ -19,7 +19,7 @@ in { "Flake support is now always enabled.") ]; - meta.maintainers = [ lib.maintainers.rycee lib.maintainers.shikanime ]; + meta.maintainers = with lib.maintainers; [ khaneliman rycee shikanime ]; options.programs.direnv = { enable = mkEnableOption "direnv, the environment switcher"; @@ -48,44 +48,32 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { + inherit config; + extraDescription = '' + Note, enabling the direnv module will always active its functionality + for Fish since the direnv package automatically gets loaded in Fish. + If this is not the case try adding - enableFishIntegration = mkOption { - default = true; - type = types.bool; - readOnly = true; - description = '' - Whether to enable Fish integration. Note, enabling the direnv module - will always active its functionality for Fish since the direnv package - automatically gets loaded in Fish. If this is not the case try adding ```nix - environment.pathsToLink = [ "/share/fish" ]; + environment.pathsToLink = [ "/share/fish" ]; ``` + to the system configuration. ''; + } // { + default = true; + readOnly = true; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; + + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; nix-direnv = { enable = mkEnableOption '' diff --git a/modules/programs/discocss.nix b/modules/programs/discocss.nix index 5a35f187f..7fa2c7965 100644 --- a/modules/programs/discocss.nix +++ b/modules/programs/discocss.nix @@ -11,9 +11,9 @@ in { enable = mkEnableOption "discocss, a tiny Discord CSS injector for Linux and MacOS"; - package = mkPackageOption pkgs "discocss" { }; + package = mkPackageOption pkgs "discocss" { nullable = true; }; - discordPackage = mkPackageOption pkgs "discord" { }; + discordPackage = mkPackageOption pkgs "discord" { nullable = true; }; discordAlias = mkOption { type = types.bool; @@ -37,10 +37,10 @@ in { "To use discocss with discordAlias you have to remove discord from home.packages, or set discordAlias to false."; }]; - home.packages = [ + home.packages = lib.mkIf (cfg.package != null) [ (cfg.package.override { discordAlias = cfg.discordAlias; - discord = cfg.discordPackage; + discord = lib.mkIf (cfg.discordPackage != null) cfg.discordPackage; }) ]; diff --git a/modules/programs/earthly.nix b/modules/programs/earthly.nix new file mode 100644 index 000000000..a2b2a44c1 --- /dev/null +++ b/modules/programs/earthly.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +let + + cfg = config.programs.earthly; + + yamlFormat = pkgs.formats.yaml { }; + +in { + meta.maintainers = [ lib.hm.maintainers.folliehiyuki ]; + + options.programs.earthly = { + enable = lib.mkEnableOption "earthly"; + + package = lib.mkPackageOption pkgs "earthly" { nullable = true; }; + + settings = lib.mkOption { + type = yamlFormat.type; + default = { }; + description = '' + Configuration written to ~/.earthly/config.yml file. + See https://docs.earthly.dev/docs/earthly-config for supported values. + ''; + example = lib.literalExpression '' + global = { + disable_analytics = true; + disable_log_sharing = true; + }; + ''; + }; + }; + + config = lib.mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + home.file.".earthly/config.yml" = lib.mkIf (cfg.settings != { }) { + source = yamlFormat.generate "earthly-config" cfg.settings; + }; + }; +} diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix index 75a109226..2559068ad 100644 --- a/modules/programs/eww.nix +++ b/modules/programs/eww.nix @@ -24,7 +24,8 @@ in { }; configDir = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = literalExpression "./eww-config-dir"; description = '' The directory that gets symlinked to @@ -32,22 +33,20 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { home.packages = [ cfg.package ]; - xdg.configFile."eww".source = cfg.configDir; + xdg = + mkIf (cfg.configDir != null) { configFile."eww".source = cfg.configDir; }; programs.bash.initExtra = mkIf cfg.enableBashIntegration '' if [[ $TERM != "dumb" ]]; then diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix index f35912b8c..14547d730 100644 --- a/modules/programs/eza.nix +++ b/modules/programs/eza.nix @@ -21,23 +21,20 @@ with lib; options.programs.eza = { enable = mkEnableOption "eza, a modern replacement for {command}`ls`"; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableIonIntegration = + lib.hm.shell.mkIonIntegrationOption { inherit config; }; - enableIonIntegration = mkEnableOption "Ion integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration"; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; extraOptions = mkOption { type = types.listOf types.str; @@ -75,7 +72,7 @@ with lib; ''; }; - package = mkPackageOption pkgs "eza" { }; + package = mkPackageOption pkgs "eza" { nullable = true; }; }; config = let @@ -108,7 +105,7 @@ with lib; programs.eza.icons = ${if cfg.icons then ''"auto"'' else "null"}''; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; programs.bash.shellAliases = optionsAlias // optionalAttrs cfg.enableBashIntegration aliases; diff --git a/modules/programs/fastfetch.nix b/modules/programs/fastfetch.nix index 55a932f9a..abc4d7cda 100644 --- a/modules/programs/fastfetch.nix +++ b/modules/programs/fastfetch.nix @@ -7,12 +7,13 @@ let jsonFormat = pkgs.formats.json { }; in { - meta.maintainers = with lib.hm.maintainers; [ afresquet ]; + meta.maintainers = + [ lib.hm.maintainers.afresquet lib.maintainers.khaneliman ]; options.programs.fastfetch = { enable = mkEnableOption "Fastfetch"; - package = mkPackageOption pkgs "fastfetch" { }; + package = mkPackageOption pkgs "fastfetch" { nullable = true; }; settings = mkOption { type = jsonFormat.type; @@ -58,7 +59,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."fastfetch/config.jsonc" = mkIf (cfg.settings != { }) { source = jsonFormat.generate "config.jsonc" cfg.settings; diff --git a/modules/programs/fd.nix b/modules/programs/fd.nix index f8f59eb54..17911ebed 100644 --- a/modules/programs/fd.nix +++ b/modules/programs/fd.nix @@ -30,7 +30,7 @@ with lib; { ''; }; - package = mkPackageOption pkgs "fd" { }; + package = mkPackageOption pkgs "fd" { nullable = true; }; }; config = let @@ -40,7 +40,7 @@ with lib; { optionsAlias = optionalAttrs (args != "") { fd = "fd ${args}"; }; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; programs.bash.shellAliases = optionsAlias; diff --git a/modules/programs/feh.nix b/modules/programs/feh.nix index bef9caac3..b96c9a27a 100644 --- a/modules/programs/feh.nix +++ b/modules/programs/feh.nix @@ -33,7 +33,7 @@ in { options.programs.feh = { enable = mkEnableOption "feh - a fast and light image viewer"; - package = mkPackageOption pkgs "feh" { }; + package = mkPackageOption pkgs "feh" { nullable = true; }; buttons = mkOption { default = { }; @@ -104,7 +104,7 @@ in { "To disable a keybinding, use `null` instead of an empty string."; }]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."feh/buttons" = mkIf (cfg.buttons != { }) { text = renderBindings cfg.buttons + "\n"; }; diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix index 2a2667c35..01cab9bd8 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox.nix @@ -1,17 +1,14 @@ { lib, ... }: - with lib; - let - modulePath = [ "programs" "firefox" ]; moduleName = concatStringsSep "." modulePath; mkFirefoxModule = import ./firefox/mkFirefoxModule.nix; - in { - meta.maintainers = [ maintainers.rycee hm.maintainers.bricked ]; + meta.maintainers = + [ maintainers.rycee hm.maintainers.bricked hm.maintainers.HPsaucii ]; imports = [ (mkFirefoxModule { @@ -21,25 +18,20 @@ in { unwrappedPackageName = "firefox-unwrapped"; visible = true; - platforms.linux = rec { - vendorPath = ".mozilla"; - configPath = "${vendorPath}/firefox"; - }; + platforms.linux = rec { configPath = ".mozilla/firefox"; }; platforms.darwin = { - vendorPath = "Library/Application Support/Mozilla"; configPath = "Library/Application Support/Firefox"; }; }) (mkRemovedOptionModule (modulePath ++ [ "extensions" ]) '' - Extensions are now managed per-profile. That is, change from ${moduleName}.extensions = [ foo bar ]; to - ${moduleName}.profiles.myprofile.extensions = [ foo bar ];'') + ${moduleName}.profiles.myprofile.extensions.packages = [ foo bar ];'') (mkRemovedOptionModule (modulePath ++ [ "enableAdobeFlash" ]) "Support for this option has been removed.") (mkRemovedOptionModule (modulePath ++ [ "enableGoogleTalk" ]) diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix index 1bb2253f1..733c8ec94 100644 --- a/modules/programs/firefox/mkFirefoxModule.nix +++ b/modules/programs/firefox/mkFirefoxModule.nix @@ -1,15 +1,13 @@ { modulePath, name, description ? null, wrappedPackageName ? null , unwrappedPackageName ? null, platforms, visible ? false -, enableBookmarks ? true }: - +, enableBookmarks ? true, }: { config, lib, pkgs, ... }: - with lib; - let - inherit (pkgs.stdenv.hostPlatform) isDarwin; + appName = name; + moduleName = concatStringsSep "." modulePath; cfg = getAttrFromPath modulePath config; @@ -32,23 +30,6 @@ let profilesPath = if isDarwin then "${cfg.configPath}/Profiles" else cfg.configPath; - nativeMessagingHostsPath = if isDarwin then - "${cfg.vendorPath}/NativeMessagingHosts" - else - "${cfg.vendorPath}/native-messaging-hosts"; - - nativeMessagingHostsJoined = pkgs.symlinkJoin { - name = "ff_native-messaging-hosts"; - paths = [ - # Link a .keep file to keep the directory around - (pkgs.writeTextDir "lib/mozilla/native-messaging-hosts/.keep" "") - # Link package configured native messaging hosts (entire browser actually) - cfg.finalPackage - ] - # Link user configured native messaging hosts - ++ cfg.nativeMessagingHosts; - }; - # The extensions path shared by all profiles; will not be supported # by future browser versions. extensionPath = "extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"; @@ -75,15 +56,19 @@ let else builtins.toJSON pref); - mkUserJs = prefs: extraPrefs: bookmarks: + mkUserJs = prePrefs: prefs: extraPrefs: bookmarks: extensions: let prefs' = lib.optionalAttrs ([ ] != bookmarks) { "browser.bookmarks.file" = toString (browserBookmarksFile bookmarks); "browser.places.importBookmarksHTML" = true; + } // lib.optionalAttrs (extensions != { }) { + "extensions.webextensions.ExtensionStorageIDB.enabled" = false; } // prefs; in '' // Generated by Home Manager. + ${prePrefs} + ${concatStrings (mapAttrsToList (name: value: '' user_pref("${name}", ${userPrefValue value}); '') prefs')} @@ -199,7 +184,7 @@ let in { assertion = duplicates == { }; message = '' - Must not have a ${name} ${entityKind} with an existing ID but + Must not have a ${appName} ${entityKind} with an existing ID but '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates); }); @@ -214,7 +199,6 @@ let # The configuration expected by the Firefox wrapper builder. bcfg = setAttrByPath [ browserName ] fcfg; - in if package == null then null else if isDarwin then @@ -223,10 +207,10 @@ let package.override (old: { cfg = old.cfg or { } // fcfg; extraPolicies = (old.extraPolicies or { }) // cfg.policies; + pkcs11Modules = (old.pkcs11Modules or [ ]) ++ cfg.pkcs11Modules; }) else (pkgs.wrapFirefox.override { config = bcfg; }) package { }; - in { options = setAttrByPath modulePath { enable = mkOption { @@ -234,11 +218,11 @@ in { default = false; example = true; description = '' - Whether to enable ${name}.${ + Whether to enable ${appName}.${ optionalString (description != null) " ${description}" } ${optionalString (!visible) - "See `programs.firefox` for more configuration options."} + "See `${moduleName}` for more configuration options."} ''; }; @@ -259,10 +243,10 @@ in { } ''; description = '' - The ${name} package to use. If state version ≥ 19.09 then - this should be a wrapped ${name} package. For earlier state - versions it should be an unwrapped ${name} package. - Set to `null` to disable installing ${name}. + The ${appName} package to use. If state version ≥ 19.09 then + this should be a wrapped ${appName} package. For earlier state + versions it should be an unwrapped ${appName} package. + Set to `null` to disable installing ${appName}. ''; }; @@ -273,7 +257,7 @@ in { The language packs to install. Available language codes can be found on the releases page: `https://releases.mozilla.org/pub/firefox/releases/''${version}/linux-x86_64/xpi/`, - replacing `''${version}` with the version of Firefox you have. + replacing `''${version}` with the version of ${appName} you have. ''; example = [ "en-GB" "de" ]; }; @@ -296,11 +280,7 @@ in { vendorPath = mkOption { internal = true; type = with types; nullOr str; - default = with platforms; - if isDarwin then - darwin.vendorPath or null - else - linux.vendorPath or null; + default = null; example = ".mozilla"; description = "Directory containing the native messaging hosts directory."; @@ -312,24 +292,24 @@ in { default = with platforms; if isDarwin then darwin.configPath else linux.configPath; example = ".mozilla/firefox"; - description = "Directory containing the ${name} configuration files."; + description = "Directory containing the ${appName} configuration files."; }; - nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption { + nativeMessagingHosts = mkOption { inherit visible; type = types.listOf types.package; default = [ ]; description = '' Additional packages containing native messaging hosts that should be - made available to ${name} extensions. + made available to ${appName} extensions. ''; - }); + }; finalPackage = mkOption { inherit visible; type = with types; nullOr package; readOnly = true; - description = "Resulting ${cfg.name} package."; + description = "Resulting ${appName} package."; }; policies = optionalAttrs (wrappedPackageName != null) (mkOption { @@ -369,10 +349,24 @@ in { ''; }; + preConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra preferences to add to {file}`user.js`, before + [](#opt-programs.firefox.profiles._name_.settings). + + Use [](#opt-programs.firefox.profiles._name_.extraConfig), unless + you want to overwrite in + [](#opt-programs.firefox.profiles._name_.settings), then use this + option. + ''; + }; + settings = mkOption { type = types.attrsOf (jsonFormat.type // { description = - "${name} preference (int, bool, string, and also attrs, list, float as a JSON string)"; + "${appName} preference (int, bool, string, and also attrs, list, float as a JSON string)"; }); default = { }; example = literalExpression '' @@ -390,9 +384,9 @@ in { } ''; description = '' - Attribute set of ${name} preferences. + Attribute set of ${appName} preferences. - ${name} only supports int, bool, and string types for + ${appName} only supports int, bool, and string types for preferences, but home-manager will automatically convert all other JSON-compatible values into strings. ''; @@ -407,9 +401,9 @@ in { }; userChrome = mkOption { - type = types.lines; + type = types.oneOf [ types.lines types.path ]; default = ""; - description = "Custom ${name} user chrome CSS."; + description = "Custom ${appName} user chrome CSS."; example = '' /* Hide tab bar in FF Quantum */ @-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) { @@ -426,9 +420,9 @@ in { }; userContent = mkOption { - type = types.lines; + type = types.oneOf [ types.lines types.path ]; default = ""; - description = "Custom ${name} user content CSS."; + description = "Custom ${appName} user content CSS."; example = '' /* Hide scrollbar in FF Quantum */ *{scrollbar-width:none !important} @@ -553,8 +547,7 @@ in { type = types.submodule (args: import ./profiles/search.nix { inherit (args) config; - inherit lib pkgs; - appName = cfg.name; + inherit lib pkgs appName; package = cfg.finalPackage; modulePath = modulePath ++ [ "profiles" name "search" ]; profilePath = config.path; @@ -568,7 +561,7 @@ in { default = false; description = '' Whether to force replace the existing containers configuration. - This is recommended since Firefox will replace the symlink on + This is recommended since ${appName} will replace the symlink on every launch, but note that you'll lose any existing configuration by enabling this. ''; @@ -650,41 +643,129 @@ in { for more information. ''; }; - extensions = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExpression '' - with pkgs.nur.repos.rycee.firefox-addons; [ - privacy-badger - ] - ''; + type = types.coercedTo (types.listOf types.package) (packages: { + packages = mkIf (builtins.length packages > 0) (warn '' + In order to support declarative extension configuration, + extension installation has been moved from + ${moduleName}.profiles..extensions + to + ${moduleName}.profiles..extensions.packages + '' packages); + }) (types.submodule { + options = { + packages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression '' + with pkgs.nur.repos.rycee.firefox-addons; [ + privacy-badger + ] + ''; + description = '' + List of ${name} add-on packages to install for this profile. + Some pre-packaged add-ons are accessible from the Nix User Repository. + Once you have NUR installed run + + ```console + $ nix-env -f '' -qaP -A nur.repos.rycee.firefox-addons + ``` + + to list the available ${name} add-ons. + + Note that it is necessary to manually enable these extensions + inside ${name} after the first installation. + + To automatically enable extensions add + `"extensions.autoDisableScopes" = 0;` + to + [{option}`${moduleName}.profiles..settings`](#opt-${moduleName}.profiles._name_.settings) + ''; + }; + + force = mkOption { + description = '' + Whether to override all previous firefox settings. + + This is required when using `settings`. + ''; + default = false; + example = true; + type = types.bool; + }; + + settings = mkOption { + default = { }; + example = literalExpression '' + { + # Example with uBlock origin's extensionID + "uBlock0@raymondhill.net".settings = { + selectedFilterLists = [ + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-unbreak" + "ublock-quick-fixes" + ]; + }; + + # Example with Stylus' UUID-form extensionID + "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}".settings = { + dbInChromeStorage = true; # required for Stylus + } + } + ''; + description = '' + Attribute set of options for each extension. + The keys of the attribute set consist of the ID of the extension + or its UUID wrapped in curly braces. + ''; + type = types.attrsOf (types.submodule { + options = { + settings = mkOption { + type = types.attrsOf jsonFormat.type; + description = + "Json formatted options for the specified extensionID"; + }; + force = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Forcibly override any existing configuration for + this extension. + ''; + }; + }; + }); + }; + }; + }); + default = { }; description = '' - List of ${name} add-on packages to install for this profile. - Some pre-packaged add-ons are accessible from the - [Nix User Repository](https://github.com/nix-community/NUR). - Once you have NUR installed run - - ```console - $ nix-env -f '' -qaP -A nur.repos.rycee.firefox-addons - ``` - - to list the available ${name} add-ons. - - Note that it is necessary to manually enable these extensions - inside ${name} after the first installation. - - To automatically enable extensions add - `"extensions.autoDisableScopes" = 0;` - to - [{option}`${moduleName}.profiles..settings`](#opt-${moduleName}.profiles._name_.settings) + Submodule for installing and configuring extensions. + ''; + example = literalExpression '' + { + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + ]; + settings."uBlock0@raymondhill.net".settings = { + selectedFilterLists = [ + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-unbreak" + "ublock-quick-fixes" + ]; + }; + } ''; }; - }; })); default = { }; - description = "Attribute set of ${name} profiles."; + description = "Attribute set of ${appName} profiles."; }; enableGnomeExtensions = mkOption { @@ -698,6 +779,14 @@ in { `true`. ''; }; + + pkcs11Modules = mkOption { + type = types.listOf types.package; + default = [ ]; + description = '' + Additional packages to be loaded as PKCS #11 modules in Firefox. + ''; + }; }; config = mkIf cfg.enable ({ @@ -709,7 +798,7 @@ in { catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles)); in { assertion = cfg.profiles == { } || length defaults == 1; - message = "Must have exactly one default ${cfg.name} profile but found " + message = "Must have exactly one default ${appName} profile but found " + toString (length defaults) + optionalString (length defaults > 1) (", namely " + concatStringsSep ", " defaults); }) @@ -731,7 +820,7 @@ in { { assertion = cfg.languagePacks == [ ] || cfg.package != null; message = '' - 'programs.firefox.languagePacks' requires 'programs.firefox.package' + '${moduleName}.languagePacks' requires '${moduleName}.package' to be set to a non-null value. ''; } @@ -739,76 +828,112 @@ in { (mkNoDuplicateAssertion cfg.profiles "profile") ] ++ (mapAttrsToList (_: profile: mkNoDuplicateAssertion profile.containers "container") - cfg.profiles); + cfg.profiles) ++ (mapAttrsToList (profileName: profile: { + assertion = profile.extensions.settings == { } + || profile.extensions.force; + message = '' + Using '${ + lib.showAttrPath + (modulePath ++ [ "profiles" profileName "extensions" "settings" ]) + }' will override all previous extensions settings. + Enable '${ + lib.showAttrPath + (modulePath ++ [ "profiles" profileName "extensions" "force" ]) + }' to acknowledge this. + ''; + }) cfg.profiles); warnings = optional (cfg.enableGnomeExtensions or false) '' Using '${moduleName}.enableGnomeExtensions' has been deprecated and will be removed in the future. Please change to overriding the package configuration using '${moduleName}.package' instead. You can refer to its example for how to do this. + '' ++ optional (cfg.vendorPath != null) '' + Using '${moduleName}.vendorPath' has been deprecated and + will be removed in the future. Native messaging hosts will function normally without specifying this path. ''; home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage; + mozilla.firefoxNativeMessagingHosts = cfg.nativeMessagingHosts + # package configured native messaging hosts (entire browser actually) + ++ (lib.optional (cfg.finalPackage != null) cfg.finalPackage); + home.file = mkMerge ([{ "${cfg.configPath}/profiles.ini" = mkIf (cfg.profiles != { }) { text = profilesIni; }; - }] ++ optional (cfg.vendorPath != null) { - "${nativeMessagingHostsPath}" = { - source = - "${nativeMessagingHostsJoined}/lib/mozilla/native-messaging-hosts"; - recursive = true; - }; - } ++ flip mapAttrsToList cfg.profiles (_: profile: { - "${profilesPath}/${profile.path}/.keep".text = ""; + }] ++ flip mapAttrsToList cfg.profiles (_: profile: + # Merge the regular profile settings with extension settings + mkMerge ([{ + "${profilesPath}/${profile.path}/.keep".text = ""; - "${profilesPath}/${profile.path}/chrome/userChrome.css" = - mkIf (profile.userChrome != "") { text = profile.userChrome; }; + "${profilesPath}/${profile.path}/chrome/userChrome.css" = + mkIf (profile.userChrome != "") (let + key = + if builtins.isString profile.userChrome then "text" else "source"; + in { "${key}" = profile.userChrome; }); - "${profilesPath}/${profile.path}/chrome/userContent.css" = - mkIf (profile.userContent != "") { text = profile.userContent; }; + "${profilesPath}/${profile.path}/chrome/userContent.css" = + mkIf (profile.userContent != "") (let + key = if builtins.isString profile.userContent then + "text" + else + "source"; + in { "${key}" = profile.userContent; }); - "${profilesPath}/${profile.path}/user.js" = mkIf (profile.settings != { } - || profile.extraConfig != "" || profile.bookmarks != [ ]) { - text = - mkUserJs profile.settings profile.extraConfig profile.bookmarks; - }; + "${profilesPath}/${profile.path}/user.js" = mkIf (profile.preConfig + != "" || profile.settings != { } || profile.extraConfig != "" + || profile.bookmarks != [ ]) { + text = + mkUserJs profile.preConfig profile.settings profile.extraConfig + profile.bookmarks profile.extensions.settings; + }; - "${profilesPath}/${profile.path}/containers.json" = - mkIf (profile.containers != { }) { - text = mkContainersJson profile.containers; - force = profile.containersForce; - }; + "${profilesPath}/${profile.path}/containers.json" = + mkIf (profile.containers != { }) { + text = mkContainersJson profile.containers; + force = profile.containersForce; + }; - "${profilesPath}/${profile.path}/search.json.mozlz4" = - mkIf (profile.search.enable) { - enable = profile.search.enable; - force = profile.search.force; - source = profile.search.file; - }; + "${profilesPath}/${profile.path}/search.json.mozlz4" = + mkIf (profile.search.enable) { + enable = profile.search.enable; + force = profile.search.force; + source = profile.search.file; + }; - "${profilesPath}/${profile.path}/extensions" = - mkIf (profile.extensions != [ ]) { - source = let - extensionsEnvPkg = pkgs.buildEnv { - name = "hm-firefox-extensions"; - paths = profile.extensions; - }; - in "${extensionsEnvPkg}/share/mozilla/${extensionPath}"; - recursive = true; - force = true; - }; - })); + "${profilesPath}/${profile.path}/extensions" = + mkIf (profile.extensions.packages != [ ]) { + source = let + extensionsEnvPkg = pkgs.buildEnv { + name = "hm-firefox-extensions"; + paths = profile.extensions.packages; + }; + in "${extensionsEnvPkg}/share/mozilla/${extensionPath}"; + recursive = true; + force = true; + }; + }] ++ + # Add extension settings as separate attributes + optional (profile.extensions.settings != { }) (mkMerge (mapAttrsToList + (name: settingConfig: { + "${profilesPath}/${profile.path}/browser-extension-data/${name}/storage.js" = + { + force = settingConfig.force || profile.extensions.force; + text = generators.toJSON { } settingConfig.settings; + }; + }) profile.extensions.settings))))); } // setAttrByPath modulePath { finalPackage = wrapPackage cfg.package; policies = { - ExtensionSettings = listToAttrs (map (lang: - nameValuePair "langpack-${lang}@firefox.mozilla.org" { - installation_mode = "normal_installed"; - install_url = - "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; - }) cfg.languagePacks); + ExtensionSettings = lib.mkIf (cfg.languagePacks != [ ]) (listToAttrs (map + (lang: + nameValuePair "langpack-${lang}@firefox.mozilla.org" { + installation_mode = "normal_installed"; + install_url = + "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; + }) cfg.languagePacks)); }; }); } diff --git a/modules/programs/firefox/profiles/search.nix b/modules/programs/firefox/profiles/search.nix index 99a226744..f0d5f5a30 100644 --- a/modules/programs/firefox/profiles/search.nix +++ b/modules/programs/firefox/profiles/search.nix @@ -48,8 +48,8 @@ let let requiredInput = { inherit name; - isAppProvided = input.isAppProvided or removeAttrs input [ "metaData" ] - == { }; + isAppProvided = + input.isAppProvided or (removeAttrs input [ "metaData" ] == { }); metaData = input.metaData or { }; }; in if requiredInput.isAppProvided then diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index 02141042d..1fb313a86 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -66,7 +66,7 @@ let }; onEvent = mkOption { - type = with types; nullOr str; + type = with types; nullOr (either str (listOf str)); default = null; description = '' Tells fish to run this function when the specified named event is @@ -511,7 +511,7 @@ in { mods = with def; modifierStr "description" description ++ modifierStr "wraps" wraps - ++ modifierStr "on-event" onEvent + ++ lib.concatMap (modifierStr "on-event") (lib.toList onEvent) ++ modifierStr "on-variable" onVariable ++ modifierStr "on-job-exit" onJobExit ++ modifierStr "on-process-exit" onProcessExit diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix index 0f231bdf4..75616b7ee 100644 --- a/modules/programs/floorp.nix +++ b/modules/programs/floorp.nix @@ -19,10 +19,7 @@ in { unwrappedPackageName = "floorp-unwrapped"; visible = true; - platforms.linux = { - configPath = ".floorp"; - vendorPath = ".floorp"; - }; + platforms.linux = { configPath = ".floorp"; }; platforms.darwin = { configPath = "Library/Application Support/Floorp"; }; }) ]; diff --git a/modules/programs/freetube.nix b/modules/programs/freetube.nix index 77700fe55..c2df1163a 100644 --- a/modules/programs/freetube.nix +++ b/modules/programs/freetube.nix @@ -21,7 +21,7 @@ in { options.programs.freetube = { enable = mkEnableOption "FreeTube, a YT client for Windows, Mac, and Linux"; - package = mkPackageOption pkgs "freetube" { }; + package = mkPackageOption pkgs "freetube" { nullable = true; }; settings = mkOption { type = lib.types.attrs; @@ -44,7 +44,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."FreeTube/hm_settings.db" = { source = pkgs.writeText "hm_settings.db" (settings cfg.settings); diff --git a/modules/programs/fuzzel.nix b/modules/programs/fuzzel.nix index 5057c36d6..95c12c836 100644 --- a/modules/programs/fuzzel.nix +++ b/modules/programs/fuzzel.nix @@ -14,7 +14,7 @@ in { options.programs.fuzzel = { enable = mkEnableOption "fuzzel"; - package = mkPackageOption pkgs "fuzzel" { }; + package = mkPackageOption pkgs "fuzzel" { nullable = true; }; settings = mkOption { type = iniFormat.type; @@ -42,7 +42,7 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."fuzzel/fuzzel.ini" = mkIf (cfg.settings != { }) { source = iniFormat.generate "fuzzel.ini" cfg.settings; diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix index 31df95de6..6f45682ca 100644 --- a/modules/programs/fzf.nix +++ b/modules/programs/fzf.nix @@ -45,6 +45,8 @@ in { "This option is no longer supported by fzf.") ]; + meta.maintainers = with lib.maintainers; [ khaneliman ]; + options.programs.fzf = { enable = mkEnableOption "fzf - a command-line fuzzy finder"; @@ -156,29 +158,14 @@ in { }; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/gallery-dl.nix b/modules/programs/gallery-dl.nix index 4f566e18b..7665d5c08 100644 --- a/modules/programs/gallery-dl.nix +++ b/modules/programs/gallery-dl.nix @@ -14,7 +14,7 @@ in { options.programs.gallery-dl = { enable = mkEnableOption "gallery-dl"; - package = mkPackageOption pkgs "gallery-dl" { }; + package = mkPackageOption pkgs "gallery-dl" { nullable = true; }; settings = mkOption { type = jsonFormat.type; @@ -34,7 +34,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."gallery-dl/config.json" = mkIf (cfg.settings != { }) { source = jsonFormat.generate "gallery-dl-settings" cfg.settings; diff --git a/modules/programs/gh-dash.nix b/modules/programs/gh-dash.nix index b351bb33a..e1d4aa7ca 100644 --- a/modules/programs/gh-dash.nix +++ b/modules/programs/gh-dash.nix @@ -12,7 +12,7 @@ in { options.programs.gh-dash = { enable = lib.mkEnableOption "GitHub CLI dashboard plugin"; - package = lib.mkPackageOption pkgs "gh-dash" { }; + package = lib.mkPackageOption pkgs "gh-dash" { nullable = true; }; settings = lib.mkOption { type = yamlFormat.type; @@ -32,9 +32,9 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - programs.gh.extensions = [ cfg.package ]; + programs.gh.extensions = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."gh-dash/config.yml".source = yamlFormat.generate "gh-dash-config.yml" cfg.settings; diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix index 9ebaa7b30..383472efc 100644 --- a/modules/programs/ghostty.nix +++ b/modules/programs/ghostty.nix @@ -8,12 +8,31 @@ let }; keyValue = pkgs.formats.keyValue keyValueSettings; in { - meta.maintainers = [ lib.maintainers.HeitorAugustoLN ]; + meta.maintainers = with lib.maintainers; [ HeitorAugustoLN khaneliman ]; - options.programs.ghostty = { + options.programs.ghostty = let + mkShellIntegrationOption = option: + option // { + description = '' + ${option.description} + + This ensures that shell integration works in more scenarios, such as + switching shells within Ghostty. But it is not needed to have shell + integration. + + See + + for more information. + ''; + }; + in { enable = lib.mkEnableOption "Ghostty"; - package = lib.mkPackageOption pkgs "ghostty" { }; + package = lib.mkPackageOption pkgs "ghostty" { + nullable = true; + extraDescription = + "Set programs.ghostty.package to null on platforms where ghostty is not available or marked broken"; + }; settings = lib.mkOption { inherit (keyValue) type; @@ -22,6 +41,10 @@ in { { theme = "catppuccin-mocha"; font-size = 10; + keybind = [ + "ctrl+h=goto_split:left" + "ctrl+l=goto_split:right" + ]; } ''; description = '' @@ -78,37 +101,24 @@ in { installBatSyntax = lib.mkEnableOption "installation of Ghostty configuration syntax for bat" // { - default = true; + default = cfg.package != null; + defaultText = + lib.literalMD "`true` if programs.ghostty.package is not null"; }; - enableBashIntegration = lib.mkEnableOption '' - bash shell integration. + enableBashIntegration = mkShellIntegrationOption + (lib.hm.shell.mkBashIntegrationOption { inherit config; }); - This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty. - But it is not needed to have shell integration. - See for more information - ''; + enableFishIntegration = mkShellIntegrationOption + (lib.hm.shell.mkFishIntegrationOption { inherit config; }); - enableFishIntegration = lib.mkEnableOption '' - fish shell integration. - - This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty. - But it is not needed to have shell integration. - See for more information - ''; - - enableZshIntegration = lib.mkEnableOption '' - zsh shell integration. - - This is ensures that shell integration works in more scenarios, such as switching shells within Ghostty. - But it is not needed to have shell integration. - See for more information - ''; + enableZshIntegration = mkShellIntegrationOption + (lib.hm.shell.mkZshIntegrationOption { inherit config; }); }; config = lib.mkIf cfg.enable (lib.mkMerge [ { - home.packages = [ cfg.package ]; + home.packages = lib.optionals (cfg.package != null) [ cfg.package ]; programs.ghostty.settings = lib.mkIf cfg.clearDefaultKeybinds { keybind = lib.mkBefore [ "clear" ]; @@ -116,27 +126,46 @@ in { # MacOS also supports XDG configuration directory, so we use it for both # Linux and macOS to reduce complexity - xdg.configFile = lib.mkMerge [ + xdg.configFile = let + validate = file: + lib.mkIf (cfg.package != null) "${ + lib.getExe cfg.package + } +validate-config --config-file=${config.xdg.configHome}/ghostty/${file}"; + in lib.mkMerge [ { "ghostty/config" = lib.mkIf (cfg.settings != { }) { source = keyValue.generate "ghostty-config" cfg.settings; - onChange = "${lib.getExe cfg.package} +validate-config"; + onChange = validate "config"; }; } (lib.mkIf (cfg.themes != { }) (lib.mapAttrs' (name: value: { name = "ghostty/themes/${name}"; - value.source = keyValue.generate "ghostty-${name}-theme" value; + value = { + source = keyValue.generate "ghostty-${name}-theme" value; + onChange = validate "themes/${name}"; + }; }) cfg.themes)) ]; } (lib.mkIf cfg.installVimSyntax { - programs.vim.plugins = [ cfg.package.vim ]; + assertions = [{ + assertion = cfg.installVimSyntax -> cfg.package != null; + message = + "programs.ghostty.installVimSyntax cannot be enabled when programs.ghostty.package is null"; + }]; + programs.vim.plugins = + lib.optionals (cfg.package != null) [ cfg.package.vim ]; }) (lib.mkIf cfg.installBatSyntax { - programs.bat = { + assertions = [{ + assertion = cfg.installBatSyntax -> cfg.package != null; + message = + "programs.ghostty.installBatSyntax cannot be enabled when programs.ghostty.package is null"; + }]; + programs.bat = lib.mkIf (cfg.package != null) { syntaxes.ghostty = { src = cfg.package; file = "share/bat/syntaxes/ghostty.sublime-syntax"; diff --git a/modules/programs/git-cliff.nix b/modules/programs/git-cliff.nix index cd7fb529d..ce9e26f39 100644 --- a/modules/programs/git-cliff.nix +++ b/modules/programs/git-cliff.nix @@ -13,7 +13,7 @@ in { options.programs.git-cliff = { enable = mkEnableOption "git-cliff changelog generator"; - package = mkPackageOption pkgs "git-cliff" { }; + package = mkPackageOption pkgs "git-cliff" { nullable = true; }; settings = mkOption { type = tomlFormat.type; @@ -34,7 +34,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = { "git-cliff/cliff.toml" = mkIf (cfg.settings != { }) { diff --git a/modules/programs/git-worktree-switcher.nix b/modules/programs/git-worktree-switcher.nix new file mode 100644 index 000000000..cb38f2e62 --- /dev/null +++ b/modules/programs/git-worktree-switcher.nix @@ -0,0 +1,39 @@ +{ pkgs, config, lib, ... }: + +let + inherit (lib) mkEnableOption mkPackageOption optionalString; + + cfg = config.programs.git-worktree-switcher; + + initScript = shell: + if (shell == "fish") then '' + ${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source + '' else '' + eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})" + ''; +in { + meta.maintainers = with lib.maintainers; [ jiriks74 mateusauler ]; + + options.programs.git-worktree-switcher = { + enable = mkEnableOption "git-worktree-switcher"; + package = mkPackageOption pkgs "git-worktree-switcher" { }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; + + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; + + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; + }; + + config = lib.mkIf cfg.enable { + home.packages = [ cfg.package ]; + programs.bash.initExtra = + optionalString cfg.enableBashIntegration (initScript "bash"); + programs.fish.interactiveShellInit = + optionalString cfg.enableFishIntegration (initScript "fish"); + programs.zsh.initExtra = + optionalString cfg.enableZshIntegration (initScript "zsh"); + }; +} diff --git a/modules/programs/git.nix b/modules/programs/git.nix index e76085192..16fc6a0fa 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -14,33 +14,6 @@ let supersectionType = attrsOf (either multipleType sectionType); in attrsOf supersectionType; - signModule = types.submodule { - options = { - key = mkOption { - type = types.nullOr types.str; - description = '' - The default GPG signing key fingerprint. - - Set to `null` to let GnuPG decide what signing key - to use depending on commit’s author. - ''; - }; - - signByDefault = mkOption { - type = types.bool; - default = false; - description = "Whether commits and tags should be signed by default."; - }; - - gpgPath = mkOption { - type = types.str; - default = "${pkgs.gnupg}/bin/gpg2"; - defaultText = "\${pkgs.gnupg}/bin/gpg2"; - description = "Path to GnuPG binary to use."; - }; - }; - }; - includeModule = types.submodule ({ config, ... }: { options = { condition = mkOption { @@ -97,7 +70,7 @@ let }); in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = with lib.maintainers; [ khaneliman rycee ]; options = { programs.git = { @@ -132,10 +105,40 @@ in { description = "Git aliases to define."; }; - signing = mkOption { - type = types.nullOr signModule; - default = null; - description = "Options related to signing commits using GnuPG."; + signing = { + key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The default signing key fingerprint. + + Set to `null` to let the signer decide what signing key + to use depending on commit’s author. + ''; + }; + + format = mkOption { + type = types.nullOr (types.enum [ "openpgp" "ssh" "x509" ]); + defaultText = literalExpression '' + "openpgp" for state version < 25.05, + undefined for state version ≥ 25.05 + ''; + description = '' + The signing method to use when signing commits and tags. + Valid values are `openpgp` (OpenPGP/GnuPG), `ssh` (SSH), and `x509` (X.509 certificates). + ''; + }; + + signByDefault = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether commits and tags should be signed by default."; + }; + + signer = mkOption { + type = types.nullOr types.str; + description = "Path to signer binary to use."; + }; }; extraConfig = mkOption { @@ -219,6 +222,9 @@ in { description = '' Enable the automatic {command}`git maintenance`. + If you have SSH remotes, set {option}`programs.git.package` to a + git version with SSH support (eg: `pkgs.gitFull`). + See . ''; }; @@ -405,12 +411,45 @@ in { ''; }; }; + + riff = { + enable = mkEnableOption "" // { + description = '' + Enable the riff diff highlighter. + See . + ''; + }; + + package = mkPackageOption pkgs "riffdiff" { }; + + commandLineOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = literalExpression ''[ "--no-adds-only-special" ]''; + apply = concatStringsSep " "; + description = '' + Command line arguments to include in the RIFF environment variable. + + Run riff --help for a full list of options + ''; + }; + }; }; }; + imports = [ + (mkRenamedOptionModule [ "programs" "git" "signing" "gpgPath" ] [ + "programs" + "git" + "signing" + "signer" + ]) + ]; + config = mkIf cfg.enable (mkMerge [ { home.packages = [ cfg.package ]; + assertions = [{ assertion = let enabled = [ @@ -418,6 +457,7 @@ in { cfg.diff-so-fancy.enable cfg.difftastic.enable cfg.diff-highlight.enable + cfg.riff.enable ]; in count id enabled <= 1; message = @@ -449,7 +489,7 @@ in { genIdentity = name: account: with account; nameValuePair "sendemail.${name}" (if account.msmtp.enable then { - smtpServer = "${pkgs.msmtp}/bin/msmtp"; + sendmailCmd = "${pkgs.msmtp}/bin/msmtp"; envelopeSender = "auto"; from = "${realName} <${address}>"; } else @@ -474,12 +514,38 @@ in { (filterAttrs hasSmtp config.accounts.email.accounts); } - (mkIf (cfg.signing != null) { - programs.git.iniContent = { - user.signingKey = mkIf (cfg.signing.key != null) cfg.signing.key; - commit.gpgSign = mkDefault cfg.signing.signByDefault; - tag.gpgSign = mkDefault cfg.signing.signByDefault; - gpg.program = cfg.signing.gpgPath; + (mkIf (cfg.signing != { }) { + programs.git = { + signing = { + format = if (versionOlder config.home.stateVersion "25.05") then + (mkOptionDefault "openpgp") + else + (mkOptionDefault null); + signer = let + defaultSigners = { + openpgp = getExe config.programs.gpg.package; + ssh = getExe' pkgs.openssh "ssh-keygen"; + x509 = getExe' config.programs.gpg.package "gpgsm"; + }; + in mkIf (cfg.signing.format != null) + (mkOptionDefault defaultSigners.${cfg.signing.format}); + }; + + iniContent = mkMerge [ + (mkIf (cfg.signing.key != null) { + user.signingKey = mkDefault cfg.signing.key; + }) + (mkIf (cfg.signing.signByDefault != null) { + commit.gpgSign = mkDefault cfg.signing.signByDefault; + tag.gpgSign = mkDefault cfg.signing.signByDefault; + }) + (mkIf (cfg.signing.format != null) { + gpg = { + format = mkDefault cfg.signing.format; + ${cfg.signing.format}.program = mkDefault cfg.signing.signer; + }; + }) + ]; }; }) @@ -636,5 +702,25 @@ in { }; }; }) + + (let riffExe = baseNameOf (getExe cfg.riff.package); + in mkIf cfg.riff.enable { + home.packages = [ cfg.riff.package ]; + + # https://github.com/walles/riff/blob/b17e6f17ce807c8652bc59cd46758661d23ce358/README.md#usage + programs.git.iniContent = { + pager = { + diff = riffExe; + log = riffExe; + show = riffExe; + }; + + interactive.diffFilter = "${riffExe} --color=on"; + }; + }) + + (mkIf (cfg.riff.enable && cfg.riff.commandLineOptions != "") { + home.sessionVariables.RIFF = cfg.riff.commandLineOptions; + }) ]); } diff --git a/modules/programs/gradle.nix b/modules/programs/gradle.nix index 8bf5d7898..f8bba3e46 100644 --- a/modules/programs/gradle.nix +++ b/modules/programs/gradle.nix @@ -50,7 +50,10 @@ in { ''; }; - package = mkPackageOption pkgs "gradle" { example = "pkgs.gradle_7"; }; + package = mkPackageOption pkgs "gradle" { + nullable = true; + example = "pkgs.gradle_7"; + }; settings = mkOption { type = types.submodule { freeformType = settingsFormat.type; }; @@ -95,7 +98,7 @@ in { config = let gradleHome = "${config.home.homeDirectory}/${cfg.home}"; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file = mkMerge ([{ "${cfg.home}/gradle.properties" = mkIf (cfg.settings != { }) { diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix index 93cdb97df..802cffea1 100644 --- a/modules/programs/granted.nix +++ b/modules/programs/granted.nix @@ -13,13 +13,11 @@ in { options.programs.granted = { enable = mkEnableOption "granted"; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; + + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { @@ -32,5 +30,11 @@ in { unset GRANTED_ALIAS_CONFIGURED } ''; + + programs.fish.functions.assume = mkIf cfg.enableFishIntegration '' + set -x GRANTED_ALIAS_CONFIGURED "true" + source ${package}/share/assume.fish $argv + set -e GRANTED_ALIAS_CONFIGURED + ''; }; } diff --git a/modules/programs/havoc.nix b/modules/programs/havoc.nix index c83a1c39a..5d48fbac1 100644 --- a/modules/programs/havoc.nix +++ b/modules/programs/havoc.nix @@ -13,7 +13,7 @@ in { options.programs.havoc = { enable = mkEnableOption "Havoc terminal"; - package = mkPackageOption pkgs "havoc" { }; + package = mkPackageOption pkgs "havoc" { nullable = true; }; settings = mkOption { type = iniFormat.type; @@ -54,7 +54,7 @@ in { assertions = [ (hm.assertions.assertPlatform "programs.havoc" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."havoc.cfg" = mkIf (cfg.settings != { }) { source = iniFormat.generate "havoc.cfg" cfg.settings; diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix index 2d216c3dc..5cba5a2f1 100644 --- a/modules/programs/himalaya.nix +++ b/modules/programs/himalaya.nix @@ -1,12 +1,14 @@ { config, lib, pkgs, ... }: +with lib; + let # aliases inherit (config.programs) himalaya; tomlFormat = pkgs.formats.toml { }; # attrs util that removes entries containing a null value - compactAttrs = lib.filterAttrs (_: val: !isNull val); + compactAttrs = filterAttrs (_: val: !isNull val); # needed for notmuch config, because the DB is here, and not in each # account's dir @@ -35,7 +37,7 @@ let email = account.address; display-name = account.realName; default = account.primary; - folder.alias = { + folder.aliases = { inbox = account.folders.inbox; sent = account.folders.sent; drafts = account.folders.drafts; @@ -44,48 +46,53 @@ let }; signatureConfig = - lib.optionalAttrs (account.signature.showSignature == "append") { + optionalAttrs (account.signature.showSignature == "append") { # TODO: signature cannot be attached yet - # https://todo.sr.ht/~soywod/pimalaya/27 + # https://github.com/pimalaya/himalaya/issues/534 signature = account.signature.text; signature-delim = account.signature.delimiter; }; - imapConfig = lib.optionalAttrs imapEnabled (compactAttrs { - backend = "imap"; - imap.host = account.imap.host; - imap.port = account.imap.port; - imap.encryption = mkEncryptionConfig account.imap.tls; - imap.login = account.userName; - imap.passwd.cmd = builtins.concatStringsSep " " account.passwordCommand; + imapConfig = optionalAttrs imapEnabled (compactAttrs { + backend.type = "imap"; + backend.host = account.imap.host; + backend.port = account.imap.port; + backend.encryption.type = mkEncryptionConfig account.imap.tls; + backend.login = account.userName; + backend.auth.type = "password"; + backend.auth.cmd = + builtins.concatStringsSep " " account.passwordCommand; }); - maildirConfig = lib.optionalAttrs maildirEnabled (compactAttrs { - backend = "maildir"; - maildir.root-dir = account.maildir.absPath; + maildirConfig = optionalAttrs maildirEnabled (compactAttrs { + backend.type = "maildir"; + backend.root-dir = account.maildir.absPath; }); - notmuchConfig = lib.optionalAttrs notmuchEnabled (compactAttrs { - backend = "notmuch"; - notmuch.database-path = maildirBasePath; + notmuchConfig = optionalAttrs notmuchEnabled (compactAttrs { + backend.type = "notmuch"; + backend.db-path = maildirBasePath; }); - smtpConfig = lib.optionalAttrs (!isNull account.smtp) (compactAttrs { - message.send.backend = "smtp"; - smtp.host = account.smtp.host; - smtp.port = account.smtp.port; - smtp.encryption = mkEncryptionConfig account.smtp.tls; - smtp.login = account.userName; - smtp.passwd.cmd = builtins.concatStringsSep " " account.passwordCommand; + smtpConfig = optionalAttrs (!isNull account.smtp) (compactAttrs { + message.send.backend.type = "smtp"; + message.send.backend.host = account.smtp.host; + message.send.backend.port = account.smtp.port; + message.send.backend.encryption.type = + mkEncryptionConfig account.smtp.tls; + message.send.backend.login = account.userName; + message.send.backend.auth.type = "password"; + message.send.backend.auth.cmd = + builtins.concatStringsSep " " account.passwordCommand; }); sendmailConfig = - lib.optionalAttrs (isNull account.smtp && !isNull account.msmtp) { - sender = "sendmail"; - sendmail.cmd = "${pkgs.msmtp}/bin/msmtp"; + optionalAttrs (isNull account.smtp && !isNull account.msmtp) { + message.send.backend.type = "sendmail"; + message.send.backend.cmd = getExe pkgs.msmtp; }; - config = lib.attrsets.mergeAttrsList [ + config = attrsets.mergeAttrsList [ globalConfig signatureConfig imapConfig @@ -95,65 +102,49 @@ let sendmailConfig ]; - in lib.recursiveUpdate config account.himalaya.settings; + in recursiveUpdate config account.himalaya.settings; in { - meta.maintainers = with lib.hm.maintainers; [ soywod toastal ]; + meta.maintainers = with hm.maintainers; [ soywod toastal ]; + + imports = [ + (mkRemovedOptionModule [ "services" "himalaya-watch" "enable" ] '' + services.himalaya-watch has been removed. + + The watch feature moved away from Himalaya scope, and resides + now in its own project called Mirador. Once the v1 released, the + service will land back in nixpkgs and home-manager. + + See . + '') + ]; options = { programs.himalaya = { - enable = lib.mkEnableOption "the email client Himalaya CLI"; - package = lib.mkPackageOption pkgs "himalaya" { }; - settings = lib.mkOption { - type = lib.types.submodule { freeformType = tomlFormat.type; }; + enable = mkEnableOption "the email client Himalaya CLI"; + package = mkPackageOption pkgs "himalaya" { nullable = true; }; + settings = mkOption { + type = types.submodule { freeformType = tomlFormat.type; }; default = { }; description = '' Himalaya CLI global configuration. - See for supported values. + See for supported values. ''; }; }; - services.himalaya-watch = { - enable = lib.mkEnableOption - "the email client Himalaya CLI envelopes watcher service"; - - environment = lib.mkOption { - type = with lib.types; attrsOf str; - default = { }; - example = lib.literalExpression '' - { - "PASSWORD_STORE_DIR" = "~/.password-store"; - } - ''; - description = '' - Extra environment variables to be exported in the service. - ''; - }; - - settings.account = lib.mkOption { - type = with lib.types; nullOr str; - default = null; - example = "personal"; - description = '' - Name of the account the watcher should be started for. - If no account is given, the default one is used. - ''; - }; - }; - - accounts.email.accounts = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule { + accounts.email.accounts = mkOption { + type = types.attrsOf (types.submodule { options.himalaya = { - enable = lib.mkEnableOption + enable = mkEnableOption "the email client Himalaya CLI for this email account"; - settings = lib.mkOption { - type = lib.types.submodule { freeformType = tomlFormat.type; }; + settings = mkOption { + type = types.submodule { freeformType = tomlFormat.type; }; default = { }; description = '' Himalaya CLI configuration for this email account. - See for supported values. + See for supported values. ''; }; }; @@ -161,41 +152,30 @@ in { }; }; - config = lib.mkIf himalaya.enable { - home.packages = [ himalaya.package ]; + config = mkIf himalaya.enable { + home.packages = lib.mkIf (himalaya.package != null) [ himalaya.package ]; - xdg.configFile."himalaya/config.toml".source = let - enabledAccounts = lib.filterAttrs (_: account: account.himalaya.enable) - config.accounts.email.accounts; - accountsConfig = lib.mapAttrs mkAccountConfig enabledAccounts; - globalConfig = compactAttrs himalaya.settings; - allConfig = globalConfig // { accounts = accountsConfig; }; - in tomlFormat.generate "himalaya-config.toml" allConfig; - systemd.user.services = let - inherit (config.services.himalaya-watch) enable environment settings; - optionalArg = key: - if (key ? settings && !isNull settings."${key}") then - [ "--${key} ${settings."${key}"}" ] - else - [ ]; - in { - himalaya-watch = lib.mkIf enable { - Unit = { - Description = "Email client Himalaya CLI envelopes watcher service"; - After = [ "network.target" ]; + xdg = { + configFile."himalaya/config.toml".source = let + enabledAccounts = filterAttrs (_: account: account.himalaya.enable) + config.accounts.email.accounts; + accountsConfig = mapAttrs mkAccountConfig enabledAccounts; + globalConfig = compactAttrs himalaya.settings; + allConfig = globalConfig // { accounts = accountsConfig; }; + in tomlFormat.generate "himalaya.config.toml" allConfig; + + desktopEntries.himalaya = + mkIf (pkgs.stdenv.hostPlatform.isLinux && (himalaya.package != null)) { + type = "Application"; + name = "himalaya"; + genericName = "Email Client"; + comment = "CLI to manage emails"; + terminal = true; + exec = "himalaya %u"; + categories = [ "Network" ]; + mimeType = [ "x-scheme-handler/mailto" "message/rfc822" ]; + settings = { Keywords = "email"; }; }; - Install = { WantedBy = [ "default.target" ]; }; - Service = { - ExecStart = lib.concatStringsSep " " - ([ "${himalaya.package}/bin/himalaya" "envelopes" "watch" ] - ++ optionalArg "account"); - ExecSearchPath = "/bin"; - Environment = - lib.mapAttrsToList (key: val: "${key}=${val}") environment; - Restart = "always"; - RestartSec = 10; - }; - }; }; }; } diff --git a/modules/programs/hstr.nix b/modules/programs/hstr.nix index e85832174..6dc2c0a33 100644 --- a/modules/programs/hstr.nix +++ b/modules/programs/hstr.nix @@ -16,13 +16,11 @@ in { package = mkPackageOption pkgs "hstr" { }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix index b4004942c..28699e4a1 100644 --- a/modules/programs/htop.nix +++ b/modules/programs/htop.nix @@ -166,12 +166,13 @@ in { config = mkIf cfg.enable { lib.htop = { - inherit fields modes leftMeters rightMeters bar text graph led blank; + inherit fields defaultFields modes leftMeters rightMeters bar text graph + led blank; }; home.packages = [ cfg.package ]; - xdg.configFile."htop/htoprc" = let + xdg.configFile."htop" = let defaults = { fields = if isDarwin then remove fields.M_SHARE defaultFields @@ -188,9 +189,9 @@ in { formatOptions = mapAttrsToList formatOption; in mkIf (cfg.settings != { }) { - text = - concatStringsSep "\n" (formatOptions before ++ formatOptions settings) - + "\n"; + source = pkgs.writeTextDir "htoprc" + (concatStringsSep "\n" (formatOptions before ++ formatOptions settings) + + "\n"); }; }; } diff --git a/modules/programs/hyprlock.nix b/modules/programs/hyprlock.nix index 25d871889..a59c133be 100644 --- a/modules/programs/hyprlock.nix +++ b/modules/programs/hyprlock.nix @@ -1,16 +1,14 @@ { config, pkgs, lib, ... }: -with lib; - let cfg = config.programs.hyprlock; in { - meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ]; + meta.maintainers = with lib.maintainers; [ khaneliman fufexan ]; options.programs.hyprlock = { - enable = mkEnableOption "" // { + enable = lib.mkEnableOption "" // { description = '' Whether to enable Hyprlock, Hyprland's GPU-accelerated lock screen utility. @@ -27,7 +25,7 @@ in { ''; }; - package = mkPackageOption pkgs "hyprlock" { }; + package = lib.mkPackageOption pkgs "hyprlock" { nullable = true; }; settings = lib.mkOption { type = with lib.types; @@ -102,21 +100,21 @@ in { importantPrefixes = lib.mkOption { type = with lib.types; listOf str; - default = [ "$" "monitor" "size" ] + default = [ "$" "bezier" "monitor" "size" ] ++ lib.optionals cfg.sourceFirst [ "source" ]; - example = [ "$" "monitor" "size" ]; + example = [ "$" "bezier" "monitor" "size" ]; description = '' List of prefix of attributes to source at the top of the config. ''; }; }; - config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + config = lib.mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."hypr/hyprlock.conf" = let shouldGenerate = cfg.extraConfig != "" || cfg.settings != { }; - in mkIf shouldGenerate { + in lib.mkIf shouldGenerate { text = lib.optionalString (cfg.settings != { }) (lib.hm.generators.toHyprconf { attrs = cfg.settings; diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix index 17b1162e8..343418dc6 100644 --- a/modules/programs/i3status.nix +++ b/modules/programs/i3status.nix @@ -130,7 +130,7 @@ in { ''; }; - package = mkPackageOption pkgs "i3status" { }; + package = mkPackageOption pkgs "i3status" { nullable = true; }; }; config = mkIf cfg.enable { @@ -190,7 +190,7 @@ in { }; }; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."i3status/config".text = concatStringsSep "\n" ([ ] ++ optional (cfg.general != { }) (formatModule "general" cfg.general) diff --git a/modules/programs/imv.nix b/modules/programs/imv.nix index 583c2c57c..2cad38134 100644 --- a/modules/programs/imv.nix +++ b/modules/programs/imv.nix @@ -16,7 +16,7 @@ in { enable = mkEnableOption "imv: a command line image viewer intended for use with tiling window managers"; - package = mkPackageOption pkgs "imv" { }; + package = mkPackageOption pkgs "imv" { nullable = true; }; settings = mkOption { default = { }; @@ -38,7 +38,7 @@ in { assertions = [ (hm.assertions.assertPlatform "programs.imv" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = mkIf (cfg.settings != { }) { "imv/config".text = toConfig cfg.settings; }; diff --git a/modules/programs/jetbrains-remote.nix b/modules/programs/jetbrains-remote.nix index 4a9c045a9..917fe87cf 100644 --- a/modules/programs/jetbrains-remote.nix +++ b/modules/programs/jetbrains-remote.nix @@ -31,7 +31,7 @@ in { "${ide}/bin/${ide.meta.mainProgram}-remote-dev-server registerBackendLocationForGateway || true"; lines = map mkLine cfg.ides; linesStr = '' - rm $HOME/.cache/JetBrains/RemoteDev/userProvidedDist/_nix_store* + rm $HOME/.cache/JetBrains/RemoteDev/userProvidedDist/_nix_store* || true '' + concatStringsSep "\n" lines; in hm.dag.entryAfter [ "writeBoundary" ] linesStr; }; diff --git a/modules/programs/jqp.nix b/modules/programs/jqp.nix new file mode 100644 index 000000000..e82bccb27 --- /dev/null +++ b/modules/programs/jqp.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.jqp; + + yamlFormat = pkgs.formats.yaml { }; +in { + options.programs.jqp = { + enable = lib.mkEnableOption "jqp, jq playground"; + + package = lib.mkPackageOption pkgs "jqp" { nullable = true; }; + + settings = lib.mkOption { + type = yamlFormat.type; + default = { }; + example = { + theme = { + name = "monokai"; + chromaStyleOverrides = { kc = "#009900 underline"; }; + }; + }; + description = "Jqp configuration"; + }; + }; + config = lib.mkIf cfg.enable { + home = { + packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + file.".jqp.yaml" = lib.mkIf (cfg.settings != { }) { + source = yamlFormat.generate "jqp-config" cfg.settings; + }; + }; + }; +} diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix index f0e1b4250..7ba71acbc 100644 --- a/modules/programs/jujutsu.nix +++ b/modules/programs/jujutsu.nix @@ -25,7 +25,7 @@ in { enable = mkEnableOption "a Git-compatible DVCS that is both simple and powerful"; - package = mkPackageOption pkgs "jujutsu" { }; + package = mkPackageOption pkgs "jujutsu" { nullable = true; }; ediff = mkOption { type = types.bool; @@ -54,7 +54,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${configDir}/jj/config.toml" = mkIf (cfg.settings != { }) { source = tomlFormat.generate "jujutsu-config" (cfg.settings diff --git a/modules/programs/k9s.nix b/modules/programs/k9s.nix index 0dd107883..b0d669822 100644 --- a/modules/programs/k9s.nix +++ b/modules/programs/k9s.nix @@ -24,7 +24,7 @@ in { enable = mkEnableOption "k9s - Kubernetes CLI To Manage Your Clusters In Style"; - package = mkPackageOption pkgs "k9s" { }; + package = mkPackageOption pkgs "k9s" { nullable = true; }; settings = mkOption { type = yamlFormat.type; @@ -182,7 +182,7 @@ in { enableXdgConfig = !isDarwin || config.xdg.enable; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = mkIf enableXdgConfig ({ "k9s/config.yaml" = mkIf (cfg.settings != { }) { diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix index 5e40952b9..7aed4125a 100644 --- a/modules/programs/kakoune.nix +++ b/modules/programs/kakoune.nix @@ -622,7 +622,7 @@ in { programs.kakoune = { enable = mkEnableOption "the kakoune text editor"; - package = mkPackageOption pkgs "kakoune-unwrapped" { }; + package = mkPackageOption pkgs "kakoune-unwrapped" { nullable = true; }; config = mkOption { type = types.nullOr configModule; @@ -656,6 +656,8 @@ in { List of kakoune plugins to install. To get a list of supported plugins run: {command}`nix-env -f '' -qaP -A kakounePlugins`. + + Requires `package` to not be set to have effect. ''; }; @@ -674,7 +676,13 @@ in { }; config = mkIf cfg.enable { - home.packages = [ kakouneWithPlugins ]; + warnings = optional (cfg.package == null && cfg.plugins != [ ]) '' + You have configured `plugins` for `kakoune` but have not set `package`. + + The listed plugins will not be installed. + ''; + + home.packages = lib.mkIf (cfg.package != null) [ kakouneWithPlugins ]; home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "kak"; }; xdg.configFile = mkMerge [ { "kak/kakrc".source = configFile; } diff --git a/modules/programs/keychain.nix b/modules/programs/keychain.nix index 4aeef4132..c428f40cf 100644 --- a/modules/programs/keychain.nix +++ b/modules/programs/keychain.nix @@ -63,37 +63,17 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; enableXsessionIntegration = mkOption { default = true; diff --git a/modules/programs/khal.nix b/modules/programs/khal.nix index a2e28e018..96879c52e 100644 --- a/modules/programs/khal.nix +++ b/modules/programs/khal.nix @@ -168,7 +168,7 @@ in { options.programs.khal = { enable = mkEnableOption "khal, a CLI calendar application"; - package = mkPackageOption pkgs "khal" { }; + package = mkPackageOption pkgs "khal" { nullable = true; }; locale = mkOption { type = lib.types.submodule { options = localeOptions; }; @@ -199,7 +199,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."khal/config".text = concatStringsSep "\n" ([ "[calendars]" ] ++ mapAttrsToList genCalendarStr khalAccounts ++ [ diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index 9854fe69c..cc7e7b4dc 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -1,29 +1,34 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) + literalExpression mkEnableOption mkIf mkOption optionalString types; + cfg = config.programs.kitty; settingsValueType = with types; oneOf [ str bool int float ]; optionalPackage = opt: - optional (opt != null && opt.package != null) opt.package; + lib.optional (opt != null && opt.package != null) opt.package; - toKittyConfig = generators.toKeyValue { + toKittyConfig = lib.generators.toKeyValue { mkKeyValue = key: value: let value' = - (if isBool value then lib.hm.booleans.yesNo else toString) value; + (if lib.isBool value then lib.hm.booleans.yesNo else toString) value; in "${key} ${value'}"; }; - toKittyKeybindings = generators.toKeyValue { + toKittyKeybindings = lib.generators.toKeyValue { mkKeyValue = key: command: "map ${key} ${command}"; }; - toKittyEnv = - generators.toKeyValue { mkKeyValue = name: value: "env ${name}=${value}"; }; + toKittyActionAliases = lib.generators.toKeyValue { + mkKeyValue = alias_name: action: "action_alias ${alias_name} ${action}"; + }; + + toKittyEnv = lib.generators.toKeyValue { + mkKeyValue = name: value: "env ${name}=${value}"; + }; shellIntegrationInit = { bash = '' @@ -49,33 +54,38 @@ let ''; }; - shellIntegrationDefaultOpt = { - default = !(elem "disabled" (splitString " " cfg.shellIntegration.mode)); - defaultText = literalExpression '' - !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode)) - ''; - }; + mkShellIntegrationOption = option: + option // { + default = (cfg.shellIntegration.mode != null) && !(lib.elem "disabled" + (lib.splitString " " cfg.shellIntegration.mode)); + defaultText = literalExpression '' + (cfg.shellIntegration.mode != null) + && !(elem "disabled" (splitString " " config.programs.kitty.shellIntegration.mode)) + ''; + }; in { imports = [ - (mkChangedOptionModule [ "programs" "kitty" "theme" ] [ + (lib.mkChangedOptionModule [ "programs" "kitty" "theme" ] [ "programs" "kitty" "themeFile" ] (config: - let value = getAttrFromPath [ "programs" "kitty" "theme" ] config; + let value = lib.getAttrFromPath [ "programs" "kitty" "theme" ] config; in if value != null then (let - matching = filter (x: x.name == value) (builtins.fromJSON + matching = lib.filter (x: x.name == value) (builtins.fromJSON (builtins.readFile "${pkgs.kitty-themes}/share/kitty-themes/themes.json")); - in throwIf (length matching == 0) + in lib.throwIf (lib.length matching == 0) "kitty-themes does not contain a theme named ${value}" - strings.removeSuffix ".conf" - (strings.removePrefix "themes/" (head matching).file)) + lib.strings.removeSuffix ".conf" + (lib.strings.removePrefix "themes/" (lib.head matching).file)) else null)) ]; + meta.maintainers = with lib.maintainers; [ khaneliman ]; + options.programs.kitty = { enable = mkEnableOption "Kitty terminal emulator"; @@ -132,11 +142,23 @@ in { }; font = mkOption { - type = types.nullOr hm.types.fontType; + type = types.nullOr lib.hm.types.fontType; default = null; description = "The font to use."; }; + actionAliases = mkOption { + type = types.attrsOf types.str; + default = { }; + description = "Define action aliases."; + example = literalExpression '' + { + "launch_tab" = "launch --cwd=current --type=tab"; + "launch_window" = "launch --cwd=current --type=os-window"; + } + ''; + }; + keybindings = mkOption { type = types.attrsOf types.str; default = { }; @@ -162,31 +184,32 @@ in { shellIntegration = { mode = mkOption { - type = types.str; + type = types.nullOr types.str; default = "no-rc"; example = "no-cursor"; - apply = o: + apply = lib.mapNullable (o: let - modes = splitString " " o; - filtered = filter (m: m != "no-rc") modes; - in concatStringsSep " " (concatLists [ [ "no-rc" ] filtered ]); + modes = lib.splitString " " o; + filtered = lib.filter (m: m != "no-rc") modes; + in lib.concatStringsSep " " + (lib.concatLists [ [ "no-rc" ] filtered ])); description = '' Set the mode of the shell integration. This accepts the same options as the `shell_integration` option of Kitty. Note that - `no-rc` is always implied. See + `no-rc` is always implied, unless this set to `null`. See for more details. ''; }; - enableBashIntegration = mkEnableOption "Kitty Bash integration" - // shellIntegrationDefaultOpt; + enableBashIntegration = mkShellIntegrationOption + (lib.hm.shell.mkBashIntegrationOption { inherit config; }); - enableFishIntegration = mkEnableOption "Kitty fish integration" - // shellIntegrationDefaultOpt; + enableFishIntegration = mkShellIntegrationOption + (lib.hm.shell.mkFishIntegrationOption { inherit config; }); - enableZshIntegration = mkEnableOption "Kitty Z Shell integration" - // shellIntegrationDefaultOpt; + enableZshIntegration = mkShellIntegrationOption + (lib.hm.shell.mkZshIntegrationOption { inherit config; }); }; extraConfig = mkOption { @@ -197,13 +220,22 @@ in { }; config = mkIf cfg.enable { + assertions = [{ + assertion = !(cfg.shellIntegration.mode == null + && (cfg.shellIntegration.enableBashIntegration + || cfg.shellIntegration.enableFishIntegration + || cfg.shellIntegration.enableZshIntegration)); + message = + "Cannot enable shell integration when `programs.kitty.shellIntegration.mode` is `null`"; + }]; + home.packages = [ cfg.package ] ++ optionalPackage cfg.font; xdg.configFile."kitty/kitty.conf" = { text = '' # Generated by Home Manager. # See https://sw.kovidgoyal.net/kitty/conf.html - '' + concatStringsSep "\n" [ + '' + lib.concatStringsSep "\n" [ (optionalString (cfg.font != null) '' font_family ${cfg.font.name} ${optionalString (cfg.font.size != null) @@ -213,16 +245,17 @@ in { (optionalString (cfg.themeFile != null) '' include ${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf '') - '' + (optionalString (cfg.shellIntegration.mode != null) '' # Shell integration is sourced and configured manually shell_integration ${cfg.shellIntegration.mode} - '' + '') (toKittyConfig cfg.settings) + (toKittyActionAliases cfg.actionAliases) (toKittyKeybindings cfg.keybindings) (toKittyEnv cfg.environment) cfg.extraConfig ]; - } // optionalAttrs pkgs.stdenv.hostPlatform.isLinux { + } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { onChange = '' ${pkgs.procps}/bin/pkill -USR1 -u $USER kitty || true ''; @@ -231,7 +264,7 @@ in { home.activation.checkKittyTheme = mkIf (cfg.themeFile != null) (let themePath = "${pkgs.kitty-themes}/share/kitty-themes/themes/${cfg.themeFile}.conf"; - in hm.dag.entryBefore [ "writeBoundary" ] '' + in lib.hm.dag.entryBefore [ "writeBoundary" ] '' if [[ ! -f "${themePath}" ]]; then errorEcho "kitty-themes does not contain the theme file ${themePath}!" exit 1 @@ -240,7 +273,7 @@ in { xdg.configFile."kitty/macos-launch-services-cmdline" = mkIf (cfg.darwinLaunchOptions != null && pkgs.stdenv.hostPlatform.isDarwin) { - text = concatStringsSep " " cfg.darwinLaunchOptions; + text = lib.concatStringsSep " " cfg.darwinLaunchOptions; }; programs.bash.initExtra = diff --git a/modules/programs/kubecolor.nix b/modules/programs/kubecolor.nix index d187c34d0..bf22232f1 100644 --- a/modules/programs/kubecolor.nix +++ b/modules/programs/kubecolor.nix @@ -55,7 +55,13 @@ in { "kube/color.yaml"; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + warnings = optional (cfg.package == null && cfg.plugins != [ ]) '' + You have configured `enableAlias` for `kubecolor` but have not set `package`. + + The alias will not be created. + ''; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.sessionVariables = if preferXdgDirectories then { KUBECOLOR_CONFIG = "${config.xdg.configHome}/${configPathSuffix}"; @@ -81,7 +87,8 @@ in { }; }; - home.shellAliases = - lib.mkIf cfg.enableAlias { kubectl = lib.getExe cfg.package; }; + home.shellAliases = lib.mkIf (cfg.enableAlias && (cfg.package != null)) { + kubectl = lib.getExe cfg.package; + }; }; } diff --git a/modules/programs/lapce.nix b/modules/programs/lapce.nix new file mode 100644 index 000000000..baf6f2404 --- /dev/null +++ b/modules/programs/lapce.nix @@ -0,0 +1,187 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.lapce; + + options = { + enable = mkEnableOption "lapce"; + package = mkPackageOption pkgs "lapce" { nullable = true; }; + channel = mkOption { + type = types.enum [ "stable" "nightly" ]; + default = "stable"; + description = '' + Lapce channel to configure. + Should correspond to the package channel. + This is used to determine the correct configuration and data directories. + ''; + }; + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = '' + Configuration written to {file}`$XDG_CONFIG_HOME/lapce/settings.toml`. + See for schema. + ''; + example = literalExpression '' + { + core = { + custom-titlebar = false; + color-theme = "Custom"; + icon-theme = "Material Icons"; + }; + editor = { + font-family = "FiraCode Nerd Bold Font, monospace"; + font-size = 22; + tab-width = 2; + cursor-surrounding-lines = 4; + render-whitespace = "all"; + bracket-pair-colorization = true; + highlight-matching-brackets = true; + }; + ui = { + font-size = 20; + open-editors-visible = false; + }; + lapce-nix.lsp-path = "$\{pkgs.nil\}/bin/nil"; + } + ''; + }; + plugins = mkOption { + type = types.listOf (types.submodule { + options = { + author = mkOption { + type = types.str; + description = '' + Author of the plugin. + ''; + }; + name = mkOption { + type = types.str; + description = '' + Name of the plugin. + ''; + }; + version = mkOption { + type = types.str; + description = '' + Version of the plugin. + ''; + }; + hash = mkOption { + type = types.str; + description = '' + Hash of the plugin tarball. + To find the hash leave this empty, rebuild and copy the hash from the error message. + ''; + default = ""; + }; + }; + }); + default = [ ]; + description = '' + Plugins to install. + ''; + example = literalExpression '' + [ + { + author = "MrFoxPro"; + name = "lapce-nix"; + version = "0.0.1"; + hash = "sha256-..."; + } + { + author = "dzhou121"; + name = "lapce-rust"; + version = "0.3.1932"; + hash = "sha256-..."; + } + ] + ''; + }; + keymaps = mkOption { + type = settingsFormat.type; + default = [ ]; + description = '' + Keymaps written to {file}`$XDG_CONFIG_HOME/lapce/keymaps.toml`. + See for examples. + ''; + example = literalExpression '' + [ + { + command = "open_log_file"; + key = "Ctrl+Shift+L"; + } + ] + ''; + }; + }; + + settingsFormat = pkgs.formats.toml { }; + + fetchPluginTarballFromRegistry = { author, name, version, hash }: + pkgs.stdenvNoCC.mkDerivation (let + url = + "https://plugins.lapce.dev/api/v1/plugins/${author}/${name}/${version}/download"; + file = "lapce-plugin-${author}-${name}-${version}.tar.zstd"; + in { + name = file; + nativeBuildInputs = [ pkgs.curl pkgs.cacert ]; + dontUnpack = true; + dontBuild = true; + installPhase = '' + runHook preInstall + + url="$(curl ${url})" + curl -L "$url" -o "$out" + + runHook postInstall + ''; + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputHash = hash; + inherit meta; + }); + pluginFromRegistry = { author, name, version, hash }@args: + pkgs.stdenvNoCC.mkDerivation { + pname = "lapce-plugin-${author}-${name}"; + inherit version; + src = fetchPluginTarballFromRegistry args; + nativeBuildInputs = [ pkgs.zstd ]; + phases = [ "installPhase" ]; + installPhase = '' + runHook preInstall + + mkdir -p $out + tar -C $out -xvf $src + + runHook postInstall + ''; + }; + pluginsFromRegistry = plugins: + pkgs.linkFarm "lapce-plugins" (builtins.listToAttrs (builtins.map + ({ author, name, version, ... }@plugin: { + name = "${author}-${name}-${version}"; + value = pluginFromRegistry plugin; + }) plugins)); +in { + meta.maintainers = [ hm.maintainers.timon-schelling ]; + + options.programs.lapce = options; + + config = mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + xdg = let dir = "lapce-${cfg.channel}"; + in { + configFile = { + "${dir}/settings.toml".source = + settingsFormat.generate "settings.toml" cfg.settings; + "${dir}/keymaps.toml".source = + settingsFormat.generate "keymaps.toml" { keymaps = cfg.keymaps; }; + }; + dataFile."${dir}/plugins".source = pluginsFromRegistry cfg.plugins; + }; + }; +} diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix index 0102a22cc..0c355c6dc 100644 --- a/modules/programs/lazygit.nix +++ b/modules/programs/lazygit.nix @@ -11,12 +11,12 @@ let inherit (pkgs.stdenv.hostPlatform) isDarwin; in { - meta.maintainers = [ hm.maintainers.kalhauge ]; + meta.maintainers = [ lib.hm.maintainers.kalhauge lib.maintainers.khaneliman ]; options.programs.lazygit = { enable = mkEnableOption "lazygit, a simple terminal UI for git commands"; - package = mkPackageOption pkgs "lazygit" { }; + package = mkPackageOption pkgs "lazygit" { nullable = true; }; settings = mkOption { type = yamlFormat.type; @@ -45,7 +45,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."Library/Application Support/lazygit/config.yml" = mkIf (cfg.settings != { } && (isDarwin && !config.xdg.enable)) { diff --git a/modules/programs/ledger.nix b/modules/programs/ledger.nix index 1b9178d15..441fc1574 100644 --- a/modules/programs/ledger.nix +++ b/modules/programs/ledger.nix @@ -21,7 +21,7 @@ in { options.programs.ledger = { enable = mkEnableOption "ledger, a double-entry accounting system"; - package = mkPackageOption pkgs "ledger" { }; + package = mkPackageOption pkgs "ledger" { nullable = true; }; settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); @@ -59,7 +59,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."ledger/ledgerrc" = mkIf (cfg.settings != { } || cfg.extraConfig != "") { diff --git a/modules/programs/librewolf.nix b/modules/programs/librewolf.nix index 7363d9e53..86f640c81 100644 --- a/modules/programs/librewolf.nix +++ b/modules/programs/librewolf.nix @@ -29,12 +29,8 @@ in { wrappedPackageName = "librewolf"; unwrappedPackageName = "librewolf-unwrapped"; - platforms.linux = { - vendorPath = ".librewolf"; - configPath = ".librewolf"; - }; + platforms.linux = { configPath = ".librewolf"; }; platforms.darwin = { - vendorPath = "Library/Application Support/LibreWolf"; configPath = "Library/Application Support/LibreWolf"; }; @@ -61,11 +57,6 @@ in { }; config = mkIf cfg.enable { - assertions = [ - (lib.hm.assertions.assertPlatform "programs.librewolf" pkgs - lib.platforms.linux) - ]; - home.file.".librewolf/librewolf.overrides.cfg" = lib.mkIf (cfg.settings != { }) { text = mkOverridesFile cfg.settings; }; }; diff --git a/modules/programs/looking-glass-client.nix b/modules/programs/looking-glass-client.nix index 1c14282b9..c17802441 100644 --- a/modules/programs/looking-glass-client.nix +++ b/modules/programs/looking-glass-client.nix @@ -11,7 +11,7 @@ in { options.programs.looking-glass-client = { enable = mkEnableOption "looking-glass-client"; - package = mkPackageOption pkgs "looking-glass-client" { }; + package = mkPackageOption pkgs "looking-glass-client" { nullable = true; }; settings = mkOption { type = settingsFormat.type; @@ -50,7 +50,7 @@ in { platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."looking-glass/client.ini" = mkIf (cfg.settings != { }) { source = diff --git a/modules/programs/lsd.nix b/modules/programs/lsd.nix index 0053a494f..fecff3c6e 100644 --- a/modules/programs/lsd.nix +++ b/modules/programs/lsd.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.lsd; @@ -21,17 +19,17 @@ in { meta.maintainers = [ ]; options.programs.lsd = { - enable = mkEnableOption "lsd"; + enable = lib.mkEnableOption "lsd"; - enableAliases = mkOption { + enableAliases = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable recommended lsd aliases. ''; }; - settings = mkOption { + settings = lib.mkOption { type = yamlFormat.type; default = { }; example = { @@ -46,7 +44,7 @@ in { ''; }; - colors = mkOption { + colors = lib.mkOption { type = yamlFormat.type; default = { }; example = { @@ -65,33 +63,61 @@ in { automatically set to `"custom"`. ''; }; + + icons = lib.mkOption { + type = yamlFormat.type; + default = { }; + example = { + name = { + ".trash" = ""; + ".cargo" = ""; + }; + extension = { + "go" = ""; + "hs" = ""; + }; + filetype = { + "dir" = "📂"; + "file" = "📄"; + }; + }; + description = '' + Configuration written to {file}`$XDG_CONFIG_HOME/lsd/icons.yaml`. See + for + details. + ''; + }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { home.packages = [ pkgs.lsd ]; - programs.bash.shellAliases = mkIf cfg.enableAliases aliases; + programs.bash.shellAliases = lib.mkIf cfg.enableAliases aliases; - programs.zsh.shellAliases = mkIf cfg.enableAliases aliases; + programs.zsh.shellAliases = lib.mkIf cfg.enableAliases aliases; - programs.fish = mkMerge [ - (mkIf (!config.programs.fish.preferAbbrs) { - shellAliases = mkIf cfg.enableAliases aliases; + programs.fish = lib.mkMerge [ + (lib.mkIf (!config.programs.fish.preferAbbrs) { + shellAliases = lib.mkIf cfg.enableAliases aliases; }) - (mkIf config.programs.fish.preferAbbrs { - shellAbbrs = mkIf cfg.enableAliases aliases; + (lib.mkIf config.programs.fish.preferAbbrs { + shellAbbrs = lib.mkIf cfg.enableAliases aliases; }) ]; programs.lsd = - mkIf (cfg.colors != { }) { settings.color.theme = "custom"; }; + lib.mkIf (cfg.colors != { }) { settings.color.theme = "custom"; }; - xdg.configFile."lsd/colors.yaml" = mkIf (cfg.colors != { }) { + xdg.configFile."lsd/colors.yaml" = lib.mkIf (cfg.colors != { }) { source = yamlFormat.generate "lsd-colors" cfg.colors; }; - xdg.configFile."lsd/config.yaml" = mkIf (cfg.settings != { }) { + xdg.configFile."lsd/icons.yaml" = lib.mkIf (cfg.icons != { }) { + source = yamlFormat.generate "lsd-icons" cfg.icons; + }; + + xdg.configFile."lsd/config.yaml" = lib.mkIf (cfg.settings != { }) { source = yamlFormat.generate "lsd-config" cfg.settings; }; }; diff --git a/modules/programs/mangohud.nix b/modules/programs/mangohud.nix index a62587a2d..035a4744b 100644 --- a/modules/programs/mangohud.nix +++ b/modules/programs/mangohud.nix @@ -13,7 +13,7 @@ let int = toString option; float = int; path = int; - bool = "false"; + bool = "0"; # "on/off" opts are disabled with `=0` string = option; list = concatStringsSep "," (lists.forEach option (x: toString x)); }.${builtins.typeOf option}; diff --git a/modules/programs/mbsync.nix b/modules/programs/mbsync.nix index 00371b7f1..f9dffd2f4 100644 --- a/modules/programs/mbsync.nix +++ b/modules/programs/mbsync.nix @@ -288,7 +288,8 @@ in { createMaildir = hm.dag.entryBetween [ "linkGeneration" ] [ "writeBoundary" ] '' run mkdir -m700 -p $VERBOSE_ARG ${ - concatMapStringsSep " " (a: a.maildir.absPath) mbsyncAccounts + concatMapStringsSep " " (a: escapeShellArg a.maildir.absPath) + mbsyncAccounts } ''; }; diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly.nix index d0dddba21..cf115129d 100644 --- a/modules/programs/mcfly.nix +++ b/modules/programs/mcfly.nix @@ -109,29 +109,14 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable (mkMerge [ diff --git a/modules/programs/micro.nix b/modules/programs/micro.nix index bf34f8e62..acd768679 100644 --- a/modules/programs/micro.nix +++ b/modules/programs/micro.nix @@ -15,7 +15,7 @@ in { programs.micro = { enable = mkEnableOption "micro, a terminal-based text editor"; - package = mkPackageOption pkgs "micro" { }; + package = mkPackageOption pkgs "micro" { nullable = true; }; settings = mkOption { type = jsonFormat.type; @@ -37,7 +37,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."micro/settings.json".source = jsonFormat.generate "micro-settings" cfg.settings; diff --git a/modules/programs/mise.nix b/modules/programs/mise.nix index 404f1bf9c..3ab263526 100644 --- a/modules/programs/mise.nix +++ b/modules/programs/mise.nix @@ -21,6 +21,7 @@ in { "enableBashIntegration" "enableZshIntegration" "enableFishIntegration" + "enableNushellIntegration" "settings" ]; @@ -28,19 +29,19 @@ in { programs.mise = { enable = mkEnableOption "mise"; - package = mkPackageOption pkgs "mise" { }; + package = mkPackageOption pkgs "mise" { nullable = true; }; - enableBashIntegration = mkEnableOption "Bash Integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh Integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish Integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; + + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; globalConfig = mkOption { type = tomlFormat.type; @@ -82,7 +83,15 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + warnings = optional (cfg.package == null && (cfg.enableBashIntegration + || cfg.enableZshIntegration || cfg.enableFishIntegration + || cfg.enableNushellIntegration)) '' + You have enabled shell integration for `mise` but have not set `package`. + + The shell integration will not be added. + ''; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = { "mise/config.toml" = mkIf (cfg.globalConfig != { }) { @@ -106,6 +115,16 @@ in { fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' ${getExe cfg.package} activate fish | source ''; + + nushell = mkIf cfg.enableNushellIntegration { + extraEnv = '' + let mise_path = $nu.default-config-dir | path join mise.nu + ^mise activate nu | save $mise_path --force + ''; + extraConfig = '' + use ($nu.default-config-dir | path join mise.nu) + ''; + }; }; }; } diff --git a/modules/programs/mods.nix b/modules/programs/mods.nix new file mode 100644 index 000000000..95e5559bc --- /dev/null +++ b/modules/programs/mods.nix @@ -0,0 +1,77 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.programs.mods; + yamlFormat = pkgs.formats.yaml { }; +in { + meta.maintainers = [ hm.maintainers.ipsavitsky ]; + + options.programs.mods = { + enable = mkEnableOption "mods"; + + package = mkOption { + type = types.package; + default = pkgs.mods; + defaultText = literalExpression "pkgs.mods"; + description = "The mods package to install"; + }; + + settings = mkOption { + type = yamlFormat.type; + default = { }; + example = '' + { + default-model = "llama3.2"; + apis = { + ollama = { + base-url = "http://localhost:11434/api"; + models = { + "llama3.2" = { + max-input-chars = 650000; + }; + }; + }; + }; + } + ''; + description = '' + Configuration written to + {file}`$XDG_CONFIG_HOME/mods/mods.yml`. + + See for the full + list of options. + ''; + }; + + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; + + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; + + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; + }; + + config = mkIf cfg.enable { + home.packages = [ cfg.package ]; + + xdg.configFile."mods/mods.yml" = mkIf (cfg.settings != { }) { + source = yamlFormat.generate "mods.yml" cfg.settings; + }; + + programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 200 '' + source <(${cfg.package}/bin/mods completion bash) + ''); + + programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 '' + source <(${cfg.package}/bin/mods completion zsh) + ''); + + programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration + (mkOrder 200 '' + ${cfg.package}/bin/mods completion fish | source + ''); + }; +} diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix index f2664e71a..b62208763 100644 --- a/modules/programs/mpv.nix +++ b/modules/programs/mpv.nix @@ -55,10 +55,8 @@ let mpvPackage = if cfg.scripts == [ ] then cfg.package - else if hasAttr "wrapMpv" pkgs then - pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; } else - pkgs.mpv.override { scripts = cfg.scripts; }; + pkgs.mpv.override { inherit (cfg) scripts; }; in { options = { @@ -69,7 +67,7 @@ in { type = types.package; default = pkgs.mpv; example = literalExpression - "pkgs.wrapMpv (pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }) { youtubeSupport = true; }"; + "pkgs.mpv-unwrapped.wrapper { mpv = pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }; youtubeSupport = true; }"; description = '' Package providing mpv. ''; @@ -130,6 +128,19 @@ in { ''; }; + includes = mkOption { + type = types.listOf types.str; + default = [ ]; + example = literalExpression '' + [ + "~/path/to/config.inc"; + "~/path/to/conditional.inc"; + ] + ''; + description = + "List of configuration files to include at the end of mpv.conf."; + }; + profiles = mkOption { description = '' Sub-configuration options for specific profiles written to @@ -207,6 +218,14 @@ in { home.packages = [ mpvPackage ]; programs.mpv.finalPackage = mpvPackage; } + + (mkIf (cfg.includes != [ ]) { + xdg.configFile."mpv/mpv.conf" = { + text = lib.mkAfter + (concatMapStringsSep "\n" (x: "include=${x}") cfg.includes); + }; + }) + (mkIf (cfg.config != { } || cfg.profiles != { }) { xdg.configFile."mpv/mpv.conf".text = '' ${optionalString (cfg.defaultProfiles != [ ]) diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix index 507189769..140aff32d 100644 --- a/modules/programs/mr.nix +++ b/modules/programs/mr.nix @@ -17,7 +17,7 @@ in { enable = mkEnableOption "mr, a tool to manage all your version control repositories"; - package = mkPackageOption pkgs "mr" { }; + package = mkPackageOption pkgs "mr" { nullable = true; }; settings = mkOption { type = iniFormat.type; @@ -42,7 +42,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file.".mrconfig".source = iniFormat.generate ".mrconfig" cfg.settings; }; } diff --git a/modules/programs/mu.nix b/modules/programs/mu.nix index d1543f000..fdb85f85a 100644 --- a/modules/programs/mu.nix +++ b/modules/programs/mu.nix @@ -16,7 +16,8 @@ let filter (a: a.mu.enable) (attrValues config.accounts.email.accounts); addrs = map (a: a.address) muAccounts; # Construct list of lists containing email aliases, and flatten - aliases = flatten (map (a: a.aliases) muAccounts); + aliases = map (alias: alias.address or alias) + (flatten (map (a: a.aliases) muAccounts)); # Sort the list in sort lessThan (addrs ++ aliases); @@ -36,6 +37,16 @@ in { package = mkPackageOption pkgs "mu" { }; + home = mkOption { + type = types.path; + default = config.xdg.cacheHome + "/mu"; + defaultText = literalExpression ''config.xdg.cacheHome + "/mu"''; + example = "\${config.home.homeDirectory}/Maildir/.mu"; + description = '' + Directory to store Mu's database. + ''; + }; + # No options/config file present for mu, and program author will not be # adding one soon. See https://github.com/djcb/mu/issues/882 for more # information about this. @@ -51,9 +62,10 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; + home.sessionVariables.MUHOME = cfg.home; + home.activation.runMuInit = let maildirOption = genCmdMaildir config.accounts.email.maildirBasePath; - dbLocation = config.xdg.cacheHome + "/mu"; muExe = getExe cfg.package; gawkExe = getExe pkgs.gawk; in hm.dag.entryAfter [ "writeBoundary" ] '' @@ -62,10 +74,12 @@ in { # In theory, mu is the only thing that creates that directory, and it is # only created during the initial index. MU_SORTED_ADDRS=$((${muExe} info store | ${gawkExe} '/personal-address/{print $4}' | LC_ALL=C sort | paste -sd ' ') || exit 0) - if [[ ! -d "${dbLocation}" || ! "$MU_SORTED_ADDRS" = "${ + if [[ ! -d "${cfg.home}" || ! "$MU_SORTED_ADDRS" = "${ concatStringsSep " " sortedAddresses }" ]]; then - run ${muExe} init ${maildirOption} ${myAddresses} $VERBOSE_ARG; + run ${muExe} init ${maildirOption} --muhome "${ + escapeShellArg cfg.home + }" ${myAddresses} $VERBOSE_ARG; fi ''; }; diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix index aff50b5c7..e8399fd1c 100644 --- a/modules/programs/navi.nix +++ b/modules/programs/navi.nix @@ -7,7 +7,7 @@ let yamlFormat = pkgs.formats.yaml { }; - configDir = if pkgs.stdenv.isDarwin then + configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then "Library/Application Support" else config.xdg.configHome; @@ -47,17 +47,14 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix index b513939df..13ee897f1 100644 --- a/modules/programs/neomutt.nix +++ b/modules/programs/neomutt.nix @@ -123,7 +123,7 @@ let "smime" ]; in with types; either (enum menus) (listOf (enum menus)); - default = "index"; + default = [ "index" ]; description = "Select the menu to bind the command to."; }; diff --git a/modules/programs/neovide.nix b/modules/programs/neovide.nix index 3b40fb3eb..74d1a8e7b 100644 --- a/modules/programs/neovide.nix +++ b/modules/programs/neovide.nix @@ -11,7 +11,7 @@ in { options.programs.neovide = { enable = lib.mkEnableOption "Neovide, No Nonsense Neovim Client in Rust"; - package = lib.mkPackageOption pkgs "neovide" { }; + package = lib.mkPackageOption pkgs "neovide" { nullable = true; }; settings = lib.mkOption { type = settingsFormat.type; @@ -45,7 +45,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."neovide/config.toml".source = settingsFormat.generate "config.toml" cfg.settings; }; diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix index e8be25f92..af7a1a1f0 100644 --- a/modules/programs/neovim.nix +++ b/modules/programs/neovim.nix @@ -1,8 +1,8 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + literalExpression mkEnableOption mkIf mkOption mkRemovedOptionModule types; cfg = config.programs.neovim; @@ -55,7 +55,7 @@ let }; }; - allPlugins = cfg.plugins ++ optional cfg.coc.enable { + allPlugins = cfg.plugins ++ lib.optional cfg.coc.enable { type = "viml"; plugin = cfg.coc.package; config = cfg.coc.pluginConfig; @@ -95,6 +95,8 @@ in { '') ]; + meta.maintainers = with lib.maintainers; [ khaneliman ]; + options = { programs.neovim = { enable = mkEnableOption "Neovim"; @@ -153,15 +155,14 @@ in { # In case we get a plain list, we need to turn it into a function, # as expected by the function in nixpkgs. # The only way to do so is to call `const`, which will ignore its input. - type = with types; - let fromType = listOf package; - in coercedTo fromType (flip warn const '' - Assigning a plain list to extraPython3Packages is deprecated. - Please assign a function taking a package set as argument, so - extraPython3Packages = [ pkgs.python3Packages.xxx ]; - should become - extraPython3Packages = ps: [ ps.xxx ]; - '') (functionTo fromType); + type = let fromType = types.listOf types.package; + in types.coercedTo fromType (lib.flip lib.warn lib.const '' + Assigning a plain list to extraPython3Packages is deprecated. + Please assign a function taking a package set as argument, so + extraPython3Packages = [ pkgs.python3Packages.xxx ]; + should become + extraPython3Packages = ps: [ ps.xxx ]; + '') (types.functionTo fromType); default = _: [ ]; defaultText = literalExpression "ps: [ ]"; example = @@ -178,15 +179,14 @@ in { # Lua packageset to evaluate the function that this option was set to. # This ensures that we always use the same Lua version as the Neovim package. extraLuaPackages = mkOption { - type = with types; - let fromType = listOf package; - in coercedTo fromType (flip warn const '' - Assigning a plain list to extraLuaPackages is deprecated. - Please assign a function taking a package set as argument, so - extraLuaPackages = [ pkgs.lua51Packages.xxx ]; - should become - extraLuaPackages = ps: [ ps.xxx ]; - '') (functionTo fromType); + type = let fromType = types.listOf types.package; + in types.coercedTo fromType (lib.flip lib.warn lib.const '' + Assigning a plain list to extraLuaPackages is deprecated. + Please assign a function taking a package set as argument, so + extraLuaPackages = [ pkgs.lua51Packages.xxx ]; + should become + extraLuaPackages = ps: [ ps.xxx ]; + '') (types.functionTo fromType); default = _: [ ]; defaultText = literalExpression "ps: [ ]"; example = literalExpression "luaPkgs: with luaPkgs; [ luautf8 ]"; @@ -414,7 +414,7 @@ in { concatConfigs = lib.concatMapStrings (p: p.config); configsOnly = lib.foldl (acc: p: if p.config != null then acc ++ [ p.config ] else acc) [ ]; - in mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals)) + in lib.mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals)) grouped; home.packages = [ cfg.finalPackage ]; @@ -423,25 +423,24 @@ in { home.shellAliases = mkIf cfg.vimdiffAlias { vimdiff = "nvim -d"; }; - xdg.configFile = - let hasLuaConfig = hasAttr "lua" config.programs.neovim.generatedConfigs; - in mkMerge ( - # writes runtime - (map (x: x.runtime) pluginsNormalized) ++ [{ - "nvim/init.lua" = let - luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "") - "vim.cmd [[source ${ - pkgs.writeText "nvim-init-home-manager.vim" - wrappedNeovim'.initRc - }]]" + config.programs.neovim.extraLuaConfig - + lib.optionalString hasLuaConfig - config.programs.neovim.generatedConfigs.lua; - in mkIf (luaRcContent != "") { text = luaRcContent; }; + xdg.configFile = let + hasLuaConfig = lib.hasAttr "lua" config.programs.neovim.generatedConfigs; + in lib.mkMerge ( + # writes runtime + (map (x: x.runtime) pluginsNormalized) ++ [{ + "nvim/init.lua" = let + luaRcContent = lib.optionalString (wrappedNeovim'.initRc != "") + "vim.cmd [[source ${ + pkgs.writeText "nvim-init-home-manager.vim" wrappedNeovim'.initRc + }]]" + config.programs.neovim.extraLuaConfig + + lib.optionalString hasLuaConfig + config.programs.neovim.generatedConfigs.lua; + in mkIf (luaRcContent != "") { text = luaRcContent; }; - "nvim/coc-settings.json" = mkIf cfg.coc.enable { - source = jsonFormat.generate "coc-settings.json" cfg.coc.settings; - }; - }]); + "nvim/coc-settings.json" = mkIf cfg.coc.enable { + source = jsonFormat.generate "coc-settings.json" cfg.coc.settings; + }; + }]); programs.neovim.finalPackage = wrappedNeovim'; }; diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix index a5e8dcfaf..7e6e993fd 100644 --- a/modules/programs/nh.nix +++ b/modules/programs/nh.nix @@ -13,7 +13,7 @@ in { package = lib.mkPackageOption pkgs "nh" { }; flake = lib.mkOption { - type = lib.types.nullOr lib.types.path; + type = lib.types.nullOr lib.types.singleLineStr; default = null; description = '' The path that will be used for the {env}`FLAKE` environment variable. @@ -52,15 +52,11 @@ in { }; config = { - warnings = lib.optionals (!(cfg.clean.enable -> !osConfig.nix.gc.automatic)) - [ - "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict." - ]; - - assertions = [{ - assertion = (cfg.flake != null) -> !(lib.hasSuffix ".nix" cfg.flake); - message = "nh.flake must be a directory, not a nix file"; - }]; + warnings = (lib.optional + (cfg.clean.enable && osConfig != null && osConfig.nix.gc.automatic) + "programs.nh.clean.enable and nix.gc.automatic (system-wide in configuration.nix) are both enabled. Please use one or the other to avoid conflict.") + ++ (lib.optional (cfg.clean.enable && config.nix.gc.automatic) + "programs.nh.clean.enable and nix.gc.automatic (Home-Manager) are both enabled. Please use one or the other to avoid conflict."); home = lib.mkIf cfg.enable { packages = [ cfg.package ]; @@ -74,8 +70,7 @@ in { Service = { Type = "oneshot"; ExecStart = - "exec ${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}"; - Environment = "PATH=$PATH:${config.nix.package}"; + "${lib.getExe cfg.package} clean user ${cfg.clean.extraArgs}"; }; }; diff --git a/modules/programs/nheko.nix b/modules/programs/nheko.nix index 1bf1ae706..0e858b30e 100644 --- a/modules/programs/nheko.nix +++ b/modules/programs/nheko.nix @@ -24,7 +24,7 @@ in { options.programs.nheko = { enable = mkEnableOption "Qt desktop client for Matrix"; - package = mkPackageOption pkgs "nheko" { }; + package = mkPackageOption pkgs "nheko" { nullable = true; }; settings = mkOption { type = iniFmt.type; @@ -64,7 +64,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${configDir}/nheko/nheko.conf" = mkIf (cfg.settings != { }) { text = '' diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix index cdf3151c6..f483cd2bc 100644 --- a/modules/programs/nix-index.nix +++ b/modules/programs/nix-index.nix @@ -1,7 +1,8 @@ { config, lib, pkgs, ... }: let cfg = config.programs.nix-index; in { - meta.maintainers = with lib.hm.maintainers; [ ambroisie ]; + meta.maintainers = + [ lib.hm.maintainers.ambroisie lib.maintainers.khaneliman ]; options.programs.nix-index = with lib; { enable = mkEnableOption "nix-index, a file database for nixpkgs"; @@ -13,17 +14,14 @@ in { description = "Package providing the {command}`nix-index` tool."; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = lib.mkIf cfg.enable { diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell.nix index 20b5fd19e..adace4e15 100644 --- a/modules/programs/nix-your-shell.nix +++ b/modules/programs/nix-your-shell.nix @@ -16,17 +16,14 @@ in { package = mkPackageOption pkgs "nix-your-shell" { }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix index a3d679b23..071f08558 100644 --- a/modules/programs/notmuch.nix +++ b/modules/programs/notmuch.nix @@ -37,8 +37,9 @@ let in { name = catAttrs "realName" primary; primary_email = catAttrs "address" primary; - other_email = catAttrs "aliases" primary ++ catAttrs "address" secondaries - ++ catAttrs "aliases" secondaries; + other_email = map (email: email.address or email) (flatten + (catAttrs "aliases" primary ++ catAttrs "address" secondaries + ++ catAttrs "aliases" secondaries)); }; search = { exclude_tags = cfg.search.excludeTags; }; diff --git a/modules/programs/nushell.nix b/modules/programs/nushell.nix index ec00210af..f18f6abff 100644 --- a/modules/programs/nushell.nix +++ b/modules/programs/nushell.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: - -with lib; - let - + inherit (lib) types; + inherit (lib.hm.nushell) isNushellInline toNushell; cfg = config.programs.nushell; configDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then @@ -14,13 +12,13 @@ let linesOrSource = name: types.submodule ({ config, ... }: { options = { - text = mkOption { + text = lib.mkOption { type = types.lines; default = if config.source != null then builtins.readFile config.source else ""; - defaultText = literalExpression + defaultText = lib.literalExpression "if source is defined, the content of source, otherwise empty"; description = '' Text of the nushell {file}`${name}` file. @@ -28,7 +26,7 @@ let ''; }; - source = mkOption { + source = lib.mkOption { type = types.nullOr types.path; default = null; description = '' @@ -39,39 +37,29 @@ let }; }); in { - meta.maintainers = - [ maintainers.Philipp-M maintainers.joaquintrinanes maintainers.aidalgol ]; - - imports = [ - (mkRemovedOptionModule [ "programs" "nushell" "settings" ] '' - Please use - - 'programs.nushell.configFile' and 'programs.nushell.envFile' - - instead. - '') + meta.maintainers = with lib.maintainers; [ + Philipp-M + joaquintrinanes + aidalgol ]; options.programs.nushell = { - enable = mkEnableOption "nushell"; + enable = lib.mkEnableOption "nushell"; - package = mkOption { - type = types.package; - default = pkgs.nushell; - defaultText = literalExpression "pkgs.nushell"; - description = "The package to use for nushell."; - }; + package = lib.mkPackageOption pkgs "nushell" { nullable = true; }; - configFile = mkOption { + configFile = lib.mkOption { type = types.nullOr (linesOrSource "config.nu"); default = null; - example = literalExpression '' - { text = ''' - let $config = { - filesize_metric: false - table_mode: rounded - use_ls_colors: true + example = lib.literalExpression '' + { + text = ''' + const NU_LIB_DIRS = $NU_LIB_DIRS ++ ''${ + lib.hm.nushell.toNushell (lib.concatStringsSep ":" [ ./scripts ]) } + $env.config.filesize_metric = false + $env.config.table_mode = 'rounded' + $env.config.use_ls_colors = true '''; } ''; @@ -82,7 +70,7 @@ in { ''; }; - envFile = mkOption { + envFile = lib.mkOption { type = types.nullOr (linesOrSource "env.nu"); default = null; example = '' @@ -95,7 +83,7 @@ in { ''; }; - loginFile = mkOption { + loginFile = lib.mkOption { type = types.nullOr (linesOrSource "login.nu"); default = null; example = '' @@ -111,7 +99,7 @@ in { ''; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { type = types.lines; default = ""; description = '' @@ -119,7 +107,7 @@ in { ''; }; - extraEnv = mkOption { + extraEnv = lib.mkOption { type = types.lines; default = ""; description = '' @@ -127,7 +115,7 @@ in { ''; }; - extraLogin = mkOption { + extraLogin = lib.mkOption { type = types.lines; default = ""; description = '' @@ -135,7 +123,7 @@ in { ''; }; - plugins = mkOption { + plugins = lib.mkOption { type = types.listOf types.package; default = [ ]; example = lib.literalExpression "[ pkgs.nushellPlugins.formats ]"; @@ -144,24 +132,55 @@ in { ''; }; - shellAliases = mkOption { + settings = lib.mkOption { + type = types.attrsOf lib.hm.types.nushellValue; + default = { }; + example = { + show_banner = false; + history.format = "sqlite"; + }; + description = '' + Nushell settings. These will be flattened and assigned one by one to `$env.config` to avoid overwriting the default or existing options. + + For example: + ```nix + { + show_banner = false; + completions.external = { + enable = true; + max_results = 200; + }; + } + ``` + becomes: + ```nushell + $env.config.completions.external.enable = true + $env.config.completions.external.max_results = 200 + $env.config.show_banner = false + ``` + ''; + }; + + shellAliases = lib.mkOption { type = types.attrsOf types.str; default = { }; - example = { ll = "ls -l"; }; + example = { + ll = "ls -l"; + g = "git"; + }; description = '' An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. ''; }; - environmentVariables = mkOption { - type = types.attrsOf hm.types.nushellValue; + environmentVariables = lib.mkOption { + type = types.attrsOf lib.hm.types.nushellValue; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { FOO = "BAR"; LIST_VALUE = [ "foo" "bar" ]; - NU_LIB_DIRS = lib.concatStringsSep ":" [ ./scripts ]; PROMPT_COMMAND = lib.hm.nushell.mkNushellInline '''{|| "> "}'''; ENV_CONVERSIONS.PATH = { from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }"; @@ -177,39 +196,63 @@ in { }; }; - config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + config = lib.mkIf cfg.enable { + warnings = lib.optional (cfg.package == null && cfg.plugins != [ ]) '' + You have configured `plugins` for `nushell` but have not set `package`. - home.file = mkMerge [ + The listed plugins will not be installed. + ''; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + home.file = lib.mkMerge [ (let writeConfig = cfg.configFile != null || cfg.extraConfig != "" - || aliasesStr != ""; + || aliasesStr != "" || cfg.settings != { }; - aliasesStr = concatStringsSep "\n" - (mapAttrsToList (k: v: "alias ${k} = ${v}") cfg.shellAliases); - in mkIf writeConfig { - "${configDir}/config.nu".text = mkMerge [ - (mkIf (cfg.configFile != null) cfg.configFile.text) + aliasesStr = lib.concatLines + (lib.mapAttrsToList (k: v: "alias ${toNushell { } k} = ${v}") + cfg.shellAliases); + in lib.mkIf writeConfig { + "${configDir}/config.nu".text = lib.mkMerge [ + (let + hasEnvVars = cfg.environmentVariables != { }; + envVarsStr = '' + load-env ${toNushell { } cfg.environmentVariables} + ''; + in lib.mkIf hasEnvVars envVarsStr) + (let + flattenSettings = let + joinDot = a: b: "${if a == "" then "" else "${a}."}${b}"; + unravel = prefix: value: + if lib.isAttrs value && !isNushellInline value then + lib.concatMap (key: unravel (joinDot prefix key) value.${key}) + (builtins.attrNames value) + else + [ (lib.nameValuePair prefix value) ]; + in unravel ""; + mkLine = { name, value }: '' + $env.config.${name} = ${toNushell { } value} + ''; + settingsLines = + lib.concatMapStrings mkLine (flattenSettings cfg.settings); + + in lib.mkIf (cfg.settings != { }) settingsLines) + (lib.mkIf (cfg.configFile != null) cfg.configFile.text) cfg.extraConfig aliasesStr ]; }) - (let - hasEnvVars = cfg.environmentVariables != { }; - envVarsStr = '' - load-env ${hm.nushell.toNushell { } cfg.environmentVariables} - ''; - in mkIf (cfg.envFile != null || cfg.extraEnv != "" || hasEnvVars) { - "${configDir}/env.nu".text = mkMerge [ - (mkIf (cfg.envFile != null) cfg.envFile.text) + (lib.mkIf (cfg.envFile != null || cfg.extraEnv != "") { + "${configDir}/env.nu".text = lib.mkMerge [ + (lib.mkIf (cfg.envFile != null) cfg.envFile.text) cfg.extraEnv - envVarsStr ]; }) - (mkIf (cfg.loginFile != null || cfg.extraLogin != "") { - "${configDir}/login.nu".text = mkMerge [ - (mkIf (cfg.loginFile != null) cfg.loginFile.text) + (lib.mkIf (cfg.loginFile != null || cfg.extraLogin != "") { + "${configDir}/login.nu".text = lib.mkMerge [ + (lib.mkIf (cfg.loginFile != null) cfg.loginFile.text) cfg.extraLogin ]; }) @@ -220,11 +263,11 @@ in { ${lib.getExe cfg.package} \ --plugin-config "$out/plugin.msgpackz" \ --commands '${ - concatStringsSep "; " + lib.concatStringsSep "; " (map (plugin: "plugin add ${lib.getExe plugin}") cfg.plugins) }' ''; - in mkIf (cfg.plugins != [ ]) { + in lib.mkIf ((cfg.package != null) && (cfg.plugins != [ ])) { "${configDir}/plugin.msgpackz".source = "${msgPackz}/plugin.msgpackz"; }) ]; diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix index 8c46a1c69..be406e662 100644 --- a/modules/programs/oh-my-posh.nix +++ b/modules/programs/oh-my-posh.nix @@ -47,37 +47,17 @@ in { ''; }; - enableBashIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Fish integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/opam.nix b/modules/programs/opam.nix index 34338514a..6027737cd 100644 --- a/modules/programs/opam.nix +++ b/modules/programs/opam.nix @@ -19,29 +19,14 @@ in { description = "Opam package to install."; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/openstackclient.nix b/modules/programs/openstackclient.nix index 98d68a2f2..c7ee7d636 100644 --- a/modules/programs/openstackclient.nix +++ b/modules/programs/openstackclient.nix @@ -9,7 +9,7 @@ in { options.programs.openstackclient = { enable = lib.mkEnableOption "OpenStack command-line client"; - package = lib.mkPackageOption pkgs "openstackclient" { }; + package = lib.mkPackageOption pkgs "openstackclient" { nullable = true; }; clouds = lib.mkOption { type = lib.types.submodule { freeformType = yamlFormat.type; }; @@ -58,7 +58,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."openstack/clouds.yaml".source = yamlFormat.generate "openstackclient-clouds-yaml-${config.home.username}" { diff --git a/modules/programs/papis.nix b/modules/programs/papis.nix index 837bfc274..1b8ae1377 100644 --- a/modules/programs/papis.nix +++ b/modules/programs/papis.nix @@ -19,7 +19,7 @@ in { options.programs.papis = { enable = mkEnableOption "papis"; - package = mkPackageOption pkgs "papis" { }; + package = mkPackageOption pkgs "papis" { nullable = true; }; settings = mkOption { type = with types; attrsOf (oneOf [ bool int str ]); @@ -86,7 +86,7 @@ in { (", namely " + concatStringsSep "," defaultLibraries); }]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."papis/config" = mkIf (cfg.libraries != { }) { text = generators.toINI { } settingsIni; }; diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects.nix index ea47bee4c..8802ad25e 100644 --- a/modules/programs/pay-respects.nix +++ b/modules/programs/pay-respects.nix @@ -12,21 +12,17 @@ in { package = mkPackageOption pkgs "pay-respects" { }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/pazi.nix b/modules/programs/pazi.nix index 9e603df23..848dfa309 100644 --- a/modules/programs/pazi.nix +++ b/modules/programs/pazi.nix @@ -12,29 +12,14 @@ in { options.programs.pazi = { enable = mkEnableOption "pazi"; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/poetry.nix b/modules/programs/poetry.nix index d297f0c78..54fa2abb3 100644 --- a/modules/programs/poetry.nix +++ b/modules/programs/poetry.nix @@ -20,6 +20,7 @@ in { enable = mkEnableOption "poetry"; package = mkPackageOption pkgs "poetry" { + nullable = true; example = "pkgs.poetry.withPlugins (ps: with ps; [ poetry-plugin-up ])"; extraDescription = "May be used to install custom poetry plugins."; }; @@ -45,7 +46,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${configDir}/pypoetry/config.toml" = lib.mkIf (cfg.settings != { }) { diff --git a/modules/programs/pyenv.nix b/modules/programs/pyenv.nix index c2273c676..1ff1f2832 100644 --- a/modules/programs/pyenv.nix +++ b/modules/programs/pyenv.nix @@ -19,29 +19,14 @@ in { description = "The package to use for pyenv."; }; - enableBashIntegration = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable pyenv's Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable pyenv's Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable pyenv's Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; rootDirectory = lib.mkOption { type = lib.types.path; diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix index e740c5602..11b48abf4 100644 --- a/modules/programs/rbenv.nix +++ b/modules/programs/rbenv.nix @@ -55,17 +55,14 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/rio.nix b/modules/programs/rio.nix index 5a5ce6fa3..927cb406b 100644 --- a/modules/programs/rio.nix +++ b/modules/programs/rio.nix @@ -12,7 +12,7 @@ in { ''; }; - package = lib.mkPackageOption pkgs "rio" { }; + package = lib.mkPackageOption pkgs "rio" { nullable = true; }; settings = lib.mkOption { type = settingsFormat.type; @@ -27,7 +27,7 @@ in { config = lib.mkIf cfg.enable (lib.mkMerge [ { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; } # Only manage configuration if not empty diff --git a/modules/programs/ripgrep.nix b/modules/programs/ripgrep.nix index cbd73bd15..3154a770d 100644 --- a/modules/programs/ripgrep.nix +++ b/modules/programs/ripgrep.nix @@ -2,17 +2,16 @@ with lib; -let - cfg = config.programs.ripgrep; - configPath = "${config.xdg.configHome}/ripgrep/ripgreprc"; +let cfg = config.programs.ripgrep; in { - meta.maintainers = [ hm.maintainers.pedorich-n ]; + meta.maintainers = + [ lib.maintainers.khaneliman lib.hm.maintainers.pedorich-n ]; options = { programs.ripgrep = { enable = mkEnableOption "Ripgrep"; - package = mkPackageOption pkgs "ripgrep" { }; + package = mkPackageOption pkgs "ripgrep" { nullable = true; }; arguments = mkOption { type = with types; listOf str; @@ -30,8 +29,9 @@ in { }; config = mkIf cfg.enable { - home = mkMerge [ - { packages = [ cfg.package ]; } + home = let configPath = "${config.xdg.configHome}/ripgrep/ripgreprc"; + in mkMerge [ + { packages = lib.mkIf (cfg.package != null) [ cfg.package ]; } (mkIf (cfg.arguments != [ ]) { file."${configPath}".text = lib.concatLines cfg.arguments; diff --git a/modules/programs/rofi-pass.nix b/modules/programs/rofi-pass.nix index f1de580fb..d5208d504 100644 --- a/modules/programs/rofi-pass.nix +++ b/modules/programs/rofi-pass.nix @@ -12,8 +12,10 @@ in { options.programs.rofi.pass = { enable = mkEnableOption "rofi integration with password-store"; - package = - mkPackageOption pkgs "rofi-pass" { example = "pkgs.rofi-pass-wayland"; }; + package = mkPackageOption pkgs "rofi-pass" { + nullable = true; + example = "pkgs.rofi-pass-wayland"; + }; stores = mkOption { type = types.listOf types.str; @@ -40,7 +42,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."rofi-pass/config".text = optionalString (cfg.stores != [ ]) ("root=" + (concatStringsSep ":" cfg.stores) + "\n") + cfg.extraConfig diff --git a/modules/programs/ruff.nix b/modules/programs/ruff.nix index e1490089a..4ae80ebda 100644 --- a/modules/programs/ruff.nix +++ b/modules/programs/ruff.nix @@ -15,7 +15,7 @@ in { enable = mkEnableOption "ruff, an extremely fast Python linter and code formatter, written in Rust"; - package = mkPackageOption pkgs "ruff" { }; + package = mkPackageOption pkgs "ruff" { nullable = true; }; settings = mkOption { type = settingsFormat.type; @@ -37,7 +37,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."ruff/ruff.toml".source = settingsFormat.generate "ruff.toml" cfg.settings; diff --git a/modules/programs/sagemath.nix b/modules/programs/sagemath.nix index 70efaca56..7d34adc49 100644 --- a/modules/programs/sagemath.nix +++ b/modules/programs/sagemath.nix @@ -12,11 +12,11 @@ in { options.programs.sagemath = { enable = mkEnableOption "SageMath, a mathematics software system"; - package = mkOption { - type = types.package; - default = pkgs.sage; - defaultText = literalExpression "pkgs.sage"; - description = "The SageMath package to use."; + package = lib.mkPackageOption pkgs "sage" { + nullable = true; + extraDescription = '' + The SageMath package to use. + ''; }; configDir = mkOption { @@ -52,9 +52,10 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${cfg.configDir}/init.sage".text = cfg.initScript; + home.sessionVariables = { DOT_SAGE = cfg.dataDir; SAGE_STARTUP_FILE = "${cfg.configDir}/init.sage"; diff --git a/modules/programs/sapling.nix b/modules/programs/sapling.nix index d2a4b4319..4e27aaa82 100644 --- a/modules/programs/sapling.nix +++ b/modules/programs/sapling.nix @@ -15,7 +15,7 @@ in { programs.sapling = { enable = mkEnableOption "Sapling"; - package = mkPackageOption pkgs "sapling" { }; + package = mkPackageOption pkgs "sapling" { nullable = true; }; userName = mkOption { type = types.str; @@ -48,7 +48,7 @@ in { config = mkIf cfg.enable (mkMerge [ { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; programs.sapling.iniContent.ui = { username = cfg.userName + " <" + cfg.userEmail + ">"; diff --git a/modules/programs/sbt.nix b/modules/programs/sbt.nix index de14bc6f3..622768298 100644 --- a/modules/programs/sbt.nix +++ b/modules/programs/sbt.nix @@ -130,6 +130,20 @@ in { ''; }; + pluginsExtra = mkOption { + type = types.listOf (types.str); + default = [ ]; + example = literalExpression '' + [ + "addDependencyTreePlugin" + ] + ''; + description = '' + A list of extra commands to put in plugins conf file. + Use it in last resort when you can't use the `plugins` option. + ''; + }; + credentials = mkOption { type = types.listOf (sbtTypes.credential); default = [ ]; @@ -183,9 +197,10 @@ in { config = mkIf cfg.enable (mkMerge [ { home.packages = [ cfg.package ]; } - (mkIf (cfg.plugins != [ ]) { + (mkIf (cfg.plugins != [ ] || cfg.pluginsExtra != [ ]) { home.file."${cfg.baseUserConfigPath}/1.0/plugins/plugins.sbt".text = - concatStrings (map renderPlugin cfg.plugins); + concatStrings (map renderPlugin cfg.plugins) + + concatStringsSep "\n" cfg.pluginsExtra + "\n"; }) (mkIf (cfg.credentials != [ ]) { diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff.nix index a85ae8d9c..f9ff922a9 100644 --- a/modules/programs/scmpuff.nix +++ b/modules/programs/scmpuff.nix @@ -16,29 +16,14 @@ in { description = "Package providing the {command}`scmpuff` tool."; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; enableAliases = mkOption { default = true; diff --git a/modules/programs/sftpman.nix b/modules/programs/sftpman.nix index c6978f80a..3a8ba5ee6 100644 --- a/modules/programs/sftpman.nix +++ b/modules/programs/sftpman.nix @@ -73,7 +73,7 @@ in { enable = mkEnableOption "sftpman, an application that handles sshfs/sftp file systems mounting"; - package = mkPackageOption pkgs "sftpman" { }; + package = mkPackageOption pkgs "sftpman" { nullable = true; }; defaultSshKey = mkOption { type = types.nullOr types.str; @@ -107,7 +107,7 @@ in { }) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = mapAttrs' (name: value: nameValuePair "sftpman/mounts/${name}.json" { diff --git a/modules/programs/skim.nix b/modules/programs/skim.nix index 2bb17d1b9..0f47a00bf 100644 --- a/modules/programs/skim.nix +++ b/modules/programs/skim.nix @@ -83,29 +83,14 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/sm64ex.nix b/modules/programs/sm64ex.nix index 23b75808f..a005484c2 100644 --- a/modules/programs/sm64ex.nix +++ b/modules/programs/sm64ex.nix @@ -34,11 +34,7 @@ in { options.programs.sm64ex = { enable = mkEnableOption "sm64ex"; - package = mkOption { - type = types.package; - default = pkgs.sm64ex; - description = "The sm64ex package to use."; - }; + package = lib.mkPackageOption pkgs "sm64ex" { nullable = true; }; region = mkOption { type = types.nullOr (types.enum [ "us" "eu" "jp" ]); @@ -120,7 +116,7 @@ in { configFile = optionals (cfg.settings != null) (concatStringsSep "\n" ((mapAttrsToList mkConfig cfg.settings))); in mkIf cfg.enable { - home.packages = [ package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.dataFile."sm64pc/sm64config.txt" = mkIf (cfg.settings != null) { text = configFile; }; diff --git a/modules/programs/spotify-player.nix b/modules/programs/spotify-player.nix index 35d3933bc..bc401fda6 100644 --- a/modules/programs/spotify-player.nix +++ b/modules/programs/spotify-player.nix @@ -13,7 +13,7 @@ in { options.programs.spotify-player = { enable = mkEnableOption "spotify-player"; - package = mkPackageOption pkgs "spotify-player" { }; + package = mkPackageOption pkgs "spotify-player" { nullable = true; }; settings = mkOption { type = tomlType; @@ -162,7 +162,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = { "spotify-player/app.toml" = mkIf (cfg.settings != { }) { diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix index 654c43fca..bb1c87b9c 100644 --- a/modules/programs/starship.nix +++ b/modules/programs/starship.nix @@ -53,25 +53,20 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableIonIntegration = + lib.hm.shell.mkIonIntegrationOption { inherit config; }; - enableIonIntegration = mkEnableOption "Ion integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; enableInteractive = mkOption { type = types.bool; diff --git a/modules/programs/swayimg.nix b/modules/programs/swayimg.nix new file mode 100644 index 000000000..aac56ece3 --- /dev/null +++ b/modules/programs/swayimg.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.swayimg; + iniFormat = pkgs.formats.ini { }; +in { + meta.maintainers = with lib.maintainers; [ dod-101 ]; + + options.programs.swayimg = { + enable = lib.mkEnableOption "swayimg"; + package = lib.mkOption { + type = lib.types.package; + default = pkgs.swayimg; + defaultText = lib.literalExpression "pkgs.swayimg"; + description = "The swayimg package to install"; + }; + settings = lib.mkOption { + type = iniFormat.type; + default = { }; + description = '' + Configuration written to + {file}`$XDG_CONFIG_HOME/swayimg/config`. See for a list of available options. + ''; + example = lib.literalExpression '' + { + viewer = { + window = "#10000010"; + scale = "fill"; + }; + "info.viewer" = { + top_left = "+name,+format"; + }; + "keys.viewer" = { + "Shift+r" = "rand_file"; + }; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "programs.swayimg" pkgs + lib.platforms.linux) + ]; + + home.packages = [ cfg.package ]; + + xdg.configFile."swayimg/config" = lib.mkIf (cfg.settings != { }) { + source = iniFormat.generate "config" cfg.settings; + }; + }; +} diff --git a/modules/programs/swaylock.nix b/modules/programs/swaylock.nix index be577ea80..dcfd30c7e 100644 --- a/modules/programs/swaylock.nix +++ b/modules/programs/swaylock.nix @@ -33,10 +33,10 @@ in { ''; }; - package = mkPackageOption pkgs "swaylock" { }; + package = mkPackageOption pkgs "swaylock" { nullable = true; }; settings = mkOption { - type = with types; attrsOf (oneOf [ bool float int str ]); + type = with types; attrsOf (oneOf [ bool float int path str ]); default = { }; description = '' Default arguments to {command}`swaylock`. An empty set @@ -59,7 +59,7 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."swaylock/config" = mkIf (cfg.settings != { }) { text = concatStrings (mapAttrsToList (n: v: diff --git a/modules/programs/taskwarrior.nix b/modules/programs/taskwarrior.nix index 9b5af43ee..8efeb1366 100644 --- a/modules/programs/taskwarrior.nix +++ b/modules/programs/taskwarrior.nix @@ -23,9 +23,6 @@ let formatPair = key: value: if isAttrs value then formatSet key value else formatLine key value; - - homeConf = "${config.xdg.configHome}/task/home-manager-taskrc"; - userConf = "${config.xdg.configHome}/task/taskrc"; in { options = { programs.taskwarrior = { @@ -85,13 +82,18 @@ in { ''; }; - package = - mkPackageOption pkgs "taskwarrior" { example = "pkgs.taskwarrior3"; }; + package = mkPackageOption pkgs "taskwarrior" { + nullable = true; + example = "pkgs.taskwarrior3"; + }; }; }; - config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + config = let + homeConf = "${config.xdg.configHome}/task/home-manager-taskrc"; + userConf = "${config.xdg.configHome}/task/taskrc"; + in mkIf cfg.enable { + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file."${homeConf}".text = '' data.location=${cfg.dataLocation} diff --git a/modules/programs/tealdeer.nix b/modules/programs/tealdeer.nix index d9318d102..6efc5aa3a 100644 --- a/modules/programs/tealdeer.nix +++ b/modules/programs/tealdeer.nix @@ -77,9 +77,14 @@ in { Configuration written to {file}`$XDG_CONFIG_HOME/tealdeer/config.toml` on Linux or {file}`$HOME/Library/Application Support/tealdeer/config.toml` on Darwin. - See for more information. + See for more information. ''; }; + + enableAutoUpdates = mkEnableOption "Auto updates" // { + default = true; + example = false; + }; }; config = mkIf cfg.enable { @@ -89,5 +94,10 @@ in { mkIf (cfg.settings != null && cfg.settings != { }) { source = tomlFormat.generate "tealdeer-config" cfg.settings; }; + + services.tldr-update = mkIf cfg.enableAutoUpdates { + enable = true; + package = pkgs.tealdeer; + }; }; } diff --git a/modules/programs/thefuck.nix b/modules/programs/thefuck.nix index ab56ea016..79b1f9462 100644 --- a/modules/programs/thefuck.nix +++ b/modules/programs/thefuck.nix @@ -13,33 +13,17 @@ with lib; enableInstantMode = mkEnableOption "thefuck's experimental instant mode"; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = let diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix index 84710207c..48587c308 100644 --- a/modules/programs/thunderbird.nix +++ b/modules/programs/thunderbird.nix @@ -49,16 +49,25 @@ let }; })); + getId = account: address: + if address == account.address then + account.id + else + (builtins.hashString "sha256" (if (builtins.isString address) then + address + else + (address.address + address.realName))); + toThunderbirdIdentity = account: address: # For backwards compatibility, the primary address reuses the account ID. let - id = if address == account.address then - account.id - else - builtins.hashString "sha256" address; + id = getId account address; + addressIsString = builtins.isString address; in { - "mail.identity.id_${id}.fullName" = account.realName; - "mail.identity.id_${id}.useremail" = address; + "mail.identity.id_${id}.fullName" = + if addressIsString then account.realName else address.realName; + "mail.identity.id_${id}.useremail" = + if addressIsString then address else address.address; "mail.identity.id_${id}.valid" = true; "mail.identity.id_${id}.htmlSigText" = if account.signature.showSignature == "none" then @@ -87,9 +96,7 @@ let addresses = [ account.address ] ++ account.aliases; in { "mail.account.account_${id}.identities" = concatStringsSep "," - ([ "id_${id}" ] - ++ map (address: "id_${builtins.hashString "sha256" address}") - account.aliases); + (map (address: "id_${getId account address}") addresses); "mail.account.account_${id}.server" = "server_${id}"; } // optionalAttrs account.primary { "mail.accountmanager.defaultaccount" = "account_${id}"; @@ -128,6 +135,18 @@ let (builtins.map (address: toThunderbirdIdentity account address) addresses) // account.thunderbird.settings id; + toThunderbirdFeed = feed: profile: + let id = feed.id; + in { + "mail.account.account_${id}.server" = "server_${id}"; + "mail.server.server_${id}.name" = feed.name; + "mail.server.server_${id}.type" = "rss"; + "mail.server.server_${id}.directory" = + "${thunderbirdProfilesPath}/${profile.name}/Mail/Feeds-${id}"; + "mail.server.server_${id}.directory-rel" = "[ProfD]Mail/Feeds-${id}"; + "mail.server.server_${id}.hostname" = "Feeds-${id}"; + }; + mkUserJs = prefs: extraPrefs: '' // Generated by Home Manager. @@ -158,6 +177,16 @@ in { description = "profile version, set null for nix-darwin"; }; + nativeMessagingHosts = mkOption { + visible = true; + type = types.listOf types.package; + default = [ ]; + description = '' + Additional packages containing native messaging hosts that should be + made available to Thunderbird extensions. + ''; + }; + profiles = mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { @@ -179,6 +208,25 @@ in { ''; }; + feedAccounts = mkOption { + type = types.attrsOf (submodule ({ config, name, ... }: { + options = { + name = mkOption { + type = types.str; + default = name; + readOnly = true; + description = "This feed account's name."; + }; + }; + })); + default = { }; + description = '' + Attribute set of feed accounts. Feeds themselves have to be + managed through Thunderbird's settings. This option allows + feeds to coexist with declaratively managed email accounts. + ''; + }; + settings = mkOption { type = thunderbirdJson; default = { }; @@ -310,7 +358,17 @@ in { accounts.email.accounts = mkOption { type = with types; - attrsOf (submodule { + attrsOf (submodule ({ config, ... }: { + config.thunderbird = { + settings = lib.mkIf (config.flavor == "gmail.com") (id: { + "mail.server.server_${id}.authMethod" = + mkOptionDefault 10; # 10 = OAuth2 + "mail.server.server_${id}.socketType" = + mkOptionDefault 3; # SSL/TLS + "mail.server.server_${id}.is_gmail" = + mkOptionDefault true; # handle labels, trash, etc + }); + }; options.thunderbird = { enable = mkEnableOption "the Thunderbird mail client for this account"; @@ -361,7 +419,7 @@ in { ''; }; }; - }); + })); }; }; @@ -400,6 +458,10 @@ in { ++ optional (any (p: p.withExternalGnupg) (attrValues cfg.profiles)) pkgs.gpgme; + mozilla.thunderbirdNativeMessagingHosts = [ + cfg.package # package configured native messaging hosts (entire mail app actually) + ] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts + home.file = mkMerge ([{ "${thunderbirdConfigPath}/profiles.ini" = mkIf (cfg.profiles != { }) { text = generators.toINI { } profilesIni; }; @@ -411,11 +473,17 @@ in { mkIf (profile.userContent != "") { text = profile.userContent; }; "${thunderbirdProfilesPath}/${name}/user.js" = let - accounts = filter (a: + emailAccounts = filter (a: a.thunderbird.profiles == [ ] || any (p: p == name) a.thunderbird.profiles) enabledAccountsWithId; - smtp = filter (a: a.smtp != null) accounts; + smtp = filter (a: a.smtp != null) emailAccounts; + + feedAccounts = + map (f: f // { id = builtins.hashString "sha256" f.name; }) + (attrValues profile.feedAccounts); + + accounts = emailAccounts ++ feedAccounts; in { text = mkUserJs (builtins.foldl' (a: b: a // b) { } ([ cfg.settings @@ -433,7 +501,8 @@ in { { "mail.openpgp.allow_external_gnupg" = profile.withExternalGnupg; } profile.settings - ] ++ (map (a: toThunderbirdAccount a profile) accounts))) + ] ++ (map (a: toThunderbirdAccount a profile) emailAccounts) + ++ (map (f: toThunderbirdFeed f profile) feedAccounts))) profile.extraConfig; }; diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index 85052c9fd..ff3a3322f 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -284,7 +284,7 @@ in { shell = mkOption { default = defaultShell; - example = "\${pkgs.zsh}/bin/zsh"; + example = literalExpression "${pkgs.zsh}/bin/zsh"; type = with types; nullOr str; description = "Set the default-shell tmux variable."; }; diff --git a/modules/programs/todoman.nix b/modules/programs/todoman.nix new file mode 100644 index 000000000..2e7ebf6a2 --- /dev/null +++ b/modules/programs/todoman.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.todoman; + + format = pkgs.formats.keyValue { }; + +in { + + meta.maintainers = [ hm.maintainers.mikilio ]; + + options.programs.todoman = { + enable = lib.mkEnableOption "todoman"; + + glob = mkOption { + type = types.str; + default = "*"; + description = '' + The glob expansion which matches all directories relevant. + ''; + example = "*/*"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Text for configuration of todoman. + The syntax is Python. + + See [docs](`https://todoman.readthedocs.io/en/stable/man.html#id5`). + for the full list of options. + ''; + example = '' + date_format = "%Y-%m-%d"; + time_format = "%H:%M"; + default_list = "Personal"; + default_due = 48; + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = config.accounts.calendar ? basePath; + message = '' + A base directory for calendars must be specified via + `accounts.calendar.basePath` to generate config for todoman + ''; + }]; + + home.packages = [ pkgs.todoman ]; + + xdg.configFile."todoman/config.py".text = lib.concatLines [ + ''path = "${config.accounts.calendar.basePath}/${cfg.glob}"'' + cfg.extraConfig + ]; + }; +} diff --git a/modules/programs/tofi.nix b/modules/programs/tofi.nix index acc1a994d..b6e46a6cb 100644 --- a/modules/programs/tofi.nix +++ b/modules/programs/tofi.nix @@ -12,7 +12,7 @@ in { options.programs.tofi = { enable = mkEnableOption "Tofi, a tiny dynamic menu for Wayland"; - package = mkPackageOption pkgs "tofi" { }; + package = mkPackageOption pkgs "tofi" { nullable = true; }; settings = mkOption { type = with types; @@ -46,7 +46,7 @@ in { assertions = [ (hm.assertions.assertPlatform "programs.tofi" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."tofi/config" = mkIf (cfg.settings != { }) { text = let diff --git a/modules/programs/vifm.nix b/modules/programs/vifm.nix index 2bf31d52d..aef2c1f16 100644 --- a/modules/programs/vifm.nix +++ b/modules/programs/vifm.nix @@ -12,7 +12,7 @@ in { options.programs.vifm = { enable = lib.mkEnableOption "vifm, a Vim-like file manager"; - package = lib.mkPackageOption pkgs "vifm" { }; + package = lib.mkPackageOption pkgs "vifm" { nullable = true; }; extraConfig = mkOption { type = types.lines; @@ -25,7 +25,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."vifm/vifmrc" = mkIf (cfg.extraConfig != "") { text = cfg.extraConfig; }; diff --git a/modules/programs/vim-vint.nix b/modules/programs/vim-vint.nix index 9565a8cb3..655c00937 100644 --- a/modules/programs/vim-vint.nix +++ b/modules/programs/vim-vint.nix @@ -14,7 +14,7 @@ in { options = { programs.vim-vint = { enable = mkEnableOption "the Vint linter for Vimscript"; - package = mkPackageOption pkgs "vim-vint" { }; + package = mkPackageOption pkgs "vim-vint" { nullable = true; }; settings = mkOption { type = yamlFormat.type; @@ -28,7 +28,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile.".vintrc.yaml".source = yamlFormat.generate "vim-vint-config" cfg.settings; diff --git a/modules/programs/vinegar.nix b/modules/programs/vinegar.nix new file mode 100644 index 000000000..cb088d89c --- /dev/null +++ b/modules/programs/vinegar.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: +let toml = pkgs.formats.toml { }; +in { + meta.maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + + options.programs.vinegar = { + enable = lib.mkEnableOption "Vinegar"; + + package = lib.mkPackageOption pkgs "vinegar" { nullable = true; }; + + settings = lib.mkOption { + type = lib.types.attrsOf toml.type; + default = { }; + example = { + env.WINEFSYNC = "1"; + + studio = { + dxvk = false; + renderer = "Vulkan"; + + fflags.DFIntTaskSchedulerTargetFps = 144; + + env = { + DXVK_HUD = "0"; + MANGOHUD = "1"; + }; + }; + }; + description = '' + Configuration written to {file}`$XDG_CONFIG_HOME/vinegar/config.toml`. + + See for more information. + ''; + }; + }; + + config = let cfg = config.programs.vinegar; + in lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "programs.vinegar" pkgs + lib.platforms.linux) + ]; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + xdg.configFile."vinegar/config.toml" = lib.mkIf (cfg.settings != { }) { + source = toml.generate "vinegar-config.toml" cfg.settings; + }; + }; +} diff --git a/modules/programs/vscode.nix b/modules/programs/vscode.nix index f77937d66..d90c5dd14 100644 --- a/modules/programs/vscode.nix +++ b/modules/programs/vscode.nix @@ -16,6 +16,8 @@ let "vscode-insiders" = "Code - Insiders"; "vscodium" = "VSCodium"; "openvscode-server" = "OpenVSCode Server"; + "windsurf" = "Windsurf"; + "cursor" = "Cursor"; }.${vscodePname}; extensionDir = { @@ -23,6 +25,8 @@ let "vscode-insiders" = "vscode-insiders"; "vscodium" = "vscode-oss"; "openvscode-server" = "openvscode-server"; + "windsurf" = "windsurf"; + "cursor" = "cursor"; }.${vscodePname}; userDir = if pkgs.stdenv.hostPlatform.isDarwin then @@ -30,66 +34,45 @@ let else "${config.xdg.configHome}/${configDir}/User"; - configFilePath = "${userDir}/settings.json"; - tasksFilePath = "${userDir}/tasks.json"; - keybindingsFilePath = "${userDir}/keybindings.json"; + configFilePath = name: + "${userDir}/${ + optionalString (name != "default") "profiles/${name}/" + }settings.json"; + tasksFilePath = name: + "${userDir}/${ + optionalString (name != "default") "profiles/${name}/" + }tasks.json"; + keybindingsFilePath = name: + "${userDir}/${ + optionalString (name != "default") "profiles/${name}/" + }keybindings.json"; - snippetDir = "${userDir}/snippets"; + snippetDir = name: + "${userDir}/${ + optionalString (name != "default") "profiles/${name}/" + }snippets"; # TODO: On Darwin where are the extensions? extensionPath = ".${extensionDir}/extensions"; - extensionJson = pkgs.vscode-utils.toExtensionJson cfg.extensions; - extensionJsonFile = pkgs.writeTextFile { - name = "extensions-json"; - destination = "/share/vscode/extensions/extensions.json"; - text = extensionJson; - }; + extensionJson = ext: pkgs.vscode-utils.toExtensionJson ext; + extensionJsonFile = name: text: + pkgs.writeTextFile { + inherit text; + name = "extensions-json-${name}"; + destination = "/share/vscode/extensions/extensions.json"; + }; - mergedUserSettings = cfg.userSettings - // optionalAttrs (!cfg.enableUpdateCheck) { "update.mode" = "none"; } - // optionalAttrs (!cfg.enableExtensionUpdateCheck) { + mergedUserSettings = + userSettings: enableUpdateCheck: enableExtensionUpdateCheck: + userSettings + // optionalAttrs (enableUpdateCheck == false) { "update.mode" = "none"; } + // optionalAttrs (enableExtensionUpdateCheck == false) { "extensions.autoCheckUpdates" = false; }; -in { - imports = [ - (mkChangedOptionModule [ "programs" "vscode" "immutableExtensionsDir" ] [ - "programs" - "vscode" - "mutableExtensionsDir" - ] (config: !config.programs.vscode.immutableExtensionsDir)) - ]; - - options = { - programs.vscode = { - enable = mkEnableOption "Visual Studio Code"; - - package = mkOption { - type = types.package; - default = pkgs.vscode; - defaultText = literalExpression "pkgs.vscode"; - example = literalExpression "pkgs.vscodium"; - description = '' - Version of Visual Studio Code to install. - ''; - }; - - enableUpdateCheck = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable update checks/notifications. - ''; - }; - - enableExtensionUpdateCheck = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable update notifications for extensions. - ''; - }; + profileType = types.submodule { + options = { userSettings = mkOption { type = jsonFormat.type; default = { }; @@ -182,16 +165,6 @@ in { ''; }; - mutableExtensionsDir = mkOption { - type = types.bool; - default = true; - example = false; - description = '' - Whether extensions can be installed or updated manually - or by Visual Studio Code. - ''; - }; - languageSnippets = mkOption { type = jsonFormat.type; default = { }; @@ -219,45 +192,207 @@ in { }; description = "Defines global user snippets."; }; + + enableUpdateCheck = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Whether to enable update checks/notifications. + Can only be set for the default profile, but + it applies to all profiles. + ''; + }; + + enableExtensionUpdateCheck = mkOption { + type = types.nullOr types.bool; + default = null; + description = '' + Whether to enable update notifications for extensions. + Can only be set for the default profile, but + it applies to all profiles. + ''; + }; + }; + }; + defaultProfile = if cfg.profiles ? default then cfg.profiles.default else { }; + allProfilesExceptDefault = removeAttrs cfg.profiles [ "default" ]; +in { + imports = [ + (mkChangedOptionModule [ "programs" "vscode" "immutableExtensionsDir" ] [ + "programs" + "vscode" + "mutableExtensionsDir" + ] (config: !config.programs.vscode.immutableExtensionsDir)) + ] ++ map (v: + mkRenamedOptionModule [ "programs" "vscode" v ] [ + "programs" + "vscode" + "profiles" + "default" + v + ]) [ + "enableUpdateCheck" + "enableExtensionUpdateCheck" + "userSettings" + "userTasks" + "keybindings" + "extensions" + "languageSnippets" + "globalSnippets" + ]; + + options.programs.vscode = { + enable = mkEnableOption "Visual Studio Code"; + + package = mkOption { + type = types.package; + default = pkgs.vscode; + defaultText = literalExpression "pkgs.vscode"; + example = literalExpression "pkgs.vscodium"; + description = '' + Version of Visual Studio Code to install. + ''; + }; + + mutableExtensionsDir = mkOption { + type = types.bool; + default = allProfilesExceptDefault == { }; + example = false; + description = '' + Whether extensions can be installed or updated manually + or by Visual Studio Code. Mutually exclusive to + programs.vscode.profiles. + ''; + }; + + profiles = mkOption { + type = types.attrsOf profileType; + default = { }; + description = '' + A list of all VSCode profiles. Mutually exclusive + to programs.vscode.mutableExtensionsDir + ''; }; }; config = mkIf cfg.enable { + warnings = [ + (mkIf (allProfilesExceptDefault != { } && cfg.mutableExtensionsDir) + "programs.vscode.mutableExtensionsDir can be used only if no profiles apart from default are set.") + (mkIf ((filterAttrs (n: v: + (v ? enableExtensionUpdateCheck || v ? enableUpdateCheck) + && (v.enableExtensionUpdateCheck != null || v.enableUpdateCheck + != null)) allProfilesExceptDefault) != { }) + "The option programs.vscode.profiles.*.enableExtensionUpdateCheck and option programs.vscode.profiles.*.enableUpdateCheck is invalid for all profiles except default.") + ]; + home.packages = [ cfg.package ]; - home.file = mkMerge [ - (mkIf (mergedUserSettings != { }) { - "${configFilePath}".source = - jsonFormat.generate "vscode-user-settings" mergedUserSettings; - }) - (mkIf (cfg.userTasks != { }) { - "${tasksFilePath}".source = - jsonFormat.generate "vscode-user-tasks" cfg.userTasks; - }) - (mkIf (cfg.keybindings != [ ]) - (let dropNullFields = filterAttrs (_: v: v != null); - in { - "${keybindingsFilePath}".source = - jsonFormat.generate "vscode-keybindings" - (map dropNullFields cfg.keybindings); - })) - (mkIf (cfg.extensions != [ ]) (let - subDir = "share/vscode/extensions"; + # The file `${userDir}/globalStorage/storage.json` needs to be writable by VSCode, + # since it contains other data, such as theme backgrounds, recently opened folders, etc. + # A caveat of adding profiles this way is, VSCode has to be closed + # when this file is being written, since the file is loaded into RAM + # and overwritten on closing VSCode. + home.activation.vscodeProfiles = hm.dag.entryAfter [ "writeBoundary" ] (let + modifyGlobalStorage = + pkgs.writeShellScript "vscode-global-storage-modify" '' + PATH=${makeBinPath [ pkgs.jq ]}''${PATH:+:}$PATH + file="${userDir}/globalStorage/storage.json" + + if [ -f "$file" ]; then + existing_profiles=$(jq '.userDataProfiles // [] | map({ (.name): .location }) | add // {}' "$file") + file_write="" + profiles=(${ + escapeShellArgs + (flatten (mapAttrsToList (n: v: n) allProfilesExceptDefault)) + }) + + for profile in "''${profiles[@]}"; do + if [[ "$(echo $existing_profiles | jq --arg profile $profile 'has ($profile)')" != "true" ]] || [[ "$(echo $existing_profiles | jq --arg profile $profile 'has ($profile)')" == "true" && "$(echo $existing_profiles | jq --arg profile $profile '.[$profile]')" != "\"$profile\"" ]]; then + file_write="$file_write$([ "$file_write" != "" ] && echo "...")$profile" + fi + done + else + for profile in "''${profiles[@]}"; do + file_write="$file_write$([ "$file_write" != "" ] && echo "...")$profile" + done + + echo "{}" > "$file" + fi + + if [ "$file_write" != "" ]; then + userDataProfiles=$(jq ".userDataProfiles += $(echo $file_write | jq -R 'split("...") | map({ name: ., location: . })')" "$file") + echo $userDataProfiles > "$file" + fi + ''; + in modifyGlobalStorage.outPath); + + home.file = mkMerge (flatten [ + (mapAttrsToList (n: v: [ + (mkIf ((mergedUserSettings v.userSettings v.enableUpdateCheck + v.enableExtensionUpdateCheck) != { }) { + "${configFilePath n}".source = + jsonFormat.generate "vscode-user-settings" + (mergedUserSettings v.userSettings v.enableUpdateCheck + v.enableExtensionUpdateCheck); + }) + + (mkIf (v.userTasks != { }) { + "${tasksFilePath n}".source = + jsonFormat.generate "vscode-user-tasks" v.userTasks; + }) + + (mkIf (v.keybindings != [ ]) { + "${keybindingsFilePath n}".source = + jsonFormat.generate "vscode-keybindings" + (map (filterAttrs (_: v: v != null)) v.keybindings); + }) + + (mkIf (v.languageSnippets != { }) (mapAttrs' (language: snippet: + nameValuePair "${snippetDir n}/${language}.json" { + source = + jsonFormat.generate "user-snippet-${language}.json" snippet; + }) v.languageSnippets)) + + (mkIf (v.globalSnippets != { }) { + "${snippetDir n}/global.code-snippets".source = + jsonFormat.generate "user-snippet-global.code-snippets" + v.globalSnippets; + }) + ]) cfg.profiles) + + # We write extensions.json for all profiles, except the default profile, + # since that is handled by code below. + (mkIf (allProfilesExceptDefault != { }) (mapAttrs' (n: v: + nameValuePair "${userDir}/profiles/${n}/extensions.json" { + source = "${ + extensionJsonFile n (extensionJson v.extensions) + }/share/vscode/extensions/extensions.json"; + }) allProfilesExceptDefault)) + + (mkIf (cfg.profiles != { }) (let # Adapted from https://discourse.nixos.org/t/vscode-extensions-setup/1801/2 + subDir = "share/vscode/extensions"; toPaths = ext: map (k: { "${extensionPath}/${k}".source = "${ext}/${subDir}/${k}"; }) (if ext ? vscodeExtUniqueId then [ ext.vscodeExtUniqueId ] else builtins.attrNames (builtins.readDir (ext + "/${subDir}"))); - in if cfg.mutableExtensionsDir then - mkMerge (concatMap toPaths cfg.extensions - ++ lib.optional (lib.versionAtLeast vscodeVersion "1.74.0") { + in if (cfg.mutableExtensionsDir && allProfilesExceptDefault == { }) then + # Mutable extensions dir can only occur when only default profile is set. + # Force regenerating extensions.json using the below method, + # causes VSCode to create the extensions.json with all the extensions + # in the extension directory, which includes extensions from other profiles. + mkMerge (concatMap toPaths + (flatten (mapAttrsToList (n: v: v.extensions) cfg.profiles)) + ++ optional + (versionAtLeast vscodeVersion "1.74.0" && defaultProfile != { }) { # Whenever our immutable extensions.json changes, force VSCode to regenerate # extensions.json with both mutable and immutable extensions. "${extensionPath}/.extensions-immutable.json" = { - text = extensionJson; + text = extensionJson defaultProfile.extensions; onChange = '' run rm $VERBOSE_ARG -f ${extensionPath}/{extensions.json,.init-default-profile-extensions} verboseEcho "Regenerating VSCode extensions.json" @@ -269,25 +404,14 @@ in { "${extensionPath}".source = let combinedExtensionsDrv = pkgs.buildEnv { name = "vscode-extensions"; - paths = cfg.extensions - ++ lib.optional (lib.versionAtLeast vscodeVersion "1.74.0") - extensionJsonFile; + paths = (flatten (mapAttrsToList (n: v: v.extensions) cfg.profiles)) + ++ optional + (versionAtLeast vscodeVersion "1.74.0" && defaultProfile != { }) + (extensionJsonFile "default" + (extensionJson defaultProfile.extensions)); }; in "${combinedExtensionsDrv}/${subDir}"; })) - - (mkIf (cfg.globalSnippets != { }) - (let globalSnippets = "${snippetDir}/global.code-snippets"; - in { - "${globalSnippets}".source = - jsonFormat.generate "user-snippet-global.code-snippets" - cfg.globalSnippets; - })) - - (lib.mapAttrs' (language: snippet: - lib.nameValuePair "${snippetDir}/${language}.json" { - source = jsonFormat.generate "user-snippet-${language}.json" snippet; - }) cfg.languageSnippets) - ]; + ]); }; } diff --git a/modules/programs/vscode/haskell.nix b/modules/programs/vscode/haskell.nix index 63ecd18e2..450c748e4 100644 --- a/modules/programs/vscode/haskell.nix +++ b/modules/programs/vscode/haskell.nix @@ -52,12 +52,12 @@ in { }; config = mkIf cfg.enable { - programs.vscode.userSettings = mkIf cfg.hie.enable { + programs.vscode.profiles.default.userSettings = mkIf cfg.hie.enable { "languageServerHaskell.enableHIE" = true; "languageServerHaskell.hieExecutablePath" = cfg.hie.executablePath; }; - programs.vscode.extensions = + programs.vscode.profiles.default.extensions = [ pkgs.vscode-extensions.justusadam.language-haskell ] ++ lib.optional cfg.hie.enable pkgs.vscode-extensions.alanz.vscode-hie-server; diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix index c842c519a..1f9864559 100644 --- a/modules/programs/watson.nix +++ b/modules/programs/watson.nix @@ -26,17 +26,14 @@ in { description = "Package providing the {command}`watson`."; }; - enableBashIntegration = mkEnableOption "watson's bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "watson's zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "watson's fish integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; settings = mkOption { type = iniFormat.type; diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix index dbbe89c3d..0d7294d03 100644 --- a/modules/programs/waybar.nix +++ b/modules/programs/waybar.nix @@ -25,7 +25,7 @@ let options = { layer = mkOption { - type = nullOr (enum [ "top" "bottom" ]); + type = nullOr (enum [ "top" "bottom" "overlay" ]); default = null; description = '' Decide if the bar is displayed in front (`"top"`) @@ -143,7 +143,7 @@ let }; }; in { - meta.maintainers = with lib.maintainers; [ berbiche ]; + meta.maintainers = with lib.maintainers; [ berbiche khaneliman ]; options.programs.waybar = with lib.types; { enable = mkEnableOption "Waybar"; @@ -198,7 +198,7 @@ in { systemd.enable = mkEnableOption "Waybar systemd integration"; systemd.target = mkOption { - type = str; + type = nullOr str; default = config.wayland.systemd.target; defaultText = literalExpression "config.wayland.systemd.target"; example = "sway-session.target"; @@ -211,6 +211,17 @@ in { ''; }; + systemd.enableInspect = mkOption { + type = bool; + default = false; + example = true; + description = '' + Inspect objects and find their CSS classes, experiment with live CSS styles, and lookup the current value of CSS properties. + + See + ''; + }; + style = mkOption { type = nullOr (either path lines); default = null; @@ -324,9 +335,12 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID"; Restart = "on-failure"; KillMode = "mixed"; + } // optionalAttrs cfg.systemd.enableInspect { + Environment = [ "GTK_DEBUG=interactive" ]; }; - Install = { WantedBy = [ cfg.systemd.target ]; }; + Install.WantedBy = + lib.optional (cfg.systemd.target != null) cfg.systemd.target; }; }) ]); diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix index bd3be4686..c1478d64a 100644 --- a/modules/programs/wezterm.nix +++ b/modules/programs/wezterm.nix @@ -1,18 +1,17 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) literalExpression mkIf mkEnableOption mkOption types; cfg = config.programs.wezterm; + tomlFormat = pkgs.formats.toml { }; shellIntegrationStr = '' source "${cfg.package}/etc/profile.d/wezterm.sh" ''; - in { - meta.maintainers = [ hm.maintainers.blmhemu ]; + meta.maintainers = [ lib.hm.maintainers.blmhemu lib.maintainers.khaneliman ]; options.programs.wezterm = { enable = mkEnableOption "wezterm"; @@ -83,13 +82,11 @@ in { ''; }; - enableBashIntegration = mkEnableOption "WezTerm's Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "WezTerm's Zsh integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { @@ -104,8 +101,8 @@ in { ${cfg.extraConfig} ''; - } // mapAttrs' (name: value: - nameValuePair "wezterm/colors/${name}.toml" { + } // lib.mapAttrs' (name: value: + lib.nameValuePair "wezterm/colors/${name}.toml" { source = tomlFormat.generate "${name}.toml" { colors = value; }; }) cfg.colorSchemes; diff --git a/modules/programs/wlogout.nix b/modules/programs/wlogout.nix index b01f8a0ae..6b318e109 100644 --- a/modules/programs/wlogout.nix +++ b/modules/programs/wlogout.nix @@ -72,7 +72,7 @@ in { options.programs.wlogout = with lib.types; { enable = mkEnableOption "wlogout"; - package = mkPackageOption pkgs "wlogout" { }; + package = mkPackageOption pkgs "wlogout" { nullable = true; }; layout = mkOption { type = listOf wlogoutLayoutConfig; @@ -132,7 +132,7 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."wlogout/layout" = mkIf (cfg.layout != [ ]) { source = pkgs.writeText "wlogout/layout" layoutContent; diff --git a/modules/programs/wofi.nix b/modules/programs/wofi.nix index 1317716ed..c2ea4e4d6 100644 --- a/modules/programs/wofi.nix +++ b/modules/programs/wofi.nix @@ -17,7 +17,7 @@ in { enable = mkEnableOption "wofi: a launcher/menu program for wlroots based wayland compositors such as sway"; - package = mkPackageOption pkgs "wofi" { }; + package = mkPackageOption pkgs "wofi" { nullable = true; }; settings = mkOption { default = { }; @@ -58,7 +58,7 @@ in { assertions = [ (hm.assertions.assertPlatform "programs.wofi" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = mkMerge [ (mkIf (cfg.settings != { }) { diff --git a/modules/programs/wpaperd.nix b/modules/programs/wpaperd.nix deleted file mode 100644 index 655024a06..000000000 --- a/modules/programs/wpaperd.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.wpaperd; - tomlFormat = pkgs.formats.toml { }; -in { - meta.maintainers = [ hm.maintainers.Avimitin ]; - - options.programs.wpaperd = { - enable = mkEnableOption "wpaperd"; - - package = mkPackageOption pkgs "wpaperd" { }; - - settings = mkOption { - type = tomlFormat.type; - default = { }; - example = literalExpression '' - { - eDP-1 = { - path = "/home/foo/Pictures/Wallpaper"; - apply-shadow = true; - }; - DP-2 = { - path = "/home/foo/Pictures/Anime"; - sorting = "descending"; - }; - } - ''; - description = '' - Configuration written to - {file}`$XDG_CONFIG_HOME/wpaperd/wallpaper.toml`. - See - for the full list of options. - ''; - }; - }; - - config = mkIf cfg.enable { - home.packages = [ cfg.package ]; - - xdg.configFile = { - "wpaperd/wallpaper.toml" = mkIf (cfg.settings != { }) { - source = tomlFormat.generate "wpaperd-wallpaper" cfg.settings; - }; - }; - }; -} diff --git a/modules/programs/xplr.nix b/modules/programs/xplr.nix index bd9222954..ddbbc1133 100644 --- a/modules/programs/xplr.nix +++ b/modules/programs/xplr.nix @@ -9,7 +9,7 @@ let version = '${cfg.package.version}' ''; - # If `value` is a Nix store path, create the symlink `/nix/store/newhash/${name}/*` + # If `value` is a Nix store path, create the symlink `/nix/store/newhash/${name}/*` # to `/nix/store/oldhash/*` and returns `/nix/store/newhash`. wrapPlugin = name: value: if lib.isStorePath value then @@ -49,7 +49,7 @@ in { options.programs.xplr = { enable = mkEnableOption "xplr, terminal UI based file explorer"; - package = mkPackageOption pkgs "xplr" { }; + package = mkPackageOption pkgs "xplr" { nullable = true; }; plugins = mkOption { type = with types; nullOr (attrsOf (either package str)); @@ -58,7 +58,7 @@ in { description = '' An attribute set of plugin paths to be added to the [package.path] of the {file}`~/config/xplr/init.lua` configuration file. - Must be a package or string representing the plugin directory's path. + Must be a package or string representing the plugin directory's path. If the path string is not absolute, it will be relative to {file}`$XDG_CONFIG_HOME/xplr/init.lua`. ''; example = literalExpression '' @@ -91,7 +91,7 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."xplr/init.lua".source = pkgs.writeText "init.lua" configFile; diff --git a/modules/programs/yambar.nix b/modules/programs/yambar.nix index f4e0a434a..efda8f19e 100644 --- a/modules/programs/yambar.nix +++ b/modules/programs/yambar.nix @@ -11,7 +11,7 @@ in { options.programs.yambar = { enable = lib.mkEnableOption "Yambar"; - package = lib.mkPackageOption pkgs "yambar" { }; + package = lib.mkPackageOption pkgs "yambar" { nullable = true; }; settings = lib.mkOption { type = yamlFormat.type; @@ -46,7 +46,7 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."yambar/config.yml" = lib.mkIf (cfg.settings != { }) { source = yamlFormat.generate "config.yml" cfg.settings; diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix index 314c4c5ed..be77188b9 100644 --- a/modules/programs/yazi.nix +++ b/modules/programs/yazi.nix @@ -1,53 +1,20 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) + literalExpression mapAttrsToList mkEnableOption mkIf mkOption optionalString + types; + cfg = config.programs.yazi; tomlFormat = pkgs.formats.toml { }; - - bashIntegration = '' - function ${cfg.shellWrapperName}() { - local tmp="$(mktemp -t "yazi-cwd.XXXXX")" - yazi "$@" --cwd-file="$tmp" - if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then - builtin cd -- "$cwd" - fi - rm -f -- "$tmp" - } - ''; - - fishIntegration = '' - function ${cfg.shellWrapperName} - set tmp (mktemp -t "yazi-cwd.XXXXX") - yazi $argv --cwd-file="$tmp" - if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] - builtin cd -- "$cwd" - end - rm -f -- "$tmp" - end - ''; - - nushellIntegration = '' - def --env ${cfg.shellWrapperName} [...args] { - let tmp = (mktemp -t "yazi-cwd.XXXXX") - yazi ...$args --cwd-file $tmp - let cwd = (open $tmp) - if $cwd != "" and $cwd != $env.PWD { - cd $cwd - } - rm -fp $tmp - } - ''; in { - meta.maintainers = with maintainers; [ xyenon eljamm ]; + meta.maintainers = with lib.maintainers; [ eljamm khaneliman xyenon ]; options.programs.yazi = { enable = mkEnableOption "yazi"; - package = mkPackageOption pkgs "yazi" { }; + package = lib.mkPackageOption pkgs "yazi" { nullable = true; }; - shellWrapperName = mkOption { + shellWrapperName = lib.mkOption { type = types.str; default = "yy"; example = "y"; @@ -56,21 +23,17 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; keymap = mkOption { type = tomlFormat.type; @@ -196,17 +159,51 @@ in { }; config = mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; - programs.bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration; + programs = let + bashIntegration = '' + function ${cfg.shellWrapperName}() { + local tmp="$(mktemp -t "yazi-cwd.XXXXX")" + yazi "$@" --cwd-file="$tmp" + if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then + builtin cd -- "$cwd" + fi + rm -f -- "$tmp" + } + ''; - programs.zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration; + fishIntegration = '' + set -l tmp (mktemp -t "yazi-cwd.XXXXX") + command yazi $argv --cwd-file="$tmp" + if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] + builtin cd -- "$cwd" + end + rm -f -- "$tmp" + ''; - programs.fish.interactiveShellInit = - mkIf cfg.enableFishIntegration fishIntegration; + nushellIntegration = '' + def --env ${cfg.shellWrapperName} [...args] { + let tmp = (mktemp -t "yazi-cwd.XXXXX") + yazi ...$args --cwd-file $tmp + let cwd = (open $tmp) + if $cwd != "" and $cwd != $env.PWD { + cd $cwd + } + rm -fp $tmp + } + ''; + in { + bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration; - programs.nushell.extraConfig = - mkIf cfg.enableNushellIntegration nushellIntegration; + zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration; + + fish.functions.${cfg.shellWrapperName} = + mkIf cfg.enableFishIntegration fishIntegration; + + nushell.extraConfig = + mkIf cfg.enableNushellIntegration nushellIntegration; + }; xdg.configFile = { "yazi/keymap.toml" = mkIf (cfg.keymap != { }) { @@ -224,27 +221,27 @@ in { } else { text = cfg.initLua; }); - } // (mapAttrs' (name: value: - nameValuePair "yazi/flavors/${name}.yazi" { source = value; }) - cfg.flavors) // (mapAttrs' (name: value: - nameValuePair "yazi/plugins/${name}.yazi" { source = value; }) + } // (lib.mapAttrs' (name: value: + lib.nameValuePair "yazi/flavors/${name}.yazi" { source = value; }) + cfg.flavors) // (lib.mapAttrs' (name: value: + lib.nameValuePair "yazi/plugins/${name}.yazi" { source = value; }) cfg.plugins); - warnings = filter (s: s != "") (concatLists [ - (mapAttrsToList (name: value: - optionalString (hasSuffix ".yazi" name) '' + warnings = lib.filter (s: s != "") (lib.concatLists [ + (mapAttrsToList (name: _value: + optionalString (lib.hasSuffix ".yazi" name) '' Flavors like `programs.yazi.flavors."${name}"` should no longer have the suffix ".yazi" in their attribute name. The flavor will be linked to `$XDG_CONFIG_HOME/yazi/flavors/${name}.yazi`. You probably want to rename it to `programs.yazi.flavors."${ - removeSuffix ".yazi" name + lib.removeSuffix ".yazi" name }"`. '') cfg.flavors) - (mapAttrsToList (name: value: - optionalString (hasSuffix ".yazi" name) '' + (mapAttrsToList (name: _value: + optionalString (lib.hasSuffix ".yazi" name) '' Plugins like `programs.yazi.plugins."${name}"` should no longer have the suffix ".yazi" in their attribute name. The plugin will be linked to `$XDG_CONFIG_HOME/yazi/plugins/${name}.yazi`. You probably want to rename it to `programs.yazi.plugins."${ - removeSuffix ".yazi" name + lib.removeSuffix ".yazi" name }"`. '') cfg.plugins) ]); @@ -253,20 +250,25 @@ in { mkAsserts = opt: requiredFiles: mapAttrsToList (name: value: let - isDir = pathIsDirectory "${value}"; + isDir = lib.pathIsDirectory "${value}"; msgNotDir = optionalString (!isDir) "The path or package should be a directory, not a single file."; isFileMissing = file: - !(pathExists "${value}/${file}") - || pathIsDirectory "${value}/${file}"; - missingFiles = filter isFileMissing requiredFiles; + !(lib.pathExists "${value}/${file}") + || lib.pathIsDirectory "${value}/${file}"; + missingFiles = lib.filter isFileMissing requiredFiles; msgFilesMissing = optionalString (missingFiles != [ ]) "The ${singularOpt} is missing these files: ${ toString missingFiles }"; - singularOpt = removeSuffix "s" opt; + singularOpt = lib.removeSuffix "s" opt; + isPluginValid = opt == "plugins" + && (lib.any (file: lib.pathExists "${value}/${file}") + requiredFiles); + isValid = + if opt == "plugins" then isPluginValid else missingFiles == [ ]; in { - assertion = isDir && missingFiles == [ ]; + assertion = isDir && isValid; message = '' Value at `programs.yazi.${opt}.${name}` is not a valid yazi ${singularOpt}. ${msgNotDir} @@ -281,6 +283,6 @@ in { "preview.png" "LICENSE" "LICENSE-tmtheme" - ]) ++ (mkAsserts "plugins" [ "init.lua" ]); + ]) ++ (mkAsserts "plugins" [ "init.lua" "main.lua" ]); }; } diff --git a/modules/programs/z-lua.nix b/modules/programs/z-lua.nix index 74dee31dc..4164aa394 100644 --- a/modules/programs/z-lua.nix +++ b/modules/programs/z-lua.nix @@ -29,29 +29,14 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; enableAliases = mkOption { default = false; diff --git a/modules/programs/zed-editor.nix b/modules/programs/zed-editor.nix index 80039a8ca..cfc55c073 100644 --- a/modules/programs/zed-editor.nix +++ b/modules/programs/zed-editor.nix @@ -80,6 +80,21 @@ in { Use the name of a repository in the [extension list](https://github.com/zed-industries/extensions/tree/main/extensions). ''; }; + + installRemoteServer = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to symlink the Zed's remote server binary to the expected + location. This allows remotely connecting to this system from a + distant Zed client. + + For more information, consult the + ["Remote Server" section](https://wiki.nixos.org/wiki/Zed#Remote_Server) + in the wiki. + ''; + }; }; }; @@ -101,6 +116,15 @@ in { else [ cfg.package ]; + home.file = mkIf (cfg.installRemoteServer && (cfg.package ? remote_server)) + (let + inherit (cfg.package) version remote_server; + binaryName = "zed-remote-server-stable-${version}"; + in { + ".zed_server/${binaryName}".source = + lib.getExe' remote_server binaryName; + }); + xdg.configFile."zed/settings.json" = (mkIf (mergedSettings != { }) { source = jsonFormat.generate "zed-user-settings" mergedSettings; }); diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix index 0906a028d..8d5f00051 100644 --- a/modules/programs/zellij.nix +++ b/modules/programs/zellij.nix @@ -34,24 +34,24 @@ in { ''; description = '' Configuration written to - {file}`$XDG_CONFIG_HOME/zellij/config.yaml`. + {file}`$XDG_CONFIG_HOME/zellij/config.kdl`. + + If `programs.zellij.package.version` is older than 0.32.0, then + the configuration is written to {file}`$XDG_CONFIG_HOME/zellij/config.yaml`. See for the full list of options. ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = false; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = false; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = false; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; config = mkIf cfg.enable { diff --git a/modules/programs/zk.nix b/modules/programs/zk.nix index d4abfe279..cffce3738 100644 --- a/modules/programs/zk.nix +++ b/modules/programs/zk.nix @@ -11,7 +11,7 @@ in { options.programs.zk = { enable = lib.mkEnableOption "zk"; - package = lib.mkPackageOption pkgs "zk" { }; + package = lib.mkPackageOption pkgs "zk" { nullable = true; }; settings = lib.mkOption { type = tomlFormat.type; @@ -43,7 +43,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."zk/config.toml" = lib.mkIf (cfg.settings != { }) { source = tomlFormat.generate "config.toml" cfg.settings; diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix index f5e258af9..8509a3dc6 100644 --- a/modules/programs/zoxide.nix +++ b/modules/programs/zoxide.nix @@ -1,30 +1,25 @@ { config, lib, pkgs, ... }: - -with lib; - let - cfg = config.programs.zoxide; - cfgOptions = concatStringsSep " " cfg.options; - + cfgOptions = lib.concatStringsSep " " cfg.options; in { meta.maintainers = [ ]; options.programs.zoxide = { - enable = mkEnableOption "zoxide"; + enable = lib.mkEnableOption "zoxide"; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.zoxide; - defaultText = literalExpression "pkgs.zoxide"; + defaultText = lib.literalExpression "pkgs.zoxide"; description = '' Zoxide package to install. ''; }; - options = mkOption { - type = types.listOf types.str; + options = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--no-cmd" ]; description = '' @@ -32,55 +27,37 @@ in { ''; }; - enableBashIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Bash integration. - ''; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Zsh integration. - ''; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Fish integration. - ''; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable Nushell integration. - ''; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { home.packages = [ cfg.package ]; - programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 150 '' - eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})" - ''); + programs.bash.initExtra = lib.mkIf cfg.enableBashIntegration + (lib.mkOrder 2000 '' + eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})" + ''); - programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' - eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})" - ''; + programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration + (lib.mkOrder 2000 '' + eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})" + ''); - programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' + programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration '' ${cfg.package}/bin/zoxide init fish ${cfgOptions} | source ''; - programs.nushell = mkIf cfg.enableNushellIntegration { + programs.nushell = lib.mkIf cfg.enableNushellIntegration { extraEnv = '' let zoxide_cache = "${config.xdg.cacheHome}/zoxide" if not ($zoxide_cache | path exists) { diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix index 50f8055c0..141b6f12d 100644 --- a/modules/programs/zsh.nix +++ b/modules/programs/zsh.nix @@ -1,292 +1,290 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) concatStringsSep literalExpression mkEnableOption mkIf mkOption mkOrder optionalString types; cfg = config.programs.zsh; relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file; - pluginsDir = if cfg.dotDir != null then - relToDotDir "plugins" else ".zsh/plugins"; - - envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables; - localVarsStr = config.lib.zsh.defineAll cfg.localVariables; - - aliasesStr = concatStringsSep "\n" ( - mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases - ); - - dirHashesStr = concatStringsSep "\n" ( - mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes - ); - - zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir; + stateVersion = config.home.stateVersion; bindkeyCommands = { emacs = "bindkey -e"; viins = "bindkey -v"; vicmd = "bindkey -a"; }; - - stateVersion = config.home.stateVersion; - - historyModule = types.submodule ({ config, ... }: { - options = { - append = mkOption { - type = types.bool; - default = false; - description = '' - If set, zsh sessions will append their history list to the history - file, rather than replace it. Thus, multiple parallel zsh sessions - will all have the new entries from their history lists added to the - history file, in the order that they exit. - - This file will still be periodically re-written to trim it when the - number of lines grows 20% beyond the value specified by - `programs.zsh.history.save`. - ''; - }; - - size = mkOption { - type = types.int; - default = 10000; - description = "Number of history lines to keep."; - }; - - save = mkOption { - type = types.int; - defaultText = 10000; - default = config.size; - description = "Number of history lines to save."; - }; - - path = mkOption { - type = types.str; - default = if versionAtLeast stateVersion "20.03" - then "$HOME/.zsh_history" - else relToDotDir ".zsh_history"; - defaultText = literalExpression '' - "$HOME/.zsh_history" if state version ≥ 20.03, - "$ZDOTDIR/.zsh_history" otherwise - ''; - example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"''; - description = "History file location"; - }; - - ignorePatterns = mkOption { - type = types.listOf types.str; - default = []; - example = literalExpression ''[ "rm *" "pkill *" ]''; - description = '' - Do not enter command lines into the history list - if they match any one of the given shell patterns. - ''; - }; - - ignoreDups = mkOption { - type = types.bool; - default = true; - description = '' - Do not enter command lines into the history list - if they are duplicates of the previous event. - ''; - }; - - ignoreAllDups = mkOption { - type = types.bool; - default = false; - description = '' - If a new command line being added to the history list - duplicates an older one, the older command is removed - from the list (even if it is not the previous event). - ''; - }; - - ignoreSpace = mkOption { - type = types.bool; - default = true; - description = '' - Do not enter command lines into the history list - if the first character is a space. - ''; - }; - - expireDuplicatesFirst = mkOption { - type = types.bool; - default = false; - description = "Expire duplicates first."; - }; - - extended = mkOption { - type = types.bool; - default = false; - description = "Save timestamp into the history file."; - }; - - share = mkOption { - type = types.bool; - default = true; - description = "Share command history between zsh sessions."; - }; - }; - }); - - pluginModule = types.submodule ({ config, ... }: { - options = { - src = mkOption { - type = types.path; - description = '' - Path to the plugin folder. - - Will be added to {env}`fpath` and {env}`PATH`. - ''; - }; - - name = mkOption { - type = types.str; - description = '' - The name of the plugin. - - Don't forget to add {option}`file` - if the script name does not follow convention. - ''; - }; - - file = mkOption { - type = types.str; - description = "The plugin script to source."; - }; - }; - - config.file = mkDefault "${config.name}.plugin.zsh"; - }); - - ohMyZshModule = types.submodule { - options = { - enable = mkEnableOption "oh-my-zsh"; - - package = mkPackageOption pkgs "oh-my-zsh" { }; - - plugins = mkOption { - default = []; - example = [ "git" "sudo" ]; - type = types.listOf types.str; - description = '' - List of oh-my-zsh plugins - ''; - }; - - custom = mkOption { - default = ""; - type = types.str; - example = "$HOME/my_customizations"; - description = '' - Path to a custom oh-my-zsh package to override config of - oh-my-zsh. See - for more information. - ''; - }; - - theme = mkOption { - default = ""; - example = "robbyrussell"; - type = types.str; - description = '' - Name of the theme to be used by oh-my-zsh. - ''; - }; - - extraConfig = mkOption { - default = ""; - example = '' - zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github - ''; - type = types.lines; - description = '' - Extra settings for plugins. - ''; - }; - }; - }; - - historySubstringSearchModule = types.submodule { - options = { - enable = mkEnableOption "history substring search"; - searchUpKey = mkOption { - type = with types; either (listOf str) str ; - default = [ "^[[A" ]; - description = '' - The key codes to be used when searching up. - The default of `^[[A` may correspond to the UP key -- if not, try - `$terminfo[kcuu1]`. - ''; - }; - searchDownKey = mkOption { - type = with types; either (listOf str) str ; - default = [ "^[[B" ]; - description = '' - The key codes to be used when searching down. - The default of `^[[B` may correspond to the DOWN key -- if not, try - `$terminfo[kcud1]`. - ''; - }; - }; - }; - - syntaxHighlightingModule = types.submodule { - options = { - enable = mkEnableOption "zsh syntax highlighting"; - - package = mkPackageOption pkgs "zsh-syntax-highlighting" { }; - - highlighters = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "brackets" ]; - description = '' - Highlighters to enable - See the list of highlighters: - ''; - }; - - patterns = mkOption { - type = types.attrsOf types.str; - default = {}; - example = { "rm -rf *" = "fg=white,bold,bg=red"; }; - description = '' - Custom syntax highlighting for user-defined patterns. - Reference: - ''; - }; - - styles = mkOption { - type = types.attrsOf types.str; - default = {}; - example = { comment = "fg=black,bold"; }; - description = '' - Custom styles for syntax highlighting. - See each highlighter style option: - ''; - }; - }; - }; - in - { imports = [ - (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ]) - (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) - (mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) + (lib.mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ]) ]; - options = { + options = + let + historyModule = types.submodule ({ config, ... }: { + options = { + append = mkOption { + type = types.bool; + default = false; + description = '' + If set, zsh sessions will append their history list to the history + file, rather than replace it. Thus, multiple parallel zsh sessions + will all have the new entries from their history lists added to the + history file, in the order that they exit. + + This file will still be periodically re-written to trim it when the + number of lines grows 20% beyond the value specified by + `programs.zsh.history.save`. + ''; + }; + + size = mkOption { + type = types.int; + default = 10000; + description = "Number of history lines to keep."; + }; + + save = mkOption { + type = types.int; + defaultText = 10000; + default = config.size; + description = "Number of history lines to save."; + }; + + path = mkOption { + type = types.str; + default = if lib.versionAtLeast stateVersion "20.03" + then "$HOME/.zsh_history" + else relToDotDir ".zsh_history"; + defaultText = literalExpression '' + "$HOME/.zsh_history" if state version ≥ 20.03, + "$ZDOTDIR/.zsh_history" otherwise + ''; + example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"''; + description = "History file location"; + }; + + ignorePatterns = mkOption { + type = types.listOf types.str; + default = []; + example = literalExpression ''[ "rm *" "pkill *" ]''; + description = '' + Do not enter command lines into the history list + if they match any one of the given shell patterns. + ''; + }; + + ignoreDups = mkOption { + type = types.bool; + default = true; + description = '' + Do not enter command lines into the history list + if they are duplicates of the previous event. + ''; + }; + + ignoreAllDups = mkOption { + type = types.bool; + default = false; + description = '' + If a new command line being added to the history list + duplicates an older one, the older command is removed + from the list (even if it is not the previous event). + ''; + }; + + saveNoDups = mkOption { + type = types.bool; + default = false; + description = '' + Do not write duplicate entries into the history file. + ''; + }; + + findNoDups = mkOption { + type = types.bool; + default = false; + description = '' + Do not display a line previously found in the history + file. + ''; + }; + + ignoreSpace = mkOption { + type = types.bool; + default = true; + description = '' + Do not enter command lines into the history list + if the first character is a space. + ''; + }; + + expireDuplicatesFirst = mkOption { + type = types.bool; + default = false; + description = "Expire duplicates first."; + }; + + extended = mkOption { + type = types.bool; + default = false; + description = "Save timestamp into the history file."; + }; + + share = mkOption { + type = types.bool; + default = true; + description = "Share command history between zsh sessions."; + }; + }; + }); + + pluginModule = types.submodule ({ config, ... }: { + options = { + src = mkOption { + type = types.path; + description = '' + Path to the plugin folder. + + Will be added to {env}`fpath` and {env}`PATH`. + ''; + }; + + name = mkOption { + type = types.str; + description = '' + The name of the plugin. + + Don't forget to add {option}`file` + if the script name does not follow convention. + ''; + }; + + file = mkOption { + type = types.str; + description = "The plugin script to source."; + }; + }; + + config.file = lib.mkDefault "${config.name}.plugin.zsh"; + }); + + ohMyZshModule = types.submodule { + options = { + enable = mkEnableOption "oh-my-zsh"; + + package = lib.mkPackageOption pkgs "oh-my-zsh" { }; + + plugins = mkOption { + default = []; + example = [ "git" "sudo" ]; + type = types.listOf types.str; + description = '' + List of oh-my-zsh plugins + ''; + }; + + custom = mkOption { + default = ""; + type = types.str; + example = "$HOME/my_customizations"; + description = '' + Path to a custom oh-my-zsh package to override config of + oh-my-zsh. See + for more information. + ''; + }; + + theme = mkOption { + default = ""; + example = "robbyrussell"; + type = types.str; + description = '' + Name of the theme to be used by oh-my-zsh. + ''; + }; + + extraConfig = mkOption { + default = ""; + example = '' + zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github + ''; + type = types.lines; + description = '' + Extra settings for plugins. + ''; + }; + }; + }; + + historySubstringSearchModule = types.submodule { + options = { + enable = mkEnableOption "history substring search"; + searchUpKey = mkOption { + type = with types; either (listOf str) str ; + default = [ "^[[A" ]; + description = '' + The key codes to be used when searching up. + The default of `^[[A` may correspond to the UP key -- if not, try + `$terminfo[kcuu1]`. + ''; + }; + searchDownKey = mkOption { + type = with types; either (listOf str) str ; + default = [ "^[[B" ]; + description = '' + The key codes to be used when searching down. + The default of `^[[B` may correspond to the DOWN key -- if not, try + `$terminfo[kcud1]`. + ''; + }; + }; + }; + + syntaxHighlightingModule = types.submodule { + options = { + enable = mkEnableOption "zsh syntax highlighting"; + + package = lib.mkPackageOption pkgs "zsh-syntax-highlighting" { }; + + highlighters = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "brackets" ]; + description = '' + Highlighters to enable + See the list of highlighters: + ''; + }; + + patterns = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { "rm -rf *" = "fg=white,bold,bg=red"; }; + description = '' + Custom syntax highlighting for user-defined patterns. + Reference: + ''; + }; + + styles = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { comment = "fg=black,bold"; }; + description = '' + Custom styles for syntax highlighting. + See each highlighter style option: + ''; + }; + }; + }; + in { programs.zsh = { enable = mkEnableOption "Z shell (Zsh)"; - package = mkPackageOption pkgs "zsh" { }; + package = lib.mkPackageOption pkgs "zsh" { }; autocd = mkOption { default = null; @@ -441,7 +439,7 @@ in }; defaultKeymap = mkOption { - type = types.nullOr (types.enum (attrNames bindkeyCommands)); + type = types.nullOr (types.enum (lib.attrNames bindkeyCommands)); default = null; example = "emacs"; description = "The default base keymap to use."; @@ -454,6 +452,15 @@ in description = "Environment variables that will be set for zsh session."; }; + initContent = mkOption { + default = ""; + type = types.lines; + example = lib.mkOrder 1000 '' + echo "Hello, initContent!" + ''; + description = "Content to be added to {file}`.zshrc`. To specify the order, use `lib.mkOrder`."; + }; + initExtraBeforeCompInit = mkOption { default = ""; type = types.lines; @@ -543,7 +550,25 @@ in }; }; - config = mkIf cfg.enable (mkMerge [ + config = + let + pluginsDir = if cfg.dotDir != null then + relToDotDir "plugins" else ".zsh/plugins"; + + envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables; + localVarsStr = config.lib.zsh.defineAll cfg.localVariables; + + aliasesStr = concatStringsSep "\n" ( + lib.mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases + ); + + dirHashesStr = concatStringsSep "\n" ( + lib.mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes + ); + + zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir; + in + mkIf cfg.enable (lib.mkMerge [ (mkIf (cfg.envExtra != "") { home.file."${relToDotDir ".zshenv"}".text = cfg.envExtra; }) @@ -596,159 +621,164 @@ in { home.packages = [ cfg.package ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions - ++ optional cfg.oh-my-zsh.enable cfg.oh-my-zsh.package; + ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions + ++ lib.optional cfg.oh-my-zsh.enable cfg.oh-my-zsh.package; - home.file."${relToDotDir ".zshrc"}".text = concatStringsSep "\n" ([ + programs.zsh.initContent = lib.mkMerge [ # zprof must be loaded before everything else, since it # benchmarks the shell initialization. - (optionalString cfg.zprof.enable '' + (mkOrder 400 (optionalString cfg.zprof.enable '' zmodload zsh/zprof - '') + '')) - cfg.initExtraFirst - "typeset -U path cdpath fpath manpath" + (mkOrder 550 cfg.initExtraFirst) + (mkOrder 600 "typeset -U path cdpath fpath manpath") - (optionalString (cfg.cdpath != []) '' + (mkOrder 650 (optionalString (cfg.cdpath != [ ]) '' cdpath+=(${concatStringsSep " " cfg.cdpath}) + '')) + (mkOrder 700 '' + for profile in ''${(z)NIX_PROFILES}; do + fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions) + done + + HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help" '') - '' - for profile in ''${(z)NIX_PROFILES}; do - fpath+=($profile/share/zsh/site-functions $profile/share/zsh/$ZSH_VERSION/functions $profile/share/zsh/vendor-completions) - done - - HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help" - '' - - (optionalString (cfg.defaultKeymap != null) '' + (mkOrder 750 (optionalString (cfg.defaultKeymap != null) '' # Use ${cfg.defaultKeymap} keymap as the default. - ${getAttr cfg.defaultKeymap bindkeyCommands} - '') - localVarsStr + ${lib.getAttr cfg.defaultKeymap bindkeyCommands} + '')) - cfg.initExtraBeforeCompInit + (mkOrder 800 localVarsStr) + (mkOrder 850 cfg.initExtraBeforeCompInit) - (concatStrings (map (plugin: '' + (mkOrder 900 (lib.concatStrings (map (plugin: '' path+="$HOME/${pluginsDir}/${plugin.name}" fpath+="$HOME/${pluginsDir}/${plugin.name}" - '') cfg.plugins)) + '') cfg.plugins))) - '' - # Oh-My-Zsh/Prezto calls compinit during initialization, - # calling it twice causes slight start up slowdown - # as all $fpath entries will be traversed again. - ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable) - cfg.completionInit - }'' + (mkOrder 950 '' + # Oh-My-Zsh/Prezto calls compinit during initialization, + # calling it twice causes slight start up slowdown + # as all $fpath entries will be traversed again. + ${optionalString + (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable) + cfg.completionInit}'') - (optionalString cfg.autosuggestion.enable '' + (mkOrder 1000 (optionalString cfg.autosuggestion.enable '' source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh - ${optionalString (cfg.autosuggestion.strategy != []) '' - ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy}) - '' - } - '') - (optionalString (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) '' - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}" + ${optionalString (cfg.autosuggestion.strategy != [ ]) '' + ZSH_AUTOSUGGEST_STRATEGY=(${ + concatStringsSep " " cfg.autosuggestion.strategy + }) + ''} + '')) + (mkOrder 1050 (optionalString + (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) '' + ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}" + '')) + + (mkOrder 1100 (optionalString cfg.oh-my-zsh.enable '' + # oh-my-zsh extra settings for plugins + ${cfg.oh-my-zsh.extraConfig} + # oh-my-zsh configuration generated by NixOS + ${optionalString (cfg.oh-my-zsh.plugins != [ ]) + "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"} + ${optionalString (cfg.oh-my-zsh.custom != "") + ''ZSH_CUSTOM="${cfg.oh-my-zsh.custom}"''} + ${optionalString (cfg.oh-my-zsh.theme != "") + ''ZSH_THEME="${cfg.oh-my-zsh.theme}"''} + source $ZSH/oh-my-zsh.sh + '')) + (mkOrder 1150 '' + ${optionalString cfg.prezto.enable (builtins.readFile + "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc")} + + ${lib.concatStrings (map (plugin: '' + if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then + source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" + fi + '') cfg.plugins)} + + # History options should be set in .zshrc and after oh-my-zsh sourcing. + # See https://github.com/nix-community/home-manager/issues/177. + HISTSIZE="${toString cfg.history.size}" + SAVEHIST="${toString cfg.history.save}" + ${optionalString (cfg.history.ignorePatterns != [ ]) + "HISTORY_IGNORE=${ + lib.escapeShellArg + "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})" + }"} + ${if lib.versionAtLeast stateVersion "20.03" then + ''HISTFILE="${cfg.history.path}"'' + else + ''HISTFILE="$HOME/${cfg.history.path}"''} + mkdir -p "$(dirname "$HISTFILE")" + + setopt HIST_FCNTL_LOCK + ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY + ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS + ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS + ${if cfg.history.saveNoDups then "setopt" else "unsetopt"} HIST_SAVE_NO_DUPS + ${if cfg.history.findNoDups then "setopt" else "unsetopt"} HIST_FIND_NO_DUPS + ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE + ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST + ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY + ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY + ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""} '') - (optionalString cfg.oh-my-zsh.enable '' - # oh-my-zsh extra settings for plugins - ${cfg.oh-my-zsh.extraConfig} - # oh-my-zsh configuration generated by NixOS - ${optionalString (cfg.oh-my-zsh.plugins != []) - "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})" - } - ${optionalString (cfg.oh-my-zsh.custom != "") - "ZSH_CUSTOM=\"${cfg.oh-my-zsh.custom}\"" - } - ${optionalString (cfg.oh-my-zsh.theme != "") - "ZSH_THEME=\"${cfg.oh-my-zsh.theme}\"" - } - source $ZSH/oh-my-zsh.sh - '') - - '' - ${optionalString cfg.prezto.enable - (builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshrc")} - - ${concatStrings (map (plugin: '' - if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then - source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" - fi - '') cfg.plugins)} - - # History options should be set in .zshrc and after oh-my-zsh sourcing. - # See https://github.com/nix-community/home-manager/issues/177. - HISTSIZE="${toString cfg.history.size}" - SAVEHIST="${toString cfg.history.save}" - ${optionalString (cfg.history.ignorePatterns != []) "HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"}"} - ${if versionAtLeast config.home.stateVersion "20.03" - then ''HISTFILE="${cfg.history.path}"'' - else ''HISTFILE="$HOME/${cfg.history.path}"''} - mkdir -p "$(dirname "$HISTFILE")" - - setopt HIST_FCNTL_LOCK - ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY - ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS - ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS - ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE - ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST - ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY - ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY - ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""} - - ${cfg.initExtra} + (mkOrder 1200 cfg.initExtra) # Aliases - ${aliasesStr} - '' - ] - ++ (mapAttrsToList (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellGlobalAliases) - ++ [ ('' - # Named Directory Hashes - ${dirHashesStr} + (mkOrder 1250 aliasesStr) + (mkOrder 1250 (concatStringsSep "\n" (lib.mapAttrsToList + (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") + cfg.shellGlobalAliases))) + (mkOrder 1300 '' + # Named Directory Hashes + ${dirHashesStr} '') - (optionalString cfg.syntaxHighlighting.enable + (mkOrder 1350 (optionalString cfg.syntaxHighlighting.enable # Load zsh-syntax-highlighting after all custom widgets have been created # https://github.com/zsh-users/zsh-syntax-highlighting#faq - '' - source ${cfg.syntaxHighlighting.package}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)}) - ${lib.concatStringsSep "\n" ( + '' + source ${cfg.syntaxHighlighting.package}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)}) + ${lib.concatStringsSep "\n" ( lib.mapAttrsToList - (name: value: "ZSH_HIGHLIGHT_STYLES+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})") + (name: value: "ZSH_HIGHLIGHT_STYLES[${lib.escapeShellArg name}]=${lib.escapeShellArg value}") cfg.syntaxHighlighting.styles - )} - ${lib.concatStringsSep "\n" ( + )} + ${lib.concatStringsSep "\n" ( lib.mapAttrsToList (name: value: "ZSH_HIGHLIGHT_PATTERNS+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})") cfg.syntaxHighlighting.patterns - )} - '') + )} + '')) - (optionalString (cfg.historySubstringSearch.enable or false) + (mkOrder 1400 (optionalString + (cfg.historySubstringSearch.enable or false) # Load zsh-history-substring-search after zsh-syntax-highlighting # https://github.com/zsh-users/zsh-history-substring-search#usage - '' - source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh - ${lib.concatMapStringsSep "\n" - (upKey: "bindkey \"${upKey}\" history-substring-search-up") - (lib.toList cfg.historySubstringSearch.searchUpKey) - } - ${lib.concatMapStringsSep "\n" - (downKey: "bindkey \"${downKey}\" history-substring-search-down") - (lib.toList cfg.historySubstringSearch.searchDownKey) - } - '') + '' + source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh + ${lib.concatMapStringsSep "\n" + (upKey: ''bindkey "${upKey}" history-substring-search-up'') + (lib.toList cfg.historySubstringSearch.searchUpKey)} + ${lib.concatMapStringsSep "\n" + (downKey: ''bindkey "${downKey}" history-substring-search-down'') + (lib.toList cfg.historySubstringSearch.searchDownKey)} + '')) - (optionalString cfg.zprof.enable - '' + (mkOrder 1450 (optionalString cfg.zprof.enable '' zprof - '') - ]); + '')) + ]; + + home.file."${relToDotDir ".zshrc"}".text = cfg.initContent; } (mkIf cfg.oh-my-zsh.enable { @@ -760,10 +790,10 @@ in (mkIf (cfg.plugins != []) { # Many plugins require compinit to be called # but allow the user to opt out. - programs.zsh.enableCompletion = mkDefault true; + programs.zsh.enableCompletion = lib.mkDefault true; home.file = - foldl' (a: b: a // b) {} + lib.foldl' (a: b: a // b) {} (map (plugin: { "${pluginsDir}/${plugin.name}".source = plugin.src; }) cfg.plugins); }) diff --git a/modules/programs/zsh/prezto.nix b/modules/programs/zsh/prezto.nix index 9a94f2385..5fdc8da23 100644 --- a/modules/programs/zsh/prezto.nix +++ b/modules/programs/zsh/prezto.nix @@ -14,6 +14,8 @@ let options = { enable = mkEnableOption "prezto"; + package = mkPackageOption pkgs "prezto" { default = "zsh-prezto"; }; + caseSensitive = mkOption { type = types.nullOr types.bool; # See . @@ -379,15 +381,15 @@ in { }; config = mkIf cfg.enable (mkMerge [{ home.file."${relToDotDir ".zprofile"}".text = - builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zprofile"; + builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zprofile"; home.file."${relToDotDir ".zlogin"}".text = - builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zlogin"; + builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zlogin"; home.file."${relToDotDir ".zlogout"}".text = - builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zlogout"; - home.packages = with pkgs; [ zsh-prezto ]; + builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zlogout"; + home.packages = [ cfg.package ]; home.file."${relToDotDir ".zshenv"}".text = - builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshenv"; + builtins.readFile "${cfg.package}/share/zsh-prezto/runcoms/zshenv"; home.file."${relToDotDir ".zpreztorc"}".text = '' # Generated by Nix ${optionalString (cfg.caseSensitive != null) '' diff --git a/modules/services/amberol.nix b/modules/services/amberol.nix index a63012447..7aa169db4 100644 --- a/modules/services/amberol.nix +++ b/modules/services/amberol.nix @@ -54,7 +54,7 @@ in { Unit = { Description = "Amberol music player daemon"; Requires = [ "dbus.service" ]; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/autorandr.nix b/modules/services/autorandr.nix index 64e6008e8..89ee612b2 100644 --- a/modules/services/autorandr.nix +++ b/modules/services/autorandr.nix @@ -36,7 +36,7 @@ in { systemd.user.services.autorandr = { Unit = { Description = "autorandr"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/barrier.nix b/modules/services/barrier.nix index 513a7e749..59c4cbf75 100644 --- a/modules/services/barrier.nix +++ b/modules/services/barrier.nix @@ -63,7 +63,7 @@ in { systemd.user.services.barrierc = { Unit = { Description = "Barrier Client daemon"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; Install.WantedBy = [ "graphical-session.target" ]; diff --git a/modules/services/batsignal.nix b/modules/services/batsignal.nix index 4f209f1e0..be5cf5347 100644 --- a/modules/services/batsignal.nix +++ b/modules/services/batsignal.nix @@ -32,7 +32,7 @@ in { systemd.user.services.batsignal = { Unit = { Description = "batsignal - battery monitor daemon"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/blanket.nix b/modules/services/blanket.nix index 5eeb2ab1e..bcc08ac85 100644 --- a/modules/services/blanket.nix +++ b/modules/services/blanket.nix @@ -24,7 +24,7 @@ in { Unit = { Description = "Blanket daemon"; Requires = [ "dbus.service" ]; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" "pipewire.service" ]; }; diff --git a/modules/services/blueman-applet.nix b/modules/services/blueman-applet.nix index 5211534c4..47f81b48c 100644 --- a/modules/services/blueman-applet.nix +++ b/modules/services/blueman-applet.nix @@ -30,7 +30,7 @@ with lib; Unit = { Description = "Blueman applet"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/cbatticon.nix b/modules/services/cbatticon.nix index 1616b2dcd..eebb5bdbc 100644 --- a/modules/services/cbatticon.nix +++ b/modules/services/cbatticon.nix @@ -118,7 +118,7 @@ in { Unit = { Description = "cbatticon system tray battery icon"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/cliphist.nix b/modules/services/cliphist.nix index 1877a6de0..e7dc8e998 100644 --- a/modules/services/cliphist.nix +++ b/modules/services/cliphist.nix @@ -1,7 +1,15 @@ { config, lib, pkgs, ... }: let cfg = config.services.cliphist; in { - meta.maintainers = [ lib.hm.maintainers.janik ]; + meta.maintainers = [ lib.hm.maintainers.janik lib.maintainers.khaneliman ]; + + imports = [ + (lib.mkRenamedOptionModule [ "services" "cliphist" "systemdTarget" ] [ + "services" + "cliphist" + "systemdTargets" + ]) + ]; options.services.cliphist = { enable = @@ -25,16 +33,18 @@ in { ''; }; - systemdTarget = lib.mkOption { - type = lib.types.str; - default = "graphical-session.target"; + systemdTargets = lib.mkOption { + type = with lib.types; either (listOf str) str; + default = [ "graphical-session.target" ]; example = "sway-session.target"; description = '' - The systemd target that will automatically start the cliphist service. + The systemd targets that will automatically start the cliphist service. - When setting this value to `"sway-session.target"`, + When setting this value to `["sway-session.target"]`, make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`, otherwise the service may never be started. + + Note: A single string value is deprecated, please use a list. ''; }; }; @@ -61,7 +71,7 @@ in { Restart = "on-failure"; }; - Install = { WantedBy = [ cfg.systemdTarget ]; }; + Install = { WantedBy = lib.toList cfg.systemdTargets; }; }; systemd.user.services.cliphist-images = lib.mkIf cfg.allowImages { @@ -77,7 +87,7 @@ in { Restart = "on-failure"; }; - Install = { WantedBy = [ cfg.systemdTarget ]; }; + Install = { WantedBy = lib.toList cfg.systemdTargets; }; }; }; } diff --git a/modules/services/clipse.nix b/modules/services/clipse.nix new file mode 100644 index 000000000..1d0ee95fd --- /dev/null +++ b/modules/services/clipse.nix @@ -0,0 +1,167 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.services.clipse; + jsonFormat = pkgs.formats.json { }; +in { + meta.maintainers = [ lib.hm.maintainers.dsoverlord ]; + + options.services.clipse = { + enable = lib.mkEnableOption "Enable clipse clipboard manager"; + + package = lib.mkPackageOption pkgs "clipse" { nullable = true; }; + + systemdTarget = lib.mkOption { + type = lib.types.str; + default = "graphical-session.target"; + example = "sway-session.target"; + description = '' + The systemd target that will automatically start the clipse service. + + When setting this value to `"sway-session.target"`, + make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`, + otherwise the service may never be started. + ''; + }; + + allowDuplicates = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Allow duplicates"; + }; + + historySize = lib.mkOption { + type = lib.types.int; + default = 100; + description = "Number of history lines to keep."; + }; + + imageDisplay = { + type = lib.mkOption { + type = lib.types.enum [ "basic" "kitty" "sixel" ]; + default = "basic"; + description = "Preview image method"; + }; + + scaleX = lib.mkOption { + type = lib.types.int; + default = 9; + description = "Image scaling factor X"; + }; + + scaleY = lib.mkOption { + type = lib.types.int; + default = 9; + description = "Image scaling factor Y"; + }; + + heightCut = lib.mkOption { + type = lib.types.int; + default = 2; + description = "Height cut"; + }; + }; + + keyBindings = lib.mkOption { + type = jsonFormat.type; + + default = { }; + + example = lib.literalExpression '' + { + "choose": "enter", + "clearSelected": "S", + "down": "down", + "end": "end", + "filter": "/", + "home": "home", + "more": "?", + "nextPage": "right", + "prevPage": "left", + "preview": "t", + "quit": "q", + "remove": "x", + "selectDown": "ctrl+down", + "selectSingle": "s", + "selectUp": "ctrl+up", + "togglePin": "p", + "togglePinned": "tab", + "up": "up", + "yankFilter": "ctrl+s" + } + ''; + + description = "Custom key bindings"; + }; + + theme = lib.mkOption { + type = jsonFormat.type; + + default = { useCustomTheme = false; }; + + example = lib.literalExpression '' + { + useCustomTheme = true; + DimmedDesc = "#ffffff"; + DimmedTitle = "#ffffff"; + FilteredMatch = "#ffffff"; + NormalDesc = "#ffffff"; + NormalTitle = "#ffffff"; + SelectedDesc = "#ffffff"; + SelectedTitle = "#ffffff"; + SelectedBorder = "#ffffff"; + SelectedDescBorder = "#ffffff"; + TitleFore = "#ffffff"; + Titleback = "#434C5E"; + StatusMsg = "#ffffff"; + PinIndicatorColor = "#ff0000"; + }; + ''; + + description = '' + Configuration written to + {file}`$XDG_CONFIG_HOME/clipse/custom_theme.json`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "services.clipse" pkgs + lib.platforms.linux) + ]; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + xdg.configFile."clipse/config.json".source = + jsonFormat.generate "settings" { + allowDuplicates = cfg.allowDuplicates; + historyFile = "clipboard_history.json"; + maxHistory = cfg.historySize; + logFile = "clipse.log"; + themeFile = "custom_theme.json"; + tempDir = "tmp_files"; + keyBindings = cfg.keyBindings; + imageDisplay = cfg.imageDisplay; + }; + + xdg.configFile."clipse/custom_theme.json".source = + jsonFormat.generate "theme" cfg.theme; + + systemd.user.services.clipse = + lib.mkIf (pkgs.stdenv.isLinux && (cfg.package != null)) { + Unit = { + Description = "Clipse listener"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + + Service = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${cfg.package}/bin/clipse -listen"; + }; + + Install = { WantedBy = [ cfg.systemdTarget ]; }; + }; + }; +} diff --git a/modules/services/darkman.nix b/modules/services/darkman.nix index b399dad86..93aafda98 100644 --- a/modules/services/darkman.nix +++ b/modules/services/darkman.nix @@ -48,7 +48,7 @@ in { darkman, a tool that automatically switches dark-mode on and off based on the time of the day''; - package = mkPackageOption pkgs "darkman" { }; + package = mkPackageOption pkgs "darkman" { nullable = true; }; settings = mkOption { type = types.submodule { freeformType = yamlFormat.type; }; @@ -76,7 +76,7 @@ in { (hm.assertions.assertPlatform "services.darkman" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile = { "darkman/config.yaml" = mkIf (cfg.settings != { }) { @@ -91,7 +91,7 @@ in { (generateScripts "light-mode.d" cfg.lightModeScripts)) ]; - systemd.user.services.darkman = { + systemd.user.services.darkman = lib.mkIf (cfg.package != null) { Unit = { Description = "Darkman system service"; Documentation = "man:darkman(1)"; diff --git a/modules/services/devilspie2.nix b/modules/services/devilspie2.nix index fa77153e7..ab61e9778 100644 --- a/modules/services/devilspie2.nix +++ b/modules/services/devilspie2.nix @@ -36,7 +36,7 @@ in { Service.ExecStart = "${pkgs.devilspie2}/bin/devilspie2"; Unit = { Description = "devilspie2"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; Install.WantedBy = [ "graphical-session.target" ]; diff --git a/modules/services/easyeffects.nix b/modules/services/easyeffects.nix index fd5e4b404..b71ec8d83 100644 --- a/modules/services/easyeffects.nix +++ b/modules/services/easyeffects.nix @@ -51,7 +51,7 @@ in { Unit = { Description = "Easyeffects daemon"; Requires = [ "dbus.service" ]; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" "pipewire.service" ]; }; diff --git a/modules/services/flameshot.nix b/modules/services/flameshot.nix index ebdfd0067..b35f518b3 100644 --- a/modules/services/flameshot.nix +++ b/modules/services/flameshot.nix @@ -56,7 +56,7 @@ in { Unit = { Description = "Flameshot screenshot tool"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; X-Restart-Triggers = mkIf (cfg.settings != { }) [ "${iniFile}" ]; }; diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix index 17d8b1431..aa81320b1 100644 --- a/modules/services/fusuma.nix +++ b/modules/services/fusuma.nix @@ -119,7 +119,7 @@ in { systemd.user.services.fusuma = { Unit = { Description = "Fusuma services"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/glance.nix b/modules/services/glance.nix index fa4f1a8d7..7abe17e2c 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -59,11 +59,11 @@ in { lib.platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."glance/glance.yml".source = settingsFile; - systemd.user.services.glance = { + systemd.user.services.glance = lib.mkIf (cfg.package != null) { Unit = { Description = "Glance feed dashboard server"; PartOf = [ "graphical-session.target" ]; diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix index edb87a9d1..f32d85af3 100644 --- a/modules/services/gpg-agent.nix +++ b/modules/services/gpg-agent.nix @@ -218,6 +218,21 @@ in { ''; }; + noAllowExternalCache = mkOption { + type = types.bool; + default = false; + description = '' + Tell Pinentry not to enable features which use an external cache for + passphrases. + + Some desktop environments prefer to unlock all credentials with one + master password and may have installed a Pinentry which employs an + additional external cache to implement such a policy. By using this + option the Pinentry is advised not to make use of such a cache and + instead always ask the user for the requested passphrase. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -245,21 +260,17 @@ in { ''; }; - enableBashIntegration = mkEnableOption "Bash integration" // { - default = true; - }; + enableBashIntegration = + lib.hm.shell.mkBashIntegrationOption { inherit config; }; - enableZshIntegration = mkEnableOption "Zsh integration" // { - default = true; - }; + enableFishIntegration = + lib.hm.shell.mkFishIntegrationOption { inherit config; }; - enableFishIntegration = mkEnableOption "Fish integration" // { - default = true; - }; + enableNushellIntegration = + lib.hm.shell.mkNushellIntegrationOption { inherit config; }; - enableNushellIntegration = mkEnableOption "Nushell integration" // { - default = true; - }; + enableZshIntegration = + lib.hm.shell.mkZshIntegrationOption { inherit config; }; }; }; @@ -269,6 +280,7 @@ in { (optional (cfg.enableSshSupport) "enable-ssh-support" ++ optional cfg.grabKeyboardAndMouse "grab" ++ optional (!cfg.enableScDaemon) "disable-scdaemon" + ++ optional (cfg.noAllowExternalCache) "no-allow-external-cache" ++ optional (cfg.defaultCacheTtl != null) "default-cache-ttl ${toString cfg.defaultCacheTtl}" ++ optional (cfg.defaultCacheTtlSsh != null) diff --git a/modules/services/grobi.nix b/modules/services/grobi.nix index 9031089c9..c8a3b1412 100644 --- a/modules/services/grobi.nix +++ b/modules/services/grobi.nix @@ -79,7 +79,7 @@ in { systemd.user.services.grobi = { Unit = { Description = "grobi display auto config daemon"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/gromit-mpx.nix b/modules/services/gromit-mpx.nix index f46eddb39..142c49814 100644 --- a/modules/services/gromit-mpx.nix +++ b/modules/services/gromit-mpx.nix @@ -215,7 +215,7 @@ in { systemd.user.services.gromit-mpx = { Unit = { Description = "Gromit-MPX"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; X-Restart-Triggers = [ "${config.xdg.configFile."gromit-mpx.cfg".source}" diff --git a/modules/services/hypridle.nix b/modules/services/hypridle.nix index c2165e5b5..2778bff66 100644 --- a/modules/services/hypridle.nix +++ b/modules/services/hypridle.nix @@ -1,15 +1,12 @@ { config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.hypridle; +let cfg = config.services.hypridle; in { - meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ]; + meta.maintainers = with lib.maintainers; [ khaneliman fufexan ]; options.services.hypridle = { - enable = mkEnableOption "Hypridle, Hyprland's idle daemon"; + enable = lib.mkEnableOption "Hypridle, Hyprland's idle daemon"; - package = mkPackageOption pkgs "hypridle" { }; + package = lib.mkPackageOption pkgs "hypridle" { nullable = true; }; settings = lib.mkOption { type = with lib.types; @@ -65,15 +62,15 @@ in { }; }; - config = mkIf cfg.enable { - xdg.configFile."hypr/hypridle.conf" = mkIf (cfg.settings != { }) { + config = lib.mkIf cfg.enable { + xdg.configFile."hypr/hypridle.conf" = lib.mkIf (cfg.settings != { }) { text = lib.hm.generators.toHyprconf { attrs = cfg.settings; inherit (cfg) importantPrefixes; }; }; - systemd.user.services.hypridle = { + systemd.user.services.hypridle = lib.mkIf (cfg.package != null) { Install = { WantedBy = [ config.wayland.systemd.target ]; }; Unit = { @@ -81,12 +78,12 @@ in { Description = "hypridle"; After = [ config.wayland.systemd.target ]; PartOf = [ config.wayland.systemd.target ]; - X-Restart-Triggers = mkIf (cfg.settings != { }) + X-Restart-Triggers = lib.mkIf (cfg.settings != { }) [ "${config.xdg.configFile."hypr/hypridle.conf".source}" ]; }; Service = { - ExecStart = "${getExe cfg.package}"; + ExecStart = "${lib.getExe cfg.package}"; Restart = "always"; RestartSec = "10"; }; diff --git a/modules/services/hyprpaper.nix b/modules/services/hyprpaper.nix index 39ff9a056..ba64e2372 100644 --- a/modules/services/hyprpaper.nix +++ b/modules/services/hyprpaper.nix @@ -1,15 +1,12 @@ { config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.hyprpaper; +let cfg = config.services.hyprpaper; in { - meta.maintainers = [ maintainers.khaneliman maintainers.fufexan ]; + meta.maintainers = with lib.maintainers; [ khaneliman fufexan ]; options.services.hyprpaper = { - enable = mkEnableOption "Hyprpaper, Hyprland's wallpaper daemon"; + enable = lib.mkEnableOption "Hyprpaper, Hyprland's wallpaper daemon"; - package = mkPackageOption pkgs "hyprpaper" { }; + package = lib.mkPackageOption pkgs "hyprpaper" { nullable = true; }; settings = lib.mkOption { type = with lib.types; @@ -59,15 +56,15 @@ in { }; }; - config = mkIf cfg.enable { - xdg.configFile."hypr/hyprpaper.conf" = mkIf (cfg.settings != { }) { + config = lib.mkIf cfg.enable { + xdg.configFile."hypr/hyprpaper.conf" = lib.mkIf (cfg.settings != { }) { text = lib.hm.generators.toHyprconf { attrs = cfg.settings; inherit (cfg) importantPrefixes; }; }; - systemd.user.services.hyprpaper = { + systemd.user.services.hyprpaper = lib.mkIf (cfg.package != null) { Install = { WantedBy = [ config.wayland.systemd.target ]; }; Unit = { @@ -75,12 +72,12 @@ in { Description = "hyprpaper"; After = [ config.wayland.systemd.target ]; PartOf = [ config.wayland.systemd.target ]; - X-Restart-Triggers = mkIf (cfg.settings != { }) + X-Restart-Triggers = lib.mkIf (cfg.settings != { }) [ "${config.xdg.configFile."hypr/hyprpaper.conf".source}" ]; }; Service = { - ExecStart = "${getExe cfg.package}"; + ExecStart = "${lib.getExe cfg.package}"; Restart = "always"; RestartSec = "10"; }; diff --git a/modules/services/imapnotify-accounts.nix b/modules/services/imapnotify-accounts.nix index e437f94e3..1a6fbf58a 100644 --- a/modules/services/imapnotify-accounts.nix +++ b/modules/services/imapnotify-accounts.nix @@ -1,10 +1,8 @@ { pkgs, lib, ... }: - -with lib; - -{ +let inherit (lib) mkOption types; +in { options.imapnotify = { - enable = mkEnableOption "imapnotify"; + enable = lib.mkEnableOption "imapnotify"; onNotify = mkOption { type = with types; either str (attrsOf str); @@ -30,10 +28,16 @@ with lib; description = "IMAP folders to watch."; }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-wait 1" ]; + description = "Extra arguments to pass to goimapnotify."; + }; + extraConfig = mkOption { type = let jsonFormat = pkgs.formats.json { }; in jsonFormat.type; default = { }; - example = { wait = 10; }; description = "Additional configuration to add for this account."; }; }; diff --git a/modules/services/imapnotify.nix b/modules/services/imapnotify.nix index a52b86e97..bf8fefd39 100644 --- a/modules/services/imapnotify.nix +++ b/modules/services/imapnotify.nix @@ -23,7 +23,10 @@ let Service = { # Use the nix store path for config to ensure service restarts when it changes ExecStart = - "${getExe cfg.package} -conf '${genAccountConfig account}'"; + "${getExe cfg.package} -conf '${genAccountConfig account}'" + " ${ + lib.optionalString (account.imapnotify.extraArgs != [ ]) + (toString account.imapnotify.extraArgs) + }"; Restart = "always"; RestartSec = 30; Type = "simple"; diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix index f30d79fc5..3e6822744 100644 --- a/modules/services/kdeconnect.nix +++ b/modules/services/kdeconnect.nix @@ -40,7 +40,7 @@ in { Unit = { Description = "Adds communication between your desktop and your smartphone"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; @@ -69,7 +69,7 @@ in { Unit = { Description = "kdeconnect-indicator"; After = [ - "graphical-session-pre.target" + "graphical-session.target" "polybar.service" "taffybar.service" "stalonetray.service" diff --git a/modules/services/keynav.nix b/modules/services/keynav.nix index d83252e53..7ba5ce2e0 100644 --- a/modules/services/keynav.nix +++ b/modules/services/keynav.nix @@ -18,7 +18,7 @@ in { systemd.user.services.keynav = { Unit = { Description = "keynav"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/linux-wallpaperengine.nix b/modules/services/linux-wallpaperengine.nix new file mode 100644 index 000000000..f2d971b8f --- /dev/null +++ b/modules/services/linux-wallpaperengine.nix @@ -0,0 +1,121 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.linux-wallpaperengine; + +in { + meta.maintainers = [ hm.maintainers.ckgxrg ]; + + options.services.linux-wallpaperengine = { + enable = mkEnableOption + "linux-wallpaperengine, an implementation of Wallpaper Engine functionality"; + + package = mkPackageOption pkgs "linux-wallpaperengine" { }; + + assetsPath = mkOption { + type = types.path; + description = "Path to the assets directory."; + }; + + clamping = mkOption { + type = types.nullOr (types.enum [ "clamp" "border" "repeat" ]); + default = null; + description = "Clamping mode for all wallpapers."; + }; + + wallpapers = mkOption { + type = types.listOf (types.submodule { + options = { + monitor = mkOption { + type = types.str; + description = "Which monitor to display the wallpaper."; + }; + + wallpaperId = mkOption { + type = types.str; + description = "Wallpaper ID to be used."; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + description = + "Extra arguments to pass to the linux-wallpaperengine command for this wallpaper."; + }; + + scaling = mkOption { + type = + types.nullOr (types.enum [ "stretch" "fit" "fill" "default" ]); + default = null; + description = "Scaling mode for this wallpaper."; + }; + + fps = mkOption { + type = types.nullOr types.int; + default = null; + description = "Limits the FPS to a given number."; + }; + + audio = { + silent = mkOption { + type = types.bool; + default = false; + description = "Mutes all sound of the wallpaper."; + }; + + automute = mkOption { + type = types.bool; + default = true; + description = "Automute when another app is playing sound."; + }; + + processing = mkOption { + type = types.bool; + default = true; + description = "Enables audio processing for background."; + }; + }; + }; + }); + default = [ ]; + description = "Define wallpapers."; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "services.linux-wallpaperengine" pkgs + lib.platforms.linux) + ]; + + home.packages = [ cfg.package ]; + + systemd.user.services."linux-wallpaperengine" = let + args = lists.forEach cfg.wallpapers (each: + concatStringsSep " " (cli.toGNUCommandLine { } { + screen-root = each.monitor; + inherit (each) scaling fps; + silent = each.audio.silent; + noautomute = !each.audio.automute; + no-audio-processing = !each.audio.processing; + } ++ each.extraOptions) + # This has to be the last argument in each group + + " --bg ${each.wallpaperId}"); + in { + Unit = { + Description = "Implementation of Wallpaper Engine on Linux"; + After = [ "graphical-session.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + Service = { + ExecStart = getExe cfg.package + " --assets-dir ${cfg.assetsPath} " + + "--clamping ${cfg.clamping} " + (strings.concatStringsSep " " args); + Restart = "on-failure"; + }; + Install = { WantedBy = [ "graphical-session.target" ]; }; + }; + }; +} diff --git a/modules/services/listenbrainz-mpd.nix b/modules/services/listenbrainz-mpd.nix index 3cc242216..3ccb75411 100644 --- a/modules/services/listenbrainz-mpd.nix +++ b/modules/services/listenbrainz-mpd.nix @@ -15,7 +15,7 @@ in { options.services.listenbrainz-mpd = { enable = mkEnableOption "listenbrainz-mpd"; - package = mkPackageOption pkgs "listenbrainz-mpd" { }; + package = mkPackageOption pkgs "listenbrainz-mpd" { nullable = true; }; settings = mkOption { type = tomlFormat.type; @@ -29,7 +29,7 @@ in { }; config = mkIf cfg.enable { - systemd.user.services."listenbrainz-mpd" = { + systemd.user.services."listenbrainz-mpd" = lib.mkIf (cfg.package != null) { Unit = { Description = "ListenBrainz submission client for MPD"; Documentation = "https://codeberg.org/elomatreb/listenbrainz-mpd"; diff --git a/modules/services/ludusavi.nix b/modules/services/ludusavi.nix new file mode 100644 index 000000000..7acadc1a0 --- /dev/null +++ b/modules/services/ludusavi.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) getExe maintainers mkEnableOption mkIf mkOption; + + inherit (lib.types) bool nullOr path; + + cfg = config.services.ludusavi; + settingsFormat = pkgs.formats.yaml { }; + + configFile = if cfg.configFile == null then + settingsFormat.generate "config.yaml" cfg.settings + else + cfg.configFile; +in { + + options.services.ludusavi = { + enable = mkEnableOption "Ludusavi game backup tool"; + configFile = mkOption { + type = nullOr path; + default = null; + description = '' + Path to a Ludusavi `config.yaml`. Mutually exclusive with the `settings` option. + See https://github.com/mtkennerly/ludusavi/blob/master/docs/help/configuration-file.md for available options. + ''; + }; + settings = mkOption { + type = settingsFormat.type; + default = { + manifest.url = + "https://raw.githubusercontent.com/mtkennerly/ludusavi-manifest/master/data/manifest.yaml"; + roots = [ ]; + backup.path = "$XDG_STATE_HOME/backups/ludusavi"; + restore.path = "$XDG_STATE_HOME/backups/ludusavi"; + }; + example = { + language = "en-US"; + theme = "light"; + roots = [{ + path = "~/.local/share/Steam"; + store = "steam"; + }]; + backup.path = "~/.local/state/backups/ludusavi"; + restore.path = "~/.local/state/backups/ludusavi"; + }; + description = '' + Ludusavi configuration as an attribute set. See + https://github.com/mtkennerly/ludusavi#configuration-file + for available options. + ''; + }; + backupNotification = mkOption { + type = bool; + default = false; + description = '' + Send a notification message after a successful backup. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = (cfg.settings != { }) != (cfg.configFile != null); + message = + "The `settings` and `configFile` options are mutually exclusive."; + }]; + + systemd.user = { + services.ludusavi = { + Unit.Description = "Run a game save backup with Ludusavi"; + Service = { + Type = "oneshot"; + ExecStart = "${getExe pkgs.ludusavi} backup --force"; + } // lib.optionalAttrs cfg.backupNotification { + ExecStartPost = "${ + getExe pkgs.libnotify + } 'Ludusavi' 'Backup completed' -i ludusavi -a 'Ludusavi'"; + }; + }; + timers.ludusavi = { + Unit.Description = "Run a game save backup with Ludusavi, daily"; + Timer.OnCalendar = "daily"; + Install.WantedBy = [ "timers.target" ]; + }; + }; + + xdg.configFile."ludusavi/config.yaml".source = configFile; + + home.packages = [ pkgs.ludusavi ]; + }; + + meta.maintainers = [ maintainers.PopeRigby ]; +} diff --git a/modules/services/macos-remap-keys/default.nix b/modules/services/macos-remap-keys/default.nix new file mode 100644 index 000000000..0c0d2575d --- /dev/null +++ b/modules/services/macos-remap-keys/default.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.macos-remap-keys; + keytables = import ./keytables.nix { inherit lib; }; + + keyToHIDCode = table: key: keytables.${table}.${key}; + + # Note: hidutil requires HIDKeyboardModifierMapping values to be in hexadecimal + # format rather than decimal JSON. Using hex strings instead of numbers will + # crash macOS. + makeMapping = table: from: to: + '' + { "HIDKeyboardModifierMappingSrc": ${ + keyToHIDCode table from + }, "HIDKeyboardModifierMappingDst": ${keyToHIDCode table to} }''; + + makeMappingsList = table: mappings: + lib.mapAttrsToList (from: to: makeMapping table from to) mappings; + + allMappings = (makeMappingsList "keyboard" (cfg.keyboard or { })) + ++ (makeMappingsList "keypad" (cfg.keypad or { })); + + allMappingsString = lib.concatStringsSep ", " allMappings; + propertyString = ''{ "UserKeyMapping": [ ${allMappingsString} ] }''; +in { + meta.maintainers = [ lib.maintainers.WeetHet ]; + + options.services.macos-remap-keys = { + enable = lib.mkEnableOption "macOS key remapping service"; + + keyboard = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + Capslock = "Escape"; + SquareBracketOpen = "SquareBracketClose"; + }; + description = "Mapping of keyboard keys to remap"; + }; + + keypad = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + Enter = "Equal"; + Plus = "Minus"; + }; + description = "Mapping of keypad keys to remap"; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "services.macos-remap-keys" pkgs + lib.platforms.darwin) + ]; + home.activation.macosRemapKeys = + lib.hm.dag.entryAfter [ "writeBoundary" ] '' + run --silence /usr/bin/hidutil property --set '${propertyString}' + ''; + + launchd.agents.remap-keys = { + enable = true; + config = { + ProgramArguments = + [ "/usr/bin/hidutil" "property" "--set" propertyString ]; + KeepAlive.SuccessfulExit = false; + RunAtLoad = true; + }; + }; + }; +} diff --git a/modules/services/macos-remap-keys/keytables.nix b/modules/services/macos-remap-keys/keytables.nix new file mode 100644 index 000000000..a44bb4ece --- /dev/null +++ b/modules/services/macos-remap-keys/keytables.nix @@ -0,0 +1,139 @@ +{ lib }: +let + letters = let + alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + lettersList = lib.stringToCharacters alphabet; + indices = builtins.genList (i: i + 4) 26; + in lib.listToAttrs (lib.zipListsWith (letter: index: { + name = letter; + value = "0x${lib.toHexString index}"; + }) lettersList indices); + + numbers = { + One = "0x1E"; + Two = "0x1F"; + Three = "0x20"; + Four = "0x21"; + Five = "0x22"; + Six = "0x23"; + Seven = "0x24"; + Eight = "0x25"; + Nine = "0x26"; + Zero = "0x27"; + }; + + specialKeys = { + Enter = "0x28"; + Escape = "0x29"; + Backspace = "0x2A"; + Tab = "0x2B"; + Spacebar = "0x2C"; + Minus = "0x2D"; + Equal = "0x2E"; + SquareBracketOpen = "0x2F"; + SquareBracketClose = "0x30"; + Backslash = "0x31"; + Hash = "0x32"; + Semicolon = "0x33"; + SingleQuote = "0x34"; + GraveAccent = "0x35"; + Comma = "0x36"; + Dot = "0x37"; + Slash = "0x38"; + Capslock = "0x39"; + }; + + fKeys1To12 = { + F1 = "0x3A"; + F2 = "0x3B"; + F3 = "0x3C"; + F4 = "0x3D"; + F5 = "0x3E"; + F6 = "0x3F"; + F7 = "0x40"; + F8 = "0x41"; + F9 = "0x42"; + F10 = "0x43"; + F11 = "0x44"; + F12 = "0x45"; + }; + + fKeys13To24 = { + F13 = "0x68"; + F14 = "0x69"; + F15 = "0x6A"; + F16 = "0x6B"; + F17 = "0x6C"; + F18 = "0x6D"; + F19 = "0x6E"; + F20 = "0x6F"; + F21 = "0x70"; + F22 = "0x71"; + F23 = "0x72"; + F24 = "0x73"; + }; + + navigationKeys = { + PrintScreen = "0x46"; + ScrollLock = "0x47"; + Pause = "0x48"; + Insert = "0x49"; + Home = "0x4A"; + PageUp = "0x4B"; + ForwardDelete = "0x4C"; + End = "0x4D"; + PageDown = "0x4E"; + RightArrow = "0x4F"; + LeftArrow = "0x50"; + DownArrow = "0x51"; + UpArrow = "0x52"; + NumLock = "0x53"; + }; + + modifierKeys = { + Control = "0xE0"; + Shift = "0xE1"; + Option = "0xE2"; + Command = "0xE3"; + RightControl = "0xE4"; + RightShift = "0xE5"; + RightOption = "0xE6"; + RightCommand = "0xE7"; + }; + + keypadKeys = { + Slash = "0x54"; + Asterisk = "0x55"; + Minus = "0x56"; + Plus = "0x57"; + Enter = "0x58"; + One = "0x59"; + Two = "0x5A"; + Three = "0x5B"; + Four = "0x5C"; + Five = "0x5D"; + Six = "0x5E"; + Seven = "0x5F"; + Eight = "0x60"; + Nine = "0x61"; + Zero = "0x62"; + Dot = "0x63"; + BashSlash = "0x64"; + Application = "0x65"; + Power = "0x66"; + Equal = "0x67"; + }; + + mapToInt = keyPage: attrs: + lib.mapAttrs (name: value: + let keycode = lib.fromHexString (lib.removePrefix "0x" value); + in "0x${lib.toHexString (keyPage + keycode)}") attrs; + + page7Keys = mapToInt (lib.fromHexString "700000000") (letters // numbers + // specialKeys // fKeys1To12 // fKeys13To24 // navigationKeys + // modifierKeys); + pageFFKeys = mapToInt (lib.fromHexString "FF00000000") { Fn = "0x3"; }; +in { + keyboard = page7Keys // pageFFKeys; + keypad = mapToInt keypadKeys; +} diff --git a/modules/services/mako.nix b/modules/services/mako.nix index e3298d837..df6532274 100644 --- a/modules/services/mako.nix +++ b/modules/services/mako.nix @@ -33,6 +33,15 @@ in { ''; }; + maxHistory = mkOption { + default = 5; + type = types.nullOr types.int; + description = '' + Set maximum number of expired notifications to keep in the history + buffer. Set 0 to disable history. + ''; + }; + sort = mkOption { default = "-time"; type = @@ -315,6 +324,7 @@ in { ''; text = '' ${optionalInteger "max-visible" cfg.maxVisible} + ${optionalInteger "max-history" cfg.maxHistory} ${optionalString "sort" cfg.sort} ${optionalString "output" cfg.output} ${optionalString "layer" cfg.layer} diff --git a/modules/services/mpd-discord-rpc.nix b/modules/services/mpd-discord-rpc.nix index 8996051a5..dfe408921 100644 --- a/modules/services/mpd-discord-rpc.nix +++ b/modules/services/mpd-discord-rpc.nix @@ -50,7 +50,7 @@ in { Unit = { Description = "Discord Rich Presence for MPD"; Documentation = "https://github.com/JakeStanger/mpd-discord-rpc"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; Service = { diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index 8787ad667..a1df5640a 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -1,38 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let - - name = "mpd"; + inherit (lib) mkIf mkOption types; cfg = config.services.mpd; - - mpdConf = pkgs.writeText "mpd.conf" '' - music_directory "${cfg.musicDirectory}" - playlist_directory "${cfg.playlistDirectory}" - ${lib.optionalString (cfg.dbFile != null) '' - db_file "${cfg.dbFile}" - ''} - state_file "${cfg.dataDir}/state" - sticker_file "${cfg.dataDir}/sticker.sql" - - ${optionalString (cfg.network.listenAddress != "any") - ''bind_to_address "${cfg.network.listenAddress}"''} - ${optionalString (cfg.network.port != 6600) - ''port "${toString cfg.network.port}"''} - - ${cfg.extraConfig} - ''; - in { - - ###### interface - options = { - services.mpd = { - enable = mkOption { type = types.bool; default = false; @@ -52,7 +25,7 @@ in { musicDirectory = mkOption { type = with types; either path str; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' ''${home.homeDirectory}/music if state version < 22.11 ''${xdg.userDirs.music} if xdg.userDirs.enable == true undefined otherwise @@ -100,7 +73,7 @@ in { dataDir = mkOption { type = types.path; - default = "${config.xdg.dataHome}/${name}"; + default = "${config.xdg.dataHome}/mpd"; defaultText = "$XDG_DATA_HOME/mpd"; apply = toString; # Prevent copies to Nix store. description = '' @@ -113,8 +86,10 @@ in { startWhenNeeded = mkOption { type = types.bool; default = false; + visible = pkgs.stdenv.hostPlatform.isLinux; + readOnly = pkgs.stdenv.hostPlatform.isDarwin; description = '' - Enable systemd socket activation. + Enable systemd socket activation. This is only supported on Linux. ''; }; @@ -149,72 +124,97 @@ in { ''; }; }; - }; - ###### implementation + config = let + mpdConf = pkgs.writeText "mpd.conf" ('' + music_directory "${cfg.musicDirectory}" + playlist_directory "${cfg.playlistDirectory}" + '' + lib.optionalString (cfg.dbFile != null) '' + db_file "${cfg.dbFile}" + '' + lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) '' + log_file "${config.home.homeDirectory}/Library/Logs/mpd/log.txt" + '' + '' + state_file "${cfg.dataDir}/state" + sticker_file "${cfg.dataDir}/sticker.sql" - config = mkIf cfg.enable { - assertions = [ - (lib.hm.assertions.assertPlatform "services.mpd" pkgs lib.platforms.linux) - ]; + '' + lib.optionalString (cfg.network.listenAddress != "any") '' + bind_to_address "${cfg.network.listenAddress}" + '' + lib.optionalString (cfg.network.port != 6600) '' + port "${toString cfg.network.port}" + '' + lib.optionalString (cfg.extraConfig != "") '' + ${cfg.extraConfig} + ''); + in mkIf cfg.enable { + home.packages = [ cfg.package ]; - services.mpd = mkMerge [ - (mkIf (versionAtLeast config.home.stateVersion "22.11" + services.mpd = lib.mkMerge [ + (mkIf (lib.versionAtLeast config.home.stateVersion "22.11" && config.xdg.userDirs.enable) { - musicDirectory = mkOptionDefault config.xdg.userDirs.music; + musicDirectory = lib.mkOptionDefault config.xdg.userDirs.music; }) - (mkIf (versionOlder config.home.stateVersion "22.11") { - musicDirectory = mkOptionDefault "${config.home.homeDirectory}/music"; + (mkIf (lib.versionOlder config.home.stateVersion "22.11") { + musicDirectory = + lib.mkOptionDefault "${config.home.homeDirectory}/music"; }) ]; - systemd.user.services.mpd = { - Unit = mkMerge [ - { - Description = "Music Player Daemon"; - After = [ "network.target" "sound.target" ]; - } + systemd.user = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { + services.mpd = { + Unit = lib.mkMerge [ + { + Description = "Music Player Daemon"; + After = [ "network.target" "sound.target" ]; + } - (mkIf cfg.network.startWhenNeeded { - Requires = [ "mpd.socket" ]; - After = [ "mpd.socket" ]; - }) - ]; + (mkIf cfg.network.startWhenNeeded { + Requires = [ "mpd.socket" ]; + After = [ "mpd.socket" ]; + }) + ]; - Install = mkIf (!cfg.network.startWhenNeeded) { - WantedBy = [ "default.target" ]; + Install = mkIf (!cfg.network.startWhenNeeded) { + WantedBy = [ "default.target" ]; + }; + + Service = { + Environment = [ "PATH=${config.home.profileDirectory}/bin" ]; + ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${ + lib.escapeShellArgs cfg.extraArgs + }"; + Type = "notify"; + ExecStartPre = '' + ${pkgs.bash}/bin/bash -c "${pkgs.coreutils}/bin/mkdir -p '${cfg.dataDir}' '${cfg.playlistDirectory}'"''; + }; }; - Service = { - Environment = [ "PATH=${config.home.profileDirectory}/bin" ]; - ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${ - escapeShellArgs cfg.extraArgs - }"; - Type = "notify"; - ExecStartPre = '' - ${pkgs.bash}/bin/bash -c "${pkgs.coreutils}/bin/mkdir -p '${cfg.dataDir}' '${cfg.playlistDirectory}'"''; + sockets.mpd = mkIf cfg.network.startWhenNeeded { + Socket = { + ListenStream = let + listen = if cfg.network.listenAddress == "any" then + toString cfg.network.port + else + "${cfg.network.listenAddress}:${toString cfg.network.port}"; + in [ listen "%t/mpd/socket" ]; + + Backlog = 5; + KeepAlive = true; + }; + + Install = { WantedBy = [ "sockets.target" ]; }; }; }; - systemd.user.sockets.mpd = mkIf cfg.network.startWhenNeeded { - Socket = { - ListenStream = let - listen = if cfg.network.listenAddress == "any" then - toString cfg.network.port - else - "${cfg.network.listenAddress}:${toString cfg.network.port}"; - in [ listen "%t/mpd/socket" ]; - - Backlog = 5; + launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { + enable = true; + config = { + ProgramArguments = + [ (lib.getExe cfg.package) "--no-daemon" "${mpdConf}" ] + ++ cfg.extraArgs; KeepAlive = true; + ProcessType = "Interactive"; }; - - Install = { WantedBy = [ "sockets.target" ]; }; }; - - home.packages = [ cfg.package ]; }; - } diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix index 343f57280..8738cae66 100644 --- a/modules/services/network-manager-applet.nix +++ b/modules/services/network-manager-applet.nix @@ -11,7 +11,7 @@ in { options = { services.network-manager-applet = { - enable = mkEnableOption "the Network Manager applet"; + enable = mkEnableOption "the Network Manager applet (nm-applet)"; }; }; @@ -28,7 +28,7 @@ in { Unit = { Description = "Network Manager applet"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client.nix index 24b3c99dd..7a3ceacb1 100644 --- a/modules/services/nextcloud-client.nix +++ b/modules/services/nextcloud-client.nix @@ -36,7 +36,7 @@ in { systemd.user.services.nextcloud-client = { Unit = { Description = "Nextcloud Client"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/notify-osd.nix b/modules/services/notify-osd.nix index 4faf83643..b118a275e 100644 --- a/modules/services/notify-osd.nix +++ b/modules/services/notify-osd.nix @@ -33,7 +33,7 @@ in { systemd.user.services.notify-osd = { Unit = { Description = "notify-osd"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix new file mode 100644 index 000000000..0cb1b2eee --- /dev/null +++ b/modules/services/ollama.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.ollama; + + ollamaPackage = if cfg.acceleration == null then + cfg.package + else + cfg.package.override { inherit (cfg) acceleration; }; + +in { + meta.maintainers = [ maintainers.terlar ]; + + options = { + services.ollama = { + enable = mkEnableOption "ollama server for local large language models"; + + package = mkPackageOption pkgs "ollama" { }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "[::]"; + description = '' + The host address which the ollama server HTTP interface listens to. + ''; + }; + + port = mkOption { + type = types.port; + default = 11434; + example = 11111; + description = '' + Which port the ollama server listens to. + ''; + }; + + acceleration = mkOption { + type = types.nullOr (types.enum [ false "rocm" "cuda" ]); + default = null; + example = "rocm"; + description = '' + What interface to use for hardware acceleration. + + - `null`: default behavior + - if `nixpkgs.config.rocmSupport` is enabled, uses `"rocm"` + - if `nixpkgs.config.cudaSupport` is enabled, uses `"cuda"` + - otherwise defaults to `false` + - `false`: disable GPU, only use CPU + - `"rocm"`: supported by most modern AMD GPUs + - may require overriding gpu type with `services.ollama.rocmOverrideGfx` + if rocm doesn't detect your AMD gpu + - `"cuda"`: supported by most modern NVIDIA GPUs + ''; + }; + + environmentVariables = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { + OLLAMA_LLM_LIBRARY = "cpu"; + HIP_VISIBLE_DEVICES = "0,1"; + }; + description = '' + Set arbitrary environment variables for the ollama service. + + Be aware that these are only seen by the ollama server (systemd service), + not normal invocations like `ollama run`. + Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.ollama = mkIf pkgs.stdenv.isLinux { + Unit = { + Description = "Server for local large language models"; + After = [ "network.target" ]; + }; + + Service = { + ExecStart = "${getExe ollamaPackage} serve"; + Environment = + (mapAttrsToList (n: v: "${n}=${v}") cfg.environmentVariables) + ++ [ "OLLAMA_HOST=${cfg.host}:${toString cfg.port}" ]; + }; + + Install = { WantedBy = [ "default.target" ]; }; + }; + + launchd.agents.ollama = mkIf pkgs.stdenv.isDarwin { + enable = true; + config = { + ProgramArguments = [ "${getExe ollamaPackage}" "serve" ]; + EnvironmentVariables = cfg.environmentVariables // { + OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; + }; + KeepAlive = { + Crashed = true; + SuccessfulExit = false; + }; + ProcessType = "Background"; + }; + }; + + home.packages = [ ollamaPackage ]; + }; +} diff --git a/modules/services/opensnitch-ui.nix b/modules/services/opensnitch-ui.nix index f45ee9cdb..a6df254f5 100644 --- a/modules/services/opensnitch-ui.nix +++ b/modules/services/opensnitch-ui.nix @@ -23,7 +23,7 @@ in { systemd.user.services.opensnitch-ui = { Unit = { Description = "Opensnitch ui"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/owncloud-client.nix b/modules/services/owncloud-client.nix index 3235dac9c..aad2d487c 100644 --- a/modules/services/owncloud-client.nix +++ b/modules/services/owncloud-client.nix @@ -24,7 +24,7 @@ in { systemd.user.services.owncloud-client = { Unit = { Description = "Owncloud Client"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/parcellite.nix b/modules/services/parcellite.nix index 39b81e869..dc6b84c41 100644 --- a/modules/services/parcellite.nix +++ b/modules/services/parcellite.nix @@ -42,7 +42,7 @@ in { Unit = { Description = "Lightweight GTK+ clipboard manager"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix index 4ea340d21..62e203584 100644 --- a/modules/services/pasystray.nix +++ b/modules/services/pasystray.nix @@ -30,7 +30,7 @@ in { Unit = { Description = "PulseAudio system tray"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/pbgopy.nix b/modules/services/pbgopy.nix index 3a3499e52..48556a5ba 100644 --- a/modules/services/pbgopy.nix +++ b/modules/services/pbgopy.nix @@ -60,7 +60,7 @@ in { systemd.user.services.pbgopy = { Unit = { Description = "pbgopy server for sharing the clipboard between devices"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; Service = { diff --git a/modules/services/picom.nix b/modules/services/picom.nix index 1d9b7bb55..59e373a62 100644 --- a/modules/services/picom.nix +++ b/modules/services/picom.nix @@ -310,7 +310,7 @@ in { systemd.user.services.picom = { Unit = { Description = "Picom X11 compositor"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/plex-mpv-shim.nix b/modules/services/plex-mpv-shim.nix index 940e57184..795827c40 100644 --- a/modules/services/plex-mpv-shim.nix +++ b/modules/services/plex-mpv-shim.nix @@ -58,7 +58,7 @@ in { systemd.user.services.plex-mpv-shim = { Unit = { Description = "Plex mpv shim"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/podman-linux/activation.nix b/modules/services/podman-linux/activation.nix index 5791f19b0..205b6651e 100644 --- a/modules/services/podman-linux/activation.nix +++ b/modules/services/podman-linux/activation.nix @@ -18,6 +18,7 @@ local manifestFile="${config.xdg.configHome}/podman/$2" local extraListCommands="''${3:-}" [[ $resourceType = "container" ]] && extraListCommands+=" -a" + [[ $resourceType = "volume" ]] && extraListCommands+=" --filter label=nix.home-manager.preserve=false" [ ! -f "$manifestFile" ] && VERBOSE_ENABLED && echo "Manifest does not exist: $manifestFile" && return 0 @@ -27,6 +28,7 @@ formatString="{{.Name}}" [[ $resourceType = "container" ]] && formatString="{{.Names}}" + [[ $resourceType = "image" ]] && formatString="{{.Repository}}" local listOutput=$(${config.services.podman.package}/bin/podman $resourceType ls $extraListCommands --filter 'label=nix.home-manager.managed=true' --format "$formatString") @@ -36,12 +38,12 @@ VERBOSE_ENABLED && echo "No ''${resourceType}s available to process." || true else for resource in "''${podmanResources[@]}"; do - if ! isResourceInManifest "$resource"; then - removeResource "$resourceType" "$resource" - else - VERBOSE_ENABLED && echo "Keeping managed $resourceType: $resource" || true - fi - done + if ! isResourceInManifest "$resource"; then + removeResource "$resourceType" "$resource" + else + VERBOSE_ENABLED && echo "Keeping managed $resourceType: $resource" || true + fi + done fi } @@ -69,19 +71,20 @@ commands=() case "$resourceType" in "container") - commands+="${config.services.podman.package}/bin/podman $resourceType stop $resource" - commands+="${config.services.podman.package}/bin/podman $resourceType rm -f $resource" + commands+=("${config.services.podman.package}/bin/podman $resourceType stop $resource") + commands+=("${config.services.podman.package}/bin/podman $resourceType rm -f $resource") ;; - "network") - commands+="${config.services.podman.package}/bin/podman $resourceType rm $resource" + "image" | "network" | "volume") + commands+=("${config.services.podman.package}/bin/podman $resourceType rm $resource") ;; esac for command in "''${commands[@]}"; do command=$(echo $command | tr -d ';&|`') DRYRUN_ENABLED && echo "Would run: $command" && continue || true VERBOSE_ENABLED && echo "Running: $command" || true - if [[ "$(eval "$command")" != "$resource" ]]; then + if [[ "$(eval "$command")" != *"$resource" ]]; then echo -e "\tCommand failed: ''${command}" + [ "$resourceType" == "image" ] && resourceType="ancestor" usedByContainers=$(${config.services.podman.package}/bin/podman container ls -a --filter "$resourceType=$resource" --format "{{.Names}}") echo -e "\t$resource in use by containers: $usedByContainers" fi @@ -92,7 +95,7 @@ [[ "$@" == *"--verbose"* ]] && VERBOSE="true" [[ "$@" == *"--dry-run"* ]] && DRY_RUN="true" - for type in "container" "network"; do + for type in "container" "image" "network" "volume"; do cleanup "$type" "''${type}s.manifest" done ''; diff --git a/modules/services/podman-linux/builds.nix b/modules/services/podman-linux/builds.nix new file mode 100644 index 000000000..937a206b0 --- /dev/null +++ b/modules/services/podman-linux/builds.nix @@ -0,0 +1,168 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.podman; + + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; + + createQuadletSource = name: buildDef: + let + buildConfig = podman-lib.deepMerge { + Build = { + AuthFile = buildDef.authFile; + Environment = buildDef.environment; + File = buildDef.file; + ImageTag = [ "homemanager/${name}" ] ++ buildDef.tags; + Label = buildDef.labels // { "nix.home-manager.managed" = true; }; + PodmanArgs = buildDef.extraPodmanArgs; + SetWorkingDirectory = buildDef.workingDirectory; + TLSVerify = buildDef.tlsVerify; + }; + Install = { + WantedBy = optionals buildDef.autoStart [ + "default.target" + "multi-user.target" + ]; + }; + Service = { + TimeoutStartSec = 300; + RemainAfterExit = "yes"; + }; + Unit = { Description = buildDef.description; }; + } buildDef.extraConfig; + in '' + # Automatically generated by home-manager for podman build configuration + # DO NOT EDIT THIS FILE DIRECTLY + # + # ${name}.build + ${podman-lib.toQuadletIni buildConfig} + ''; + + toQuadletInternal = name: buildDef: { + assertions = podman-lib.buildConfigAsserts name buildDef.extraConfig; + serviceName = + "podman-${name}"; # quadlet service name: 'podman--build.service + source = podman-lib.removeBlankLines (createQuadletSource name buildDef); + resourceType = "build"; + }; +in let + buildDefinitionType = types.submodule ({ name, ... }: { + options = { + + autoStart = mkOption { + type = types.bool; + default = true; + description = + "Whether to start the build on boot. Requires user lingering."; + }; + + authFile = mkOption { + type = with types; nullOr path; + default = null; + description = "Path of the authentication file."; + }; + + description = mkOption { + type = with types; nullOr str; + default = "Service for build ${name}"; + defaultText = "Service for build \${name}"; + example = "My Build"; + description = "The description of the build."; + }; + + environment = mkOption { + type = podman-lib.primitiveAttrs; + default = { }; + example = literalExpression '' + { + VAR1 = "0:100"; + VAR2 = true; + VAR3 = 5; + } + ''; + description = "Environment variables to set in the build."; + }; + + extraConfig = mkOption { + type = podman-lib.extraConfigType; + default = { }; + example = literalExpression '' + { + Build = { + Arch = "aarch64"; + }; + Service = { + TimeoutStartSec = 15; + }; + } + ''; + description = "INI sections and values to populate the Build Quadlet."; + }; + + extraPodmanArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--retries 5" ]; + description = "Extra arguments to pass to the podman build command."; + }; + + file = mkOption { + type = types.str; + example = literalExpression '' + `"xdg.configFile."containerfiles/my-img/Containerfile"` + or + `"https://github.com/.../my-img/Containerfile"` + ''; + description = + "Path to a Containerfile which contains instructions to build the image."; + }; + + tags = mkOption { + type = with types; listOf str; + default = [ ]; + description = '' + Name associated with the build. + First tag will always be "homemanager/". + ''; + }; + + labels = mkOption { + type = with types; attrsOf str; + default = { }; + example = { + app = "myapp"; + some-label = "somelabel"; + }; + description = "The labels to apply to the build."; + }; + + tlsVerify = mkOption { + type = types.bool; + default = true; + description = + "Require HTTPS and verification of certificates when contacting registries."; + }; + + workingDirectory = mkOption { + type = with types; nullOr path; + default = null; + description = "WorkingDirectory of the systemd unit file."; + }; + }; + }); +in { + options.services.podman.builds = mkOption { + type = types.attrsOf buildDefinitionType; + default = { }; + description = "Defines Podman build quadlet configurations."; + }; + + config = let buildQuadlets = mapAttrsToList toQuadletInternal cfg.builds; + in mkIf cfg.enable { + services.podman.internal.quadletDefinitions = buildQuadlets; + assertions = flatten (map (build: build.assertions) buildQuadlets); + + xdg.configFile."podman/images.manifest".text = + podman-lib.generateManifestText buildQuadlets; + }; +} diff --git a/modules/services/podman-linux/containers.nix b/modules/services/podman-linux/containers.nix index 41ab29130..d5836119a 100644 --- a/modules/services/podman-linux/containers.nix +++ b/modules/services/podman-linux/containers.nix @@ -5,24 +5,60 @@ with lib; let cfg = config.services.podman; - podman-lib = import ./podman-lib.nix { inherit lib config; }; + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; createQuadletSource = name: containerDef: let - mapHmNetworks = network: - if builtins.hasAttr network cfg.networks then - "podman-${network}-network.service" - else - null; + formatServiceNameForType = type: name: + { + image = "podman-${name}-image.service"; + build = "podman-${name}-build.service"; + network = "podman-${name}-network.service"; + volume = "podman-${name}-volume.service"; + }."${type}"; - finalConfig = let - managedNetworks = if lib.isList containerDef.network then - map mapHmNetworks containerDef.network - else if containerDef.network != null then - map mapHmNetworks [ containerDef.network ] + dependencyByHomeManagerQuadlet = type: name: + let + definitionsOfType = + filter (q: q.resourceType == type) cfg.internal.quadletDefinitions; + matchingName = + filter (q: q.serviceName == "podman-${name}") definitionsOfType; + in if ((length matchingName) == 1) then + [ (formatServiceNameForType type name) ] else [ ]; - in (podman-lib.deepMerge { + + forEachValue = type: value: + let resolve = v: dependencyByHomeManagerQuadlet type v; + in if isList value then + concatLists (map resolve value) + else + resolve value; + + withResolverFor = type: value: + { + "image" = forEachValue "image" value; + "build" = forEachValue "build" value; + "network" = forEachValue "network" value; + "volume" = let + a = if isList value then value else [ value ]; + volumes = map (v: elemAt (splitString ":" v) 0) a; + in forEachValue "volume" volumes; + }.${type}; + + dependencyServices = (withResolverFor "image" containerDef.image) + ++ (withResolverFor "build" containerDef.image) + ++ (withResolverFor "network" containerDef.network) + ++ (withResolverFor "volume" containerDef.volumes); + + resolvedImage = if (builtins.hasAttr containerDef.image cfg.images) then + cfg.images."${containerDef.image}".image + else if (builtins.hasAttr containerDef.image cfg.builds) then + "localhost/homemanager/${containerDef.image}" + else + containerDef.image; + + quadlet = (podman-lib.deepMerge { Container = { AddCapability = containerDef.addCapabilities; AddDevice = containerDef.devices; @@ -34,7 +70,7 @@ let EnvironmentFile = containerDef.environmentFile; Exec = containerDef.exec; Group = containerDef.group; - Image = containerDef.image; + Image = resolvedImage; IP = containerDef.ip4; IP6 = containerDef.ip6; Label = @@ -48,11 +84,10 @@ let Volume = containerDef.volumes; }; Install = { - WantedBy = (if containerDef.autoStart then [ + WantedBy = optionals containerDef.autoStart [ "default.target" "multi-user.target" - ] else - [ ]); + ]; }; Service = { Environment = { @@ -66,8 +101,8 @@ let TimeoutStopSec = 30; }; Unit = { - After = [ "network.target" ] ++ managedNetworks; - Requires = managedNetworks; + After = dependencyServices; + Requires = dependencyServices; Description = (if (builtins.isString containerDef.description) then containerDef.description else @@ -79,7 +114,7 @@ let # DO NOT EDIT THIS FILE DIRECTLY # # ${name}.container - ${podman-lib.toQuadletIni finalConfig} + ${podman-lib.toQuadletIni quadlet} ''; toQuadletInternal = name: containerDef: { @@ -307,7 +342,7 @@ in { flatten (map (container: container.assertions) containerQuadlets); # manifest file - home.file."${config.xdg.configHome}/podman/containers.manifest".text = + xdg.configFile."podman/containers.manifest".text = podman-lib.generateManifestText containerQuadlets; }; } diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix index 459762d46..a08541a6d 100644 --- a/modules/services/podman-linux/default.nix +++ b/modules/services/podman-linux/default.nix @@ -5,8 +5,15 @@ let in { meta.maintainers = with lib.hm.maintainers; [ bamhm182 n-hass ]; - imports = - [ ./containers.nix ./install-quadlet.nix ./networks.nix ./services.nix ]; + imports = [ + ./builds.nix + ./containers.nix + ./images.nix + ./install-quadlet.nix + ./networks.nix + ./services.nix + ./volumes.nix + ]; options.services.podman = { enable = lib.mkEnableOption "Podman, a daemonless container engine"; diff --git a/modules/services/podman-linux/images.nix b/modules/services/podman-linux/images.nix new file mode 100644 index 000000000..51aa9f1be --- /dev/null +++ b/modules/services/podman-linux/images.nix @@ -0,0 +1,162 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.podman; + + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; + + createQuadletSource = name: imageDef: + let + credsString = + (if imageDef.username != null then imageDef.username else "") + + (if imageDef.password != null then ":${imageDef.password}" else ""); + + imageConfig = podman-lib.deepMerge { + Image = { + AuthFile = imageDef.authFile; + CertDir = imageDef.certDir; + Creds = (if credsString != "" then credsString else null); + DecryptionKey = imageDef.decryptionKeyFile; + Image = imageDef.image; + ImageTag = imageDef.tag; + PodmanArgs = imageDef.extraPodmanArgs; + TLSVerify = imageDef.tlsVerify; + }; + Install = { + WantedBy = optionals imageDef.autoStart [ + "default.target" + "multi-user.target" + ]; + }; + Service = { + ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ]; + TimeoutStartSec = 300; + RemainAfterExit = "yes"; + }; + Unit = { Description = imageDef.description; }; + } imageDef.extraConfig; + in '' + # Automatically generated by home-manager for podman image configuration + # DO NOT EDIT THIS FILE DIRECTLY + # + # ${name}.image + ${podman-lib.toQuadletIni imageConfig} + ''; + + toQuadletInternal = name: imageDef: { + assertions = podman-lib.buildConfigAsserts name imageDef.extraConfig; + serviceName = + "podman-${name}"; # quadlet service name: 'podman--image.service + source = podman-lib.removeBlankLines (createQuadletSource name imageDef); + resourceType = "image"; + }; +in let + imageDefinitionType = types.submodule ({ name, ... }: { + options = { + autoStart = mkOption { + type = types.bool; + default = true; + description = + "Whether to pull the image on boot. Requires user lingering."; + }; + + authFile = mkOption { + type = with types; nullOr path; + default = null; + description = + "Path of the authentication file used to connect to registry."; + }; + + certDir = mkOption { + type = with types; nullOr path; + default = null; + description = + "Path of certificates (*.{crt,cert,key}) used to connect to registry."; + }; + + decryptionKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = "Path to key used for decrpytion of images."; + }; + + description = mkOption { + type = with types; nullOr str; + default = "Service for image ${name}"; + defaultText = "Service for image \${name}"; + example = "My Image"; + description = "The description of the image."; + }; + + extraConfig = mkOption { + type = podman-lib.extraConfigType; + default = { }; + example = literalExpression '' + { + Image = { + ContainersConfModule = "/etc/nvd.conf"; + }; + } + ''; + description = "INI sections and values to populate the Image Quadlet."; + }; + + extraPodmanArgs = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ "--os=linux" ]; + description = + "Extra arguments to pass to the podman image pull command."; + }; + + image = mkOption { + type = types.str; + example = "quay.io/centos/centos:latest"; + description = "Image to pull."; + }; + + password = mkOption { + type = with types; nullOr str; + default = null; + example = "P@ssw0rd"; + description = + "Password used to connect to registry. (Will be visible in nix store)"; + }; + + tag = mkOption { + type = with types; nullOr str; + default = null; + example = "quay.io/centos/centos:latest"; + description = + "FQIN of referenced Image when source is a file or directory archive."; + }; + + tlsVerify = mkOption { + type = types.bool; + default = true; + description = + "Require HTTPS and verification of certificates when contacting registries."; + }; + + username = mkOption { + type = with types; nullOr str; + default = null; + example = "bob"; + description = "Username used to connect to registry."; + }; + + }; + }); +in { + options.services.podman.images = mkOption { + type = types.attrsOf imageDefinitionType; + default = { }; + description = "Defines Podman image quadlet configurations."; + }; + + config = let imageQuadlets = mapAttrsToList toQuadletInternal cfg.images; + in mkIf cfg.enable { + services.podman.internal.quadletDefinitions = imageQuadlets; + assertions = flatten (map (image: image.assertions) imageQuadlets); + }; +} diff --git a/modules/services/podman-linux/install-quadlet.nix b/modules/services/podman-linux/install-quadlet.nix index 8ce6a33e8..d0157020c 100644 --- a/modules/services/podman-linux/install-quadlet.nix +++ b/modules/services/podman-linux/install-quadlet.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.podman; - podman-lib = import ./podman-lib.nix { inherit lib config; }; + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; activation = import ./activation.nix { inherit config podman-lib; }; activationCleanupScript = activation.cleanup; diff --git a/modules/services/podman-linux/networks.nix b/modules/services/podman-linux/networks.nix index bb4ac5915..8fee143e4 100644 --- a/modules/services/podman-linux/networks.nix +++ b/modules/services/podman-linux/networks.nix @@ -5,13 +5,7 @@ with lib; let cfg = config.services.podman; - podman-lib = import ./podman-lib.nix { inherit lib config; }; - - awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" '' - until ${cfg.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do - sleep 1; - done - ''; + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; createQuadletSource = name: networkDef: let @@ -39,7 +33,7 @@ let "${makeBinPath [ pkgs.su pkgs.coreutils ]}" ]); }; - ExecStartPre = [ "${awaitPodmanUnshare}" ]; + ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ]; TimeoutStartSec = 15; RemainAfterExit = "yes"; }; @@ -162,7 +156,7 @@ in { services.podman.internal.quadletDefinitions = networkQuadlets; assertions = flatten (map (network: network.assertions) networkQuadlets); - home.file."${config.xdg.configHome}/podman/networks.manifest".text = + xdg.configFile."podman/networks.manifest".text = podman-lib.generateManifestText networkQuadlets; }; } diff --git a/modules/services/podman-linux/podman-lib.nix b/modules/services/podman-linux/podman-lib.nix index 1acc930fc..30ffcc836 100644 --- a/modules/services/podman-linux/podman-lib.nix +++ b/modules/services/podman-linux/podman-lib.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ pkgs, lib, config, ... }: with lib; @@ -63,8 +63,10 @@ in { buildConfigAsserts = quadletName: extraConfig: let configRules = { + Build = { ImageTag = (with types; listOf str); }; Container = { ContainerName = types.enum [ quadletName ]; }; Network = { NetworkName = types.enum [ quadletName ]; }; + Volume = { VolumeName = types.enum [ quadletName ]; }; }; # Function to build assertions for a specific section and its attributes. @@ -83,8 +85,23 @@ in { else [ ]; + checkImageTag = extraConfig: + let + imageTags = (extraConfig.Build or { }).ImageTag or [ ]; + containsRequiredTag = + builtins.elem "homemanager/${quadletName}" imageTags; + imageTagsStr = concatMapStringsSep ''" "'' toString imageTags; + in [{ + assertion = imageTags == [ ] || containsRequiredTag; + message = '' + In '${quadletName}' config. Build.ImageTag: '[ "${imageTagsStr}" ]' does not contain 'homemanager/${quadletName}'.''; + }]; + # Flatten assertions from all sections in `extraConfig`. - in flatten (mapAttrsToList buildSectionAsserts extraConfig); + in flatten (concatLists [ + (mapAttrsToList buildSectionAsserts extraConfig) + (checkImageTag extraConfig) + ]); extraConfigType = with types; attrsOf (attrsOf (oneOf [ primitiveAttrs primitiveList primitive ])); @@ -107,8 +124,10 @@ in { # specific logic for writing the unit name goes here. It should be # identical to what `podman ls` shows in { + "build" = "localhost/homemanager/${strippedName}"; "container" = strippedName; "network" = strippedName; + "volume" = strippedName; }."${quadlet.resourceType}"; in if allQuadletsSameType then '' ${concatStringsSep "\n" @@ -133,4 +152,10 @@ in { lines = splitString "\n" text; nonEmptyLines = filter (line: line != "") lines; in concatStringsSep "\n" nonEmptyLines; + + awaitPodmanUnshare = pkgs.writeShellScript "await-podman-unshare" '' + until ${config.services.podman.package}/bin/podman unshare ${pkgs.coreutils}/bin/true; do + ${pkgs.coreutils}/bin/sleep 1 + done + ''; } diff --git a/modules/services/podman-linux/services.nix b/modules/services/podman-linux/services.nix index 87ff83ad8..4a22b703f 100644 --- a/modules/services/podman-linux/services.nix +++ b/modules/services/podman-linux/services.nix @@ -42,8 +42,8 @@ in { "${config.home.homeDirectory}/.nix-profile/bin" ] }"; - ExecStart = "${pkgs.podman}/bin/podman auto-update"; - ExecStartPost = "${pkgs.podman}/bin/podman image prune -f"; + ExecStart = "${cfg.package}/bin/podman auto-update"; + ExecStartPost = "${cfg.package}/bin/podman image prune -f"; TimeoutStartSec = "300s"; TimeoutStopSec = "10s"; }; @@ -65,7 +65,9 @@ in { xdg.configFile."systemd/user/podman-user-wait-network-online.service.d/50-exec-search-path.conf".text = '' [Service] - ExecSearchPath=${pkgs.bashInteractive}/bin:${pkgs.systemd}/bin:/bin + ExecSearchPath=${ + makeBinPath (with pkgs; [ bashInteractive systemd coreutils ]) + }:/bin ''; }) ]); diff --git a/modules/services/podman-linux/volumes.nix b/modules/services/podman-linux/volumes.nix new file mode 100644 index 000000000..10f7cd927 --- /dev/null +++ b/modules/services/podman-linux/volumes.nix @@ -0,0 +1,186 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.podman; + + podman-lib = import ./podman-lib.nix { inherit pkgs lib config; }; + + createQuadletSource = name: volumeDef: + let + volumeConfig = podman-lib.deepMerge { + Install = { + WantedBy = optionals volumeDef.autoStart [ + "default.target" + "multi-user.target" + ]; + }; + Service = { + Environment = { + PATH = (builtins.concatStringsSep ":" [ + "${podman-lib.newuidmapPaths}" + "${makeBinPath [ pkgs.su pkgs.coreutils ]}" + ]); + }; + ExecStartPre = [ "${podman-lib.awaitPodmanUnshare}" ]; + TimeoutStartSec = 15; + RemainAfterExit = "yes"; + }; + Unit = { Description = volumeDef.description; }; + Volume = { + Copy = volumeDef.copy; + Device = volumeDef.device; + Driver = volumeDef.driver; + Group = volumeDef.group; + Image = volumeDef.image; + Label = volumeDef.labels // { + "nix.home-manager.managed" = true; + "nix.home-manager.preserve" = volumeDef.preserve; + }; + PodmanArgs = volumeDef.extraPodmanArgs; + Type = volumeDef.type; + User = volumeDef.user; + VolumeName = name; + }; + } volumeDef.extraConfig; + in '' + # Automatically generated by home-manager for podman volume configuration + # DO NOT EDIT THIS FILE DIRECTLY + # + # ${name}.volume + ${podman-lib.toQuadletIni volumeConfig} + ''; + + toQuadletInternal = name: volumeDef: { + assertions = podman-lib.buildConfigAsserts name volumeDef.extraConfig; + serviceName = + "podman-${name}"; # quadlet service name: 'podman--volume.service' + source = podman-lib.removeBlankLines (createQuadletSource name volumeDef); + resourceType = "volume"; + }; + +in let + volumeDefinitionType = types.submodule ({ name, ... }: { + options = { + + autoStart = mkOption { + type = types.bool; + default = true; + description = "Whether to create the volume on boot."; + }; + + copy = mkOption { + type = types.bool; + default = true; + description = + "Copy content of the image located at the mountpoint of the volume on first run."; + }; + + description = mkOption { + type = with types; nullOr str; + default = "Service for volume ${name}"; + defaultText = "Service for volume \${name}"; + example = "My Volume"; + description = "The description of the volume."; + }; + + device = mkOption { + type = with types; nullOr str; + default = null; + example = "tmpfs"; + description = "The path of a device which is mounted for the volume."; + }; + + driver = mkOption { + type = with types; nullOr str; + default = null; + example = "image"; + description = "The volume driver to use."; + }; + + extraConfig = mkOption { + type = podman-lib.extraConfigType; + default = { }; + example = literalExpression '' + { + Volume = { + ContainerConfModule = "/etc/nvd.conf"; + }; + } + ''; + description = "INI sections and values to populate the Volume Quadlet."; + }; + + extraPodmanArgs = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ "--opt copy" ]; + description = + "Extra arguments to pass to the podman volume create command."; + }; + + group = mkOption { + type = with types; nullOr (either int str); + default = null; + description = "The group ID owning the volume inside the container."; + }; + + image = mkOption { + type = with types; nullOr str; + default = null; + example = "quay.io/centos/centos:latest"; + description = + "Specifies the image the volume is based on when Driver is set to the image."; + }; + + labels = mkOption { + type = with types; attrsOf str; + default = { }; + example = { + app = "myapp"; + some-label = "somelabel"; + }; + description = "The labels to apply to the volume."; + }; + + preserve = mkOption { + type = types.bool; + default = true; + description = '' + Whether the volume should be preserved if it is removed from the configuration. + Setting this to false will cause the volume to be deleted if the volume is removed from the configuration + ''; + }; + + type = mkOption { + type = with types; nullOr str; + default = null; + example = "tmpfs"; + description = + "Filesystem type of Device. (used as -t in mount commands)"; + }; + + user = mkOption { + type = with types; nullOr (either int str); + default = null; + description = "The user ID owning the volume inside the container."; + }; + }; + }); +in { + options.services.podman.volumes = mkOption { + type = types.attrsOf volumeDefinitionType; + default = { }; + description = "Defines Podman volume quadlet configurations."; + }; + + config = let volumeQuadlets = mapAttrsToList toQuadletInternal cfg.volumes; + in mkIf cfg.enable { + services.podman.internal.quadletDefinitions = volumeQuadlets; + assertions = flatten (map (volume: volume.assertions) volumeQuadlets); + + xdg.configFile."podman/volumes.manifest".text = + podman-lib.generateManifestText volumeQuadlets; + }; +} diff --git a/modules/services/poweralertd.nix b/modules/services/poweralertd.nix index 9c59ad3f0..20481e905 100644 --- a/modules/services/poweralertd.nix +++ b/modules/services/poweralertd.nix @@ -44,7 +44,7 @@ in { Unit = { Description = "UPower-powered power alerter"; Documentation = "man:poweralertd(1)"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/psd.nix b/modules/services/psd.nix index 477176aa3..eed04f3fa 100644 --- a/modules/services/psd.nix +++ b/modules/services/psd.nix @@ -4,6 +4,14 @@ let cfg = config.services.psd; + configFile = '' + ${lib.optionalString (cfg.browsers != [ ]) '' + BROWSERS=(${lib.concatStringsSep " " cfg.browsers}) + ''} + + USE_BACKUP="${if cfg.useBackup then "yes" else "no"}" + BACKUP_LIMIT=${builtins.toString cfg.backupLimit} + ''; in { meta.maintainers = [ lib.hm.maintainers.danjujan ]; @@ -22,6 +30,34 @@ in { defaults to seconds if omitted. ''; }; + + browsers = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "chromium" "google-chrome" "firefox" ]; + description = '' + A list of browsers to sync. An empty list will enable all browsers to be managed by profile-sync-daemon. + + Available choices are: + chromium chromium-dev conkeror.mozdev.org epiphany falkon firefox firefox-trunk google-chrome google-chrome-beta google-chrome-unstable heftig-aurora icecat inox luakit midori opera opera-beta opera-developer opera-legacy otter-browser qupzilla qutebrowser palemoon rekonq seamonkey surf vivaldi vivaldi-snapshot + ''; + }; + + useBackup = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to completly enable or disable the crash recovery feature. + ''; + }; + + backupLimit = lib.mkOption { + type = lib.types.ints.unsigned; + default = 5; + description = '' + Maximum number of crash recovery snapshots to keep (the oldest ones are deleted first). + ''; + }; }; config = lib.mkIf cfg.enable { @@ -38,6 +74,10 @@ in { rsync kmod gawk + gnugrep + gnused + coreutils + findutils nettools util-linux profile-sync-daemon @@ -84,5 +124,7 @@ in { Timer = { OnUnitActiveSec = cfg.resyncTimer; }; }; }; + + xdg.configFile."psd/psd.conf".text = configFile; }; } diff --git a/modules/services/pueue.nix b/modules/services/pueue.nix index f0603bb47..1e35f0614 100644 --- a/modules/services/pueue.nix +++ b/modules/services/pueue.nix @@ -15,7 +15,7 @@ in { options.services.pueue = { enable = mkEnableOption "Pueue, CLI process scheduler and manager"; - package = mkPackageOption pkgs "pueue" { }; + package = mkPackageOption pkgs "pueue" { nullable = true; }; settings = mkOption { type = yamlFormat.type; @@ -38,11 +38,11 @@ in { assertions = [ (hm.assertions.assertPlatform "services.pueue" pkgs platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xdg.configFile."pueue/pueue.yml".source = configFile; - systemd.user = { + systemd.user = lib.mkIf (cfg.package != null) { services.pueued = { Unit = { Description = "Pueue Daemon - CLI process scheduler and manager"; diff --git a/modules/services/pulseeffects.nix b/modules/services/pulseeffects.nix index 3edc53499..c4a150c17 100644 --- a/modules/services/pulseeffects.nix +++ b/modules/services/pulseeffects.nix @@ -52,7 +52,7 @@ in { Unit = { Description = "Pulseeffects daemon"; Requires = [ "dbus.service" ]; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" "pulseaudio.service" ]; }; diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix index 7e887f32e..499dc4e3b 100644 --- a/modules/services/random-background.nix +++ b/modules/services/random-background.nix @@ -76,7 +76,7 @@ in { systemd.user.services.random-background = { Unit = { Description = "Set random desktop background using feh"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/redshift-gammastep/lib/options.nix b/modules/services/redshift-gammastep/lib/options.nix index 81347e643..476f8baa3 100644 --- a/modules/services/redshift-gammastep/lib/options.nix +++ b/modules/services/redshift-gammastep/lib/options.nix @@ -189,7 +189,7 @@ in { in { Description = "${programName} colour temperature adjuster"; Documentation = serviceDocumentation; - After = [ "graphical-session-pre.target" ] ++ geoclueAgentService; + After = [ "graphical-session.target" ] ++ geoclueAgentService; Wants = geoclueAgentService; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/remmina.nix b/modules/services/remmina.nix index dac0471db..de86fe215 100644 --- a/modules/services/remmina.nix +++ b/modules/services/remmina.nix @@ -39,7 +39,7 @@ in { Unit = { Description = "Remmina remote desktop client"; Documentation = "man:remmina(1)"; - Requires = [ "graphical-session-pre.target" ]; + Requires = [ "graphical-session.target" ]; }; Service = { diff --git a/modules/services/rsibreak.nix b/modules/services/rsibreak.nix index d587c2daf..e3743090f 100644 --- a/modules/services/rsibreak.nix +++ b/modules/services/rsibreak.nix @@ -23,7 +23,7 @@ in { systemd.user.services.rsibreak = { Unit = { Description = "RSI break timer"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix index 085573f8a..3e2b14b11 100644 --- a/modules/services/screen-locker.nix +++ b/modules/services/screen-locker.nix @@ -31,6 +31,14 @@ in { example = "\${pkgs.i3lock}/bin/i3lock -n -c 000000"; }; + lockCmdEnv = lib.mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "XSECURELOCK_PAM_SERVICE=xsecurelock" ]; + description = + "Environment variables to source a with the locker command (lockCmd)."; + }; + inactiveInterval = mkOption { type = types.int; default = 10; @@ -117,7 +125,7 @@ in { systemd.user.services.xss-lock = { Unit = { Description = "xss-lock, session locker service"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; @@ -127,6 +135,8 @@ in { ExecStart = concatStringsSep " " ([ "${cfg.xss-lock.package}/bin/xss-lock" "-s \${XDG_SESSION_ID}" ] ++ cfg.xss-lock.extraOptions ++ [ "-- ${cfg.lockCmd}" ]); + Environment = cfg.lockCmdEnv; + Restart = "always"; }; }; } @@ -140,7 +150,7 @@ in { systemd.user.services.xautolock-session = { Unit = { Description = "xautolock, session locker service"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; @@ -153,6 +163,7 @@ in { "-locker '${pkgs.systemd}/bin/loginctl lock-session \${XDG_SESSION_ID}'" ] ++ optional cfg.xautolock.detectSleep "-detectsleep" ++ cfg.xautolock.extraOptions); + Restart = "always"; }; }; }) diff --git a/modules/services/sctd.nix b/modules/services/sctd.nix index 44c770264..4e9671747 100644 --- a/modules/services/sctd.nix +++ b/modules/services/sctd.nix @@ -30,7 +30,7 @@ with lib; Unit = { Description = "Dynamically adjust the screen color temperature twice every minute"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix index b8bb912ba..fddf074f8 100644 --- a/modules/services/swaync.nix +++ b/modules/services/swaync.nix @@ -7,7 +7,8 @@ let jsonFormat = pkgs.formats.json { }; in { - meta.maintainers = [ lib.hm.maintainers.abayomi185 ]; + meta.maintainers = + [ lib.hm.maintainers.abayomi185 lib.maintainers.khaneliman ]; options.services.swaync = { enable = lib.mkEnableOption "Swaync notification daemon"; @@ -78,7 +79,8 @@ in { config = lib.mkIf cfg.enable { # at-spi2-core is to minimize journalctl noise of: # "AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files" - home.packages = [ cfg.package pkgs.at-spi2-core ]; + home.packages = + lib.mkIf (cfg.package != null) [ cfg.package pkgs.at-spi2-core ]; xdg.configFile = { "swaync/config.json".source = @@ -91,7 +93,7 @@ in { }; }; - systemd.user.services.swaync = { + systemd.user.services.swaync = lib.mkIf (cfg.package != null) { Unit = { Description = "Swaync notification daemon"; Documentation = "https://github.com/ErikReider/SwayNotificationCenter"; diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index f609b3b65..0370dceae 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -1,16 +1,22 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) literalExpression mkOption mkEnableOption mkPackageOption types; cfg = config.services.syncthing; + settingsFormat = pkgs.formats.json { }; cleanedConfig = - converge (filterAttrsRecursive (_: v: v != null && v != { })) cfg.settings; + lib.converge (lib.filterAttrsRecursive (_: v: v != null && v != { })) + cfg.settings; isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/"; + # syncthing's configuration directory (see https://docs.syncthing.net/users/config.html) + syncthing_dir = if pkgs.stdenv.isDarwin then + "$HOME/Library/Application Support/Syncthing" + else + "\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing"; + # Syncthing supports serving the GUI over Unix sockets. If that happens, the # API is served over the Unix socket as well. This function returns the correct # curl arguments for the address portion of the curl command for both network @@ -26,38 +32,48 @@ let else "${cfg.guiAddress}${path}"; - devices = mapAttrsToList (_: device: device // { deviceID = device.id; }) + devices = lib.mapAttrsToList (_: device: device // { deviceID = device.id; }) cfg.settings.devices; - folders = mapAttrsToList (_: folder: + folders = lib.mapAttrsToList (_: folder: folder // { devices = map (device: if builtins.isString device then { deviceId = cfg.settings.devices.${device}.id; } else device) folder.devices; - }) (filterAttrs (_: folder: folder.enable) cfg.settings.folders); + }) (lib.filterAttrs (_: folder: folder.enable) cfg.settings.folders); - jq = "${pkgs.jq}/bin/jq"; - sleep = "${pkgs.coreutils}/bin/sleep"; - printf = "${pkgs.coreutils}/bin/printf"; - cat = "${pkgs.coreutils}/bin/cat"; - curl = "${pkgs.curl}/bin/curl"; - install = "${pkgs.coreutils}/bin/install"; - syncthing = "${pkgs.syncthing}/bin/syncthing"; + jq = lib.getExe pkgs.jq; + sleep = lib.getExe' pkgs.coreutils "sleep"; + printf = lib.getExe' pkgs.coreutils "printf"; + cat = lib.getExe' pkgs.coreutils "cat"; + curl = lib.getExe pkgs.curl; + install = lib.getExe' pkgs.coreutils "install"; + mktemp = lib.getExe' pkgs.coreutils "mktemp"; + syncthing = lib.getExe cfg.package; - updateConfig = pkgs.writers.writeBash "merge-syncthing-config" ('' - set -efu + copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" '' + ${install} -dm700 "${syncthing_dir}" + ${lib.optionalString (cfg.cert != null) '' + ${install} -Dm400 ${toString cfg.cert} "${syncthing_dir}/cert.pem" + ''} + ${lib.optionalString (cfg.key != null) '' + ${install} -Dm400 ${toString cfg.key} "${syncthing_dir}/key.pem" + ''} + ''; - # be careful not to leak secrets in the filesystem or in process listings - umask 0077 + curlShellFunction = '' + # systemd sets and creates RUNTIME_DIRECTORY on Linux + # on Darwin, we create it manually via mktemp + RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:=$(${mktemp} -d)}" curl() { # get the api key by parsing the config.xml while ! ${pkgs.libxml2}/bin/xmllint \ --xpath 'string(configuration/gui/apikey)' \ - ''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing/config.xml \ + "${syncthing_dir}/config.xml" \ >"$RUNTIME_DIRECTORY/api_key" do ${sleep} 1; done (${printf} "X-API-Key: "; ${cat} "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" @@ -65,6 +81,15 @@ let --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } + ''; + + updateConfig = pkgs.writers.writeBash "merge-syncthing-config" ('' + set -efu + + # be careful not to leak secrets in the filesystem or in process listings + umask 0077 + + ${curlShellFunction} '' + /* Syncthing's rest API for the folders and devices is almost identical. @@ -91,7 +116,7 @@ let } [ # Now for each of these attributes, write the curl commands that are # identical to both folders and devices. - (mapAttrs (conf_type: s: + (lib.mapAttrs (conf_type: s: # We iterate the `conf` list now, and run a curl -X POST command for each, that # should update that device/folder only. lib.pipe s.conf [ @@ -167,17 +192,16 @@ let syncthingArgs = defaultSyncthingArgs ++ cfg.extraOptions; in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; - options = with types; { + options = { services.syncthing = { enable = mkEnableOption '' Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync. - Further declarative configuration options only supported on Linux devices. ''; cert = mkOption { - type = nullOr str; + type = with types; nullOr str; default = null; description = '' Path to the `cert.pem` file, which will be copied into Syncthing's @@ -186,7 +210,7 @@ in { }; key = mkOption { - type = nullOr str; + type = with types; nullOr str; default = null; description = '' Path to the `key.pem` file, which will be copied into Syncthing's @@ -195,7 +219,7 @@ in { }; passwordFile = mkOption { - type = nullOr path; + type = with types; nullOr path; default = null; description = '' Path to the gui password file. @@ -203,7 +227,7 @@ in { }; overrideDevices = mkOption { - type = bool; + type = types.bool; default = true; description = '' Whether to delete the devices which are not configured via the @@ -214,7 +238,7 @@ in { }; overrideFolders = mkOption { - type = bool; + type = types.bool; default = true; description = '' Whether to delete the folders which are not configured via the @@ -225,7 +249,7 @@ in { }; settings = mkOption { - type = submodule { + type = types.submodule { freeformType = settingsFormat.type; options = { # global options @@ -234,11 +258,11 @@ in { description = '' The options element contains all other global configuration options ''; - type = submodule ({ name, ... }: { + type = types.submodule { freeformType = settingsFormat.type; options = { localAnnounceEnabled = mkOption { - type = nullOr bool; + type = with types; nullOr bool; default = null; description = '' Whether to send announcements to the local LAN, also use such announcements to find other devices. @@ -246,7 +270,7 @@ in { }; localAnnouncePort = mkOption { - type = nullOr int; + type = with types; nullOr int; default = null; description = '' The port on which to listen and send IPv4 broadcast announcements to. @@ -254,7 +278,7 @@ in { }; relaysEnabled = mkOption { - type = nullOr bool; + type = with types; nullOr bool; default = null; description = '' When true, relays will be connected to and potentially used for device to device connections. @@ -262,7 +286,7 @@ in { }; urAccepted = mkOption { - type = nullOr int; + type = with types; nullOr int; default = null; description = '' Whether the user has accepted to submit anonymous usage data. @@ -272,7 +296,7 @@ in { }; limitBandwidthInLan = mkOption { - type = nullOr bool; + type = with types; nullOr bool; default = null; description = '' Whether to apply bandwidth limits to devices in the same broadcast domain as the local device. @@ -280,7 +304,7 @@ in { }; maxFolderConcurrency = mkOption { - type = nullOr int; + type = with types; nullOr int; default = null; description = '' This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning. @@ -288,7 +312,7 @@ in { ''; }; }; - }); + }; }; # device settings @@ -308,12 +332,12 @@ in { addresses = [ "tcp://192.168.0.10:51820" ]; }; }; - type = attrsOf (submodule ({ name, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { freeformType = settingsFormat.type; options = { name = mkOption { - type = str; + type = types.str; default = name; description = '' The name of the device. @@ -321,14 +345,14 @@ in { }; id = mkOption { - type = str; + type = types.str; description = '' The device ID. See . ''; }; autoAcceptFolders = mkOption { - type = bool; + type = types.bool; default = false; description = '' Automatically create or share folders that this device advertises at the default path. @@ -358,12 +382,12 @@ in { }; } ''; - type = attrsOf (submodule ({ name, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { freeformType = settingsFormat.type; options = { enable = mkOption { - type = bool; + type = types.bool; default = true; description = '' Whether to share this folder. @@ -373,11 +397,12 @@ in { }; path = mkOption { - type = str // { + type = types.str // { check = x: - str.check x - && (substring 0 1 x == "/" || substring 0 2 x == "~/"); - description = str.description + " starting with / or ~/"; + types.str.check x && (lib.substring 0 1 x == "/" + || lib.substring 0 2 x == "~/"); + description = types.str.description + + " starting with / or ~/"; }; default = name; description = '' @@ -388,7 +413,7 @@ in { }; id = mkOption { - type = str; + type = types.str; default = name; description = '' The ID of the folder. Must be the same on all devices. @@ -396,7 +421,7 @@ in { }; label = mkOption { - type = str; + type = types.str; default = name; description = '' The label of the folder. @@ -404,7 +429,7 @@ in { }; type = mkOption { - type = enum [ + type = types.enum [ "sendreceive" "sendonly" "receiveonly" @@ -418,7 +443,7 @@ in { }; devices = mkOption { - type = listOf str; + type = with types; listOf str; default = [ ]; description = '' The devices this folder should be shared with. Each device must @@ -490,7 +515,7 @@ in { }; copyOwnershipFromParent = mkOption { - type = bool; + type = types.bool; default = false; description = '' On Unix systems, tries to copy file/folder ownership from @@ -541,7 +566,7 @@ in { }; guiAddress = mkOption { - type = str; + type = types.str; default = "127.0.0.1:8384"; description = '' The address to serve the web interface at. @@ -561,7 +586,7 @@ in { }; extraOptions = mkOption { - type = listOf str; + type = with types; listOf str; default = [ ]; example = [ "--reset-deltas" ]; description = '' @@ -604,9 +629,9 @@ in { }; }; - config = mkMerge [ - (mkIf cfg.enable { - home.packages = [ (getOutput "man" pkgs.syncthing) ]; + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + home.packages = [ (lib.getOutput "man" cfg.package) ]; systemd.user.services = { syncthing = { @@ -618,28 +643,14 @@ in { }; Service = { - ExecStartPre = mkIf (cfg.cert != null || cfg.key != null) "+${ - pkgs.writers.writeBash "syncthing-copy-keys" '' - syncthing_dir="''${XDG_STATE_HOME:-$HOME/.local/state}/syncthing" - ${install} -dm700 "$syncthing_dir" - ${optionalString (cfg.cert != null) '' - ${install} -Dm400 ${ - toString cfg.cert - } "$syncthing_dir/cert.pem" - ''} - ${optionalString (cfg.key != null) '' - ${install} -Dm400 ${ - toString cfg.key - } "$syncthing_dir/key.pem" - ''} - '' - }"; - ExecStart = escapeShellArgs syncthingArgs; + ExecStartPre = + lib.mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}"; + ExecStart = lib.escapeShellArgs syncthingArgs; Restart = "on-failure"; SuccessExitStatus = [ 3 4 ]; RestartForceExitStatus = [ 3 4 ]; Environment = - mkIf (cfg.allProxy != null) { all_proxy = cfg.allProxy; }; + lib.mkIf (cfg.allProxy != null) { all_proxy = cfg.allProxy; }; # Sandboxing. LockPersonality = true; @@ -654,7 +665,7 @@ in { Install = { WantedBy = [ "default.target" ]; }; }; - syncthing-init = mkIf (cleanedConfig != { }) { + syncthing-init = lib.mkIf (cleanedConfig != { }) { Unit = { Description = "Syncthing configuration updater"; Requires = [ "syncthing.service" ]; @@ -672,23 +683,44 @@ in { }; }; - launchd.agents.syncthing = { - enable = true; - config = { - ProgramArguments = syncthingArgs; - KeepAlive = { - Crashed = true; - SuccessfulExit = false; + launchd.agents = let + # agent `syncthing` uses `${syncthing_dir}/${watch_file}` to notify agent `syncthing-init` + watch_file = ".launchd_update_config"; + in { + syncthing = { + enable = true; + config = { + ProgramArguments = [ + "${pkgs.writers.writeBash "syncthing-wrapper" '' + ${copyKeys} # simulate systemd's `syncthing-init.Service.ExecStartPre` + touch "${syncthing_dir}/${watch_file}" # notify syncthing-init agent + exec ${lib.escapeShellArgs syncthingArgs} + ''}" + ]; + KeepAlive = { + Crashed = true; + SuccessfulExit = false; + }; + ProcessType = "Background"; + }; + }; + + syncthing-init = { + enable = true; + config = { + ProgramArguments = [ "${updateConfig}" ]; + WatchPaths = [ + "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}" + ]; }; - ProcessType = "Background"; }; }; }) - (mkIf (isAttrs cfg.tray && cfg.tray.enable) { + (lib.mkIf (lib.isAttrs cfg.tray && cfg.tray.enable) { assertions = [ - (hm.assertions.assertPlatform "services.syncthing.tray" pkgs - platforms.linux) + (lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs + lib.platforms.linux) ]; systemd.user.services = { @@ -696,7 +728,7 @@ in { Unit = { Description = cfg.tray.package.pname; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; @@ -710,10 +742,10 @@ in { }) # deprecated - (mkIf (isBool cfg.tray && cfg.tray) { + (lib.mkIf (lib.isBool cfg.tray && cfg.tray) { assertions = [ - (hm.assertions.assertPlatform "services.syncthing.tray" pkgs - platforms.linux) + (lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs + lib.platforms.linux) ]; systemd.user.services = { @@ -721,7 +753,7 @@ in { Unit = { Description = "syncthingtray"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/tldr-update.nix b/modules/services/tldr-update.nix new file mode 100644 index 000000000..47be1ab24 --- /dev/null +++ b/modules/services/tldr-update.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: +let cfg = config.services.tldr-update; +in { + meta.maintainers = [ lib.maintainers.perchun ]; + + options.services.tldr-update = { + enable = lib.mkEnableOption '' + Automatic updates for the tldr CLI + ''; + + package = lib.mkPackageOption pkgs "tldr" { example = "tlrc"; }; + + period = lib.mkOption { + type = lib.types.str; + default = "weekly"; + description = '' + Systemd timer period to create for scheduled {command}`tldr --update`. + + The format is described in {manpage}`systemd.time(7)`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.user.services.tldr-update = { + Unit = { + Description = "Update tldr CLI cache"; + Documentation = "https://tldr.sh/"; + }; + + Service = { + Type = "oneshot"; + ExecStart = '' + ${lib.getExe cfg.package} --update + ''; + }; + }; + + systemd.user.timers.tldr-update = { + Unit.Description = "Update tldr CLI cache"; + + Timer = { + OnCalendar = cfg.period; + Persistent = true; + }; + + Install.WantedBy = [ "timers.target" ]; + }; + }; +} diff --git a/modules/services/trayscale.nix b/modules/services/trayscale.nix index d9853d7aa..0760448c6 100644 --- a/modules/services/trayscale.nix +++ b/modules/services/trayscale.nix @@ -28,7 +28,7 @@ in { Description = "An unofficial GUI wrapper around the Tailscale CLI client"; Requires = [ "tray.target" ]; - After = [ "graphical-session-pre.target" "tray.target" ]; + After = [ "graphical-session.target" "tray.target" ]; PartOf = [ "graphical-session.target" ]; }; Install = { WantedBy = [ "graphical-session.target" ]; }; diff --git a/modules/services/twmn.nix b/modules/services/twmn.nix index c29ff621b..e4d9f67b9 100644 --- a/modules/services/twmn.nix +++ b/modules/services/twmn.nix @@ -361,7 +361,7 @@ in { systemd.user.services.twmnd = { Unit = { Description = "twmn daemon"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; X-Restart-Triggers = [ "${config.xdg.configFile."twmn/twmn.conf".source}" ]; diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix index 2572b3594..c6165ecf5 100644 --- a/modules/services/udiskie.nix +++ b/modules/services/udiskie.nix @@ -116,7 +116,7 @@ in { Unit = { Description = "udiskie mount daemon"; Requires = lib.optional (cfg.tray != "never") "tray.target"; - After = [ "graphical-session-pre.target" ] + After = [ "graphical-session.target" ] ++ lib.optional (cfg.tray != "never") "tray.target"; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/unclutter.nix b/modules/services/unclutter.nix index e08c23eb3..d0327b5e1 100644 --- a/modules/services/unclutter.nix +++ b/modules/services/unclutter.nix @@ -45,7 +45,7 @@ in { systemd.user.services.unclutter = { Unit = { Description = "unclutter"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/window-managers/fluxbox.nix b/modules/services/window-managers/fluxbox.nix index c06b14d60..f84714742 100644 --- a/modules/services/window-managers/fluxbox.nix +++ b/modules/services/window-managers/fluxbox.nix @@ -13,7 +13,7 @@ in { xsession.windowManager.fluxbox = { enable = mkEnableOption "Fluxbox window manager"; - package = mkPackageOption pkgs "fluxbox" { }; + package = mkPackageOption pkgs "fluxbox" { nullable = true; }; init = mkOption { type = types.lines; @@ -95,7 +95,7 @@ in { platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; home.file = { ".fluxbox/init" = mkIf (cfg.init != "") { text = cfg.init; }; diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix index 73602ec61..35e47a152 100644 --- a/modules/services/window-managers/hyprland.nix +++ b/modules/services/window-managers/hyprland.nix @@ -56,12 +56,23 @@ in { ''; }; - package = lib.mkPackageOption pkgs "hyprland" { }; + package = lib.mkPackageOption pkgs "hyprland" { + nullable = true; + extraDescription = + "Set this to null if you use the NixOS module to install Hyprland."; + }; + + portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" { + nullable = true; + }; finalPackage = lib.mkOption { - type = lib.types.package; + type = with lib.types; nullOr package; readOnly = true; - default = cfg.package.override { enableXWayland = cfg.xwayland.enable; }; + default = if cfg.package != null then + cfg.package.override { enableXWayland = cfg.xwayland.enable; } + else + null; defaultText = lib.literalMD "`wayland.windowManager.hyprland.package` with applied configuration"; description = '' @@ -69,6 +80,24 @@ in { ''; }; + finalPortalPackage = lib.mkOption { + type = with lib.types; nullOr package; + readOnly = true; + default = if (cfg.portalPackage != null) then + if cfg.finalPackage != null then + cfg.portalPackage.override { hyprland = cfg.finalPackage; } + else + cfg.portalPackage + else + null; + defaultText = lib.literalMD '' + `wayland.windowManager.hyprland.portalPackage` with + `wayland.windowManager.hyprland.finalPackage` override''; + description = '' + The xdg-desktop-portal-hyprland package after overriding its hyprland input. + ''; + }; + plugins = lib.mkOption { type = with lib.types; listOf (either package path); default = [ ]; @@ -220,10 +249,8 @@ in { "You have enabled hyprland.systemd.enable or listed plugins in hyprland.plugins but do not have any configuration in hyprland.settings or hyprland.extraConfig. This is almost certainly a mistake."; in lib.optional inconsistent warning; - home.packages = lib.concatLists [ - (lib.optional (cfg.package != null) cfg.finalPackage) - (lib.optional (cfg.xwayland.enable) pkgs.xwayland) - ]; + home.packages = lib.mkIf (cfg.package != null) + ([ cfg.finalPackage ] ++ lib.optional cfg.xwayland.enable pkgs.xwayland); xdg.configFile."hypr/hyprland.conf" = let shouldGenerate = cfg.systemd.enable || cfg.extraConfig != "" @@ -264,6 +291,14 @@ in { ''; }; + xdg.portal = { + enable = cfg.finalPortalPackage != null; + extraPortals = + lib.mkIf (cfg.finalPortalPackage != null) [ cfg.finalPortalPackage ]; + configPackages = lib.mkIf (cfg.finalPackage != null) + (lib.mkDefault [ cfg.finalPackage ]); + }; + systemd.user.targets.hyprland-session = lib.mkIf cfg.systemd.enable { Unit = { Description = "Hyprland compositor session"; @@ -277,12 +312,5 @@ in { [ "xdg-desktop-autostart.target" ]; }; }; - - systemd.user.targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; }; } diff --git a/modules/services/window-managers/i3-sway/i3.nix b/modules/services/window-managers/i3-sway/i3.nix index 8c64aee44..eac5ef42e 100644 --- a/modules/services/window-managers/i3-sway/i3.nix +++ b/modules/services/window-managers/i3-sway/i3.nix @@ -208,7 +208,7 @@ in { xsession.windowManager.i3 = { enable = mkEnableOption "i3 window manager"; - package = mkPackageOption pkgs "i3" { }; + package = mkPackageOption pkgs "i3" { nullable = true; }; config = mkOption { type = types.nullOr configModule; @@ -232,7 +232,7 @@ in { platforms.linux) ]; - home.packages = [ cfg.package ]; + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; xsession.windowManager.command = "${cfg.package}/bin/i3"; diff --git a/modules/services/window-managers/i3-sway/lib/options.nix b/modules/services/window-managers/i3-sway/lib/options.nix index 2869c2bf8..6a3fcf1c1 100644 --- a/modules/services/window-managers/i3-sway/lib/options.nix +++ b/modules/services/window-managers/i3-sway/lib/options.nix @@ -421,7 +421,13 @@ in { }; hideEdgeBorders = mkOption { - type = types.enum [ "none" "vertical" "horizontal" "both" "smart" ]; + type = let + i3Options = [ "none" "vertical" "horizontal" "both" "smart" ]; + swayOptions = i3Options ++ [ "smart_no_gaps" ]; + in if isI3 then + types.enum i3Options + else + types.enum (swayOptions ++ (map (e: "--i3 ${e}") swayOptions)); default = "none"; description = "Hide window borders adjacent to the screen edges."; }; diff --git a/modules/services/window-managers/i3-sway/sway.nix b/modules/services/window-managers/i3-sway/sway.nix index 4148fcf1d..36d27328e 100644 --- a/modules/services/window-managers/i3-sway/sway.nix +++ b/modules/services/window-managers/i3-sway/sway.nix @@ -553,13 +553,6 @@ in { optional cfg.systemd.xdgAutostart "xdg-desktop-autostart.target"; }; }; - - systemd.user.targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; } ]); } diff --git a/modules/services/window-managers/river.nix b/modules/services/window-managers/river.nix index 06d458411..cc10a4344 100644 --- a/modules/services/window-managers/river.nix +++ b/modules/services/window-managers/river.nix @@ -201,12 +201,5 @@ in { After = [ "graphical-session-pre.target" ]; }; }; - - systemd.user.targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; }; } diff --git a/modules/services/window-managers/wayfire.nix b/modules/services/window-managers/wayfire.nix index c551eb05f..e52201c79 100644 --- a/modules/services/window-managers/wayfire.nix +++ b/modules/services/window-managers/wayfire.nix @@ -189,12 +189,5 @@ After = [ "graphical-session-pre.target" ]; }; }; - - systemd.user.targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; }; } diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix index f3352750c..4bbd98e0b 100644 --- a/modules/services/wlsunset.nix +++ b/modules/services/wlsunset.nix @@ -128,6 +128,7 @@ in { systemd.user.services.wlsunset = { Unit = { Description = "Day/night gamma adjustments for Wayland compositors."; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/wluma.nix b/modules/services/wluma.nix new file mode 100644 index 000000000..1698b1387 --- /dev/null +++ b/modules/services/wluma.nix @@ -0,0 +1,103 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.wluma; + format = pkgs.formats.toml { }; + configFile = format.generate "config.toml" cfg.settings; +in { + meta.maintainers = with lib.maintainers; [ _0x5a4 ]; + + options.services.wluma = { + enable = lib.mkEnableOption + "Enable wluma, a service for automatic brightness adjustment"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.wluma; + defaultText = lib.literalExpression "pkgs.wluma"; + description = "Package providing {command}`wluma`."; + }; + + settings = lib.mkOption { + type = format.type; + default = { }; + example = { + als.iio = { + path = ""; + thresholds = { + "0" = "night"; + "20" = "dark"; + "80" = "dim"; + "250" = "normal"; + "500" = "bright"; + "800" = "outdoors"; + }; + }; + }; + description = '' + Configuration to use for wluma. See + + for available options. + ''; + }; + + systemd.enable = lib.mkOption { + description = "Wluma systemd integration"; + type = lib.types.bool; + default = true; + }; + + systemd.target = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = config.wayland.systemd.target; + defaultText = lib.literalExpression "config.wayland.systemd.target"; + example = "sway-session.target"; + description = '' + The systemd target that will automatically start the Wluma service. + + When setting this value to `"sway-session.target"`, + make sure to also enable {option}`wayland.windowManager.sway.systemd.enable`, + otherwise the service may never be started. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "services.wluma" pkgs + lib.platforms.linux) + ]; + + home.packages = [ cfg.package ]; + + xdg.configFile = lib.mkIf (cfg.settings != { }) { + "wluma/config.toml".source = configFile; + }; + + systemd.user.services.wluma = lib.mkIf cfg.systemd.enable { + Unit = { + Description = + "Automatic brightness adjustment based on screen contents and ALS "; + After = [ cfg.systemd.target ]; + PartOf = [ cfg.systemd.target ]; + ConditionEnvironment = "WAYLAND_DISPLAY"; + X-Restart-Triggers = lib.mkIf (cfg.settings != { }) [ "${configFile}" ]; + }; + + Install.WantedBy = [ cfg.systemd.target ]; + + Service = { + ExecStart = lib.getExe cfg.package; + Restart = "always"; + + # Sandboxing. + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateUsers = true; + RestrictNamespaces = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "@system-service"; + }; + }; + }; +} diff --git a/modules/services/wob.nix b/modules/services/wob.nix index d36565a00..d79338071 100644 --- a/modules/services/wob.nix +++ b/modules/services/wob.nix @@ -14,7 +14,7 @@ in { options.services.wob = { enable = mkEnableOption "wob"; - package = mkPackageOption pkgs "wob" { }; + package = mkPackageOption pkgs "wob" { nullable = true; }; settings = mkOption { type = settingsFormat.type; @@ -44,7 +44,7 @@ in { (lib.hm.assertions.assertPlatform "services.wob" pkgs lib.platforms.linux) ]; - systemd.user = mkIf cfg.systemd { + systemd.user = mkIf (cfg.systemd && (cfg.package != null)) { services.wob = { Unit = { Description = diff --git a/modules/services/wpaperd.nix b/modules/services/wpaperd.nix new file mode 100644 index 000000000..983687e6b --- /dev/null +++ b/modules/services/wpaperd.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.wpaperd; + tomlFormat = pkgs.formats.toml { }; + inherit (lib) mkRenamedOptionModule mkIf; +in { + meta.maintainers = [ lib.hm.maintainers."3ulalia" ]; + + imports = [ + (mkRenamedOptionModule # \ + [ "programs" "wpaperd" "enable" ] # \ + [ "services" "wpaperd" "enable" ]) + (mkRenamedOptionModule # \ + [ "programs" "wpaperd" "package" ] # \ + [ "services" "wpaperd" "package" ]) + (mkRenamedOptionModule # \ + [ "programs" "wpaperd" "settings" ] # \ + [ "services" "wpaperd" "settings" ]) + ]; + + options.services.wpaperd = { + enable = lib.mkEnableOption "wpaperd"; + + package = lib.mkPackageOption pkgs "wpaperd" { nullable = true; }; + + settings = lib.mkOption { + type = tomlFormat.type; + default = { }; + example = lib.literalExpression '' + { + eDP-1 = { + path = "/home/foo/Pictures/Wallpaper"; + apply-shadow = true; + }; + DP-2 = { + path = "/home/foo/Pictures/Anime"; + sorting = "descending"; + }; + } + ''; + description = '' + Configuration written to + {file}`$XDG_CONFIG_HOME/wpaperd/wallpaper.toml`. + See + for the full list of options. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "services.wpaperd" pkgs + lib.platforms.linux) + ]; + + home.packages = lib.mkIf (cfg.package != null) [ cfg.package ]; + + xdg.configFile = { + "wpaperd/wallpaper.toml" = mkIf (cfg.settings != { }) { + source = tomlFormat.generate "wpaperd-wallpaper" cfg.settings; + }; + }; + + systemd.user.services.wpaperd = lib.mkIf (cfg.package != null) { + Install = { WantedBy = [ config.wayland.systemd.target ]; }; + + Unit = { + ConditionEnvironment = "WAYLAND_DISPLAY"; + Description = "wpaperd"; + PartOf = [ config.wayland.systemd.target ]; + After = [ config.wayland.systemd.target ]; + X-Restart-Triggers = + [ "${config.xdg.configFile."wpaperd/wallpaper.toml".source}" ]; + }; + + Service = { + ExecStart = "${lib.getExe cfg.package}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} diff --git a/modules/services/xcape.nix b/modules/services/xcape.nix index 130db65b5..fa80607ce 100644 --- a/modules/services/xcape.nix +++ b/modules/services/xcape.nix @@ -60,11 +60,11 @@ in { Unit = mkMerge [ { Description = "xcape"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; } (mkIf (config.home.keyboard != null && config.home.keyboard != { }) { - After = [ "graphical-session-pre.target" "setxkbmap.service" ]; + After = [ "graphical-session.target" "setxkbmap.service" ]; }) ]; diff --git a/modules/services/xembed-sni-proxy.nix b/modules/services/xembed-sni-proxy.nix index 4273e81a3..dca6cebca 100644 --- a/modules/services/xembed-sni-proxy.nix +++ b/modules/services/xembed-sni-proxy.nix @@ -15,8 +15,8 @@ in { package = mkOption { type = types.package; - default = pkgs.plasma-workspace; - defaultText = literalExpression "pkgs.plasma-workspace"; + default = pkgs.kdePackages.plasma-workspace; + defaultText = literalExpression "pkgs.kdePackages.plasma-workspace"; description = '' Package containing the {command}`xembedsniproxy` program. @@ -34,7 +34,7 @@ in { systemd.user.services.xembed-sni-proxy = { Unit = { Description = "XEmbed SNI Proxy"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; }; diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook.nix index 2ce64e691..77b4c1dfe 100644 --- a/modules/services/xidlehook.nix +++ b/modules/services/xidlehook.nix @@ -151,7 +151,7 @@ in { Service = { Type = if cfg.once then "oneshot" else "simple"; ExecStart = "${script}"; - }; + } // lib.optionalAttrs (!cfg.once) { Restart = "always"; }; Install.WantedBy = [ "graphical-session.target" ]; }; }; diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix index c5d6126be..0931f3d8a 100644 --- a/modules/services/xscreensaver.nix +++ b/modules/services/xscreensaver.nix @@ -50,7 +50,7 @@ in { systemd.user.services.xscreensaver = { Unit = { Description = "XScreenSaver"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; # Make sure the service is restarted if the settings change. diff --git a/modules/services/xsuspender.nix b/modules/services/xsuspender.nix index 058f15471..412f374c4 100644 --- a/modules/services/xsuspender.nix +++ b/modules/services/xsuspender.nix @@ -183,7 +183,7 @@ in { systemd.user.services.xsuspender = { Unit = { Description = "XSuspender"; - After = [ "graphical-session-pre.target" ]; + After = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ]; X-Restart-Triggers = [ "${config.xdg.configFile."xsuspender.conf".source}" ]; diff --git a/modules/services/yubikey-agent.nix b/modules/services/yubikey-agent.nix new file mode 100644 index 000000000..5e1379a38 --- /dev/null +++ b/modules/services/yubikey-agent.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf; + cfg = config.services.yubikey-agent; + +in { + meta.maintainers = [ lib.maintainers.cmacrae ]; + + options.services.yubikey-agent = { + enable = lib.mkEnableOption "Seamless ssh-agent for YubiKeys"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.yubikey-agent; + defaultText = lib.literalExpression "pkgs.yubikey-agent"; + description = "The yubikey-agent package to use."; + }; + }; + + config = mkIf cfg.enable (lib.mkMerge [ + { home.packages = [ cfg.package ]; } + + (mkIf pkgs.stdenv.isLinux { + systemd.user.services.yubikey-agent = { + Unit = { + Description = "Seamless ssh-agent for YubiKeys"; + Documentation = "https://github.com/FiloSottile/yubikey-agent"; + Requires = "yubikey-agent.socket"; + After = "yubikey-agent.socket"; + RefuseManualStart = true; + }; + + Service = { + ExecStart = + "${cfg.package}/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock"; + Type = "simple"; + # /run/user/$UID for the socket + ReadWritePaths = [ "%t" ]; + }; + }; + + systemd.user.sockets.yubikey-agent = { + Unit = { + Description = "Unix domain socket for Yubikey SSH agent"; + Documentation = "https://github.com/FiloSottile/yubikey-agent"; + }; + + Socket = { + ListenStream = "%t/yubikey-agent/yubikey-agent.sock"; + RuntimeDirectory = "yubikey-agent"; + SocketMode = "0600"; + DirectoryMode = "0700"; + }; + + Install = { WantedBy = [ "sockets.target" ]; }; + }; + + home.sessionVariables = { + SSH_AUTH_SOCK = + "\${XDG_RUNTIME_DIR:-/run/user/$UID}/yubikey-agent/yubikey-agent.sock"; + }; + }) + + (mkIf pkgs.stdenv.isDarwin { + launchd.agents.yubikey-agent = { + enable = true; + config = { + ProgramArguments = [ + "${cfg.package}/bin/yubikey-agent" + "-l" + "/tmp/yubikey-agent.sock" + ]; + + KeepAlive = { + Crashed = true; + SuccessfulExit = false; + }; + ProcessType = "Background"; + Sockets = { + Listener = { + SockPathName = "/tmp/yubikey-agent.sock"; + SockPathMode = 384; # 0600 in decimal + }; + }; + }; + }; + + home.sessionVariables = { SSH_AUTH_SOCK = "/tmp/yubikey-agent.sock"; }; + }) + ]); +} diff --git a/modules/targets/darwin/fonts.nix b/modules/targets/darwin/fonts.nix index 988c5edc9..4c98f94d9 100644 --- a/modules/targets/darwin/fonts.nix +++ b/modules/targets/darwin/fonts.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let homeDir = config.home.homeDirectory; fontsEnv = pkgs.buildEnv { @@ -13,13 +11,13 @@ let installDir = "${homeDir}/Library/Fonts/HomeManager"; in { # macOS won't recognize symlinked fonts - config = mkIf pkgs.stdenv.hostPlatform.isDarwin { + config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { home.file."Library/Fonts/.home-manager-fonts-version" = { text = "${fontsEnv}"; onChange = '' - run mkdir -p ${escapeShellArg installDir} + run mkdir -p ${lib.escapeShellArg installDir} run ${pkgs.rsync}/bin/rsync $VERBOSE_ARG -acL --chmod=u+w --delete \ - ${escapeShellArgs [ "${fonts}/" installDir ]} + ${lib.escapeShellArgs [ "${fonts}/" installDir ]} ''; }; }; diff --git a/modules/targets/darwin/keybindings.nix b/modules/targets/darwin/keybindings.nix index 96800073c..9d2c064c2 100644 --- a/modules/targets/darwin/keybindings.nix +++ b/modules/targets/darwin/keybindings.nix @@ -1,15 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.targets.darwin; homeDir = config.home.homeDirectory; confFile = pkgs.writeText "DefaultKeybinding.dict" (lib.generators.toPlist { } cfg.keybindings); in { - options.targets.darwin.keybindings = mkOption { - type = with types; attrsOf anything; + options.targets.darwin.keybindings = lib.mkOption { + type = with lib.types; attrsOf anything; default = { }; example = { "^u" = "deleteToBeginningOfLine:"; @@ -28,15 +26,15 @@ in { ''; }; - config = mkIf (cfg.keybindings != { }) { + config = lib.mkIf (cfg.keybindings != { }) { assertions = [ - (hm.assertions.assertPlatform "targets.darwin.keybindings" pkgs - platforms.darwin) + (lib.hm.assertions.assertPlatform "targets.darwin.keybindings" pkgs + lib.platforms.darwin) ]; # NOTE: just copy the files because symlinks won't be recognized by macOS home.activation.setCocoaKeybindings = - hm.dag.entryAfter [ "writeBoundary" ] '' + lib.hm.dag.entryAfter [ "writeBoundary" ] '' verboseEcho "Configuring keybindings for the Cocoa Text System" run install -Dm644 $VERBOSE_ARG \ "${confFile}" "${homeDir}/Library/KeyBindings/DefaultKeyBinding.dict" diff --git a/modules/targets/darwin/linkapps.nix b/modules/targets/darwin/linkapps.nix index 0d434234b..caa461f45 100644 --- a/modules/targets/darwin/linkapps.nix +++ b/modules/targets/darwin/linkapps.nix @@ -1,9 +1,24 @@ { config, lib, pkgs, ... }: -{ - config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { +let cfg = config.targets.darwin; +in { + options.targets.darwin.linkApps = { + enable = + lib.mkEnableOption "linking macOS applications to the user environment" + // { + default = true; + }; + + directory = lib.mkOption { + type = lib.types.str; + default = "Applications/Home Manager Apps"; + description = "Path to link apps relative to the home directory."; + }; + }; + + config = lib.mkIf (pkgs.stdenv.hostPlatform.isDarwin && cfg.linkApps.enable) { # Install MacOS applications to the user environment. - home.file."Applications/Home Manager Apps".source = let + home.file.${cfg.linkApps.directory}.source = let apps = pkgs.buildEnv { name = "home-manager-applications"; paths = config.home.packages; diff --git a/modules/targets/darwin/search.nix b/modules/targets/darwin/search.nix index 8e0df3b20..9d82801bc 100644 --- a/modules/targets/darwin/search.nix +++ b/modules/targets/darwin/search.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.targets.darwin; searchEngines = { @@ -11,18 +9,18 @@ let Google = "com.google.www"; Yahoo = "com.yahoo.www"; }; - searchId = getAttr cfg.search searchEngines; + searchId = lib.getAttr cfg.search searchEngines; in { - options.targets.darwin.search = mkOption { - type = with types; nullOr (enum (attrNames searchEngines)); + options.targets.darwin.search = lib.mkOption { + type = with lib.types; nullOr (enum (lib.attrNames searchEngines)); default = null; description = "Default search engine."; }; - config = mkIf (cfg.search != null) { + config = lib.mkIf (cfg.search != null) { assertions = [ - (hm.assertions.assertPlatform "targets.darwin.search" pkgs - platforms.darwin) + (lib.hm.assertions.assertPlatform "targets.darwin.search" pkgs + lib.platforms.darwin) ]; targets.darwin.defaults = { diff --git a/modules/targets/darwin/user-defaults/default.nix b/modules/targets/darwin/user-defaults/default.nix index 97342d36b..9f1d35e6c 100644 --- a/modules/targets/darwin/user-defaults/default.nix +++ b/modules/targets/darwin/user-defaults/default.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.targets.darwin; @@ -13,27 +11,27 @@ let cliFlags = lib.optionalString isLocal "-currentHost"; toActivationCmd = domain: attrs: - "run /usr/bin/defaults ${cliFlags} import ${escapeShellArg domain} ${ - toDefaultsFile domain attrs - }"; + "run /usr/bin/defaults ${cliFlags} import ${ + lib.escapeShellArg domain + } ${toDefaultsFile domain attrs}"; nonNullDefaults = - mapAttrs (domain: attrs: (filterAttrs (n: v: v != null) attrs)) + lib.mapAttrs (domain: attrs: (lib.filterAttrs (n: v: v != null) attrs)) settings; writableDefaults = - filterAttrs (domain: attrs: attrs != { }) nonNullDefaults; - in mapAttrsToList toActivationCmd writableDefaults; + lib.filterAttrs (domain: attrs: attrs != { }) nonNullDefaults; + in lib.mapAttrsToList toActivationCmd writableDefaults; defaultsCmds = mkActivationCmds false cfg.defaults; currentHostDefaultsCmds = mkActivationCmds true cfg.currentHostDefaults; activationCmds = defaultsCmds ++ currentHostDefaultsCmds; in { - meta.maintainers = [ maintainers.midchildan ]; + meta.maintainers = [ lib.maintainers.midchildan ]; - options.targets.darwin.defaults = mkOption { - type = types.submodule ./opts-allhosts.nix; + options.targets.darwin.defaults = lib.mkOption { + type = lib.types.submodule ./opts-allhosts.nix; default = { }; example = { "com.apple.desktopservices" = { @@ -56,8 +54,8 @@ in { ''; }; - options.targets.darwin.currentHostDefaults = mkOption { - type = types.submodule ./opts-currenthost.nix; + options.targets.darwin.currentHostDefaults = lib.mkOption { + type = lib.types.submodule ./opts-currenthost.nix; default = { }; example = { "com.apple.controlcenter" = { BatteryShowPercentage = true; }; @@ -75,33 +73,34 @@ in { ''; }; - config = mkIf (activationCmds != [ ]) { + config = lib.mkIf (activationCmds != [ ]) { assertions = [ - (hm.assertions.assertPlatform "targets.darwin.defaults" pkgs - platforms.darwin) + (lib.hm.assertions.assertPlatform "targets.darwin.defaults" pkgs + lib.platforms.darwin) ]; warnings = let batteryOptionName = '' targets.darwin.currentHostDefaults."com.apple.controlcenter".BatteryShowPercentage''; batteryPercentage = - attrByPath [ "com.apple.menuextra.battery" "ShowPercent" ] null + lib.attrByPath [ "com.apple.menuextra.battery" "ShowPercent" ] null cfg.defaults; - webkitDevExtras = attrByPath [ + webkitDevExtras = lib.attrByPath [ "com.apple.Safari" "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" ] null cfg.defaults; - in optional (batteryPercentage != null) '' + in lib.optional (batteryPercentage != null) '' The option 'com.apple.menuextra.battery.ShowPercent' no longer works on macOS 11 and later. Instead, use '${batteryOptionName}'. - '' ++ optional (webkitDevExtras != null) '' + '' ++ lib.optional (webkitDevExtras != null) '' The option 'com.apple.Safari.com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled' is no longer present in recent versions of Safari. ''; - home.activation.setDarwinDefaults = hm.dag.entryAfter [ "writeBoundary" ] '' - verboseEcho "Configuring macOS user defaults" - ${concatStringsSep "\n" activationCmds} - ''; + home.activation.setDarwinDefaults = + lib.hm.dag.entryAfter [ "writeBoundary" ] '' + verboseEcho "Configuring macOS user defaults" + ${lib.concatStringsSep "\n" activationCmds} + ''; }; } diff --git a/modules/targets/darwin/user-defaults/opts-allhosts.nix b/modules/targets/darwin/user-defaults/opts-allhosts.nix index 4a4f10671..6d4307747 100644 --- a/modules/targets/darwin/user-defaults/opts-allhosts.nix +++ b/modules/targets/darwin/user-defaults/opts-allhosts.nix @@ -1,8 +1,8 @@ { config, lib, ... }: -with lib; - let + inherit (lib) types; + mkNullableOption = args: lib.mkOption (args // { type = types.nullOr args.type; @@ -284,12 +284,12 @@ in { }; config = { - "com.apple.Safari" = mkIf (safari.IncludeDevelopMenu != null) { + "com.apple.Safari" = lib.mkIf (safari.IncludeDevelopMenu != null) { WebKitDeveloperExtrasEnabledPreferenceKey = safari.IncludeDevelopMenu; "WebKitPreferences.developerExtrasEnabled" = safari.IncludeDevelopMenu; }; "com.apple.Safari.SandboxBroker" = - mkIf (safari.IncludeDevelopMenu != null) { + lib.mkIf (safari.IncludeDevelopMenu != null) { ShowDevelopMenu = safari.IncludeDevelopMenu; }; }; diff --git a/modules/targets/darwin/user-defaults/opts-currenthost.nix b/modules/targets/darwin/user-defaults/opts-currenthost.nix index 129f91487..61c2f8b3a 100644 --- a/modules/targets/darwin/user-defaults/opts-currenthost.nix +++ b/modules/targets/darwin/user-defaults/opts-currenthost.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: let mkNullableOption = args: diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix index 9dce9f5c8..8503f58e8 100644 --- a/modules/targets/generic-linux.nix +++ b/modules/targets/generic-linux.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.targets.genericLinux; @@ -12,7 +10,7 @@ let in { imports = [ - (mkRenamedOptionModule [ "targets" "genericLinux" "extraXdgDataDirs" ] [ + (lib.mkRenamedOptionModule [ "targets" "genericLinux" "extraXdgDataDirs" ] [ "xdg" "systemDirs" "data" @@ -20,7 +18,7 @@ in { ]; options.targets.genericLinux = { - enable = mkEnableOption "" // { + enable = lib.mkEnableOption "" // { description = '' Whether to enable settings that make Home Manager work better on GNU/Linux distributions other than NixOS. @@ -28,9 +26,10 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ - (hm.assertions.assertPlatform "targets.genericLinux" pkgs platforms.linux) + (lib.hm.assertions.assertPlatform "targets.genericLinux" pkgs + lib.platforms.linux) ]; xdg.systemDirs.data = [ @@ -48,8 +47,8 @@ in { # We need to append system-wide FHS directories due to the default prefix # resolving to the Nix store. # https://github.com/nix-community/home-manager/pull/2891#issuecomment-1101064521 - home.sessionVariables = { - XCURSOR_PATH = "$XCURSOR_PATH\${XCURSOR_PATH:+:}" + concatStringsSep ":" [ + home.sessionSearchVariables = { + XCURSOR_PATH = [ "${config.home.profileDirectory}/share/icons" "/usr/share/icons" "/usr/share/pixmaps" @@ -93,7 +92,7 @@ in { # https://salsa.debian.org/debian/ncurses/-/blob/master/debian/rules # https://src.fedoraproject.org/rpms/ncurses/blob/main/f/ncurses.spec # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-libs/ncurses/ncurses-6.2-r1.ebuild - distroTerminfoDirs = concatStringsSep ":" [ + distroTerminfoDirs = lib.concatStringsSep ":" [ "/etc/terminfo" # debian, fedora, gentoo "/lib/terminfo" # debian "/usr/share/terminfo" # package default, all distros diff --git a/modules/wayland.nix b/modules/wayland.nix index 9a485c56c..6bf36162a 100644 --- a/modules/wayland.nix +++ b/modules/wayland.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ config, lib, ... }: { meta.maintainers = [ lib.maintainers.thiagokokada ]; @@ -21,4 +21,8 @@ }; }; }; + + config = lib.mkIf (!config.xsession.enable) { + systemd.user.targets.tray = config.xsession.trayTarget; + }; } diff --git a/modules/xresources.nix b/modules/xresources.nix index a2396e236..91a872eb5 100644 --- a/modules/xresources.nix +++ b/modules/xresources.nix @@ -1,24 +1,23 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.xresources; formatLine = n: v: let formatList = x: - if isList x then + if lib.isList x then throw "can not convert 2-dimensional lists to Xresources format" else formatValue x; formatValue = v: - if isBool v then + if lib.isBool v then (if v then "true" else "false") - else if isList v then - concatMapStringsSep ", " formatList v + else if lib.isList v then + lib.concatMapStringsSep ", " formatList v else toString v; in "${n}: ${formatValue v}"; @@ -26,7 +25,7 @@ let xrdbMerge = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${cfg.path}"; in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options = { xresources.properties = mkOption { @@ -36,7 +35,7 @@ in { entry = either prim (listOf prim); in nullOr (attrsOf entry); default = null; - example = literalExpression '' + example = lib.literalExpression '' { "Emacs*toolBar" = 0; "XTerm*faceName" = "dejavu sans mono"; @@ -58,7 +57,7 @@ in { xresources.extraConfig = mkOption { type = types.lines; default = ""; - example = literalExpression '' + example = lib.literalExpression '' builtins.readFile ( pkgs.fetchFromGitHub { owner = "solarized"; @@ -85,13 +84,13 @@ in { }; }; - config = mkIf ((cfg.properties != null && cfg.properties != { }) + config = lib.mkIf ((cfg.properties != null && cfg.properties != { }) || cfg.extraConfig != "") { home.file.${cfg.path} = { - text = concatStringsSep "\n" ([ ] - ++ optional (cfg.extraConfig != "") cfg.extraConfig - ++ optionals (cfg.properties != null) - (mapAttrsToList formatLine cfg.properties)) + "\n"; + text = lib.concatStringsSep "\n" ([ ] + ++ lib.optional (cfg.extraConfig != "") cfg.extraConfig + ++ lib.optionals (cfg.properties != null) + (lib.mapAttrsToList formatLine cfg.properties)) + "\n"; onChange = '' if [[ -v DISPLAY ]]; then ${xrdbMerge} diff --git a/modules/xsession.nix b/modules/xsession.nix index 269ce1fa0..6f13a854e 100644 --- a/modules/xsession.nix +++ b/modules/xsession.nix @@ -1,17 +1,30 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkOption types; cfg = config.xsession; in { - meta.maintainers = [ maintainers.rycee ]; + meta.maintainers = [ lib.maintainers.rycee ]; options = { xsession = { - enable = mkEnableOption "X Session"; + enable = lib.mkEnableOption "X Session"; + + trayTarget = mkOption { + readOnly = true; + internal = true; + visible = false; + description = "Common tray.target for both xsession and wayland"; + type = types.attrs; + default = { + Unit = { + Description = "Home Manager System Tray"; + Requires = [ "graphical-session-pre.target" ]; + }; + }; + }; scriptPath = mkOption { type = types.str; @@ -35,7 +48,7 @@ in { windowManager.command = mkOption { type = types.str; - example = literalExpression '' + example = lib.literalExpression '' let xmonad = pkgs.xmonad-with-packages.override { packages = self: [ self.xmonad-contrib self.taffybar ]; @@ -78,7 +91,7 @@ in { importedVariables = mkOption { type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*"); - apply = unique; + apply = lib.unique; example = [ "GDK_PIXBUF_ICON_LOADER" ]; visible = false; description = '' @@ -90,9 +103,10 @@ in { }; }; - config = mkIf cfg.enable { - assertions = - [ (hm.assertions.assertPlatform "xsession" pkgs platforms.linux) ]; + config = lib.mkIf cfg.enable { + assertions = [ + (lib.hm.assertions.assertPlatform "xsession" pkgs lib.platforms.linux) + ]; xsession.importedVariables = [ "DBUS_SESSION_BUS_ADDRESS" @@ -105,7 +119,7 @@ in { ]; systemd.user = { - services = mkIf (config.home.keyboard != null) { + services = lib.mkIf (config.home.keyboard != null) { setxkbmap = { Unit = { Description = "Set up keyboard in X"; @@ -120,9 +134,9 @@ in { RemainAfterExit = true; ExecStart = with config.home.keyboard; let - args = optional (layout != null) "-layout '${layout}'" - ++ optional (variant != null) "-variant '${variant}'" - ++ optional (model != null) "-model '${model}'" + args = lib.optional (layout != null) "-layout '${layout}'" + ++ lib.optional (variant != null) "-variant '${variant}'" + ++ lib.optional (model != null) "-model '${model}'" ++ [ "-option ''" ] ++ map (v: "-option '${v}'") options; in "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}"; }; @@ -163,12 +177,7 @@ in { }; }; - tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; + tray = cfg.trayTarget; }; }; @@ -184,9 +193,9 @@ in { # script starts up graphical-session.target. systemctl --user stop graphical-session.target graphical-session-pre.target - ${optionalString (cfg.importedVariables != [ ]) + ${lib.optionalString (cfg.importedVariables != [ ]) ("systemctl --user import-environment " - + escapeShellArgs cfg.importedVariables)} + + lib.escapeShellArgs cfg.importedVariables)} ${cfg.profileExtra} @@ -215,9 +224,9 @@ in { sleep 0.5 done - ${optionalString (cfg.importedVariables != [ ]) + ${lib.optionalString (cfg.importedVariables != [ ]) ("systemctl --user unset-environment " - + escapeShellArgs cfg.importedVariables)} + + lib.escapeShellArgs cfg.importedVariables)} ''; }; }; diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index 018e9bab6..7dae50a5c 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.home-manager; @@ -9,14 +7,14 @@ let in { imports = [ ../nixos/common.nix ]; - config = mkMerge [ + config = lib.mkMerge [ { home-manager.extraSpecialArgs.darwinConfig = config; } - (mkIf (cfg.users != { }) { - system.activationScripts.postActivation.text = concatStringsSep "\n" - (mapAttrsToList (username: usercfg: '' - echo Activating home-manager configuration for ${username} - sudo -u ${username} --set-home ${ - pkgs.writeShellScript "activation-${username}" '' + (lib.mkIf (cfg.users != { }) { + system.activationScripts.postActivation.text = lib.concatStringsSep "\n" + (lib.mapAttrsToList (username: usercfg: '' + echo Activating home-manager configuration for ${usercfg.home.username} + sudo -u ${usercfg.home.username} --set-home ${ + pkgs.writeShellScript "activation-${usercfg.home.username}" '' ${lib.optionalString (cfg.backupFileExtension != null) "export HOME_MANAGER_BACKUP_EXT=${ lib.escapeShellArg cfg.backupFileExtension diff --git a/nixos/common.nix b/nixos/common.nix index 08491be9b..05931ad60 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,11 +1,10 @@ # This module is the common base for the NixOS and nix-darwin modules. # For OS-specific configuration, please edit nixos/default.nix or nix-darwin/default.nix instead. -{ config, lib, pkgs, ... }: - -with lib; +{ options, config, lib, pkgs, ... }: let + inherit (lib) flip mkOption mkEnableOption mkIf types; cfg = config.home-manager; @@ -34,6 +33,14 @@ let home.username = config.users.users.${name}.name; home.homeDirectory = config.users.users.${name}.home; + # Forward `nix.enable` from the OS configuration. The + # conditional is to check whether nix-darwin is new enough + # to have the `nix.enable` option; it was previously a + # `mkRemovedOptionModule` error, which we can crudely detect + # by `visible` being set to `false`. + nix.enable = + mkIf (options.nix.enable.visible or true) config.nix.enable; + # Make activation script use same version of Nix as system as a whole. # This avoids problems with Nix not being in PATH. nix.package = config.nix.package; @@ -66,7 +73,7 @@ in { extraSpecialArgs = mkOption { type = types.attrs; default = { }; - example = literalExpression "{ inherit emacs-overlay; }"; + example = lib.literalExpression "{ inherit emacs-overlay; }"; description = '' Extra `specialArgs` passed to Home Manager. This option can be used to pass additional arguments to all modules. @@ -76,7 +83,8 @@ in { sharedModules = mkOption { type = with types; listOf raw; default = [ ]; - example = literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]"; + example = + lib.literalExpression "[ { home.packages = [ nixpkgs-fmt ]; } ]"; description = '' Extra modules added to all users. ''; @@ -95,19 +103,18 @@ in { }; }; - config = (mkMerge [ + config = (lib.mkMerge [ # Fix potential recursion when configuring home-manager users based on values in users.users #594 (mkIf (cfg.useUserPackages && cfg.users != { }) { - users.users = - (mapAttrs (username: usercfg: { packages = [ usercfg.home.path ]; }) - cfg.users); + users.users = (lib.mapAttrs + (_username: usercfg: { packages = [ usercfg.home.path ]; }) cfg.users); environment.pathsToLink = [ "/etc/profile.d" ]; }) (mkIf (cfg.users != { }) { - warnings = flatten (flip mapAttrsToList cfg.users (user: config: + warnings = lib.flatten (flip lib.mapAttrsToList cfg.users (user: config: flip map config.warnings (warning: "${user} profile: ${warning}"))); - assertions = flatten (flip mapAttrsToList cfg.users (user: config: + assertions = lib.flatten (flip lib.mapAttrsToList cfg.users (user: config: flip map config.assertions (assertion: { inherit (assertion) assertion; message = "${user} profile: ${assertion.message}"; diff --git a/nixos/default.nix b/nixos/default.nix index 4484d28f8..ee973146c 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,19 +1,17 @@ { config, lib, pkgs, utils, ... }: -with lib; - let cfg = config.home-manager; - serviceEnvironment = optionalAttrs (cfg.backupFileExtension != null) { + serviceEnvironment = lib.optionalAttrs (cfg.backupFileExtension != null) { HOME_MANAGER_BACKUP_EXT = cfg.backupFileExtension; - } // optionalAttrs cfg.verbose { VERBOSE = "1"; }; + } // lib.optionalAttrs cfg.verbose { VERBOSE = "1"; }; in { imports = [ ./common.nix ]; - config = mkMerge [ + config = lib.mkMerge [ { home-manager = { extraSpecialArgs.nixosConfig = config; @@ -33,10 +31,11 @@ in { }]; }; } - (mkIf (cfg.users != { }) { - systemd.services = mapAttrs' (_: usercfg: + (lib.mkIf (cfg.users != { }) { + systemd.services = lib.mapAttrs' (_: usercfg: let username = usercfg.home.username; - in nameValuePair ("home-manager-${utils.escapeSystemdPath username}") { + in lib.nameValuePair + "home-manager-${utils.escapeSystemdPath username}" { description = "Home Manager environment for ${username}"; wantedBy = [ "multi-user.target" ]; wants = [ "nix-daemon.socket" ]; @@ -61,7 +60,7 @@ in { sed = "${pkgs.gnused}/bin/sed"; - exportedSystemdVariables = concatStringsSep "|" [ + exportedSystemdVariables = lib.concatStringsSep "|" [ "DBUS_SESSION_BUS_ADDRESS" "DISPLAY" "WAYLAND_DISPLAY" diff --git a/tests/asserts.nix b/tests/asserts.nix index c1fe177ee..0d4f50307 100644 --- a/tests/asserts.nix +++ b/tests/asserts.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: +let inherit (lib) concatStringsSep mkOption types; +in { options.test.asserts = { warnings = { enable = mkOption { @@ -37,44 +35,43 @@ with lib; }; }; - config = mkMerge [ - (mkIf config.test.asserts.warnings.enable { + config = lib.mkMerge [ + (lib.mkIf config.test.asserts.warnings.enable { home.file = { "asserts/warnings.actual".text = concatStringsSep '' -- '' config.warnings; + "asserts/warnings.expected".text = concatStringsSep '' + + -- + '' config.test.asserts.warnings.expected; }; nmt.script = '' assertFileContent \ home-files/asserts/warnings.actual \ - ${ - pkgs.writeText "warnings.expected" (concatStringsSep '' - - -- - '' config.test.asserts.warnings.expected) - } + "$TESTED/home-files/asserts/warnings.expected" ''; }) - (mkIf config.test.asserts.assertions.enable { + (lib.mkIf config.test.asserts.assertions.enable { home.file = { "asserts/assertions.actual".text = concatStringsSep '' -- - '' (map (x: x.message) (filter (x: !x.assertion) config.assertions)); + '' + (map (x: x.message) (lib.filter (x: !x.assertion) config.assertions)); + "asserts/assertions.expected".text = concatStringsSep '' + + -- + '' config.test.asserts.assertions.expected; }; nmt.script = '' assertFileContent \ home-files/asserts/assertions.actual \ - ${ - pkgs.writeText "assertions.expected" (concatStringsSep '' - - -- - '' config.test.asserts.assertions.expected) - } + "$TESTED/home-files/asserts/assertions.expected" ''; }) ]; diff --git a/tests/default.nix b/tests/default.nix index 638845752..05036d6a7 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -9,31 +9,164 @@ let sha256 = "0qhn7nnwdwzh910ss78ga2d00v42b0lspfd7ybl61mpfgz3lmdcj"; }; + # Recursively replace each derivation in the given attribute set with the same + # derivation but with the `outPath` attribute set to the string + # `"@package-name@"`. This allows the tests to refer to derivations through + # their values without establishing an actual dependency on the derivation + # output. + scrubDerivation = name: value: + let + scrubbedValue = scrubDerivations value; + + newDrvAttrs = { + buildScript = abort "no build allowed"; + + outPath = builtins.traceVerbose "${name} - got out path" + "@${lib.getName value}@"; + + # Prevent getOutput from descending into outputs + outputSpecified = true; + + # Allow the original package to be used in derivation inputs + __spliced = { + buildHost = value; + hostTarget = value; + }; + }; + in if lib.isAttrs value then + if lib.isDerivation value then + scrubbedValue // newDrvAttrs + else + scrubbedValue + else + value; + scrubDerivations = attrs: let in lib.mapAttrs scrubDerivation attrs; + + # Globally unscrub a few selected packages that are used by a wide selection of tests. + whitelist = let + inner = self: super: { + inherit (pkgs) + coreutils jq desktop-file-utils diffutils findutils glibcLocales gettext + gnugrep gnused shared-mime-info emptyDirectory + # Needed by pretty much all tests that have anything to do with fish. + babelfish fish; + + xorg = + super.xorg.overrideScope (self: super: { inherit (pkgs.xorg) lndir; }); + }; + + outer = self: super: + inner self super // { + buildPackages = super.buildPackages.extend inner; + }; + in outer; + + darwinBlacklist = let + # List of packages that need to be scrubbed on Darwin + # Packages are scrubbed in linux and expected in test output + packagesToScrub = [ + "alot" + "antidote" + "atuin" + "bash-completion" + "carapace" + "delta" + "direnv" + "espanso" + "gh" + "ghostty" + "gnupg" + "granted" + "i3status" + "kitty" + "lesspipe" + "mu" + "msmtp" + "nheko" + "nix" + "nix-index" + "nix-your-shell" + "ollama" + "openstackclient" + "papis" + "pay-respects" + "pls" + "pyenv" + "sagemath" + "scmpuff" + "sm64ex" + "thefuck" + "wezterm" + "yubikey-agent" + "zellij" + "zplug" + ]; + + inner = self: super: + lib.mapAttrs (name: value: + if lib.elem name packagesToScrub then + # Apply scrubbing to this specific package + scrubDerivation name value + else + value) super; + + outer = self: super: + inner self super // { + buildPackages = super.buildPackages.extend inner; + }; + in outer; + + scrubbedPkgs = + # TODO: fix darwin stdenv stubbing + if isDarwin then + let rawPkgs = lib.makeExtensible (final: pkgs); + in builtins.traceVerbose "eval scrubbed darwin nixpkgs" + (rawPkgs.extend darwinBlacklist) + else + let rawScrubbedPkgs = lib.makeExtensible (final: scrubDerivations pkgs); + in builtins.traceVerbose "eval scrubbed nixpkgs" + (rawScrubbedPkgs.extend whitelist); + modules = import ../modules/modules.nix { inherit lib pkgs; check = false; - } ++ [{ - # Bypass reference inside modules/modules.nix to make the test - # suite more pure. - _module.args.pkgsPath = pkgs.path; + } ++ [ + ({ config, ... }: { + _module.args = { + # Prevent the nixpkgs module from working. We want to minimize the number + # of evaluations of Nixpkgs. + pkgsPath = abort "pkgs path is unavailable in tests"; + realPkgs = pkgs; + pkgs = let + overlays = config.test.stubOverlays ++ lib.optionals + (config.nixpkgs.overlays != null && config.nixpkgs.overlays != [ ]) + config.nixpkgs.overlays; + stubbedPkgs = if overlays == [ ] then + scrubbedPkgs + else + builtins.traceVerbose "eval overlayed nixpkgs" + (lib.foldr (o: p: p.extend o) scrubbedPkgs overlays); + in lib.mkImageMediaOverride stubbedPkgs; + }; - # Fix impurities. Without these some of the user's environment - # will leak into the tests through `builtins.getEnv`. - xdg.enable = true; - home = { - username = "hm-user"; - homeDirectory = "/home/hm-user"; - stateVersion = lib.mkDefault "18.09"; - }; + # Fix impurities. Without these some of the user's environment + # will leak into the tests through `builtins.getEnv`. + xdg.enable = lib.mkDefault true; + home = { + username = "hm-user"; + homeDirectory = "/home/hm-user"; + stateVersion = lib.mkDefault "18.09"; + }; - # Avoid including documentation since this will cause - # unnecessary rebuilds of the tests. - manual.manpages.enable = lib.mkDefault false; + # Avoid including documentation since this will cause + # unnecessary rebuilds of the tests. + manual.manpages.enable = lib.mkDefault false; - imports = [ ./asserts.nix ./big-test.nix ./stubs.nix ]; + imports = [ ./asserts.nix ./big-test.nix ./stubs.nix ]; - test.enableBig = enableBig; - }]; + test.enableBig = enableBig; + }) + ]; isDarwin = pkgs.stdenv.hostPlatform.isDarwin; isLinux = pkgs.stdenv.hostPlatform.isLinux; @@ -50,6 +183,7 @@ in import nmtSrc { ./modules/misc/manual ./modules/misc/nix ./modules/misc/specialisation + ./modules/misc/xdg ./modules/programs/aerc ./modules/programs/alacritty ./modules/programs/alot @@ -72,6 +206,7 @@ in import nmtSrc { ./modules/programs/darcs ./modules/programs/dircolors ./modules/programs/direnv + ./modules/programs/earthly ./modules/programs/emacs ./modules/programs/fastfetch ./modules/programs/feh @@ -83,6 +218,7 @@ in import nmtSrc { ./modules/programs/git ./modules/programs/git-cliff ./modules/programs/git-credential-oauth + ./modules/programs/git-worktree-switcher ./modules/programs/go ./modules/programs/gpg ./modules/programs/gradle @@ -95,12 +231,14 @@ in import nmtSrc { ./modules/programs/irssi ./modules/programs/jujutsu ./modules/programs/joplin-desktop + ./modules/programs/jqp ./modules/programs/k9s ./modules/programs/kakoune ./modules/programs/khal ./modules/programs/khard ./modules/programs/kitty ./modules/programs/kubecolor + ./modules/programs/lapce ./modules/programs/ledger ./modules/programs/less ./modules/programs/lesspipe @@ -111,6 +249,7 @@ in import nmtSrc { ./modules/programs/mbsync ./modules/programs/micro ./modules/programs/mise + ./modules/programs/mods ./modules/programs/mpv ./modules/programs/mu ./modules/programs/mujmap @@ -159,6 +298,7 @@ in import nmtSrc { ./modules/programs/tealdeer ./modules/programs/texlive ./modules/programs/thefuck + ./modules/programs/thunderbird ./modules/programs/tmate ./modules/programs/tmux ./modules/programs/topgrade @@ -179,13 +319,19 @@ in import nmtSrc { ./modules/xresources ] ++ lib.optionals isDarwin [ ./modules/launchd + ./modules/programs/aerospace ./modules/services/emacs-darwin ./modules/services/espanso-darwin ./modules/services/git-sync-darwin ./modules/services/imapnotify-darwin ./modules/services/nix-gc-darwin + ./modules/services/macos-remap-keys + ./modules/services/ollama/darwin + ./modules/services/yubikey-agent-darwin ./modules/targets-darwin ] ++ lib.optionals isLinux [ + ./modules/misc/xdg/linux.nix + ./modules/config/home-cursor ./modules/config/i18n ./modules/i18n/input-method ./modules/misc/debug @@ -194,7 +340,6 @@ in import nmtSrc { ./modules/misc/numlock ./modules/misc/pam ./modules/misc/qt - ./modules/misc/xdg ./modules/misc/xsession ./modules/programs/abook ./modules/programs/autorandr @@ -203,8 +348,11 @@ in import nmtSrc { ./modules/programs/bemenu ./modules/programs/boxxy ./modules/programs/cavalier + ./modules/programs/eww + ./modules/programs/firefox ./modules/programs/firefox/firefox.nix ./modules/programs/firefox/floorp.nix + ./modules/programs/firefox/librewolf.nix ./modules/programs/foot ./modules/programs/freetube ./modules/programs/fuzzel @@ -224,15 +372,15 @@ in import nmtSrc { ./modules/programs/rbw ./modules/programs/rofi ./modules/programs/rofi-pass + ./modules/programs/swayimg ./modules/programs/swaylock ./modules/programs/swayr ./modules/programs/terminator - ./modules/programs/thunderbird ./modules/programs/tofi + ./modules/programs/vinegar ./modules/programs/waybar ./modules/programs/wlogout ./modules/programs/wofi - ./modules/programs/wpaperd ./modules/programs/xmobar ./modules/programs/yambar ./modules/programs/yt-dlp @@ -244,6 +392,7 @@ in import nmtSrc { ./modules/services/cachix-agent ./modules/services/cliphist ./modules/services/clipman + ./modules/services/clipse ./modules/services/comodoro ./modules/services/copyq ./modules/services/conky @@ -265,11 +414,13 @@ in import nmtSrc { ./modules/services/imapnotify ./modules/services/kanshi ./modules/services/lieer + ./modules/services/linux-wallpaperengine ./modules/services/mopidy ./modules/services/mpd ./modules/services/mpd-mpris ./modules/services/mpdris2 ./modules/services/nix-gc + ./modules/services/ollama/linux ./modules/services/osmscout-server ./modules/services/pantalaimon ./modules/services/parcellite @@ -291,6 +442,7 @@ in import nmtSrc { ./modules/services/swayosd ./modules/services/sxhkd ./modules/services/syncthing/linux + ./modules/services/tldr-update ./modules/services/trayer ./modules/services/trayscale ./modules/services/twmn @@ -306,7 +458,9 @@ in import nmtSrc { ./modules/services/window-managers/wayfire ./modules/services/wlsunset ./modules/services/wob + ./modules/services/wpaperd ./modules/services/xsettingsd + ./modules/services/yubikey-agent ./modules/systemd ./modules/targets-linux ]); diff --git a/tests/flake.nix b/tests/flake.nix new file mode 100644 index 000000000..0db07add2 --- /dev/null +++ b/tests/flake.nix @@ -0,0 +1,45 @@ +# This is an internal Nix Flake intended for use when running tests. +# +# You can build all tests or specific tests by running +# +# nix build --reference-lock-file flake.lock ./tests#test-all +# nix build --reference-lock-file flake.lock ./tests#test-alacritty-empty-settings +# +# in the Home Manager project root directory. +# +# Similarly for integration tests +# +# nix build --reference-lock-file flake.lock ./tests#integration-test-all +# nix build --reference-lock-file flake.lock ./tests#integration-test-standalone-standard-basics + +{ + description = "Tests of Home Manager for Nix"; + + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + + outputs = { self, nixpkgs, ... }: + let forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; + in { + devShells = forAllSystems (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + tests = import ./. { inherit pkgs; }; + in tests.run); + + packages = forAllSystems (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + lib = pkgs.lib; + + testPackages = let + tests = import ./. { inherit pkgs; }; + renameTestPkg = n: lib.nameValuePair "test-${n}"; + in lib.mapAttrs' renameTestPkg tests.build; + + integrationTestPackages = let + tests = import ./integration { inherit pkgs; }; + renameTestPkg = n: lib.nameValuePair "integration-test-${n}"; + in lib.mapAttrs' renameTestPkg tests; + in testPackages // integrationTestPackages); + }; +} diff --git a/tests/integration/standalone/kitty-theme-bad-home.nix b/tests/integration/standalone/kitty-theme-bad-home.nix index 4c4594173..ca1a1289f 100644 --- a/tests/integration/standalone/kitty-theme-bad-home.nix +++ b/tests/integration/standalone/kitty-theme-bad-home.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ home.username = "alice"; home.homeDirectory = "/home/alice"; home.stateVersion = "24.11"; diff --git a/tests/integration/standalone/kitty-theme-good-home.nix b/tests/integration/standalone/kitty-theme-good-home.nix index 606724bab..23eaacbfb 100644 --- a/tests/integration/standalone/kitty-theme-good-home.nix +++ b/tests/integration/standalone/kitty-theme-good-home.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ home.username = "alice"; home.homeDirectory = "/home/alice"; diff --git a/tests/modules/accounts/email-test-accounts.nix b/tests/modules/accounts/email-test-accounts.nix index e66e58949..44614733e 100644 --- a/tests/modules/accounts/email-test-accounts.nix +++ b/tests/modules/accounts/email-test-accounts.nix @@ -1,5 +1,3 @@ -{ ... }: - { accounts.email = { maildirBasePath = "Mail"; diff --git a/tests/modules/config/home-cursor/default.nix b/tests/modules/config/home-cursor/default.nix new file mode 100644 index 000000000..7cef6bae6 --- /dev/null +++ b/tests/modules/config/home-cursor/default.nix @@ -0,0 +1,169 @@ +{ + # Ensure backwards compatibility with existing configs + home-cursor-legacy = { realPkgs, ... }: { + config = { + home.pointerCursor = { + package = realPkgs.catppuccin-cursors.macchiatoBlue; + name = "catppuccin-macchiato-blue-standard"; + size = 64; + gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + }; + + home.stateVersion = "24.11"; + + nmt.script = '' + assertFileContent \ + home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \ + ${./expected-index.theme} + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"' + ''; + }; + }; + + home-cursor-legacy-disabled = { ... }: { + config = { + home.pointerCursor = null; + + home.stateVersion = "24.11"; + + test.asserts.warnings.expected = ['' + Setting home.pointerCursor to null is deprecated. + Please update your configuration to explicitly set: + + home.pointerCursor.enable = false; + '']; + + nmt.script = '' + assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"' + ''; + }; + }; + + home-cursor-legacy-disabled-with-enable = { realPkgs, ... }: { + config = { + home.pointerCursor = { + enable = false; + package = realPkgs.catppuccin-cursors.macchiatoBlue; + name = "catppuccin-macchiato-blue-standard"; + size = 64; + gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + }; + + home.stateVersion = "24.11"; + + nmt.script = '' + assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"' + ''; + }; + }; + + home-cursor-legacy-enabled-with-enable = { realPkgs, ... }: { + config = { + home.pointerCursor = { + enable = true; + package = realPkgs.catppuccin-cursors.macchiatoBlue; + name = "catppuccin-macchiato-blue-standard"; + size = 64; + gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + }; + + home.stateVersion = "24.11"; + + nmt.script = '' + assertFileContent \ + home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \ + ${./expected-index.theme} + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"' + ''; + + }; + }; + + home-cursor = { realPkgs, ... }: { + config = { + home.pointerCursor = { + enable = true; + package = realPkgs.catppuccin-cursors.macchiatoBlue; + name = "catppuccin-macchiato-blue-standard"; + size = 64; + gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + }; + + home.stateVersion = "25.05"; + + nmt.script = '' + assertFileContent \ + home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme \ + ${./expected-index.theme} + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'XCURSOR_SIZE="64"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileRegex $hmEnvFile 'HYPRCURSOR_SIZE="64"' + ''; + }; + }; + + home-cursor-disabled = { realPkgs, ... }: { + config = { + home.pointerCursor = { + enable = false; + package = realPkgs.catppuccin-cursors.macchiatoBlue; + name = "catppuccin-macchiato-blue-standard"; + size = 64; + gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + }; + + home.stateVersion = "25.05"; + + nmt.script = '' + assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme + + hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmEnvFile + assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"' + assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"' + ''; + }; + }; +} diff --git a/tests/modules/config/home-cursor/expected-index.theme b/tests/modules/config/home-cursor/expected-index.theme new file mode 100644 index 000000000..7ce17e0b2 --- /dev/null +++ b/tests/modules/config/home-cursor/expected-index.theme @@ -0,0 +1,3 @@ +[Icon Theme] +Name=Catppuccin Macchiato Blue +Comment=based on Volantes Cursors diff --git a/tests/modules/config/i18n/default.nix b/tests/modules/config/i18n/default.nix index 667b3b1d9..b3a7c7cc2 100644 --- a/tests/modules/config/i18n/default.nix +++ b/tests/modules/config/i18n/default.nix @@ -15,24 +15,23 @@ }; }; - i18n-custom-locales = { pkgs, ... }: { - config = let stub = pkgs.glibcLocalesCustom; - in { - test.stubs.glibcLocalesCustom = { - inherit (pkgs.glibcLocales) version; - outPath = null; # we need a real path for this stub + i18n-custom-locales = { config, pkgs, ... }: { + config = let + customGlibcLocales = pkgs.glibcLocales.override { + allLocales = false; + locales = [ "en_US.UTF-8/UTF-8" ]; }; - - i18n.glibcLocales = stub; + in { + i18n.glibcLocales = customGlibcLocales; nmt.script = '' hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh assertFileExists $hmEnvFile - assertFileRegex $hmEnvFile 'LOCALE_ARCHIVE_.*${stub}' + assertFileRegex $hmEnvFile 'LOCALE_ARCHIVE_.*${customGlibcLocales}' envFile=home-files/.config/environment.d/10-home-manager.conf assertFileExists $envFile - assertFileRegex $envFile 'LOCALE_ARCHIVE_.*${stub}' + assertFileRegex $envFile 'LOCALE_ARCHIVE_.*${customGlibcLocales}' ''; }; }; diff --git a/tests/modules/files/disabled.nix b/tests/modules/files/disabled.nix index b9ed858aa..d106f26bd 100644 --- a/tests/modules/files/disabled.nix +++ b/tests/modules/files/disabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file."disabled" = { enable = false; diff --git a/tests/modules/files/executable.nix b/tests/modules/files/executable.nix index 9ab8f3591..0e144ed48 100644 --- a/tests/modules/files/executable.nix +++ b/tests/modules/files/executable.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file."executable" = { text = ""; diff --git a/tests/modules/files/hidden-source.nix b/tests/modules/files/hidden-source.nix index 380a2cb2d..6c205b481 100644 --- a/tests/modules/files/hidden-source.nix +++ b/tests/modules/files/hidden-source.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file.".hidden".source = ./.hidden; diff --git a/tests/modules/files/source-with-spaces.nix b/tests/modules/files/source-with-spaces.nix index cd78664e5..a854caf64 100644 --- a/tests/modules/files/source-with-spaces.nix +++ b/tests/modules/files/source-with-spaces.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file."source with spaces!".source = ./. + "/source with spaces!"; diff --git a/tests/modules/files/target-conflict.nix b/tests/modules/files/target-conflict.nix index 9677cf9de..34f1a34d2 100644 --- a/tests/modules/files/target-conflict.nix +++ b/tests/modules/files/target-conflict.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file = { conflict1 = { diff --git a/tests/modules/files/target-with-shellvar.nix b/tests/modules/files/target-with-shellvar.nix index 59fc02fde..317db5b21 100644 --- a/tests/modules/files/target-with-shellvar.nix +++ b/tests/modules/files/target-with-shellvar.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file."$HOME/$FOO/bar baz".text = "blah"; diff --git a/tests/modules/files/text.nix b/tests/modules/files/text.nix index c09c56c4a..70bbc438f 100644 --- a/tests/modules/files/text.nix +++ b/tests/modules/files/text.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.file."using-text".text = '' This is the diff --git a/tests/modules/home-environment/default.nix b/tests/modules/home-environment/default.nix index e76e248a1..c38ad5ce5 100644 --- a/tests/modules/home-environment/default.nix +++ b/tests/modules/home-environment/default.nix @@ -1,4 +1,5 @@ { - home-session-variables = ./session-variables.nix; home-session-path = ./session-path.nix; + home-session-search-variables = ./session-search-variables.nix; + home-session-variables = ./session-variables.nix; } diff --git a/tests/modules/home-environment/session-path.nix b/tests/modules/home-environment/session-path.nix index 57cfeceda..907d6c398 100644 --- a/tests/modules/home-environment/session-path.nix +++ b/tests/modules/home-environment/session-path.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { imports = [ @@ -10,6 +10,6 @@ hmSessVars=home-path/etc/profile.d/hm-session-vars.sh assertFileExists $hmSessVars assertFileContains $hmSessVars \ - 'export PATH="$PATH''${PATH:+:}bar:baz:foo"' + 'export PATH="bar:baz:foo''${PATH:+:}$PATH"' ''; } diff --git a/tests/modules/home-environment/session-search-variables.nix b/tests/modules/home-environment/session-search-variables.nix new file mode 100644 index 000000000..b12009f2b --- /dev/null +++ b/tests/modules/home-environment/session-search-variables.nix @@ -0,0 +1,15 @@ +{ ... }: + +{ + imports = [ + ({ ... }: { config.home.sessionSearchVariables.TEST = [ "foo" ]; }) + ({ ... }: { config.home.sessionSearchVariables.TEST = [ "bar" "baz" ]; }) + ]; + + nmt.script = '' + hmSessVars=home-path/etc/profile.d/hm-session-vars.sh + assertFileExists $hmSessVars + assertFileContains $hmSessVars \ + 'export TEST="bar:baz:foo''${TEST:+:}$TEST"' + ''; +} diff --git a/tests/modules/home-environment/session-variables.nix b/tests/modules/home-environment/session-variables.nix index e1c8bedf8..0234c4cf8 100644 --- a/tests/modules/home-environment/session-variables.nix +++ b/tests/modules/home-environment/session-variables.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let @@ -16,6 +16,7 @@ let export XDG_CONFIG_HOME="/home/hm-user/.config" export XDG_DATA_HOME="/home/hm-user/.local/share" export XDG_STATE_HOME="/home/hm-user/.local/state" + ''; darwinExpected = '' @@ -29,6 +30,7 @@ let export XDG_CONFIG_HOME="/home/hm-user/.config" export XDG_DATA_HOME="/home/hm-user/.local/share" export XDG_STATE_HOME="/home/hm-user/.local/state" + ''; expected = pkgs.writeText "expected" diff --git a/tests/modules/i18n/input-method/fcitx5-configuration.nix b/tests/modules/i18n/input-method/fcitx5-configuration.nix index 7ff43a4f2..8990e49dd 100644 --- a/tests/modules/i18n/input-method/fcitx5-configuration.nix +++ b/tests/modules/i18n/input-method/fcitx5-configuration.nix @@ -1,14 +1,16 @@ -{ config, pkgs, ... }: - -{ - imports = [ ./fcitx5-stubs.nix ]; +{ config, lib, realPkgs, ... }: +lib.mkIf config.test.enableBig { i18n.inputMethod = { enabled = "fcitx5"; - fcitx5.addons = [ pkgs.libsForQt5.fcitx5-chinese-addons ]; + fcitx5.waylandFrontend = true; }; + _module.args.pkgs = lib.mkForce realPkgs; + nmt.script = '' assertFileExists home-files/.config/systemd/user/fcitx5-daemon.service + assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GTK_IM_MODULE' + assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'QT_IM_MODULE' ''; } diff --git a/tests/modules/i18n/input-method/fcitx5-stubs.nix b/tests/modules/i18n/input-method/fcitx5-stubs.nix deleted file mode 100644 index 9712a7518..000000000 --- a/tests/modules/i18n/input-method/fcitx5-stubs.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - test.stubs = { - fcitx5 = { - version = "0"; - outPath = null; - buildScript = '' - mkdir -p $out/bin $out/share/applications $out/share/dbus-1/services $out/etc/xdg/autostart - touch $out/bin/fcitx5 \ - $out/bin/fcitx5-config-qt \ - $out/share/applications/org.fcitx.Fcitx5.desktop \ - $out/share/dbus-1/services/org.fcitx.Fcitx5.service \ - $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop - # The grep usage of fcitx5-with-addons expects one of the files to match with the fcitx5.out - # https://github.com/NixOS/nixpkgs/blob/d2eb4be48705289791428c07aca8ff654c1422ba/pkgs/tools/inputmethods/fcitx5/with-addons.nix#L40-L44 - echo $out >> $out/etc/xdg/autostart/org.fcitx.Fcitx5.desktop - chmod +x $out/bin/fcitx5 \ - $out/bin/fcitx5-config-qt - ''; - }; - fcitx5-lua = { outPath = null; }; - fcitx5-gtk = { outPath = null; }; - - gtk2 = { - buildScript = '' - mkdir -p $out/bin - echo '#/usr/bin/env bash' > $out/bin/gtk-query-immodules-2.0 - chmod +x $out/bin/* - ''; - }; - gtk3 = { - buildScript = '' - mkdir -p $out/bin - echo '#/usr/bin/env bash' > $out/bin/gtk-query-immodules-3.0 - chmod +x $out/bin/* - ''; - }; - }; - - nixpkgs.overlays = [ - (final: prev: { - libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: { - fcitx5-chinese-addons = prev.mkStubPackage { outPath = null; }; - fcitx5-configtool = prev.mkStubPackage { outPath = null; }; - fcitx5-qt = prev.mkStubPackage { outPath = null; }; - - fcitx5-with-addons = qt5prev.fcitx5-with-addons.override { - inherit (final) libsForQt5 qt6Packages; - }; - }); - - qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: { - fcitx5-qt = prev.mkStubPackage { outPath = null; }; - }); - - }) - ]; -} diff --git a/tests/modules/i18n/input-method/kime-configuration.nix b/tests/modules/i18n/input-method/kime-configuration.nix index b79694608..52ec07cf9 100644 --- a/tests/modules/i18n/input-method/kime-configuration.nix +++ b/tests/modules/i18n/input-method/kime-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - let kimeConfig = '' diff --git a/tests/modules/launchd/agents.nix b/tests/modules/launchd/agents.nix index ccf4f6e24..b47126ba9 100644 --- a/tests/modules/launchd/agents.nix +++ b/tests/modules/launchd/agents.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { launchd.agents."test-service" = { diff --git a/tests/modules/misc/debug/default.nix b/tests/modules/misc/debug/default.nix index 7eb286666..e7cde48a6 100644 --- a/tests/modules/misc/debug/default.nix +++ b/tests/modules/misc/debug/default.nix @@ -1,8 +1,8 @@ { - debug = { pkgs, config, lib, ... }: + debug = { realPkgs, config, lib, ... }: lib.mkIf config.test.enableBig { home.enableDebugInfo = true; - home.packages = with pkgs; [ curl gdb ]; + home.packages = with realPkgs; [ curl gdb ]; nmt.script = '' [ -L $TESTED/home-path/lib/debug/curl ] \ diff --git a/tests/modules/misc/editorconfig/editorconfig-simple-config.nix b/tests/modules/misc/editorconfig/editorconfig-simple-config.nix index ca0581e5f..58cdbee29 100644 --- a/tests/modules/misc/editorconfig/editorconfig-simple-config.nix +++ b/tests/modules/misc/editorconfig/editorconfig-simple-config.nix @@ -1,5 +1,3 @@ -{ ... }: - { editorconfig = { enable = true; diff --git a/tests/modules/misc/fontconfig/multiple-font-packages.nix b/tests/modules/misc/fontconfig/multiple-font-packages.nix index 3845b4ba4..c32bfb3ea 100644 --- a/tests/modules/misc/fontconfig/multiple-font-packages.nix +++ b/tests/modules/misc/fontconfig/multiple-font-packages.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ pkgs, ... }: { config = { home.packages = [ pkgs.comic-relief pkgs.unifont ]; diff --git a/tests/modules/misc/fontconfig/no-font-package.nix b/tests/modules/misc/fontconfig/no-font-package.nix index c4c687a13..52b2a74d6 100644 --- a/tests/modules/misc/fontconfig/no-font-package.nix +++ b/tests/modules/misc/fontconfig/no-font-package.nix @@ -1,17 +1,11 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - home.packages = [ - # Look, no font! - ]; + home.packages = [ + # Look, no font! + ]; - fonts.fontconfig.enable = true; + fonts.fontconfig.enable = true; - nmt.script = '' - assertPathNotExists home-path/lib/fontconfig/cache - ''; - }; + nmt.script = '' + assertPathNotExists home-path/lib/fontconfig/cache + ''; } diff --git a/tests/modules/misc/fontconfig/single-font-package.nix b/tests/modules/misc/fontconfig/single-font-package.nix index b70bdf8a9..dcf62238b 100644 --- a/tests/modules/misc/fontconfig/single-font-package.nix +++ b/tests/modules/misc/fontconfig/single-font-package.nix @@ -1,15 +1,13 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, realPkgs, ... }: -with lib; +lib.mkIf config.test.enableBig { + home.packages = [ pkgs.comic-relief ]; -{ - config = { - home.packages = [ pkgs.comic-relief ]; + fonts.fontconfig.enable = true; - fonts.fontconfig.enable = true; + _module.args.pkgs = lib.mkForce realPkgs; - nmt.script = '' - assertDirectoryNotEmpty home-path/lib/fontconfig/cache - ''; - }; + nmt.script = '' + assertDirectoryNotEmpty home-path/lib/fontconfig/cache + ''; } diff --git a/tests/modules/misc/gtk/gtk2-basic-config.nix b/tests/modules/misc/gtk/gtk2-basic-config.nix index 5671ac93e..684e852fb 100644 --- a/tests/modules/misc/gtk/gtk2-basic-config.nix +++ b/tests/modules/misc/gtk/gtk2-basic-config.nix @@ -1,25 +1,17 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - gtk = { - enable = true; - theme.name = "Adwaita"; - gtk2.extraConfig = "gtk-can-change-accels = 1"; - }; - - test.stubs.dconf = { }; - - nmt.script = '' - assertFileExists home-files/.gtkrc-2.0 - - assertFileContent home-files/.gtkrc-2.0 \ - ${./gtk2-basic-config-expected.conf} - - assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \ - 'GTK2_RC_FILES=.*/.gtkrc-2.0' - ''; + gtk = { + enable = true; + theme.name = "Adwaita"; + gtk2.extraConfig = "gtk-can-change-accels = 1"; }; + + nmt.script = '' + assertFileExists home-files/.gtkrc-2.0 + + assertFileContent home-files/.gtkrc-2.0 \ + ${./gtk2-basic-config-expected.conf} + + assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \ + 'GTK2_RC_FILES=.*/.gtkrc-2.0' + ''; } diff --git a/tests/modules/misc/gtk/gtk2-config-file-location.nix b/tests/modules/misc/gtk/gtk2-config-file-location.nix index a08998384..514ac7571 100644 --- a/tests/modules/misc/gtk/gtk2-config-file-location.nix +++ b/tests/modules/misc/gtk/gtk2-config-file-location.nix @@ -1,18 +1,12 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - gtk.enable = true; - gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + gtk.enable = true; + gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - test.stubs.dconf = { }; - - nmt.script = '' - assertFileExists home-files/.config/gtk-2.0/gtkrc - assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \ - 'GTK2_RC_FILES=.*/\.config/gtk-2.0/gtkrc' - ''; - }; + nmt.script = '' + assertFileExists home-files/.config/gtk-2.0/gtkrc + assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \ + 'GTK2_RC_FILES=.*/\.config/gtk-2.0/gtkrc' + ''; } diff --git a/tests/modules/misc/gtk/gtk3-basic-settings.nix b/tests/modules/misc/gtk/gtk3-basic-settings.nix index 058dd85b2..d09c1e2ab 100644 --- a/tests/modules/misc/gtk/gtk3-basic-settings.nix +++ b/tests/modules/misc/gtk/gtk3-basic-settings.nix @@ -1,24 +1,16 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - gtk = { - enable = true; - gtk3.extraConfig = { - gtk-cursor-blink = false; - gtk-recent-files-limit = 20; - }; + gtk = { + enable = true; + gtk3.extraConfig = { + gtk-cursor-blink = false; + gtk-recent-files-limit = 20; }; - - test.stubs.dconf = { }; - - nmt.script = '' - assertFileExists home-files/.config/gtk-3.0/settings.ini - - assertFileContent home-files/.config/gtk-3.0/settings.ini \ - ${./gtk3-basic-settings-expected.ini} - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/gtk-3.0/settings.ini + + assertFileContent home-files/.config/gtk-3.0/settings.ini \ + ${./gtk3-basic-settings-expected.ini} + ''; } diff --git a/tests/modules/misc/manual/manual.nix b/tests/modules/misc/manual/manual.nix index 1e79cdb7a..6ac6c0b53 100644 --- a/tests/modules/misc/manual/manual.nix +++ b/tests/modules/misc/manual/manual.nix @@ -1,22 +1,22 @@ -{ ... }: +{ lib, realPkgs, ... }: { - config = { - manual = { - html.enable = true; - manpages.enable = true; - json.enable = true; - }; - - nmt.script = '' - assertFileExists home-path/share/doc/home-manager/index.xhtml - assertFileExists home-path/share/doc/home-manager/options.json - assertFileExists home-path/share/doc/home-manager/options.xhtml - assertFileExists home-path/share/doc/home-manager/nixos-options.xhtml - assertFileExists home-path/share/doc/home-manager/nix-darwin-options.xhtml - assertFileExists home-path/share/doc/home-manager/release-notes.xhtml - assertFileExists home-path/share/man/man1/home-manager.1 - assertFileExists home-path/share/man/man5/home-configuration.nix.5 - ''; + manual = { + html.enable = true; + manpages.enable = true; + json.enable = true; }; + + _module.args.pkgs = lib.mkForce realPkgs; + + nmt.script = '' + assertFileExists home-path/share/doc/home-manager/index.xhtml + assertFileExists home-path/share/doc/home-manager/options.json + assertFileExists home-path/share/doc/home-manager/options.xhtml + assertFileExists home-path/share/doc/home-manager/nixos-options.xhtml + assertFileExists home-path/share/doc/home-manager/nix-darwin-options.xhtml + assertFileExists home-path/share/doc/home-manager/release-notes.xhtml + assertFileExists home-path/share/man/man1/home-manager.1 + assertFileExists home-path/share/man/man5/home-configuration.nix.5 + ''; } diff --git a/tests/modules/misc/nix/example-registry.nix b/tests/modules/misc/nix/example-registry.nix index 99da470ef..70cb066b2 100644 --- a/tests/modules/misc/nix/example-registry.nix +++ b/tests/modules/misc/nix/example-registry.nix @@ -1,5 +1,3 @@ -{ ... }: - { nix = { registry = { diff --git a/tests/modules/misc/numlock/numlock.nix b/tests/modules/misc/numlock/numlock.nix index 5616de1c5..a46a52f94 100644 --- a/tests/modules/misc/numlock/numlock.nix +++ b/tests/modules/misc/numlock/numlock.nix @@ -1,16 +1,8 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - xsession.numlock.enable = true; + xsession.numlock.enable = true; - test.stubs.numlockx = { }; - - nmt.script = '' - serviceFile=home-files/.config/systemd/user/numlockx.service - assertFileExists $serviceFile - ''; - }; + nmt.script = '' + serviceFile=home-files/.config/systemd/user/numlockx.service + assertFileExists $serviceFile + ''; } diff --git a/tests/modules/misc/pam/session-variables.nix b/tests/modules/misc/pam/session-variables.nix index 4fbec4163..f2625da5f 100644 --- a/tests/modules/misc/pam/session-variables.nix +++ b/tests/modules/misc/pam/session-variables.nix @@ -1,8 +1,4 @@ -{ config, lib, ... }: - -with lib; - -{ +{ config, ... }: { config = { pam.sessionVariables = { V1 = "v1"; diff --git a/tests/modules/misc/qt/qt-platform-theme-gnome.nix b/tests/modules/misc/qt/qt-platform-theme-gnome.nix index ca5829ee7..9feeee640 100644 --- a/tests/modules/misc/qt/qt-platform-theme-gnome.nix +++ b/tests/modules/misc/qt/qt-platform-theme-gnome.nix @@ -6,13 +6,6 @@ style.name = "adwaita"; }; - test.stubs = { - qgnomeplatform = { }; - qgnomeplatform-qt6 = { }; - adwaita-qt = { }; - adwaita-qt6 = { }; - }; - nmt.script = '' assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \ 'QT_QPA_PLATFORMTHEME="gnome"' diff --git a/tests/modules/misc/qt/qt-platform-theme-gtk.nix b/tests/modules/misc/qt/qt-platform-theme-gtk.nix index 22107016c..7b179c287 100644 --- a/tests/modules/misc/qt/qt-platform-theme-gtk.nix +++ b/tests/modules/misc/qt/qt-platform-theme-gtk.nix @@ -1,6 +1,6 @@ -{ - imports = [ ../../i18n/input-method/fcitx5-stubs.nix ]; +{ config, ... }: +{ qt = { enable = true; platformTheme.name = "gtk"; @@ -11,11 +11,11 @@ nixpkgs.overlays = [ (final: prev: { libsForQt5 = prev.libsForQt5.overrideScope (qt5final: qt5prev: { - qtstyleplugins = prev.mkStubPackage { outPath = null; }; + qtstyleplugins = config.lib.test.mkStubPackage { outPath = null; }; }); qt6Packages = prev.qt6Packages.overrideScope (qt6final: qt6prev: { - qt6gtk2 = prev.mkStubPackage { outPath = null; }; + qt6gtk2 = config.lib.test.mkStubPackage { outPath = null; }; }); }) ]; diff --git a/tests/modules/misc/specialisation/specialisation.nix b/tests/modules/misc/specialisation/specialisation.nix index a8d417d48..daea6e2c7 100644 --- a/tests/modules/misc/specialisation/specialisation.nix +++ b/tests/modules/misc/specialisation/specialisation.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { home.file.testfile.text = "not special"; specialisation.test.configuration = { diff --git a/tests/modules/misc/xdg/autostart.nix b/tests/modules/misc/xdg/autostart.nix new file mode 100644 index 000000000..754d11396 --- /dev/null +++ b/tests/modules/misc/xdg/autostart.nix @@ -0,0 +1,38 @@ +{ pkgs, ... }: + +{ + xdg.autostart = { + enable = true; + entries = [ + "${pkgs.test1}/share/applications/test1.desktop" + "${pkgs.test2}/share/applications/test2.desktop" + ]; + }; + + test.stubs = { + test1 = { + outPath = null; + buildScript = '' + mkdir -p $out/share/applications + echo test1 > $out/share/applications/test1.desktop + ''; + }; + test2 = { + outPath = null; + buildScript = '' + mkdir -p $out/share/applications + echo test2 > $out/share/applications/test2.desktop + ''; + }; + }; + + nmt.script = '' + assertFileExists home-files/.config/autostart/test1.desktop + assertFileContent home-files/.config/autostart/test1.desktop \ + ${pkgs.test1}/share/applications/test1.desktop + + assertFileExists home-files/.config/autostart/test2.desktop + assertFileContent home-files/.config/autostart/test2.desktop \ + ${pkgs.test2}/share/applications/test2.desktop + ''; +} diff --git a/tests/modules/misc/xdg/default-locations.nix b/tests/modules/misc/xdg/default-locations.nix index 1f6b36cc8..79f1f5321 100644 --- a/tests/modules/misc/xdg/default-locations.nix +++ b/tests/modules/misc/xdg/default-locations.nix @@ -1,11 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: { config = { # Test fallback behavior for stateVersion >= 20.09, which is pure. - xdg.enable = lib.mkForce false; + xdg.enable = false; home.stateVersion = "20.09"; xdg.configFile.test.text = "config"; diff --git a/tests/modules/misc/xdg/default.nix b/tests/modules/misc/xdg/default.nix index 87f74e22f..13ebb7e10 100644 --- a/tests/modules/misc/xdg/default.nix +++ b/tests/modules/misc/xdg/default.nix @@ -1,12 +1,6 @@ { - xdg-mime-apps-basics = ./mime-apps-basics.nix; - xdg-system-dirs = ./system-dirs.nix; - xdg-desktop-entries = ./desktop-entries.nix; xdg-file-gen = ./file-gen.nix; xdg-default-locations = ./default-locations.nix; - xdg-user-dirs-null = ./user-dirs-null.nix; - xdg-portal = ./portal.nix; - xdg-mime = ./mime.nix; xdg-mime-disabled = ./mime-disabled.nix; - xdg-mime-package = ./mime-packages.nix; + xdg-autostart = ./autostart.nix; } diff --git a/tests/modules/misc/xdg/desktop-entries.nix b/tests/modules/misc/xdg/desktop-entries.nix index 5f00029b6..9f52c550d 100644 --- a/tests/modules/misc/xdg/desktop-entries.nix +++ b/tests/modules/misc/xdg/desktop-entries.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ pkgs, ... }: { config = { xdg.desktopEntries = { full = { # full definition diff --git a/tests/modules/misc/xdg/file-gen.nix b/tests/modules/misc/xdg/file-gen.nix index 7514f414f..f06c6e520 100644 --- a/tests/modules/misc/xdg/file-gen.nix +++ b/tests/modules/misc/xdg/file-gen.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { xdg.configHome = /. + "${config.home.homeDirectory}/.dummy-config"; xdg.dataHome = /. + "${config.home.homeDirectory}/.dummy-data"; diff --git a/tests/modules/misc/xdg/linux.nix b/tests/modules/misc/xdg/linux.nix new file mode 100644 index 000000000..b0a6bb043 --- /dev/null +++ b/tests/modules/misc/xdg/linux.nix @@ -0,0 +1,9 @@ +{ + xdg-mime-apps-basics = ./mime-apps-basics.nix; + xdg-system-dirs = ./system-dirs.nix; + xdg-desktop-entries = ./desktop-entries.nix; + xdg-user-dirs-null = ./user-dirs-null.nix; + xdg-portal = ./portal.nix; + xdg-mime = ./mime.nix; + xdg-mime-package = ./mime-packages.nix; +} diff --git a/tests/modules/misc/xdg/mime-apps-basics.nix b/tests/modules/misc/xdg/mime-apps-basics.nix index e181e8206..3688040e5 100644 --- a/tests/modules/misc/xdg/mime-apps-basics.nix +++ b/tests/modules/misc/xdg/mime-apps-basics.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { xdg.mimeApps = { diff --git a/tests/modules/misc/xdg/mime-disabled.nix b/tests/modules/misc/xdg/mime-disabled.nix index a3df63091..43885528b 100644 --- a/tests/modules/misc/xdg/mime-disabled.nix +++ b/tests/modules/misc/xdg/mime-disabled.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ config = { xdg.mime.enable = false; nmt.script = '' diff --git a/tests/modules/misc/xdg/portal.nix b/tests/modules/misc/xdg/portal.nix index e9ac8e381..48527b129 100644 --- a/tests/modules/misc/xdg/portal.nix +++ b/tests/modules/misc/xdg/portal.nix @@ -1,26 +1,28 @@ -{ config, lib, pkgs, ... }: +{ config, lib, realPkgs, ... }: lib.mkIf config.test.enableBig { xdg.portal = { enable = true; extraPortals = - [ pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-wlr ]; - configPackages = [ pkgs.hyprland ]; + [ realPkgs.xdg-desktop-portal-hyprland realPkgs.xdg-desktop-portal-wlr ]; + configPackages = [ realPkgs.hyprland ]; config = { sway.default = [ "wlr" "gtk" ]; }; }; + test.unstubs = [ (self: super: { inherit (realPkgs) xdg-desktop-portal; }) ]; + nmt.script = '' assertFileExists home-path/share/systemd/user/xdg-desktop-portal.service assertFileExists home-path/share/systemd/user/xdg-desktop-portal-wlr.service assertFileExists home-path/share/systemd/user/xdg-desktop-portal-hyprland.service assertFileContent home-path/share/xdg-desktop-portal/portals/hyprland.portal \ - ${pkgs.xdg-desktop-portal-hyprland}/share/xdg-desktop-portal/portals/hyprland.portal + ${realPkgs.xdg-desktop-portal-hyprland}/share/xdg-desktop-portal/portals/hyprland.portal assertFileContent home-path/share/xdg-desktop-portal/portals/wlr.portal \ - ${pkgs.xdg-desktop-portal-wlr}/share/xdg-desktop-portal/portals/wlr.portal + ${realPkgs.xdg-desktop-portal-wlr}/share/xdg-desktop-portal/portals/wlr.portal assertFileContent home-path/share/xdg-desktop-portal/hyprland-portals.conf \ - ${pkgs.hyprland}/share/xdg-desktop-portal/hyprland-portals.conf + ${realPkgs.hyprland}/share/xdg-desktop-portal/hyprland-portals.conf assertFileContent home-files/.config/xdg-desktop-portal/sway-portals.conf \ ${./sway-portals-expected.conf} ''; diff --git a/tests/modules/misc/xsession/basic.nix b/tests/modules/misc/xsession/basic.nix index d6756291c..f212de19d 100644 --- a/tests/modules/misc/xsession/basic.nix +++ b/tests/modules/misc/xsession/basic.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { xsession = { diff --git a/tests/modules/misc/xsession/keyboard-without-layout.nix b/tests/modules/misc/xsession/keyboard-without-layout.nix index 90038cfd0..d49d60e02 100644 --- a/tests/modules/misc/xsession/keyboard-without-layout.nix +++ b/tests/modules/misc/xsession/keyboard-without-layout.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { home.stateVersion = "19.09"; diff --git a/tests/modules/programs/abook/no-settings.nix b/tests/modules/programs/abook/no-settings.nix index f8b096fb1..942c19e50 100644 --- a/tests/modules/programs/abook/no-settings.nix +++ b/tests/modules/programs/abook/no-settings.nix @@ -1,13 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.abook.enable = true; - test.stubs.abook = { }; - nmt.script = '' assertPathNotExists home-files/.config/abook/abookrc ''; diff --git a/tests/modules/programs/abook/with-settings.nix b/tests/modules/programs/abook/with-settings.nix index e89ad7dad..a02c9d6fd 100644 --- a/tests/modules/programs/abook/with-settings.nix +++ b/tests/modules/programs/abook/with-settings.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.abook = { @@ -28,8 +24,6 @@ with lib; ''; }; - test.stubs.abook = { }; - nmt.script = '' assertFileExists home-files/.config/abook/abookrc assertFileContent home-files/.config/abook/abookrc ${./with-settings.cfg} diff --git a/tests/modules/programs/aerc/assertion.nix b/tests/modules/programs/aerc/assertion.nix index 9b37f0824..b1523bbc0 100644 --- a/tests/modules/programs/aerc/assertion.nix +++ b/tests/modules/programs/aerc/assertion.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { test.asserts.assertions.expected = ['' @@ -19,8 +15,6 @@ with lib; This option is safe; if `passwordCommand` is properly set, no credentials will be written to the nix store. '']; - test.stubs.aerc = { }; - programs.aerc = { enable = true; extraAccounts = { diff --git a/tests/modules/programs/aerc/default.nix b/tests/modules/programs/aerc/default.nix index 9417a2197..80b7e9efc 100644 --- a/tests/modules/programs/aerc/default.nix +++ b/tests/modules/programs/aerc/default.nix @@ -2,4 +2,5 @@ aerc-noSettings = ./noSettings.nix; aerc-settings = ./settings.nix; aerc-assertion = ./assertion.nix; + aerc-oauth = ./oauth.nix; } diff --git a/tests/modules/programs/aerc/noSettings.nix b/tests/modules/programs/aerc/noSettings.nix index c941c19b7..46d146bf9 100644 --- a/tests/modules/programs/aerc/noSettings.nix +++ b/tests/modules/programs/aerc/noSettings.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { nmt.script = let dir = "home-files/.config/aerc"; @@ -12,7 +8,5 @@ with lib; assertPathNotExists ${dir}/stylesets ''; programs.aerc.enable = true; - - test.stubs.aerc = { }; }; } diff --git a/tests/modules/programs/aerc/oauth.expected b/tests/modules/programs/aerc/oauth.expected new file mode 100644 index 000000000..6824d1fed --- /dev/null +++ b/tests/modules/programs/aerc/oauth.expected @@ -0,0 +1,9 @@ +# Generated by Home Manager. + +[basic] +copy-to = Sent +default = Inbox +from = Annie X. Hacker +outgoing = smtp+xoauth2://anniex@smtp.office365.com:587?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https%3A%2F%2Flogin.microsoftonline.com%2Fcommon%2Foauth2%2Fv2.0%2Ftoken +postpone = Drafts +source = imaps+xoauth2://anniex@outlook.office365.com:993?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https%3A%2F%2Flogin.microsoftonline.com%2Fcommon%2Foauth2%2Fv2.0%2Ftoken diff --git a/tests/modules/programs/aerc/oauth.nix b/tests/modules/programs/aerc/oauth.nix new file mode 100644 index 000000000..e91d25203 --- /dev/null +++ b/tests/modules/programs/aerc/oauth.nix @@ -0,0 +1,39 @@ +{ config, pkgs, ... }: { + config = { + nmt.script = let + dir = if (pkgs.stdenv.isDarwin && !config.xdg.enable) then + "home-files/Library/Preferences/aerc" + else + "home-files/.config/aerc"; + in '' + assertFileContent ${dir}/accounts.conf ${./oauth.expected} + ''; + programs.aerc = { + enable = true; + extraConfig.general.unsafe-accounts-conf = true; + }; + + accounts.email.accounts = { + basic = { + realName = "Annie X. Hacker"; + userName = "anniex"; + address = "anniex@mail.invalid"; + primary = true; + flavor = "outlook.office365.com"; + + aerc = rec { + enable = true; + imapAuth = "xoauth2"; + smtpAuth = imapAuth; + imapOauth2Params = { + client_id = "9e5f94bc-e8a4-4e73-b8be-63364c29d753"; + token_endpoint = + "https://login.microsoftonline.com/common/oauth2/v2.0/token"; + }; + smtpOauth2Params = imapOauth2Params; + }; + }; + }; + }; +} + diff --git a/tests/modules/programs/aerc/settings.nix b/tests/modules/programs/aerc/settings.nix index af4d16f70..306930985 100644 --- a/tests/modules/programs/aerc/settings.nix +++ b/tests/modules/programs/aerc/settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, pkgs, ... }: { config = { nmt.script = let dir = if (pkgs.stdenv.isDarwin && !config.xdg.enable) then @@ -19,8 +15,6 @@ with lib; assertFileContent ${dir}/stylesets/asLines ${./stylesets.expected} ''; - test.stubs.aerc = { }; - programs.aerc = { enable = true; diff --git a/tests/modules/programs/aerospace/aerospace.nix b/tests/modules/programs/aerospace/aerospace.nix new file mode 100644 index 000000000..9e06ad8f0 --- /dev/null +++ b/tests/modules/programs/aerospace/aerospace.nix @@ -0,0 +1,25 @@ +{ + programs.aerospace = { + enable = true; + userSettings = { + gaps = { + outer.left = 8; + outer.bottom = 8; + outer.top = 8; + outer.right = 8; + }; + mode.main.binding = { + alt-h = "focus left"; + alt-j = "focus down"; + alt-k = "focus up"; + alt-l = "focus right"; + }; + }; + }; + + nmt.script = '' + assertFileContent home-files/.config/aerospace/aerospace.toml ${ + ./settings-expected.toml + } + ''; +} diff --git a/tests/modules/programs/aerospace/default.nix b/tests/modules/programs/aerospace/default.nix new file mode 100644 index 000000000..d77a32af6 --- /dev/null +++ b/tests/modules/programs/aerospace/default.nix @@ -0,0 +1 @@ +{ aerospace = ./aerospace.nix; } diff --git a/tests/modules/programs/aerospace/settings-expected.toml b/tests/modules/programs/aerospace/settings-expected.toml new file mode 100644 index 000000000..b46ebad41 --- /dev/null +++ b/tests/modules/programs/aerospace/settings-expected.toml @@ -0,0 +1,27 @@ +accordion-padding = 30 +after-login-command = [] +after-startup-command = [] +default-root-container-layout = "tiles" +default-root-container-orientation = "auto" +enable-normalization-flatten-containers = true +enable-normalization-opposite-orientation-for-nested-containers = true +exec-on-workspace-change = [] +on-focus-changed = [] +on-focused-monitor-changed = ["move-mouse monitor-lazy-center"] +on-window-detected = [] +start-at-login = false + +[gaps.outer] +bottom = 8 +left = 8 +right = 8 +top = 8 + +[key-mapping] +preset = "qwerty" + +[mode.main.binding] +alt-h = "focus left" +alt-j = "focus down" +alt-k = "focus up" +alt-l = "focus right" diff --git a/tests/modules/programs/alacritty/empty-settings.nix b/tests/modules/programs/alacritty/empty-settings.nix index c587018e5..4aa010672 100644 --- a/tests/modules/programs/alacritty/empty-settings.nix +++ b/tests/modules/programs/alacritty/empty-settings.nix @@ -1,11 +1,7 @@ { - config = { - programs.alacritty.enable = true; + programs.alacritty.enable = true; - test.stubs.alacritty = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/alacritty - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/alacritty + ''; } diff --git a/tests/modules/programs/alacritty/example-settings.nix b/tests/modules/programs/alacritty/example-settings.nix index ccda3b2c5..fca3bf68d 100644 --- a/tests/modules/programs/alacritty/example-settings.nix +++ b/tests/modules/programs/alacritty/example-settings.nix @@ -1,31 +1,23 @@ -{ config, ... }: - { - config = { - programs.alacritty = { - enable = true; - package = config.lib.test.mkStubPackage { }; - - settings = { - window.dimensions = { - lines = 3; - columns = 200; - }; - - keyboard.bindings = [{ - key = "K"; - mods = "Control"; - chars = "\\u000c"; - }]; + programs.alacritty = { + enable = true; + settings = { + window.dimensions = { + lines = 3; + columns = 200; }; + + keyboard.bindings = [{ + key = "K"; + mods = "Control"; + chars = "\\u000c"; + }]; }; - - test.stubs = { alacritty = { }; }; - - nmt.script = '' - assertFileContent \ - home-files/.config/alacritty/alacritty.toml \ - ${./example-settings-expected.toml} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/alacritty/alacritty.toml \ + ${./example-settings-expected.toml} + ''; } diff --git a/tests/modules/programs/alacritty/settings-merging.nix b/tests/modules/programs/alacritty/settings-merging.nix index 1d47b77a6..e86bf5e42 100644 --- a/tests/modules/programs/alacritty/settings-merging.nix +++ b/tests/modules/programs/alacritty/settings-merging.nix @@ -1,39 +1,33 @@ -{ config, lib, ... }: +{ lib, ... }: { - config = { - programs.alacritty = { - enable = true; - package = config.lib.test.mkStubPackage { }; + programs.alacritty = { + enable = true; + settings = { + window.dimensions = { + lines = 3; + columns = 200; + }; - settings = { - window.dimensions = { - lines = 3; - columns = 200; - }; + keyboard.bindings = [{ + key = "K"; + mods = "Control"; + chars = "\\u000c"; + }]; - keyboard.bindings = [{ - key = "K"; - mods = "Control"; - chars = "\\u000c"; - }]; - - font = let - defaultFont = - lib.mkMerge [ (lib.mkIf true "SFMono") (lib.mkIf false "Iosevka") ]; - in { - normal.family = defaultFont; - bold.family = defaultFont; - }; + font = let + defaultFont = + lib.mkMerge [ (lib.mkIf true "SFMono") (lib.mkIf false "Iosevka") ]; + in { + normal.family = defaultFont; + bold.family = defaultFont; }; }; - - test.stubs = { alacritty = { }; }; - - nmt.script = '' - assertFileContent \ - home-files/.config/alacritty/alacritty.toml \ - ${./settings-toml-expected.toml} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/alacritty/alacritty.toml \ + ${./settings-toml-expected.toml} + ''; } diff --git a/tests/modules/programs/alacritty/toml-config.nix b/tests/modules/programs/alacritty/toml-config.nix index 8235d44c2..b065fa302 100644 --- a/tests/modules/programs/alacritty/toml-config.nix +++ b/tests/modules/programs/alacritty/toml-config.nix @@ -1,36 +1,28 @@ -{ config, ... }: - { - config = { - programs.alacritty = { - enable = true; - package = config.lib.test.mkStubPackage { }; + programs.alacritty = { + enable = true; + settings = { + window.dimensions = { + lines = 3; + columns = 200; + }; - settings = { - window.dimensions = { - lines = 3; - columns = 200; - }; + keyboard.bindings = [{ + key = "K"; + mods = "Control"; + chars = "\\u000c"; + }]; - keyboard.bindings = [{ - key = "K"; - mods = "Control"; - chars = "\\u000c"; - }]; - - font = { - normal.family = "SFMono"; - bold.family = "SFMono"; - }; + font = { + normal.family = "SFMono"; + bold.family = "SFMono"; }; }; - - test.stubs = { alacritty = { }; }; - - nmt.script = '' - assertFileContent \ - home-files/.config/alacritty/alacritty.toml \ - ${./settings-toml-expected.toml} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/alacritty/alacritty.toml \ + ${./settings-toml-expected.toml} + ''; } diff --git a/tests/modules/programs/alot/alot.nix b/tests/modules/programs/alot/alot.nix index 6316fbd76..279b99144 100644 --- a/tests/modules/programs/alot/alot.nix +++ b/tests/modules/programs/alot/alot.nix @@ -1,34 +1,26 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - alot = { - contactCompletion = { }; - extraConfig = '' - auto_remove_unread = True - ask_subject = False - handle_mouse = True - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + alot = { + contactCompletion = { }; + extraConfig = '' + auto_remove_unread = True + ask_subject = False + handle_mouse = True + ''; }; + imap.port = 993; }; - - programs.alot = { enable = true; }; - - test.stubs.alot = { }; - - nmt.script = '' - assertFileExists home-files/.config/alot/config - assertFileContent home-files/.config/alot/config ${./alot-expected.conf} - ''; }; + + programs.alot = { enable = true; }; + + nmt.script = '' + assertFileExists home-files/.config/alot/config + assertFileContent home-files/.config/alot/config ${./alot-expected.conf} + ''; } diff --git a/tests/modules/programs/antidote/antidote.nix b/tests/modules/programs/antidote/antidote.nix index 3d8fff6a9..ec697e02c 100644 --- a/tests/modules/programs/antidote/antidote.nix +++ b/tests/modules/programs/antidote/antidote.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - let relToDotDirCustom = ".zshplugins"; in { programs.zsh = { @@ -12,11 +10,6 @@ in { }; }; - test.stubs = { - antidote = { }; - zsh = { }; - }; - nmt.script = '' assertFileContains home-files/${relToDotDirCustom}/.zshrc \ 'source @antidote@/share/antidote/antidote.zsh' diff --git a/tests/modules/programs/aria2/settings.nix b/tests/modules/programs/aria2/settings.nix index 346de9679..a0ba02a3f 100644 --- a/tests/modules/programs/aria2/settings.nix +++ b/tests/modules/programs/aria2/settings.nix @@ -1,40 +1,32 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.aria2 = { - enable = true; + programs.aria2 = { + enable = true; - settings = { - listen-port = 60000; - dht-listen-port = 60000; - seed-ratio = 1.0; - max-upload-limit = "50K"; - ftp-pasv = true; - }; - - extraConfig = '' - # Extra aria2 configuration. - ''; + settings = { + listen-port = 60000; + dht-listen-port = 60000; + seed-ratio = 1.0; + max-upload-limit = "50K"; + ftp-pasv = true; }; - test.stubs.aria2 = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/aria2/aria2.conf \ - ${ - pkgs.writeText "aria2-expected-config.conf" '' - dht-listen-port=60000 - ftp-pasv=true - listen-port=60000 - max-upload-limit=50K - seed-ratio=1.000000 - # Extra aria2 configuration. - '' - } + extraConfig = '' + # Extra aria2 configuration. ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/aria2/aria2.conf \ + ${ + builtins.toFile "aria2-expected-config.conf" '' + dht-listen-port=60000 + ftp-pasv=true + listen-port=60000 + max-upload-limit=50K + seed-ratio=1.000000 + # Extra aria2 configuration. + '' + } + ''; } diff --git a/tests/modules/programs/atuin/bash.nix b/tests/modules/programs/atuin/bash.nix index 21d306b2f..5176a79ba 100644 --- a/tests/modules/programs/atuin/bash.nix +++ b/tests/modules/programs/atuin/bash.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { atuin.enable = true; @@ -9,11 +7,6 @@ }; }; - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/atuin/empty-settings.nix b/tests/modules/programs/atuin/empty-settings.nix index be6b55986..b10fa4891 100644 --- a/tests/modules/programs/atuin/empty-settings.nix +++ b/tests/modules/programs/atuin/empty-settings.nix @@ -1,13 +1,6 @@ -{ ... }: - { programs.atuin.enable = true; - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertPathNotExists home-files/.config/atuin/config.toml ''; diff --git a/tests/modules/programs/atuin/example-settings.nix b/tests/modules/programs/atuin/example-settings.nix index 98aca707d..c23b84e3e 100644 --- a/tests/modules/programs/atuin/example-settings.nix +++ b/tests/modules/programs/atuin/example-settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.atuin = { enable = true; @@ -12,11 +10,6 @@ }; }; - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileContent \ home-files/.config/atuin/config.toml \ diff --git a/tests/modules/programs/atuin/fish.nix b/tests/modules/programs/atuin/fish.nix index 49d9a2821..f67c9cfa1 100644 --- a/tests/modules/programs/atuin/fish.nix +++ b/tests/modules/programs/atuin/fish.nix @@ -10,11 +10,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileExists home-files/.config/fish/config.fish assertFileContains \ diff --git a/tests/modules/programs/atuin/no-shell.nix b/tests/modules/programs/atuin/no-shell.nix index c6481e427..6cab60e27 100644 --- a/tests/modules/programs/atuin/no-shell.nix +++ b/tests/modules/programs/atuin/no-shell.nix @@ -17,11 +17,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileNotRegex home-files/.zshrc 'atuin init zsh' assertFileNotRegex home-files/.bashrc 'atuin init bash' diff --git a/tests/modules/programs/atuin/set-flags.nix b/tests/modules/programs/atuin/set-flags.nix index ebc68a5d1..14c719708 100644 --- a/tests/modules/programs/atuin/set-flags.nix +++ b/tests/modules/programs/atuin/set-flags.nix @@ -16,11 +16,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/atuin/zsh.nix b/tests/modules/programs/atuin/zsh.nix index 2cb4fefef..b83f9258c 100644 --- a/tests/modules/programs/atuin/zsh.nix +++ b/tests/modules/programs/atuin/zsh.nix @@ -1,16 +1,9 @@ -{ ... }: - { programs = { atuin.enable = true; zsh.enable = true; }; - test.stubs = { - atuin = { name = "atuin"; }; - bash-preexec = { }; - }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileContains \ diff --git a/tests/modules/programs/autojump/default-settings.nix b/tests/modules/programs/autojump/default-settings.nix index e7d40bb37..a886a029c 100644 --- a/tests/modules/programs/autojump/default-settings.nix +++ b/tests/modules/programs/autojump/default-settings.nix @@ -1,18 +1,12 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.autojump.enable = true; + programs.autojump.enable = true; - test.stubs.autojump = { - buildScript = "mkdir -p $out/bin; touch $out/bin/autojump"; - outPath = null; - }; - - nmt.script = '' - assertFileExists home-path/bin/autojump - ''; + test.stubs.autojump = { + buildScript = "mkdir -p $out/bin; touch $out/bin/autojump"; + outPath = null; }; + + nmt.script = '' + assertFileExists home-path/bin/autojump + ''; } diff --git a/tests/modules/programs/autorandr/basic-configuration.nix b/tests/modules/programs/autorandr/basic-configuration.nix index d0f14ec86..3a2e74202 100644 --- a/tests/modules/programs/autorandr/basic-configuration.nix +++ b/tests/modules/programs/autorandr/basic-configuration.nix @@ -1,66 +1,60 @@ -{ config, pkgs, ... }: - { - config = { - programs.autorandr = { - enable = true; - profiles = { - default = { - fingerprint = { - DP1 = "XXX"; - DP2 = "YYY"; - }; - config = { - DP1.enable = false; - DP2 = { - crtc = 0; - primary = true; - position = "0x0"; - mode = "1920x1080"; - filter = "nearest"; - transform = [ - [ 0.6 0.0 0.0 ] # a b c - [ 0.0 0.6 0.0 ] # d e f - [ 0.0 0.0 1.0 ] # g h i - ]; - extraConfig = '' - key1 value1 - key2 value2 - ''; - }; + programs.autorandr = { + enable = true; + profiles = { + default = { + fingerprint = { + DP1 = "XXX"; + DP2 = "YYY"; + }; + config = { + DP1.enable = false; + DP2 = { + crtc = 0; + primary = true; + position = "0x0"; + mode = "1920x1080"; + filter = "nearest"; + transform = [ + [ 0.6 0.0 0.0 ] # a b c + [ 0.0 0.6 0.0 ] # d e f + [ 0.0 0.0 1.0 ] # g h i + ]; + extraConfig = '' + key1 value1 + key2 value2 + ''; }; }; }; }; - - test.stubs.autorandr = { }; - - nmt.script = '' - config=home-files/.config/autorandr/default/config - setup=home-files/.config/autorandr/default/setup - - assertFileExists $setup - assertFileRegex $setup 'DP1 XXX' - assertFileRegex $setup 'DP2 YYY' - - assertFileExists $config - assertFileContent $config \ - ${ - pkgs.writeText "basic-configuration.conf" '' - output DP1 - off - - output DP2 - pos 0x0 - crtc 0 - primary - mode 1920x1080 - filter nearest - transform 0.600000,0.000000,0.000000,0.000000,0.600000,0.000000,0.000000,0.000000,1.000000 - key1 value1 - key2 value2 - '' - } - ''; }; + + nmt.script = '' + config=home-files/.config/autorandr/default/config + setup=home-files/.config/autorandr/default/setup + + assertFileExists $setup + assertFileRegex $setup 'DP1 XXX' + assertFileRegex $setup 'DP2 YYY' + + assertFileExists $config + assertFileContent $config \ + ${ + builtins.toFile "basic-configuration.conf" '' + output DP1 + off + + output DP2 + pos 0x0 + crtc 0 + primary + mode 1920x1080 + filter nearest + transform 0.600000,0.000000,0.000000,0.000000,0.600000,0.000000,0.000000,0.000000,1.000000 + key1 value1 + key2 value2 + '' + } + ''; } diff --git a/tests/modules/programs/autorandr/scale.nix b/tests/modules/programs/autorandr/scale.nix index 095778a43..0fd55ae76 100644 --- a/tests/modules/programs/autorandr/scale.nix +++ b/tests/modules/programs/autorandr/scale.nix @@ -1,34 +1,28 @@ -{ config, pkgs, ... }: - { - config = { - programs.autorandr = { - enable = true; - profiles = { - default = { - fingerprint.DP1 = "XXX"; - config.DP1 = { - scale = { - x = 2; - y = 4; - }; + programs.autorandr = { + enable = true; + profiles = { + default = { + fingerprint.DP1 = "XXX"; + config.DP1 = { + scale = { + x = 2; + y = 4; }; }; }; }; - - test.stubs.autorandr = { }; - - nmt.script = '' - config=home-files/.config/autorandr/default/config - - assertFileExists $config - assertFileContent $config \ - ${ - pkgs.writeText "scale-expected.conf" '' - output DP1 - scale 2x4'' - } - ''; }; + + nmt.script = '' + config=home-files/.config/autorandr/default/config + + assertFileExists $config + assertFileContent $config \ + ${ + builtins.toFile "scale-expected.conf" '' + output DP1 + scale 2x4'' + } + ''; } diff --git a/tests/modules/programs/awscli/awscli.nix b/tests/modules/programs/awscli/awscli.nix index 0a96990ad..abcfc8a25 100644 --- a/tests/modules/programs/awscli/awscli.nix +++ b/tests/modules/programs/awscli/awscli.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { awscli = { @@ -14,8 +12,6 @@ }; }; - test.stubs.awscli2 = { }; - nmt.script = '' assertFileExists home-files/.aws/config assertFileContent home-files/.aws/config \ diff --git a/tests/modules/programs/bacon/bacon.nix b/tests/modules/programs/bacon/bacon.nix index 6df88456d..712c6da3b 100644 --- a/tests/modules/programs/bacon/bacon.nix +++ b/tests/modules/programs/bacon/bacon.nix @@ -21,7 +21,7 @@ in { }; }; }; - test.stubs.bacon = { }; + nmt.script = '' assertFileExists 'home-files/${configDir}/prefs.toml' assertFileContent 'home-files/${configDir}/prefs.toml' ${./expected.toml} diff --git a/tests/modules/programs/bacon/empty-config.nix b/tests/modules/programs/bacon/empty-config.nix index 51ceb94e5..def614d39 100644 --- a/tests/modules/programs/bacon/empty-config.nix +++ b/tests/modules/programs/bacon/empty-config.nix @@ -7,8 +7,6 @@ let in { programs.bacon.enable = true; - test.stubs.bacon = { }; - nmt.script = '' assertPathNotExists 'home-files/${configDir}/prefs.toml' ''; diff --git a/tests/modules/programs/bash/bash-history-control-with-file.nix b/tests/modules/programs/bash/bash-history-control-with-file.nix new file mode 100644 index 000000000..d3193232a --- /dev/null +++ b/tests/modules/programs/bash/bash-history-control-with-file.nix @@ -0,0 +1,16 @@ +{ + config = { + programs.bash = { + enable = true; + historyControl = [ "erasedups" ]; + historyFile = "/home/hm-user/foo/bash/history"; + }; + + nmt.script = '' + assertFileExists home-files/.bashrc + + assertFileRegex home-files/.bashrc \ + '^mkdir -p "\$(dirname "\$HISTFILE")"' + ''; + }; +} diff --git a/tests/modules/programs/bash/completion.nix b/tests/modules/programs/bash/completion.nix index 2e5e69dd1..744da3d7a 100644 --- a/tests/modules/programs/bash/completion.nix +++ b/tests/modules/programs/bash/completion.nix @@ -1,12 +1,6 @@ -{ config, lib, pkgs, ... }: - -with lib; - { programs.bash.enable = true; - test.stubs.bash-completion = { }; - nmt.script = '' assertFileExists home-files/.bashrc diff --git a/tests/modules/programs/bash/default.nix b/tests/modules/programs/bash/default.nix index 1dbbee777..6b20d1fbc 100644 --- a/tests/modules/programs/bash/default.nix +++ b/tests/modules/programs/bash/default.nix @@ -2,4 +2,5 @@ bash-completion = ./completion.nix; bash-logout = ./logout.nix; bash-session-variables = ./session-variables.nix; + bash-history-control-with-file = ./bash-history-control-with-file.nix; } diff --git a/tests/modules/programs/bash/logout.nix b/tests/modules/programs/bash/logout.nix index c366c520e..5fb78a94f 100644 --- a/tests/modules/programs/bash/logout.nix +++ b/tests/modules/programs/bash/logout.nix @@ -1,27 +1,21 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.bash = { - enable = true; - enableCompletion = false; + programs.bash = { + enable = true; + enableCompletion = false; - logoutExtra = '' - clear-console - ''; - }; - - nmt.script = '' - assertFileExists home-files/.bash_logout - assertFileContent \ - home-files/.bash_logout \ - ${ - builtins.toFile "logout-expected" '' - clear-console - '' - } + logoutExtra = '' + clear-console ''; }; + + nmt.script = '' + assertFileExists home-files/.bash_logout + assertFileContent \ + home-files/.bash_logout \ + ${ + builtins.toFile "logout-expected" '' + clear-console + '' + } + ''; } diff --git a/tests/modules/programs/bash/session-variables.nix b/tests/modules/programs/bash/session-variables.nix index bbf2b71ab..01d204b77 100644 --- a/tests/modules/programs/bash/session-variables.nix +++ b/tests/modules/programs/bash/session-variables.nix @@ -1,33 +1,29 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.bash = { - enable = true; - enableCompletion = false; + programs.bash = { + enable = true; + enableCompletion = false; - sessionVariables = { - V1 = "v1"; - V2 = "v2-${config.programs.bash.sessionVariables.V1}"; - }; + sessionVariables = { + V1 = "v1"; + V2 = "v2-${config.programs.bash.sessionVariables.V1}"; }; - - nmt.script = '' - assertFileExists home-files/.profile - assertFileContent \ - home-files/.profile \ - ${ - builtins.toFile "session-variables-expected" '' - . "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh" - - export V1="v1" - export V2="v2-v1" - - - '' - } - ''; }; + + nmt.script = '' + assertFileExists home-files/.profile + assertFileContent \ + home-files/.profile \ + ${ + builtins.toFile "session-variables-expected" '' + . "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh" + + export V1="v1" + export V2="v2-v1" + + + '' + } + ''; } diff --git a/tests/modules/programs/bat/bat.nix b/tests/modules/programs/bat/bat.nix index 578310486..bc07489ca 100644 --- a/tests/modules/programs/bat/bat.nix +++ b/tests/modules/programs/bat/bat.nix @@ -1,58 +1,50 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.bat = { - enable = true; + programs.bat = { + enable = true; - config = { - theme = "TwoDark"; - pager = "less -FR"; - map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; - show-all = true; + config = { + theme = "TwoDark"; + pager = "less -FR"; + map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; + show-all = true; - # False boolean options should not appear in the config - lessopen = false; - }; - - themes.testtheme.src = pkgs.writeText "testtheme.tmTheme" '' - This is a test theme. - ''; - - syntaxes.testsyntax.src = pkgs.writeText "testsyntax.sublime-syntax" '' - This is a test syntax. - ''; + # False boolean options should not appear in the config + lessopen = false; }; - test.stubs.bat = { }; + themes.testtheme.src = builtins.toFile "testtheme.tmTheme" '' + This is a test theme. + ''; - nmt.script = '' - assertFileExists home-files/.config/bat/config - assertFileContent home-files/.config/bat/config ${ - pkgs.writeText "bat.expected" '' - --map-syntax='*.jenkinsfile:Groovy' - --map-syntax='*.props:Java Properties' - --pager='less -FR' - --theme=TwoDark - --show-all - '' - } - - assertFileExists home-files/.config/bat/themes/testtheme.tmTheme - assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${ - pkgs.writeText "bat.expected" '' - This is a test theme. - '' - } - - assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax - assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${ - pkgs.writeText "bat.expected" '' - This is a test syntax. - '' - } + syntaxes.testsyntax.src = builtins.toFile "testsyntax.sublime-syntax" '' + This is a test syntax. ''; }; + + nmt.script = '' + assertFileExists home-files/.config/bat/config + assertFileContent home-files/.config/bat/config ${ + builtins.toFile "bat.expected" '' + --map-syntax='*.jenkinsfile:Groovy' + --map-syntax='*.props:Java Properties' + --pager='less -FR' + --theme=TwoDark + --show-all + '' + } + + assertFileExists home-files/.config/bat/themes/testtheme.tmTheme + assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${ + builtins.toFile "bat.expected" '' + This is a test theme. + '' + } + + assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax + assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${ + builtins.toFile "bat.expected" '' + This is a test syntax. + '' + } + ''; } diff --git a/tests/modules/programs/bat/deprecated-options.nix b/tests/modules/programs/bat/deprecated-options.nix index 096815cbe..b00333d82 100644 --- a/tests/modules/programs/bat/deprecated-options.nix +++ b/tests/modules/programs/bat/deprecated-options.nix @@ -1,67 +1,59 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.bat = { - enable = true; + programs.bat = { + enable = true; - config = { - theme = "TwoDark"; - pager = "less -FR"; - map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; - }; - - themes.testtheme = '' - This is a test theme. - ''; - - syntaxes.testsyntax = '' - This is a test syntax. - ''; + config = { + theme = "TwoDark"; + pager = "less -FR"; + map-syntax = [ "*.jenkinsfile:Groovy" "*.props:Java Properties" ]; }; - test.stubs.bat = { }; + themes.testtheme = '' + This is a test theme. + ''; - test.asserts.warnings.enable = true; - test.asserts.warnings.expected = [ - '' - Using programs.bat.themes as a string option is deprecated and will be - removed in the future. Please change to using it as an attribute set - instead. - '' - '' - Using programs.bat.syntaxes as a string option is deprecated and will be - removed in the future. Please change to using it as an attribute set - instead. - '' - ]; - - nmt.script = '' - assertFileExists home-files/.config/bat/config - assertFileContent home-files/.config/bat/config ${ - pkgs.writeText "bat.expected" '' - --map-syntax='*.jenkinsfile:Groovy' - --map-syntax='*.props:Java Properties' - --pager='less -FR' - --theme=TwoDark - '' - } - - assertFileExists home-files/.config/bat/themes/testtheme.tmTheme - assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${ - pkgs.writeText "bat.expected" '' - This is a test theme. - '' - } - - assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax - assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${ - pkgs.writeText "bat.expected" '' - This is a test syntax. - '' - } + syntaxes.testsyntax = '' + This is a test syntax. ''; }; + + test.asserts.warnings.enable = true; + test.asserts.warnings.expected = [ + '' + Using programs.bat.themes as a string option is deprecated and will be + removed in the future. Please change to using it as an attribute set + instead. + '' + '' + Using programs.bat.syntaxes as a string option is deprecated and will be + removed in the future. Please change to using it as an attribute set + instead. + '' + ]; + + nmt.script = '' + assertFileExists home-files/.config/bat/config + assertFileContent home-files/.config/bat/config ${ + builtins.toFile "bat.expected" '' + --map-syntax='*.jenkinsfile:Groovy' + --map-syntax='*.props:Java Properties' + --pager='less -FR' + --theme=TwoDark + '' + } + + assertFileExists home-files/.config/bat/themes/testtheme.tmTheme + assertFileContent home-files/.config/bat/themes/testtheme.tmTheme ${ + builtins.toFile "bat.expected" '' + This is a test theme. + '' + } + + assertFileExists home-files/.config/bat/syntaxes/testsyntax.sublime-syntax + assertFileContent home-files/.config/bat/syntaxes/testsyntax.sublime-syntax ${ + builtins.toFile "bat.expected" '' + This is a test syntax. + '' + } + ''; } diff --git a/tests/modules/programs/beets/mpdstats.nix b/tests/modules/programs/beets/mpdstats.nix index d825f85bd..e3291a174 100644 --- a/tests/modules/programs/beets/mpdstats.nix +++ b/tests/modules/programs/beets/mpdstats.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { home.stateVersion = "23.05"; @@ -14,11 +12,6 @@ mpdIntegration.enableStats = true; }; - test.stubs = { - beets = { }; - mpd = { }; - }; - nmt.script = '' assertFileExists home-files/.config/beets/config.yaml assertFileContent \ diff --git a/tests/modules/programs/beets/mpdupdate.nix b/tests/modules/programs/beets/mpdupdate.nix index b73da81e8..eba8800c0 100644 --- a/tests/modules/programs/beets/mpdupdate.nix +++ b/tests/modules/programs/beets/mpdupdate.nix @@ -1,11 +1,8 @@ -{ config, ... }: - { home.stateVersion = "23.05"; programs.beets = { enable = true; - package = config.lib.test.mkStubPackage { outPath = "@beets@"; }; mpdIntegration.enableUpdate = true; }; diff --git a/tests/modules/programs/bemenu/basic-configuration.nix b/tests/modules/programs/bemenu/basic-configuration.nix index 01708d202..cf556ef6a 100644 --- a/tests/modules/programs/bemenu/basic-configuration.nix +++ b/tests/modules/programs/bemenu/basic-configuration.nix @@ -19,8 +19,6 @@ }; }; - test.stubs.bemenu = { }; - nmt.script = '' assertFileExists home-path/etc/profile.d/hm-session-vars.sh assertFileContains home-path/etc/profile.d/hm-session-vars.sh \ diff --git a/tests/modules/programs/bemenu/empty-configuration.nix b/tests/modules/programs/bemenu/empty-configuration.nix index d9e729696..a07dfc436 100644 --- a/tests/modules/programs/bemenu/empty-configuration.nix +++ b/tests/modules/programs/bemenu/empty-configuration.nix @@ -1,7 +1,5 @@ { - programs.bemenu = { enable = true; }; - - test.stubs.bemenu = { }; + programs.bemenu.enable = true; nmt.script = '' assertFileExists home-path/etc/profile.d/hm-session-vars.sh diff --git a/tests/modules/programs/borgmatic/basic-configuration.nix b/tests/modules/programs/borgmatic/basic-configuration.nix index 15a57ca78..21333baf4 100644 --- a/tests/modules/programs/borgmatic/basic-configuration.nix +++ b/tests/modules/programs/borgmatic/basic-configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, realPkgs, ... }: let @@ -61,8 +61,6 @@ in { }; }; - test.stubs.borgmatic = { }; - nmt.script = '' config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml assertFileExists $config_file @@ -120,7 +118,7 @@ in { builtins.elemAt backups.main.hooks.extraConfig.before_actions 0 }" - yq=${pkgs.yq-go}/bin/yq + yq=${realPkgs.yq-go}/bin/yq for filter in "''${!expectations[@]}"; do expected_value="''${expectations[$filter]}" diff --git a/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix b/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix index 106a0c18c..9d9ee3232 100644 --- a/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix +++ b/tests/modules/programs/borgmatic/both-sourcedirectories-and-patterns.nix @@ -1,10 +1,4 @@ -{ config, pkgs, ... }: - -let - - backups = config.programs.borgmatic.backups; - -in { +{ programs.borgmatic = { enable = true; backups = { @@ -18,8 +12,6 @@ in { }; }; - test.stubs.borgmatic = { }; - test.asserts.assertions.expected = ['' Borgmatic backup configuration "main" cannot specify both 'location.sourceDirectories' and 'location.patterns'. '']; diff --git a/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix b/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix index cadd7fd23..e04d05157 100644 --- a/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix +++ b/tests/modules/programs/borgmatic/exclude-hm-symlinks-nothing-else.nix @@ -1,11 +1,6 @@ -{ config, pkgs, ... }: +{ realPkgs, ... }: -let - - backups = config.programs.borgmatic.backups; - excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar"; - -in { +{ programs.borgmatic = { enable = true; backups = { @@ -19,13 +14,11 @@ in { }; }; - test.stubs.borgmatic = { }; - nmt.script = '' config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml assertFileExists $config_file - yq=${pkgs.yq-go}/bin/yq + yq=${realPkgs.yq-go}/bin/yq hmExclusionsFile=$($yq '.exclude_from[0]' $config_file) expected_content='/home/hm-user/.config/borgmatic.d/main.yaml' diff --git a/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix b/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix index bc0e50129..056b1443f 100644 --- a/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix +++ b/tests/modules/programs/borgmatic/exclude-hm-symlinks.nix @@ -1,8 +1,7 @@ -{ config, pkgs, ... }: +{ realPkgs, ... }: let - backups = config.programs.borgmatic.backups; excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar"; in { @@ -20,8 +19,6 @@ in { }; }; - test.stubs.borgmatic = { }; - nmt.script = '' config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml assertFileExists $config_file @@ -30,7 +27,7 @@ in { expectations[exclude_from[0]]="${excludeFile}" - yq=${pkgs.yq-go}/bin/yq + yq=${realPkgs.yq-go}/bin/yq for filter in "''${!expectations[@]}"; do expected_value="''${expectations[$filter]}" diff --git a/tests/modules/programs/borgmatic/include-hm-symlinks.nix b/tests/modules/programs/borgmatic/include-hm-symlinks.nix index dd9908b56..b89f7e2b9 100644 --- a/tests/modules/programs/borgmatic/include-hm-symlinks.nix +++ b/tests/modules/programs/borgmatic/include-hm-symlinks.nix @@ -1,8 +1,7 @@ -{ config, pkgs, ... }: +{ realPkgs, ... }: let - backups = config.programs.borgmatic.backups; excludeFile = builtins.toFile "excludeFile.txt" "/foo/bar"; in { @@ -20,8 +19,6 @@ in { }; }; - test.stubs.borgmatic = { }; - nmt.script = '' config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml assertFileExists $config_file @@ -30,7 +27,7 @@ in { expectations[exclude_from[0]]="${excludeFile}" - yq=${pkgs.yq-go}/bin/yq + yq=${realPkgs.yq-go}/bin/yq for filter in "''${!expectations[@]}"; do expected_value="''${expectations[$filter]}" diff --git a/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix b/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix index 596fdf1cd..bf0653329 100644 --- a/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix +++ b/tests/modules/programs/borgmatic/neither-sourcedirectories-nor-patterns.nix @@ -1,17 +1,9 @@ -{ config, pkgs, ... }: - -let - - backups = config.programs.borgmatic.backups; - -in { +{ programs.borgmatic = { enable = true; backups = { main = { location = { repositories = [ "/mnt/disk1" ]; }; }; }; }; - test.stubs.borgmatic = { }; - test.asserts.assertions.expected = ['' Borgmatic backup configuration "main" must specify one of 'location.sourceDirectories' or 'location.patterns'. '']; diff --git a/tests/modules/programs/borgmatic/patterns-configuration.nix b/tests/modules/programs/borgmatic/patterns-configuration.nix index 098708cad..d92237d43 100644 --- a/tests/modules/programs/borgmatic/patterns-configuration.nix +++ b/tests/modules/programs/borgmatic/patterns-configuration.nix @@ -1,8 +1,7 @@ -{ config, pkgs, ... }: +{ config, realPkgs, ... }: let - boolToString = bool: if bool then "true" else "false"; backups = config.programs.borgmatic.backups; in { @@ -23,8 +22,6 @@ in { }; }; - test.stubs.borgmatic = { }; - nmt.script = '' config_file=$TESTED/home-files/.config/borgmatic.d/main.yaml assertFileExists $config_file @@ -44,7 +41,7 @@ in { builtins.elemAt backups.main.location.patterns 3 }" - yq=${pkgs.yq-go}/bin/yq + yq=${realPkgs.yq-go}/bin/yq for filter in "''${!expectations[@]}"; do expected_value="''${expectations[$filter]}" diff --git a/tests/modules/programs/bottom/empty-settings.nix b/tests/modules/programs/bottom/empty-settings.nix index 71799c831..3c5c8b72a 100644 --- a/tests/modules/programs/bottom/empty-settings.nix +++ b/tests/modules/programs/bottom/empty-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.bottom = { enable = true; diff --git a/tests/modules/programs/bottom/example-settings.nix b/tests/modules/programs/bottom/example-settings.nix index a0ed11085..918969b1d 100644 --- a/tests/modules/programs/bottom/example-settings.nix +++ b/tests/modules/programs/bottom/example-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.bottom = { enable = true; diff --git a/tests/modules/programs/boxxy/empty-settings.nix b/tests/modules/programs/boxxy/empty-settings.nix index 3a34cd5cd..61692a237 100644 --- a/tests/modules/programs/boxxy/empty-settings.nix +++ b/tests/modules/programs/boxxy/empty-settings.nix @@ -1,13 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.boxxy.enable = true; - test.stubs.boxxy = { }; - nmt.script = '' assertPathNotExists home-files/.config/boxxy ''; diff --git a/tests/modules/programs/boxxy/example-settings.nix b/tests/modules/programs/boxxy/example-settings.nix index 7ecec4167..46003a0e7 100644 --- a/tests/modules/programs/boxxy/example-settings.nix +++ b/tests/modules/programs/boxxy/example-settings.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.boxxy.enable = true; @@ -15,8 +11,6 @@ with lib; context = [ "/home/test_user/your_project_repo" ]; }]; - test.stubs.boxxy = { }; - nmt.script = '' boxxyyaml=home-files/.config/boxxy/boxxy.yaml assertFileExists $boxxyyaml diff --git a/tests/modules/programs/broot/broot.nix b/tests/modules/programs/broot/broot.nix index 8bb7c02c4..d4f60a7c2 100644 --- a/tests/modules/programs/broot/broot.nix +++ b/tests/modules/programs/broot/broot.nix @@ -1,4 +1,4 @@ -{ ... }: +{ realPkgs, ... }: { programs.broot = { @@ -6,10 +6,7 @@ settings.modal = true; }; - tests.stubs = { - broot = { }; - hjson = { }; - }; + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson-go; }) ]; nmt.script = '' assertFileExists home-files/.config/broot/conf.toml diff --git a/tests/modules/programs/browserpass/browserpass.nix b/tests/modules/programs/browserpass/browserpass.nix index 7211c0ed8..14d50af06 100644 --- a/tests/modules/programs/browserpass/browserpass.nix +++ b/tests/modules/programs/browserpass/browserpass.nix @@ -1,35 +1,32 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ realPkgs, ... }: { - config = { - programs.browserpass = { - enable = true; - browsers = - [ "brave" "chrome" "chromium" "firefox" "librewolf" "vivaldi" ]; - }; - - nmt.script = if pkgs.stdenv.hostPlatform.isDarwin then '' - for dir in "BraveSoftware/Brave-Browser" "Google/Chrome" "Chromium" "Mozilla" "LibreWolf" "Vivaldi"; do - assertFileExists "home-files/Library/Application Support/$dir/NativeMessagingHosts/com.github.browserpass.native.json" - done - - for dir in "Google/Chrome" "Chromium" "Vivaldi"; do - assertFileExists "home-files/Library/Application Support/$dir/policies/managed/com.github.browserpass.native.json" - done - '' else '' - for dir in "BraveSoftware/Brave-Browser" "google-chrome" "chromium" "vivaldi"; do - assertFileExists "home-files/.config/$dir/NativeMessagingHosts/com.github.browserpass.native.json" - done - - for dir in "google-chrome" "chromium" "vivaldi"; do - assertFileExists "home-files/.config/$dir/policies/managed/com.github.browserpass.native.json" - done - - for dir in ".mozilla" ".librewolf"; do - assertFileExists "home-files/$dir/native-messaging-hosts/com.github.browserpass.native.json" - done - ''; + programs.browserpass = { + enable = true; + browsers = [ "brave" "chrome" "chromium" "firefox" "librewolf" "vivaldi" ]; }; + + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) browserpass; }) ]; + + nmt.script = if realPkgs.stdenv.hostPlatform.isDarwin then '' + for dir in "BraveSoftware/Brave-Browser" "Google/Chrome" "Chromium" "Mozilla" "LibreWolf" "Vivaldi"; do + assertFileExists "home-files/Library/Application Support/$dir/NativeMessagingHosts/com.github.browserpass.native.json" + done + + for dir in "Google/Chrome" "Chromium" "Vivaldi"; do + assertFileExists "home-files/Library/Application Support/$dir/policies/managed/com.github.browserpass.native.json" + done + '' else '' + for dir in "BraveSoftware/Brave-Browser" "google-chrome" "chromium" "vivaldi"; do + assertFileExists "home-files/.config/$dir/NativeMessagingHosts/com.github.browserpass.native.json" + done + + for dir in "google-chrome" "chromium" "vivaldi"; do + assertFileExists "home-files/.config/$dir/policies/managed/com.github.browserpass.native.json" + done + + for dir in ".mozilla" ".librewolf"; do + assertFileExists "home-files/$dir/native-messaging-hosts/com.github.browserpass.native.json" + done + ''; } diff --git a/tests/modules/programs/btop/empty-settings.nix b/tests/modules/programs/btop/empty-settings.nix index 21aad857d..1fcab6339 100644 --- a/tests/modules/programs/btop/empty-settings.nix +++ b/tests/modules/programs/btop/empty-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { programs.btop.enable = true; - test.stubs.btop = { }; - nmt.script = '' assertPathNotExists home-files/.config/btop ''; diff --git a/tests/modules/programs/carapace/bash.nix b/tests/modules/programs/carapace/bash.nix index 7377df3c3..bfcd9a2f0 100644 --- a/tests/modules/programs/carapace/bash.nix +++ b/tests/modules/programs/carapace/bash.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { carapace.enable = true; @@ -9,6 +7,6 @@ nmt.script = '' assertFileExists home-files/.bashrc assertFileRegex home-files/.bashrc \ - 'source <(/nix/store/.*carapace.*/bin/carapace _carapace bash)' + 'source <(@carapace@/bin/carapace _carapace bash)' ''; } diff --git a/tests/modules/programs/carapace/fish.nix b/tests/modules/programs/carapace/fish.nix index 6b71cef5a..f0a281d38 100644 --- a/tests/modules/programs/carapace/fish.nix +++ b/tests/modules/programs/carapace/fish.nix @@ -1,11 +1,13 @@ -{ ... }: +{ config, lib, realPkgs, ... }: -{ +lib.mkIf config.test.enableBig { programs = { carapace.enable = true; fish.enable = true; }; + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) carapace; }) ]; + nmt.script = '' assertFileExists home-files/.config/fish/config.fish assertFileRegex home-files/.config/fish/config.fish \ diff --git a/tests/modules/programs/carapace/zsh.nix b/tests/modules/programs/carapace/zsh.nix index 5ab4fe8a1..a10fd2533 100644 --- a/tests/modules/programs/carapace/zsh.nix +++ b/tests/modules/programs/carapace/zsh.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { carapace.enable = true; @@ -9,6 +7,6 @@ nmt.script = '' assertFileExists home-files/.zshrc assertFileRegex home-files/.zshrc \ - 'source <(/nix/store/.*carapace.*/bin/carapace _carapace zsh)' + 'source <(@carapace@/bin/carapace _carapace zsh)' ''; } diff --git a/tests/modules/programs/cmus/cmus.nix b/tests/modules/programs/cmus/cmus.nix index 303bad767..8feb087cb 100644 --- a/tests/modules/programs/cmus/cmus.nix +++ b/tests/modules/programs/cmus/cmus.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.cmus = { enable = true; @@ -7,8 +5,6 @@ extraConfig = "test"; }; - test.stubs.cmus = { }; - nmt.script = '' assertFileContent \ home-files/.config/cmus/rc \ diff --git a/tests/modules/programs/comodoro/comodoro.nix b/tests/modules/programs/comodoro/comodoro.nix index 37f43b448..bd7d924dd 100644 --- a/tests/modules/programs/comodoro/comodoro.nix +++ b/tests/modules/programs/comodoro/comodoro.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.comodoro = { enable = true; @@ -26,8 +24,6 @@ }; }; - test.stubs.comodoro = { }; - nmt.script = '' assertFileExists home-files/.config/comodoro/config.toml assertFileContent home-files/.config/comodoro/config.toml ${./expected.toml} diff --git a/tests/modules/programs/dircolors/default.nix b/tests/modules/programs/dircolors/default.nix index a82e2b859..39d44858f 100644 --- a/tests/modules/programs/dircolors/default.nix +++ b/tests/modules/programs/dircolors/default.nix @@ -1 +1,4 @@ -{ dircolors-settings = ./settings.nix; } +{ + dircolors-settings = ./settings.nix; + dircolors-xdg-config-settings = ./xdg-config-settings.nix; +} diff --git a/tests/modules/programs/dircolors/settings.nix b/tests/modules/programs/dircolors/settings.nix index 9ca676ef9..f2802aaa0 100644 --- a/tests/modules/programs/dircolors/settings.nix +++ b/tests/modules/programs/dircolors/settings.nix @@ -1,9 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ pkgs, ... }: { config = { + programs.zsh.enable = true; + programs.dircolors = { enable = true; @@ -22,6 +20,11 @@ with lib; assertFileContent \ home-files/.dir_colors \ ${./settings-expected.conf} + + + assertFileRegex \ + home-files/.zshrc \ + "eval \$(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)" ''; }; } diff --git a/tests/modules/programs/dircolors/xdg-config-settings.nix b/tests/modules/programs/dircolors/xdg-config-settings.nix new file mode 100644 index 000000000..dd48dd8c1 --- /dev/null +++ b/tests/modules/programs/dircolors/xdg-config-settings.nix @@ -0,0 +1,31 @@ +{ config, pkgs, ... }: { + config = { + home.preferXdgDirectories = true; + + programs.zsh.enable = true; + + programs.dircolors = { + enable = true; + + settings = { + OTHER_WRITABLE = "30;46"; + ".sh" = "01;32"; + ".csh" = "01;32"; + }; + + extraConfig = '' + # Extra dircolors configuration. + ''; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/dir_colors \ + ${./settings-expected.conf} + + assertFileRegex \ + home-files/.zshrc \ + "eval \$(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)" + ''; + }; +} diff --git a/tests/modules/programs/direnv/bash.nix b/tests/modules/programs/direnv/bash.nix index db0d6b391..7feb65cc1 100644 --- a/tests/modules/programs/direnv/bash.nix +++ b/tests/modules/programs/direnv/bash.nix @@ -1,17 +1,11 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.bash.enable = true; - programs.direnv.enable = true; + programs.bash.enable = true; + programs.direnv.enable = true; - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileRegex \ - home-files/.bashrc \ - 'eval "\$(/nix/store/.*direnv.*/bin/direnv hook bash)"' - ''; - }; + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileRegex \ + home-files/.bashrc \ + 'eval "\$(@direnv@/bin/direnv hook bash)"' + ''; } diff --git a/tests/modules/programs/direnv/nix-direnv.nix b/tests/modules/programs/direnv/nix-direnv.nix index 588cd6ed6..5b83647fd 100644 --- a/tests/modules/programs/direnv/nix-direnv.nix +++ b/tests/modules/programs/direnv/nix-direnv.nix @@ -1,16 +1,14 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ realPkgs, ... }: { - config = { - programs.bash.enable = true; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; + programs.bash.enable = true; + programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh - ''; - }; + nixpkgs.overlays = [ (_: _: { inherit (realPkgs) nix-direnv; }) ]; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh + ''; } diff --git a/tests/modules/programs/direnv/nushell.nix b/tests/modules/programs/direnv/nushell.nix index 502b325d5..6bc2fba7d 100644 --- a/tests/modules/programs/direnv/nushell.nix +++ b/tests/modules/programs/direnv/nushell.nix @@ -4,8 +4,6 @@ programs.nushell.enable = true; programs.direnv.enable = true; - test.stubs.nushell = { }; - nmt.script = let configFile = if pkgs.stdenv.isDarwin && !config.xdg.enable then "home-files/Library/Application Support/nushell/config.nu" @@ -13,6 +11,6 @@ "home-files/.config/nushell/config.nu"; in '' assertFileExists "${configFile}" - assertFileRegex "${configFile}" '/nix/store/.*direnv.*/bin/direnv export json' + assertFileRegex "${configFile}" '@direnv@/bin/direnv export json' ''; } diff --git a/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix b/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix index 3bfd768c4..a712704f6 100644 --- a/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix +++ b/tests/modules/programs/direnv/stdlib-and-nix-direnv.nix @@ -1,21 +1,19 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ realPkgs, ... }: let expectedContent = "something important"; in { - config = { - programs.bash.enable = true; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; - programs.direnv.stdlib = expectedContent; + programs.bash.enable = true; + programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; + programs.direnv.stdlib = expectedContent; - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh - assertFileRegex \ - home-files/.config/direnv/direnvrc \ - '${expectedContent}' - ''; - }; + nixpkgs.overlays = [ (_: _: { inherit (realPkgs) nix-direnv; }) ]; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileExists home-files/.config/direnv/lib/hm-nix-direnv.sh + assertFileRegex \ + home-files/.config/direnv/direnvrc \ + '${expectedContent}' + ''; } diff --git a/tests/modules/programs/direnv/stdlib.nix b/tests/modules/programs/direnv/stdlib.nix index 2a859132f..3f7a55e03 100644 --- a/tests/modules/programs/direnv/stdlib.nix +++ b/tests/modules/programs/direnv/stdlib.nix @@ -1,20 +1,14 @@ -{ config, lib, pkgs, ... }: - -with lib; - let expectedContent = "something important"; in { - config = { - programs.bash.enable = true; - programs.direnv.enable = true; - programs.direnv.stdlib = expectedContent; + programs.bash.enable = true; + programs.direnv.enable = true; + programs.direnv.stdlib = expectedContent; - nmt.script = '' - assertPathNotExists home-files/.config/direnv/lib/hm-nix-direnv.sh - assertFileExists home-files/.bashrc - assertFileRegex \ - home-files/.config/direnv/direnvrc \ - '${expectedContent}' - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/direnv/lib/hm-nix-direnv.sh + assertFileExists home-files/.bashrc + assertFileRegex \ + home-files/.config/direnv/direnvrc \ + '${expectedContent}' + ''; } diff --git a/tests/modules/programs/earthly/default.nix b/tests/modules/programs/earthly/default.nix new file mode 100644 index 000000000..5606289c1 --- /dev/null +++ b/tests/modules/programs/earthly/default.nix @@ -0,0 +1 @@ +{ earthly-settings = ./earthly-settings.nix; } diff --git a/tests/modules/programs/earthly/earthly-settings.nix b/tests/modules/programs/earthly/earthly-settings.nix new file mode 100644 index 000000000..1710e5a4c --- /dev/null +++ b/tests/modules/programs/earthly/earthly-settings.nix @@ -0,0 +1,21 @@ +{ + programs.earthly = { + enable = true; + + settings = { + global.disable_analytics = true; + + git."github.com" = { + auth = "ssh"; + user = "username"; + }; + }; + }; + + test.stubs.earthly = { }; + + nmt.script = '' + assertFileExists home-files/.earthly/config.yml + assertFileContent home-files/.earthly/config.yml ${./earthly-settings.yml} + ''; +} diff --git a/tests/modules/programs/earthly/earthly-settings.yml b/tests/modules/programs/earthly/earthly-settings.yml new file mode 100644 index 000000000..182f011b2 --- /dev/null +++ b/tests/modules/programs/earthly/earthly-settings.yml @@ -0,0 +1,6 @@ +git: + github.com: + auth: ssh + user: username +global: + disable_analytics: true diff --git a/tests/modules/programs/eww/basic-config.nix b/tests/modules/programs/eww/basic-config.nix new file mode 100644 index 000000000..30059d4f1 --- /dev/null +++ b/tests/modules/programs/eww/basic-config.nix @@ -0,0 +1,15 @@ +{ + config = { + programs.eww = { + enable = true; + configDir = ./config-dir; + }; + + nmt.script = '' + yuckDir=home-files/.config/eww + + assertFileExists $yuckDir/eww.yuck + assertFileExists $yuckDir/eww.scss + ''; + }; +} diff --git a/tests/modules/programs/eww/config-dir/eww.scss b/tests/modules/programs/eww/config-dir/eww.scss new file mode 100644 index 000000000..880b93238 --- /dev/null +++ b/tests/modules/programs/eww/config-dir/eww.scss @@ -0,0 +1,4 @@ +.powermenu { + padding: 10px 10px; + border-radius: 10px; +} diff --git a/tests/modules/programs/eww/config-dir/eww.yuck b/tests/modules/programs/eww/config-dir/eww.yuck new file mode 100644 index 000000000..f7fd7d5c0 --- /dev/null +++ b/tests/modules/programs/eww/config-dir/eww.yuck @@ -0,0 +1,58 @@ +(defwindow powermenu + :monitor 0 + :geometry (geometry + :anchor "center" + ) + ; Widgets + (box + :spacing 5 + :class "powermenu" + :space-evenly true + :orientation "vertical" + :halign "left" + :valign "center" + + ; Contents + (button + :onclick "eww open confirm-command --arg action=poweroff --arg command=poweroff" + "Poweroff" + ) + (button + :onclick "eww open confirm-command --arg action=reboot --arg command=reboot" + "Reboot" + ) + (button + :onclick "eww close powermenu" + "Cancel" + ) + ) +) + +(defwindow confirm-command [action command] + :monitor 0 + :geometry (geometry + :anchor "center" + :width "13%" + :height "8%" + ) + ; Widgets + (box + :class "powermenu" + :orientation "vertical" + :halign "center" + :valign "center" + "Are you sure you want to ${action}" + (box + :orientation "horizontal" + :spacing 10 + (button + :onclick "eww close confirm-command" + "No" + ) + (button + :onclick command + "Yes" + ) + ) + ) +) diff --git a/tests/modules/programs/eww/default.nix b/tests/modules/programs/eww/default.nix new file mode 100644 index 000000000..b87014079 --- /dev/null +++ b/tests/modules/programs/eww/default.nix @@ -0,0 +1,4 @@ +{ + eww-basic-config = ./basic-config.nix; + eww-null-config = ./null-config.nix; +} diff --git a/tests/modules/programs/eww/null-config.nix b/tests/modules/programs/eww/null-config.nix new file mode 100644 index 000000000..0ae1b903b --- /dev/null +++ b/tests/modules/programs/eww/null-config.nix @@ -0,0 +1,11 @@ +{ + config = { + programs.eww = { enable = true; }; + + nmt.script = '' + yuckDir=home-files/.config/eww + + assertPathNotExists $yuckDir/eww.yuck + ''; + }; +} diff --git a/tests/modules/programs/fastfetch/basic-configuration.nix b/tests/modules/programs/fastfetch/basic-configuration.nix index a0b6783a8..3e333b3f0 100644 --- a/tests/modules/programs/fastfetch/basic-configuration.nix +++ b/tests/modules/programs/fastfetch/basic-configuration.nix @@ -29,8 +29,6 @@ }; }; - test.stubs.fastfetch = { }; - nmt.script = let configFile = "home-files/.config/fastfetch/config.jsonc"; in '' assertFileExists "${configFile}" diff --git a/tests/modules/programs/fastfetch/default-configuration.nix b/tests/modules/programs/fastfetch/default-configuration.nix index 428081d4d..0fa35d7e7 100644 --- a/tests/modules/programs/fastfetch/default-configuration.nix +++ b/tests/modules/programs/fastfetch/default-configuration.nix @@ -1,8 +1,6 @@ { programs.fastfetch.enable = true; - test.stubs.fastfetch = { }; - nmt.script = '' assertPathNotExists "home-files/.config/fastfetch/config.jsonc" ''; diff --git a/tests/modules/programs/feh/feh-bindings.nix b/tests/modules/programs/feh/feh-bindings.nix index 787b02d7c..fc13d0e21 100644 --- a/tests/modules/programs/feh/feh-bindings.nix +++ b/tests/modules/programs/feh/feh-bindings.nix @@ -1,32 +1,26 @@ -{ pkgs, ... }: - { - config = { - programs.feh.enable = true; + programs.feh.enable = true; - programs.feh.buttons = { - zoom_in = null; - zoom_out = 4; - next_img = "C-4"; - prev_img = [ 3 "C-3" ]; - }; - - programs.feh.keybindings = { - zoom_in = null; - zoom_out = "minus"; - prev_img = [ "h" "Left" ]; - }; - - test.stubs.feh = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/feh/buttons \ - ${./feh-bindings-expected-buttons} - - assertFileContent \ - home-files/.config/feh/keys \ - ${./feh-bindings-expected-keys} - ''; + programs.feh.buttons = { + zoom_in = null; + zoom_out = 4; + next_img = "C-4"; + prev_img = [ 3 "C-3" ]; }; + + programs.feh.keybindings = { + zoom_in = null; + zoom_out = "minus"; + prev_img = [ "h" "Left" ]; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/feh/buttons \ + ${./feh-bindings-expected-buttons} + + assertFileContent \ + home-files/.config/feh/keys \ + ${./feh-bindings-expected-keys} + ''; } diff --git a/tests/modules/programs/feh/feh-empty-settings.nix b/tests/modules/programs/feh/feh-empty-settings.nix index 9a50e20bf..0c50e9ffb 100644 --- a/tests/modules/programs/feh/feh-empty-settings.nix +++ b/tests/modules/programs/feh/feh-empty-settings.nix @@ -1,15 +1,9 @@ -{ pkgs, ... }: - { - config = { - programs.feh.enable = true; + programs.feh.enable = true; - test.stubs.feh = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/feh/buttons - assertPathNotExists home-files/.config/feh/keys - assertPathNotExists home-files/.config/feh/themes - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/feh/buttons + assertPathNotExists home-files/.config/feh/keys + assertPathNotExists home-files/.config/feh/themes + ''; } diff --git a/tests/modules/programs/feh/feh-themes.nix b/tests/modules/programs/feh/feh-themes.nix index f06ea0716..398277d6d 100644 --- a/tests/modules/programs/feh/feh-themes.nix +++ b/tests/modules/programs/feh/feh-themes.nix @@ -1,32 +1,26 @@ -{ pkgs, ... }: - { - config = { - programs.feh.enable = true; + programs.feh.enable = true; - programs.feh.themes = { - feh = [ "--image-bg" "black" ]; - webcam = [ "--multiwindow" "--reload" "20" ]; - present = [ "--full-screen" "--sort" "name" "--hide-pointer" ]; - booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ]; - imagemap = [ - "-rVq" - "--thumb-width" - "40" - "--thumb-height" - "30" - "--index-info" - "%n\\n%wx%h" - ]; - example = [ "--info" "foo bar" ]; - }; - - test.stubs.feh = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/feh/themes \ - ${./feh-themes-expected} - ''; + programs.feh.themes = { + feh = [ "--image-bg" "black" ]; + webcam = [ "--multiwindow" "--reload" "20" ]; + present = [ "--full-screen" "--sort" "name" "--hide-pointer" ]; + booth = [ "--full-screen" "--hide-pointer" "--slideshow-delay" "20" ]; + imagemap = [ + "-rVq" + "--thumb-width" + "40" + "--thumb-height" + "30" + "--index-info" + "%n\\n%wx%h" + ]; + example = [ "--info" "foo bar" ]; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/feh/themes \ + ${./feh-themes-expected} + ''; } diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix index a3af6d4ab..7dca728a9 100644 --- a/tests/modules/programs/firefox/common.nix +++ b/tests/modules/programs/firefox/common.nix @@ -1,6 +1,8 @@ name: builtins.mapAttrs (test: module: import module [ "programs" name ]) { "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix; + "${name}-null-package" = ./null-package.nix; + "${name}-final-package" = ./final-package.nix; "${name}-policies" = ./policies.nix; "${name}-profiles-bookmarks" = ./profiles/bookmarks; "${name}-profiles-containers" = ./profiles/containers; @@ -9,6 +11,8 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) { "${name}-profiles-containers-id-out-of-range" = ./profiles/containers/id-out-of-range.nix; "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix; + "${name}-profiles-extensions" = ./profiles/extensions; + "${name}-profiles-overwrite" = ./profiles/overwrite; "${name}-profiles-search" = ./profiles/search; "${name}-profiles-settings" = ./profiles/settings; "${name}-state-version-19_09" = ./state-version-19_09.nix; diff --git a/tests/modules/programs/firefox/default.nix b/tests/modules/programs/firefox/default.nix new file mode 100644 index 000000000..4e7b93c69 --- /dev/null +++ b/tests/modules/programs/firefox/default.nix @@ -0,0 +1 @@ +{ "firefox-multiple-derivatives" = ./multiple-derivatives.nix; } diff --git a/tests/modules/programs/firefox/deprecated-native-messenger.nix b/tests/modules/programs/firefox/deprecated-native-messenger.nix index 87423aba3..53309cee4 100644 --- a/tests/modules/programs/firefox/deprecated-native-messenger.nix +++ b/tests/modules/programs/firefox/deprecated-native-messenger.nix @@ -1,18 +1,13 @@ modulePath: { config, lib, ... }: - -with lib; - let - - moduleName = concatStringsSep "." modulePath; + moduleName = lib.concatStringsSep "." modulePath; firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath; - in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; enableGnomeExtensions = true; } // { diff --git a/tests/modules/programs/firefox/final-package.nix b/tests/modules/programs/firefox/final-package.nix new file mode 100644 index 000000000..277b3e105 --- /dev/null +++ b/tests/modules/programs/firefox/final-package.nix @@ -0,0 +1,21 @@ +modulePath: +{ config, lib, realPkgs, ... }: + +let + + cfg = lib.getAttrFromPath modulePath config; + +in lib.mkIf config.test.enableBig +(lib.setAttrByPath modulePath { enable = true; } // { + home.stateVersion = "19.09"; + + _module.args.pkgs = lib.mkForce realPkgs; + + nmt.script = '' + package=${cfg.package} + finalPackage=${cfg.finalPackage} + if [[ $package != $finalPackage ]]; then + fail "Expected finalPackage ($finalPackage) to equal package ($package)" + fi + ''; +}) diff --git a/tests/modules/programs/firefox/librewolf.nix b/tests/modules/programs/firefox/librewolf.nix new file mode 100644 index 000000000..3a77e0f1d --- /dev/null +++ b/tests/modules/programs/firefox/librewolf.nix @@ -0,0 +1 @@ +import ./common.nix "librewolf" diff --git a/tests/modules/programs/firefox/multiple-derivatives.nix b/tests/modules/programs/firefox/multiple-derivatives.nix new file mode 100644 index 000000000..12a35de70 --- /dev/null +++ b/tests/modules/programs/firefox/multiple-derivatives.nix @@ -0,0 +1,16 @@ +{ config, lib, ... }: + +lib.mkIf config.test.enableBig { + programs.firefox = { + enable = true; + package = null; + }; + programs.floorp = { + enable = true; + package = null; + }; + programs.librewolf = { + enable = true; + package = null; + }; +} diff --git a/tests/modules/programs/firefox/null-package.nix b/tests/modules/programs/firefox/null-package.nix new file mode 100644 index 000000000..e5d1516dc --- /dev/null +++ b/tests/modules/programs/firefox/null-package.nix @@ -0,0 +1,10 @@ +modulePath: +{ config, lib, ... }: + +lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; } + // { + programs.firefox = { + enable = true; + package = null; + }; + }) diff --git a/tests/modules/programs/firefox/policies.nix b/tests/modules/programs/firefox/policies.nix index 5cda1406a..4cf761a53 100644 --- a/tests/modules/programs/firefox/policies.nix +++ b/tests/modules/programs/firefox/policies.nix @@ -1,20 +1,15 @@ modulePath: { config, lib, pkgs, ... }: - -with lib; - let - - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath; - in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig ({ + config = lib.mkIf config.test.enableBig ({ home.stateVersion = "23.05"; - } // setAttrByPath modulePath { + } // lib.setAttrByPath modulePath { enable = true; policies = { BlockAboutConfig = true; }; package = pkgs.${cfg.wrappedPackageName}.override { diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix deleted file mode 100644 index 897067625..000000000 --- a/tests/modules/programs/firefox/profile-settings.nix +++ /dev/null @@ -1,241 +0,0 @@ -modulePath: -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = getAttrFromPath modulePath config; - - firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath; - - withName = path: - pkgs.substituteAll { - src = path; - name = cfg.wrappedPackageName; - }; - -in { - imports = [ firefoxMockOverlay ]; - - config = mkIf config.test.enableBig (setAttrByPath modulePath { - enable = true; - profiles.basic.isDefault = true; - - profiles.test = { - id = 1; - settings = { - "general.smoothScroll" = false; - "browser.newtabpage.pinned" = [{ - title = "NixOS"; - url = "https://nixos.org"; - }]; - }; - }; - - profiles.bookmarks = { - id = 2; - settings = { "general.smoothScroll" = false; }; - bookmarks = [ - { - toolbar = true; - bookmarks = [{ - name = "Home Manager"; - url = "https://wiki.nixos.org/wiki/Home_Manager"; - }]; - } - { - name = "wikipedia"; - tags = [ "wiki" ]; - keyword = "wiki"; - url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go"; - } - { - name = "kernel.org"; - url = "https://www.kernel.org"; - } - { - name = "Nix sites"; - bookmarks = [ - { - name = "homepage"; - url = "https://nixos.org/"; - } - { - name = "wiki"; - tags = [ "wiki" "nix" ]; - url = "https://wiki.nixos.org/"; - } - { - name = "Nix sites"; - bookmarks = [ - { - name = "homepage"; - url = "https://nixos.org/"; - } - { - name = "wiki"; - url = "https://wiki.nixos.org/"; - } - ]; - } - ]; - } - ]; - }; - - profiles.search = { - id = 3; - search = { - force = true; - default = "Google"; - privateDefault = "DuckDuckGo"; - order = [ "Nix Packages" "NixOS Wiki" ]; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { - name = "type"; - value = "packages"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - }]; - - icon = - "/run/current-system/sw/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - - definedAliases = [ "@np" ]; - }; - - "NixOS Wiki" = { - urls = [{ - template = - "https://wiki.nixos.org/index.php?search={searchTerms}"; - }]; - iconUpdateURL = "https://wiki.nixos.org/favicon.png"; - updateInterval = 24 * 60 * 60 * 1000; - definedAliases = [ "@nw" ]; - }; - - "Bing".metaData.hidden = true; - "Google".metaData.alias = "@g"; - }; - }; - }; - - profiles.searchWithoutDefault = { - id = 4; - search = { - force = true; - order = [ "Google" "Nix Packages" ]; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { - name = "type"; - value = "packages"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - }]; - - definedAliases = [ "@np" ]; - }; - }; - }; - }; - - profiles.containers = { - id = 5; - containers = { - "shopping" = { - id = 6; - icon = "circle"; - color = "yellow"; - }; - }; - }; - } // { - - nmt.script = let - - noHashQuery = '' - 'def walk(f): - . as $in - | if type == "object" then - reduce keys[] as $key - ( {}; . + { ($key): ($in[$key] | walk(f)) } | f ) - elif type == "array" then - map( walk(f) ) - else - f - end; - walk(if type == "object" then - if has("hash") then .hash = null else . end | - if has("privateHash") then .privateHash = null else . end - else - . - end)' ''; - - in '' - assertFileRegex \ - home-path/bin/${cfg.wrappedPackageName} \ - MOZ_APP_LAUNCHER - - assertDirectoryExists home-files/${cfg.configPath}/basic - - assertFileContent \ - home-files/${cfg.configPath}/test/user.js \ - ${withName ./profile-settings-expected-user.js} - - assertFileContent \ - home-files/${cfg.configPath}/containers/containers.json \ - ${withName ./profile-settings-expected-containers.json} - - bookmarksUserJs=$(normalizeStorePaths \ - home-files/${cfg.configPath}/bookmarks/user.js) - - assertFileContent \ - $bookmarksUserJs \ - ${withName ./profile-settings-expected-bookmarks-user.js} - - bookmarksFile="$(sed -n \ - '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \ - $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)" - - assertFileContent \ - $bookmarksFile \ - ${withName ./profile-settings-expected-bookmarks.html} - - function assertFirefoxSearchContent() { - compressedSearch=$(normalizeStorePaths "$1") - - decompressedSearch=$(dirname $compressedSearch)/search.json - ${pkgs.mozlz4a}/bin/mozlz4a -d "$compressedSearch" >(${pkgs.jq}/bin/jq ${noHashQuery} > "$decompressedSearch") - - assertFileContent \ - $decompressedSearch \ - "$2" - } - - assertFirefoxSearchContent \ - home-files/${cfg.configPath}/search/search.json.mozlz4 \ - ${withName ./profile-settings-expected-search.json} - - assertFirefoxSearchContent \ - home-files/${cfg.configPath}/searchWithoutDefault/search.json.mozlz4 \ - ${withName ./profile-settings-expected-search-without-default.json} - ''; - }); -} diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix index dfbcfbd92..81766719e 100644 --- a/tests/modules/programs/firefox/profiles/bookmarks/default.nix +++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix @@ -1,11 +1,9 @@ modulePath: { config, lib, pkgs, ... }: -with lib; - let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; @@ -18,7 +16,7 @@ let in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; profiles.bookmarks = { settings = { "general.smoothScroll" = false; }; diff --git a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js index 47448a6e4..d36dccfdf 100644 --- a/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js +++ b/tests/modules/programs/firefox/profiles/bookmarks/expected-bookmarks-user.js @@ -1,5 +1,7 @@ // Generated by Home Manager. + + user_pref("browser.bookmarks.file", "/nix/store/00000000000000000000000000000000-@name@-bookmarks.html"); user_pref("browser.places.importBookmarksHTML", true); user_pref("general.smoothScroll", false); diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix index 6a0d9e93f..e0e917773 100644 --- a/tests/modules/programs/firefox/profiles/containers/default.nix +++ b/tests/modules/programs/firefox/profiles/containers/default.nix @@ -1,18 +1,15 @@ modulePath: -{ config, lib, pkgs, ... }: - -with lib; - +{ config, lib, ... }: let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; profiles.containers = { containers = { diff --git a/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix index a60522165..0c9d2e666 100644 --- a/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix +++ b/tests/modules/programs/firefox/profiles/containers/duplicate-ids.nix @@ -1,22 +1,20 @@ modulePath: { config, lib, ... }: -with lib; - let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig ({ + config = lib.mkIf config.test.enableBig ({ test.asserts.assertions.expected = ['' Must not have a ${cfg.name} container with an existing ID but - ID 9 is used by dangerous, shopping'']; - } // setAttrByPath modulePath { + } // lib.setAttrByPath modulePath { enable = true; profiles = { diff --git a/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix index f39666723..d2c273f9b 100644 --- a/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix +++ b/tests/modules/programs/firefox/profiles/containers/id-out-of-range.nix @@ -1,8 +1,6 @@ modulePath: { config, lib, ... }: -with lib; - let firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; @@ -10,10 +8,10 @@ let in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig ({ + config = lib.mkIf config.test.enableBig ({ test.asserts.assertions.expected = [ "Container id must be smaller than 4294967294 (2^32 - 2)" ]; - } // setAttrByPath modulePath { + } // lib.setAttrByPath modulePath { enable = true; profiles.my-profile = { diff --git a/tests/modules/programs/firefox/profiles/duplicate-ids.nix b/tests/modules/programs/firefox/profiles/duplicate-ids.nix index dc5557b47..255715f4a 100644 --- a/tests/modules/programs/firefox/profiles/duplicate-ids.nix +++ b/tests/modules/programs/firefox/profiles/duplicate-ids.nix @@ -1,22 +1,20 @@ modulePath: { config, lib, ... }: -with lib; - let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath; in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig ({ + config = lib.mkIf config.test.enableBig ({ test.asserts.assertions.expected = ['' Must not have a ${cfg.name} profile with an existing ID but - ID 1 is used by first, second'']; - } // setAttrByPath modulePath { + } // lib.setAttrByPath modulePath { enable = true; profiles = { diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix new file mode 100644 index 000000000..77fbe33b0 --- /dev/null +++ b/tests/modules/programs/firefox/profiles/extensions/default.nix @@ -0,0 +1,36 @@ +modulePath: +{ config, lib, ... }: + +let + cfg = lib.getAttrFromPath modulePath config; + + firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; +in { + imports = [ firefoxMockOverlay ]; + + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { + enable = true; + profiles.extensions = { + extensions = { + force = true; + settings = { + "uBlock0@raymondhill.net".settings = { + selectedFilterLists = [ + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-unbreak" + "ublock-quick-fixes" + ]; + }; + }; + }; + }; + } // { + nmt.script = '' + assertFileContent \ + home-files/${cfg.configPath}/extensions/browser-extension-data/uBlock0@raymondhill.net/storage.js \ + ${./expected-storage.js} + ''; + }); +} diff --git a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js new file mode 100644 index 000000000..225234411 --- /dev/null +++ b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js @@ -0,0 +1 @@ +{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]} \ No newline at end of file diff --git a/tests/modules/programs/firefox/profiles/overwrite/default.nix b/tests/modules/programs/firefox/profiles/overwrite/default.nix new file mode 100644 index 000000000..02ec789d6 --- /dev/null +++ b/tests/modules/programs/firefox/profiles/overwrite/default.nix @@ -0,0 +1,41 @@ +modulePath: +{ config, lib, ... }: + +let + + cfg = lib.getAttrFromPath modulePath config; + + firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; + +in { + imports = [ firefoxMockOverlay ]; + + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { + enable = true; + profiles = { + basic.isDefault = true; + test = { + id = 6; + preConfig = '' + user_pref("browser.search.suggest.enabled", false); + ''; + settings = { "browser.search.suggest.enabled" = true; }; + extraConfig = '' + user_pref("findbar.highlightAll", true); + ''; + }; + }; + } // { + nmt.script = '' + assertFileRegex \ + home-path/bin/${cfg.wrappedPackageName} \ + MOZ_APP_LAUNCHER + + assertDirectoryExists home-files/${cfg.configPath}/basic + + assertFileContent \ + home-files/${cfg.configPath}/test/user.js \ + ${./expected-user.js} + ''; + }); +} diff --git a/tests/modules/programs/firefox/profiles/overwrite/expected-user.js b/tests/modules/programs/firefox/profiles/overwrite/expected-user.js new file mode 100644 index 000000000..cbcc5f262 --- /dev/null +++ b/tests/modules/programs/firefox/profiles/overwrite/expected-user.js @@ -0,0 +1,10 @@ +// Generated by Home Manager. + +user_pref("browser.search.suggest.enabled", false); + + +user_pref("browser.search.suggest.enabled", true); + + +user_pref("findbar.highlightAll", true); + diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix index 76acfcd3a..689c58439 100644 --- a/tests/modules/programs/firefox/profiles/search/default.nix +++ b/tests/modules/programs/firefox/profiles/search/default.nix @@ -1,11 +1,9 @@ modulePath: { config, lib, pkgs, ... }: -with lib; - let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; @@ -18,7 +16,7 @@ let in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; profiles = { search = { diff --git a/tests/modules/programs/firefox/profiles/settings/default.nix b/tests/modules/programs/firefox/profiles/settings/default.nix index 39d329ece..9c27a3515 100644 --- a/tests/modules/programs/firefox/profiles/settings/default.nix +++ b/tests/modules/programs/firefox/profiles/settings/default.nix @@ -1,18 +1,16 @@ modulePath: -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath; in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; profiles = { basic.isDefault = true; diff --git a/tests/modules/programs/firefox/profiles/settings/expected-user.js b/tests/modules/programs/firefox/profiles/settings/expected-user.js index d929df2b3..8118d73bf 100644 --- a/tests/modules/programs/firefox/profiles/settings/expected-user.js +++ b/tests/modules/programs/firefox/profiles/settings/expected-user.js @@ -1,5 +1,7 @@ // Generated by Home Manager. + + user_pref("browser.newtabpage.pinned", "[{\"title\":\"NixOS\",\"url\":\"https://nixos.org\"}]"); user_pref("general.smoothScroll", false); diff --git a/tests/modules/programs/firefox/profiles/shared-path.nix b/tests/modules/programs/firefox/profiles/shared-path.nix index e6d4a06d4..b0936bfaa 100644 --- a/tests/modules/programs/firefox/profiles/shared-path.nix +++ b/tests/modules/programs/firefox/profiles/shared-path.nix @@ -1,13 +1,11 @@ modulePath: { config, lib, ... }: -with lib; - let firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath; in { imports = [ firefoxMockOverlay ]; - config = mkIf config.test.enableBig (setAttrByPath modulePath { + config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath { enable = true; profiles = { diff --git a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix index ecbd492fa..736eff7ca 100644 --- a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix +++ b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix @@ -1,30 +1,36 @@ modulePath: -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, realPkgs, ... }: let - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; in { - nixpkgs.overlays = [ - (self: super: { - "${cfg.wrappedPackageName}-unwrapped" = - pkgs.runCommandLocal "${cfg.wrappedPackageName}-0" { - meta.description = "I pretend to be ${cfg.name}"; - passthru.gtk3 = null; - } '' - mkdir -p "$out"/{bin,lib} - touch "$out/bin/${cfg.wrappedPackageName}" - chmod 755 "$out/bin/${cfg.wrappedPackageName}" - ''; + test.stubs = let unwrappedName = "${cfg.wrappedPackageName}-unwrapped"; + in { + "${unwrappedName}" = { + name = unwrappedName; + extraAttrs = { + binaryName = cfg.wrappedPackageName; + gtk3 = null; + meta.description = "I pretend to be ${cfg.name}"; + }; + outPath = null; + buildScript = '' + echo BUILD + mkdir -p "$out"/{bin,lib} + touch "$out/bin/${cfg.wrappedPackageName}" + chmod 755 "$out/bin/${cfg.wrappedPackageName}" + ''; + }; - chrome-gnome-shell = - pkgs.runCommandLocal "dummy-chrome-gnome-shell" { } '' - mkdir -p $out/lib/mozilla/native-messaging-hosts - touch $out/lib/mozilla/native-messaging-hosts/dummy - ''; - }) - ]; + chrome-gnome-shell = { + buildScript = '' + mkdir -p $out/lib/mozilla/native-messaging-hosts + touch $out/lib/mozilla/native-messaging-hosts/dummy + ''; + }; + }; + + nixpkgs.overlays = [ (_: _: { inherit (realPkgs) mozlz4a; }) ]; } diff --git a/tests/modules/programs/firefox/state-version-19_09.nix b/tests/modules/programs/firefox/state-version-19_09.nix index 475705c31..b12a4f6fc 100644 --- a/tests/modules/programs/firefox/state-version-19_09.nix +++ b/tests/modules/programs/firefox/state-version-19_09.nix @@ -1,20 +1,15 @@ modulePath: -{ config, lib, pkgs, ... }: - -with lib; - +{ config, lib, ... }: let - - cfg = getAttrFromPath modulePath config; + cfg = lib.getAttrFromPath modulePath config; firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath; - in { imports = [ firefoxMockOverlay ]; config = lib.mkIf config.test.enableBig ({ home.stateVersion = "19.09"; - } // setAttrByPath modulePath { enable = true; } // { + } // lib.setAttrByPath modulePath { enable = true; } // { nmt.script = '' assertFileRegex \ home-path/bin/${cfg.wrappedPackageName} \ diff --git a/tests/modules/programs/fish/functions.nix b/tests/modules/programs/fish/functions.nix index b8b5793a5..4bead25b0 100644 --- a/tests/modules/programs/fish/functions.nix +++ b/tests/modules/programs/fish/functions.nix @@ -1,7 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ lib, pkgs, ... }: let func = pkgs.writeText "func.fish" '' diff --git a/tests/modules/programs/fish/no-functions.nix b/tests/modules/programs/fish/no-functions.nix index 125ed8841..3caddfd95 100644 --- a/tests/modules/programs/fish/no-functions.nix +++ b/tests/modules/programs/fish/no-functions.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ lib, ... }: { config = { programs.fish = { enable = true; diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix index 88684b3b4..3e655e33f 100644 --- a/tests/modules/programs/fish/plugins.nix +++ b/tests/modules/programs/fish/plugins.nix @@ -1,7 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ lib, pkgs, ... }: let fooPluginSrc = pkgs.writeText "fooPluginSrc" ""; diff --git a/tests/modules/programs/foot/empty-settings.nix b/tests/modules/programs/foot/empty-settings.nix index 26b82e7fb..f156dae2e 100644 --- a/tests/modules/programs/foot/empty-settings.nix +++ b/tests/modules/programs/foot/empty-settings.nix @@ -1,15 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.foot.enable = true; + programs.foot.enable = true; - test.stubs.foot = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/foot - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/foot + ''; } diff --git a/tests/modules/programs/foot/example-settings.nix b/tests/modules/programs/foot/example-settings.nix index 8390305ea..392b916e6 100644 --- a/tests/modules/programs/foot/example-settings.nix +++ b/tests/modules/programs/foot/example-settings.nix @@ -1,29 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.foot = { - enable = true; - package = config.lib.test.mkStubPackage { }; + programs.foot = { + enable = true; + package = config.lib.test.mkStubPackage { }; - settings = { - main = { - term = "xterm-256color"; + settings = { + main = { + term = "xterm-256color"; - font = "Fira Code:size=11"; - dpi-aware = "yes"; - }; - - mouse = { hide-when-typing = "yes"; }; + font = "Fira Code:size=11"; + dpi-aware = "yes"; }; - }; - nmt.script = '' - assertFileContent \ - home-files/.config/foot/foot.ini \ - ${./example-settings-expected.ini} - ''; + mouse = { hide-when-typing = "yes"; }; + }; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/foot/foot.ini \ + ${./example-settings-expected.ini} + ''; } diff --git a/tests/modules/programs/foot/systemd-user-service.nix b/tests/modules/programs/foot/systemd-user-service.nix index 5ebd90675..c313c0f20 100644 --- a/tests/modules/programs/foot/systemd-user-service.nix +++ b/tests/modules/programs/foot/systemd-user-service.nix @@ -1,19 +1,14 @@ -{ config, lib, pkgs, ... }: - { - config = { - programs.foot = { - package = config.lib.test.mkStubPackage { outPath = "@foot@"; }; - enable = true; - server.enable = true; - }; - - nmt.script = '' - assertPathNotExists home-files/.config/foot/foot.ini - - assertFileContent \ - home-files/.config/systemd/user/foot.service \ - ${./systemd-user-service-expected.service} - ''; + programs.foot = { + enable = true; + server.enable = true; }; + + nmt.script = '' + assertPathNotExists home-files/.config/foot/foot.ini + + assertFileContent \ + home-files/.config/systemd/user/foot.service \ + ${./systemd-user-service-expected.service} + ''; } diff --git a/tests/modules/programs/freetube/basic-configuration.nix b/tests/modules/programs/freetube/basic-configuration.nix index a30d3bed4..dd3cdaf13 100644 --- a/tests/modules/programs/freetube/basic-configuration.nix +++ b/tests/modules/programs/freetube/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { programs.freetube = { enable = true; @@ -17,8 +15,6 @@ }; }; - test.stubs.freetube = { }; - nmt.script = '' assertFileExists home-files/.config/FreeTube/hm_settings.db assertFileContent home-files/.config/FreeTube/hm_settings.db \ diff --git a/tests/modules/programs/fuzzel/empty-settings.nix b/tests/modules/programs/fuzzel/empty-settings.nix index e14aad4f5..74e275ff3 100644 --- a/tests/modules/programs/fuzzel/empty-settings.nix +++ b/tests/modules/programs/fuzzel/empty-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { programs.fuzzel.enable = true; - test.stubs.fuzzel = { }; - nmt.script = '' assertPathNotExists home-files/.config/fuzzel ''; diff --git a/tests/modules/programs/gallery-dl/gallery-dl.nix b/tests/modules/programs/gallery-dl/gallery-dl.nix index 2cc94e1e0..fdfa3395a 100644 --- a/tests/modules/programs/gallery-dl/gallery-dl.nix +++ b/tests/modules/programs/gallery-dl/gallery-dl.nix @@ -12,8 +12,6 @@ }; }; - test.stubs.gallery-dl = { }; - nmt.script = '' assertFileContent home-files/.config/gallery-dl/config.json \ ${builtins.toFile "gallery-dl-expected-settings.json" '' diff --git a/tests/modules/programs/getmail/getmail.nix b/tests/modules/programs/getmail/getmail.nix index c460a37e7..8122d6529 100644 --- a/tests/modules/programs/getmail/getmail.nix +++ b/tests/modules/programs/getmail/getmail.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; diff --git a/tests/modules/programs/gh-dash/config.nix b/tests/modules/programs/gh-dash/config.nix index 9972d6738..cec1b8b3e 100644 --- a/tests/modules/programs/gh-dash/config.nix +++ b/tests/modules/programs/gh-dash/config.nix @@ -1,18 +1,17 @@ -{ ... }: - { - programs.gh-dash = { - enable = true; - settings = { - prSections = [{ - title = "My Pull Requests"; - filters = "is:open author:@me"; - }]; + programs = { + gh.enable = true; + gh-dash = { + enable = true; + settings = { + prSections = [{ + title = "My Pull Requests"; + filters = "is:open author:@me"; + }]; + }; }; }; - test.stubs.gh = { }; - nmt.script = '' assertFileExists home-files/.config/gh-dash/config.yml assertFileContent home-files/.config/gh-dash/config.yml ${ diff --git a/tests/modules/programs/gh/config-file.nix b/tests/modules/programs/gh/config-file.nix index e7c17d5d9..b23c92d62 100644 --- a/tests/modules/programs/gh/config-file.nix +++ b/tests/modules/programs/gh/config-file.nix @@ -1,26 +1,20 @@ -{ config, lib, pkgs, ... }: - { - config = { - programs.gh = { - enable = true; - settings.aliases = { co = "pr checkout"; }; - settings.editor = "vim"; - }; - - test.stubs.gh = { }; - - nmt.script = '' - assertFileExists home-files/.config/gh/config.yml - assertFileContent home-files/.config/gh/config.yml ${ - builtins.toFile "config-file.yml" '' - aliases: - co: pr checkout - editor: vim - git_protocol: https - version: '1' - '' - } - ''; + programs.gh = { + enable = true; + settings.aliases = { co = "pr checkout"; }; + settings.editor = "vim"; }; + + nmt.script = '' + assertFileExists home-files/.config/gh/config.yml + assertFileContent home-files/.config/gh/config.yml ${ + builtins.toFile "config-file.yml" '' + aliases: + co: pr checkout + editor: vim + git_protocol: https + version: '1' + '' + } + ''; } diff --git a/tests/modules/programs/gh/credential-helper.git.conf b/tests/modules/programs/gh/credential-helper.git.conf index 529d6725a..299441742 100644 --- a/tests/modules/programs/gh/credential-helper.git.conf +++ b/tests/modules/programs/gh/credential-helper.git.conf @@ -3,3 +3,9 @@ [credential "https://github.example.com"] helper = "@gh@/bin/gh auth git-credential" + +[gpg] + format = "openpgp" + +[gpg "openpgp"] + program = "path-to-gpg" diff --git a/tests/modules/programs/gh/credential-helper.nix b/tests/modules/programs/gh/credential-helper.nix index 771572318..b0cad9454 100644 --- a/tests/modules/programs/gh/credential-helper.nix +++ b/tests/modules/programs/gh/credential-helper.nix @@ -1,5 +1,3 @@ -{ config, lib, pkgs, ... }: - { programs.gh = { enable = true; @@ -9,9 +7,10 @@ }; }; - programs.git.enable = true; - - test.stubs.gh = { }; + programs.git = { + enable = true; + signing.signer = "path-to-gpg"; + }; nmt.script = '' assertFileExists home-files/.config/git/config diff --git a/tests/modules/programs/gh/extensions.nix b/tests/modules/programs/gh/extensions.nix index c8824ed09..4426e2a9b 100644 --- a/tests/modules/programs/gh/extensions.nix +++ b/tests/modules/programs/gh/extensions.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { programs.gh = { @@ -7,7 +7,6 @@ }; test.stubs = { - gh = { }; gh-eco = { name = "gh-eco"; buildScript = '' diff --git a/tests/modules/programs/gh/warnings.nix b/tests/modules/programs/gh/warnings.nix index bf7e5df8e..6a4a9361c 100644 --- a/tests/modules/programs/gh/warnings.nix +++ b/tests/modules/programs/gh/warnings.nix @@ -1,36 +1,32 @@ -{ config, options, lib, pkgs, ... }: +{ options, lib, ... }: { - config = { - programs.gh = { - enable = true; - aliases = { co = "pr checkout"; }; - editor = "vim"; - }; - - test.stubs.gh = { }; - - test.asserts.warnings.expected = [ - "The option `programs.gh.editor' defined in ${ - lib.showFiles options.programs.gh.editor.files - } has been renamed to `programs.gh.settings.editor'." - "The option `programs.gh.aliases' defined in ${ - lib.showFiles options.programs.gh.aliases.files - } has been renamed to `programs.gh.settings.aliases'." - ]; - test.asserts.warnings.enable = true; - - nmt.script = '' - assertFileExists home-files/.config/gh/config.yml - assertFileContent home-files/.config/gh/config.yml ${ - builtins.toFile "config-file.yml" '' - aliases: - co: pr checkout - editor: vim - git_protocol: https - version: '1' - '' - } - ''; + programs.gh = { + enable = true; + aliases = { co = "pr checkout"; }; + editor = "vim"; }; + + test.asserts.warnings.expected = [ + "The option `programs.gh.editor' defined in ${ + lib.showFiles options.programs.gh.editor.files + } has been renamed to `programs.gh.settings.editor'." + "The option `programs.gh.aliases' defined in ${ + lib.showFiles options.programs.gh.aliases.files + } has been renamed to `programs.gh.settings.aliases'." + ]; + test.asserts.warnings.enable = true; + + nmt.script = '' + assertFileExists home-files/.config/gh/config.yml + assertFileContent home-files/.config/gh/config.yml ${ + builtins.toFile "config-file.yml" '' + aliases: + co: pr checkout + editor: vim + git_protocol: https + version: '1' + '' + } + ''; } diff --git a/tests/modules/programs/ghostty/empty-settings.nix b/tests/modules/programs/ghostty/empty-settings.nix index 4e5e83e8d..1ea025eb5 100644 --- a/tests/modules/programs/ghostty/empty-settings.nix +++ b/tests/modules/programs/ghostty/empty-settings.nix @@ -1,6 +1,6 @@ { programs.ghostty.enable = true; - test.stubs.ghostty = { }; + nmt.script = '' assertPathNotExists home-files/.config/ghostty/config ''; diff --git a/tests/modules/programs/ghostty/example-theme.nix b/tests/modules/programs/ghostty/example-theme.nix index b4d211595..29f40a897 100644 --- a/tests/modules/programs/ghostty/example-theme.nix +++ b/tests/modules/programs/ghostty/example-theme.nix @@ -1,7 +1,6 @@ -{ config, ... }: { +{ programs.ghostty = { enable = true; - package = config.lib.test.mkStubPackage { }; themes = { catppuccin-mocha = { diff --git a/tests/modules/programs/git-cliff/example-settings.nix b/tests/modules/programs/git-cliff/example-settings.nix index 5c865d48e..c0330b3da 100644 --- a/tests/modules/programs/git-cliff/example-settings.nix +++ b/tests/modules/programs/git-cliff/example-settings.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { programs.git-cliff = { enable = true; @@ -13,8 +9,6 @@ with lib; }; }; - test.stubs.git-cliff = { }; - nmt.script = '' assertFileContent \ home-files/.config/git-cliff/cliff.toml \ diff --git a/tests/modules/programs/git-credential-oauth/basic.nix b/tests/modules/programs/git-credential-oauth/basic.nix index 741adfbfb..2e82c8303 100644 --- a/tests/modules/programs/git-credential-oauth/basic.nix +++ b/tests/modules/programs/git-credential-oauth/basic.nix @@ -1,12 +1,10 @@ -{ config, pkgs, ... }: +{ config, ... }: { programs.git-credential-oauth = { enable = true; }; programs.git = { enable = true; }; - test.stubs.git-credential-oauth = { }; - nmt.script = '' assertFileExists home-files/.config/git/config assertFileContains \ diff --git a/tests/modules/programs/git-credential-oauth/extra-flags.nix b/tests/modules/programs/git-credential-oauth/extra-flags.nix index 7a586ede6..e258512a7 100644 --- a/tests/modules/programs/git-credential-oauth/extra-flags.nix +++ b/tests/modules/programs/git-credential-oauth/extra-flags.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { programs.git-credential-oauth = { @@ -8,8 +8,6 @@ programs.git = { enable = true; }; - test.stubs.git-credential-oauth = { }; - nmt.script = '' assertFileExists home-files/.config/git/config assertFileContains \ diff --git a/tests/modules/programs/git-worktree-switcher/bash.nix b/tests/modules/programs/git-worktree-switcher/bash.nix new file mode 100644 index 000000000..0e0fb55e2 --- /dev/null +++ b/tests/modules/programs/git-worktree-switcher/bash.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + programs = { + bash.enable = true; + git-worktree-switcher.enable = true; + }; + + test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; }; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileContains \ + home-files/.bashrc \ + 'eval "$(@git-worktree-switcher@/bin/git-worktree-switcher init bash)"' + ''; +} diff --git a/tests/modules/programs/git-worktree-switcher/default.nix b/tests/modules/programs/git-worktree-switcher/default.nix new file mode 100644 index 000000000..d5a34f1c0 --- /dev/null +++ b/tests/modules/programs/git-worktree-switcher/default.nix @@ -0,0 +1,5 @@ +{ + git-worktree-switcher-bash = ./bash.nix; + git-worktree-switcher-fish = ./fish.nix; + git-worktree-switcher-zsh = ./zsh.nix; +} diff --git a/tests/modules/programs/git-worktree-switcher/fish.nix b/tests/modules/programs/git-worktree-switcher/fish.nix new file mode 100644 index 000000000..946cfa754 --- /dev/null +++ b/tests/modules/programs/git-worktree-switcher/fish.nix @@ -0,0 +1,15 @@ +{ + programs = { + fish.enable = true; + git-worktree-switcher.enable = true; + }; + + test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; }; + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + assertFileContains \ + home-files/.config/fish/config.fish \ + '@git-worktree-switcher@/bin/git-worktree-switcher init fish | source' + ''; +} diff --git a/tests/modules/programs/git-worktree-switcher/zsh.nix b/tests/modules/programs/git-worktree-switcher/zsh.nix new file mode 100644 index 000000000..31028441d --- /dev/null +++ b/tests/modules/programs/git-worktree-switcher/zsh.nix @@ -0,0 +1,15 @@ +{ + programs = { + zsh.enable = true; + git-worktree-switcher.enable = true; + }; + + test.stubs.git-worktree-switcher = { name = "git-worktree-switcher"; }; + + nmt.script = '' + assertFileExists home-files/.zshrc + assertFileContains \ + home-files/.zshrc \ + 'eval "$(@git-worktree-switcher@/bin/git-worktree-switcher init zsh)"' + ''; +} diff --git a/tests/modules/programs/git/default.nix b/tests/modules/programs/git/default.nix index 3b92b2ff1..4c7baa6ab 100644 --- a/tests/modules/programs/git/default.nix +++ b/tests/modules/programs/git/default.nix @@ -3,7 +3,9 @@ git-with-most-options = ./git.nix; git-with-msmtp = ./git-with-msmtp.nix; git-with-str-extra-config = ./git-with-str-extra-config.nix; + git-with-signing-key-id-legacy = ./git-with-signing-key-id-legacy.nix; git-with-signing-key-id = ./git-with-signing-key-id.nix; git-without-signing-key-id = ./git-without-signing-key-id.nix; + git-without-signing = ./git-without-signing.nix; git-with-hooks = ./git-with-hooks.nix; } diff --git a/tests/modules/programs/git/git-expected.conf b/tests/modules/programs/git/git-expected.conf index 61e0a2cc5..3d072b404 100644 --- a/tests/modules/programs/git/git-expected.conf +++ b/tests/modules/programs/git/git-expected.conf @@ -38,6 +38,9 @@ smudge = "git-lfs smudge -- %f" [gpg] + format = "openpgp" + +[gpg "openpgp"] program = "path-to-gpg" [interactive] diff --git a/tests/modules/programs/git/git-with-email-expected.conf b/tests/modules/programs/git/git-with-email-expected.conf index fa027422f..5a0d9a6b5 100644 --- a/tests/modules/programs/git/git-with-email-expected.conf +++ b/tests/modules/programs/git/git-with-email-expected.conf @@ -1,3 +1,9 @@ +[gpg] + format = "openpgp" + +[gpg "openpgp"] + program = "@gnupg@/bin/gpg" + [sendemail "hm-account"] from = "H. M. Test Jr. " smtpEncryption = "tls" diff --git a/tests/modules/programs/git/git-with-email.nix b/tests/modules/programs/git/git-with-email.nix index 0999eaa87..db6053a53 100644 --- a/tests/modules/programs/git/git-with-email.nix +++ b/tests/modules/programs/git/git-with-email.nix @@ -1,40 +1,36 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ realPkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts.hm-account.smtp.tls.certificatesFile = - "/etc/test/certificates.crt"; - programs.git = { - enable = true; - package = pkgs.gitMinimal; - userEmail = "hm@example.com"; - userName = "H. M. Test"; - }; + accounts.email.accounts.hm-account.smtp.tls.certificatesFile = + "/etc/test/certificates.crt"; - home.stateVersion = "20.09"; - - nmt.script = '' - function assertGitConfig() { - local value - value=$(${pkgs.gitMinimal}/bin/git config \ - --file $TESTED/home-files/.config/git/config \ - --get $1) - if [[ $value != $2 ]]; then - fail "Expected option '$1' to have value '$2' but it was '$value'" - fi - } - - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config ${ - ./git-with-email-expected.conf - } - - assertGitConfig "sendemail.hm@example.com.from" "H. M. Test " - assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. " - ''; + programs.git = { + enable = true; + userEmail = "hm@example.com"; + userName = "H. M. Test"; }; + + home.stateVersion = "20.09"; + + nmt.script = '' + function assertGitConfig() { + local value + value=$(${realPkgs.gitMinimal}/bin/git config \ + --file $TESTED/home-files/.config/git/config \ + --get $1) + if [[ $value != $2 ]]; then + fail "Expected option '$1' to have value '$2' but it was '$value'" + fi + } + + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + ./git-with-email-expected.conf + } + + assertGitConfig "sendemail.hm@example.com.from" "H. M. Test " + assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. " + ''; } diff --git a/tests/modules/programs/git/git-with-hooks.nix b/tests/modules/programs/git/git-with-hooks.nix index 83f1059bc..6dcf15e21 100644 --- a/tests/modules/programs/git/git-with-hooks.nix +++ b/tests/modules/programs/git/git-with-hooks.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ realPkgs, ... }: { programs.git = { @@ -8,7 +8,7 @@ nmt.script = '' function getGitConfig() { - ${pkgs.gitMinimal}/bin/git config \ + ${realPkgs.gitMinimal}/bin/git config \ --file $TESTED/home-files/.config/git/config \ --get $1 } diff --git a/tests/modules/programs/git/git-with-msmtp-expected.conf b/tests/modules/programs/git/git-with-msmtp-expected.conf index 8cd5d86f0..9525d14b2 100644 --- a/tests/modules/programs/git/git-with-msmtp-expected.conf +++ b/tests/modules/programs/git/git-with-msmtp-expected.conf @@ -1,3 +1,9 @@ +[gpg] + format = "openpgp" + +[gpg "openpgp"] + program = "path-to-gpg" + [sendemail "hm-account"] from = "H. M. Test Jr. " smtpEncryption = "tls" @@ -8,7 +14,7 @@ [sendemail "hm@example.com"] envelopeSender = "auto" from = "H. M. Test " - smtpServer = "@msmtp@/bin/msmtp" + sendmailCmd = "@msmtp@/bin/msmtp" [user] email = "hm@example.com" diff --git a/tests/modules/programs/git/git-with-msmtp.nix b/tests/modules/programs/git/git-with-msmtp.nix index 80e082c97..eec269c76 100644 --- a/tests/modules/programs/git/git-with-msmtp.nix +++ b/tests/modules/programs/git/git-with-msmtp.nix @@ -1,43 +1,37 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, realPkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts."hm@example.com".msmtp.enable = true; + accounts.email.accounts."hm@example.com".msmtp.enable = true; - programs.git = { - enable = true; - package = pkgs.gitMinimal; - userEmail = "hm@example.com"; - userName = "H. M. Test"; - }; - - home.stateVersion = "20.09"; - - test.stubs.msmtp = { }; - - nmt.script = '' - function assertGitConfig() { - local value - value=$(${pkgs.gitMinimal}/bin/git config \ - --file $TESTED/home-files/.config/git/config \ - --get $1) - if [[ $value != $2 ]]; then - fail "Expected option '$1' to have value '$2' but it was '$value'" - fi - } - - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config \ - ${./git-with-msmtp-expected.conf} - - assertGitConfig "sendemail.hm@example.com.from" "H. M. Test " - assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. " - assertGitConfig "sendemail.hm@example.com.smtpServer" "${pkgs.msmtp}/bin/msmtp" - assertGitConfig "sendemail.hm@example.com.envelopeSender" "auto" - ''; + programs.git = { + enable = true; + signing.signer = "path-to-gpg"; + userEmail = "hm@example.com"; + userName = "H. M. Test"; }; + + home.stateVersion = "20.09"; + + nmt.script = '' + function assertGitConfig() { + local value + value=$(${realPkgs.gitMinimal}/bin/git config \ + --file $TESTED/home-files/.config/git/config \ + --get $1) + if [[ $value != $2 ]]; then + fail "Expected option '$1' to have value '$2' but it was '$value'" + fi + } + + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config \ + ${./git-with-msmtp-expected.conf} + + assertGitConfig "sendemail.hm@example.com.from" "H. M. Test " + assertGitConfig "sendemail.hm-account.from" "H. M. Test Jr. " + assertGitConfig "sendemail.hm@example.com.sendmailCmd" "${pkgs.msmtp}/bin/msmtp" + assertGitConfig "sendemail.hm@example.com.envelopeSender" "auto" + ''; } diff --git a/tests/modules/programs/git/git-with-signing-key-id-expected.conf b/tests/modules/programs/git/git-with-signing-key-id-expected.conf index b26377aac..aefca4142 100644 --- a/tests/modules/programs/git/git-with-signing-key-id-expected.conf +++ b/tests/modules/programs/git/git-with-signing-key-id-expected.conf @@ -2,7 +2,10 @@ gpgSign = true [gpg] - program = "path-to-gpg" + format = "ssh" + +[gpg "ssh"] + program = "path-to-ssh" [tag] gpgSign = true @@ -10,4 +13,4 @@ [user] email = "user@example.org" name = "John Doe" - signingKey = "00112233445566778899AABBCCDDEEFF" + signingKey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" diff --git a/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf b/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf new file mode 100644 index 000000000..7c9bc1d02 --- /dev/null +++ b/tests/modules/programs/git/git-with-signing-key-id-legacy-expected.conf @@ -0,0 +1,16 @@ +[commit] + gpgSign = true + +[gpg] + format = "openpgp" + +[gpg "openpgp"] + program = "path-to-gpg" + +[tag] + gpgSign = true + +[user] + email = "user@example.org" + name = "John Doe" + signingKey = "00112233445566778899AABBCCDDEEFF" diff --git a/tests/modules/programs/git/git-with-signing-key-id-legacy.nix b/tests/modules/programs/git/git-with-signing-key-id-legacy.nix new file mode 100644 index 000000000..36f092299 --- /dev/null +++ b/tests/modules/programs/git/git-with-signing-key-id-legacy.nix @@ -0,0 +1,28 @@ +{ lib, options, ... }: { + config = { + programs.git = { + enable = true; + userName = "John Doe"; + userEmail = "user@example.org"; + + signing = { + gpgPath = "path-to-gpg"; + key = "00112233445566778899AABBCCDDEEFF"; + signByDefault = true; + }; + }; + + test.asserts.warnings.expected = [ + "The option `programs.git.signing.gpgPath' defined in ${ + lib.showFiles options.programs.git.signing.gpgPath.files + } has been renamed to `programs.git.signing.signer'." + ]; + + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + ./git-with-signing-key-id-legacy-expected.conf + } + ''; + }; +} diff --git a/tests/modules/programs/git/git-with-signing-key-id.nix b/tests/modules/programs/git/git-with-signing-key-id.nix index 8d182505f..a0aae8b53 100644 --- a/tests/modules/programs/git/git-with-signing-key-id.nix +++ b/tests/modules/programs/git/git-with-signing-key-id.nix @@ -1,22 +1,22 @@ -{ pkgs, ... }: { - config = { - programs.git = { - enable = true; - userName = "John Doe"; - userEmail = "user@example.org"; +{ + programs.git = { + enable = true; + userName = "John Doe"; + userEmail = "user@example.org"; - signing = { - gpgPath = "path-to-gpg"; - key = "00112233445566778899AABBCCDDEEFF"; - signByDefault = true; - }; + signing = { + signer = "path-to-ssh"; + format = "ssh"; + key = + "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; + signByDefault = true; }; - - nmt.script = '' - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config ${ - ./git-with-signing-key-id-expected.conf - } - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + ./git-with-signing-key-id-expected.conf + } + ''; } diff --git a/tests/modules/programs/git/git-with-str-extra-config-expected.conf b/tests/modules/programs/git/git-with-str-extra-config-expected.conf index 071268e83..8c9b7ee11 100644 --- a/tests/modules/programs/git/git-with-str-extra-config-expected.conf +++ b/tests/modules/programs/git/git-with-str-extra-config-expected.conf @@ -1,5 +1,11 @@ This can be anything. +[gpg] + format = "openpgp" + +[gpg "openpgp"] + program = "path-to-gpg" + [user] email = "user@example.org" name = "John Doe" diff --git a/tests/modules/programs/git/git-with-str-extra-config.nix b/tests/modules/programs/git/git-with-str-extra-config.nix index b2294c65b..90ed363b2 100644 --- a/tests/modules/programs/git/git-with-str-extra-config.nix +++ b/tests/modules/programs/git/git-with-str-extra-config.nix @@ -1,29 +1,23 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.git = { - enable = true; - package = pkgs.gitMinimal; - extraConfig = '' - This can be anything. - ''; - userEmail = "user@example.org"; - userName = "John Doe"; - }; - - test.asserts.warnings.expected = ['' - Using programs.git.extraConfig as a string option is - deprecated and will be removed in the future. Please - change to using it as an attribute set instead. - '']; - - nmt.script = '' - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config \ - ${./git-with-str-extra-config-expected.conf} + programs.git = { + enable = true; + signing.signer = "path-to-gpg"; + extraConfig = '' + This can be anything. ''; + userEmail = "user@example.org"; + userName = "John Doe"; }; + + test.asserts.warnings.expected = ['' + Using programs.git.extraConfig as a string option is + deprecated and will be removed in the future. Please + change to using it as an attribute set instead. + '']; + + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config \ + ${./git-with-str-extra-config-expected.conf} + ''; } diff --git a/tests/modules/programs/git/git-without-signing-key-id-expected.conf b/tests/modules/programs/git/git-without-signing-key-id-expected.conf index 8c04aeda1..29452a2db 100644 --- a/tests/modules/programs/git/git-without-signing-key-id-expected.conf +++ b/tests/modules/programs/git/git-without-signing-key-id-expected.conf @@ -2,6 +2,9 @@ gpgSign = true [gpg] + format = "openpgp" + +[gpg "openpgp"] program = "path-to-gpg" [tag] diff --git a/tests/modules/programs/git/git-without-signing-key-id.nix b/tests/modules/programs/git/git-without-signing-key-id.nix index 3428c40d7..adc7995bf 100644 --- a/tests/modules/programs/git/git-without-signing-key-id.nix +++ b/tests/modules/programs/git/git-without-signing-key-id.nix @@ -1,22 +1,20 @@ -{ pkgs, ... }: { - config = { - programs.git = { - enable = true; - userName = "John Doe"; - userEmail = "user@example.org"; +{ + programs.git = { + enable = true; + userName = "John Doe"; + userEmail = "user@example.org"; - signing = { - gpgPath = "path-to-gpg"; - key = null; - signByDefault = true; - }; + signing = { + signer = "path-to-gpg"; + key = null; + signByDefault = true; }; - - nmt.script = '' - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config ${ - ./git-without-signing-key-id-expected.conf - } - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + ./git-without-signing-key-id-expected.conf + } + ''; } diff --git a/tests/modules/programs/git/git-without-signing.conf b/tests/modules/programs/git/git-without-signing.conf new file mode 100644 index 000000000..f05c7b6c7 --- /dev/null +++ b/tests/modules/programs/git/git-without-signing.conf @@ -0,0 +1,3 @@ +[user] + email = "user@example.org" + name = "John Doe" diff --git a/tests/modules/programs/git/git-without-signing.nix b/tests/modules/programs/git/git-without-signing.nix new file mode 100644 index 000000000..95a70b949 --- /dev/null +++ b/tests/modules/programs/git/git-without-signing.nix @@ -0,0 +1,16 @@ +{ + programs.git = { + enable = true; + userName = "John Doe"; + userEmail = "user@example.org"; + }; + + home.stateVersion = "25.05"; + + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + ./git-without-signing.conf + } + ''; +} diff --git a/tests/modules/programs/git/git.nix b/tests/modules/programs/git/git.nix index fb949be00..2e436bc75 100644 --- a/tests/modules/programs/git/git.nix +++ b/tests/modules/programs/git/git.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, pkgs, ... }: let @@ -21,81 +19,75 @@ let }; in { - config = { - programs.git = mkMerge [ - { + programs.git = lib.mkMerge [ + { + enable = true; + package = pkgs.gitMinimal; + aliases = { + a1 = "foo"; + a2 = "bar"; + escapes = ''"\n ''; + }; + extraConfig = { + extra = { + name = "value"; + multiple = [ 1 ]; + }; + }; + ignores = [ "*~" "*.swp" ]; + includes = [ + { path = "~/path/to/config.inc"; } + { + path = "~/path/to/conditional.inc"; + condition = "gitdir:~/src/dir"; + } + { + condition = "gitdir:~/src/dir"; + contents = gitInclude; + } + { + condition = "gitdir:~/src/otherproject"; + contents = gitInclude; + contentSuffix = "gitconfig-work"; + } + ]; + signing = { + signer = "path-to-gpg"; + format = "openpgp"; + key = "00112233445566778899AABBCCDDEEFF"; + signByDefault = true; + }; + userEmail = "user@example.org"; + userName = "John Doe"; + lfs.enable = true; + delta = { enable = true; - package = pkgs.gitMinimal; - aliases = { - a1 = "foo"; - a2 = "bar"; - escapes = ''"\n ''; - }; - extraConfig = { - extra = { - name = "value"; - multiple = [ 1 ]; + options = { + features = "decorations"; + whitespace-error-style = "22 reverse"; + decorations = { + commit-decoration-style = "bold yellow box ul"; + file-style = "bold yellow ul"; + file-decoration-style = "none"; }; }; - ignores = [ "*~" "*.swp" ]; - includes = [ - { path = "~/path/to/config.inc"; } - { - path = "~/path/to/conditional.inc"; - condition = "gitdir:~/src/dir"; - } - { - condition = "gitdir:~/src/dir"; - contents = gitInclude; - } - { - condition = "gitdir:~/src/otherproject"; - contents = gitInclude; - contentSuffix = "gitconfig-work"; - } - ]; - signing = { - gpgPath = "path-to-gpg"; - key = "00112233445566778899AABBCCDDEEFF"; - signByDefault = true; - }; - userEmail = "user@example.org"; - userName = "John Doe"; - lfs.enable = true; - delta = { - enable = true; - options = { - features = "decorations"; - whitespace-error-style = "22 reverse"; - decorations = { - commit-decoration-style = "bold yellow box ul"; - file-style = "bold yellow ul"; - file-decoration-style = "none"; - }; - }; - }; - } + }; + } - { - aliases.a2 = mkForce "baz"; - extraConfig."extra \"backcompat.with.dots\"".previously = "worked"; - extraConfig.extra.boolean = true; - extraConfig.extra.integer = 38; - extraConfig.extra.multiple = [ 2 ]; - extraConfig.extra.subsection.value = "test"; - } - ]; + { + aliases.a2 = lib.mkForce "baz"; + extraConfig."extra \"backcompat.with.dots\"".previously = "worked"; + extraConfig.extra.boolean = true; + extraConfig.extra.integer = 38; + extraConfig.extra.multiple = [ 2 ]; + extraConfig.extra.subsection.value = "test"; + } + ]; - test.stubs = { - git-lfs = { }; - delta = { }; - }; - - nmt.script = '' - assertFileExists home-files/.config/git/config - assertFileContent home-files/.config/git/config ${ - substituteExpected ./git-expected.conf - } - ''; - }; + nmt.script = '' + assertFileExists home-files/.config/git/config + assertFileContent home-files/.config/git/config ${ + substituteExpected ./git-expected.conf + } + ''; } diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix index 6c3eb6bca..b6f6c49f6 100644 --- a/tests/modules/programs/gnome-shell/gnome-shell.nix +++ b/tests/modules/programs/gnome-shell/gnome-shell.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let dummy-gnome-shell-extensions = pkgs.runCommand "dummy-package" { } '' mkdir -p $out/share/gnome-shell/extensions/dummy-package @@ -31,7 +28,7 @@ let "test-extension-uuid" ]; - actualEnabledExtensions = catAttrs "value" + actualEnabledExtensions = lib.catAttrs "value" config.dconf.settings."org/gnome/shell".enabled-extensions.value; in { @@ -62,8 +59,8 @@ in { message = "Expected disable-user-extensions to be false."; } { - assertion = - all (e: elem e actualEnabledExtensions) expectedEnabledExtensions; + assertion = lib.all (e: lib.elem e actualEnabledExtensions) + expectedEnabledExtensions; message = '' Expected enabled-extensions to contain all of: ${toString expectedEnabledExtensions} @@ -79,8 +76,6 @@ in { } ]; - test.stubs.dconf = { }; - nmt.script = '' assertFileExists home-path/share/gnome-shell/extensions/dummy-package/test assertFileExists home-path/share/gnome-shell/extensions/test-extension/test diff --git a/tests/modules/programs/gnome-terminal/bad-profile-name.nix b/tests/modules/programs/gnome-terminal/bad-profile-name.nix index 308b9306e..91554909f 100644 --- a/tests/modules/programs/gnome-terminal/bad-profile-name.nix +++ b/tests/modules/programs/gnome-terminal/bad-profile-name.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { programs.gnome-terminal = { enable = true; @@ -13,11 +11,6 @@ }; }; - nixpkgs.overlays = - [ (self: super: { gnome-terminal = config.lib.test.mkStubPackage { }; }) ]; - - test.stubs.dconf = { }; - test.asserts.assertions.expected = ['' The attribute name of a Gnome Terminal profile must be a UUID. Incorrect profile names: another-bad-name, bad-name'']; diff --git a/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix b/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix index 6dab6a2b4..3c0a786ab 100644 --- a/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix +++ b/tests/modules/programs/gnome-terminal/gnome-terminal-1.nix @@ -1,62 +1,50 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.gnome-terminal = { - enable = true; - profile = { - "e0b782ed-6aca-44eb-8c75-62b3706b6220" = { - allowBold = true; - audibleBell = true; - backspaceBinding = "ascii-delete"; - boldIsBright = true; - colors = { - backgroundColor = "#2E3436"; - foregroundColor = "#D3D7C1"; - palette = [ - "#000000" - "#AA0000" - "#00AA00" - "#AA5500" - "#0000AA" - "#AA00AA" - "#00AAAA" - "#AAAAAA" - "#555555" - "#FF5555" - "#55FF55" - "#FFFF55" - "#5555FF" - "#FF55FF" - "#55FFFF" - "#FFFFFF" - ]; - }; - cursorBlinkMode = "off"; - cursorShape = "underline"; - default = true; - deleteBinding = "delete-sequence"; - scrollbackLines = 1000000; - scrollOnOutput = false; - showScrollbar = false; - transparencyPercent = 5; - visibleName = "kamadorueda"; + programs.gnome-terminal = { + enable = true; + profile = { + "e0b782ed-6aca-44eb-8c75-62b3706b6220" = { + allowBold = true; + audibleBell = true; + backspaceBinding = "ascii-delete"; + boldIsBright = true; + colors = { + backgroundColor = "#2E3436"; + foregroundColor = "#D3D7C1"; + palette = [ + "#000000" + "#AA0000" + "#00AA00" + "#AA5500" + "#0000AA" + "#AA00AA" + "#00AAAA" + "#AAAAAA" + "#555555" + "#FF5555" + "#55FF55" + "#FFFF55" + "#5555FF" + "#FF55FF" + "#55FFFF" + "#FFFFFF" + ]; }; + cursorBlinkMode = "off"; + cursorShape = "underline"; + default = true; + deleteBinding = "delete-sequence"; + scrollbackLines = 1000000; + scrollOnOutput = false; + showScrollbar = false; + transparencyPercent = 5; + visibleName = "kamadorueda"; }; - showMenubar = false; }; - - nixpkgs.overlays = [ - (self: super: { gnome-terminal = config.lib.test.mkStubPackage { }; }) - ]; - - test.stubs.dconf = { }; - - nmt.script = '' - dconfIni=$(grep -oPm 1 '/nix/store/[a-z0-9]*?-hm-dconf.ini' $TESTED/activate) - assertFileContent $dconfIni ${./gnome-terminal-1.conf} - ''; + showMenubar = false; }; + + nmt.script = '' + dconfIni=$(grep -oPm 1 '/nix/store/[a-z0-9]*?-hm-dconf.ini' $TESTED/activate) + assertFileContent $dconfIni ${./gnome-terminal-1.conf} + ''; } diff --git a/tests/modules/programs/go/go-telemetry.nix b/tests/modules/programs/go/go-telemetry.nix index c0afd674a..b5fda3d3a 100644 --- a/tests/modules/programs/go/go-telemetry.nix +++ b/tests/modules/programs/go/go-telemetry.nix @@ -9,8 +9,6 @@ }; }; - test.stubs.go = { }; - nm.script = let modeFileDir = if !pkgs.stdenv.isDarwin then ".config/go/telemetry" diff --git a/tests/modules/programs/gpg/immutable-keyfiles.nix b/tests/modules/programs/gpg/immutable-keyfiles.nix index b359d71e4..34ef9f0fe 100644 --- a/tests/modules/programs/gpg/immutable-keyfiles.nix +++ b/tests/modules/programs/gpg/immutable-keyfiles.nix @@ -1,15 +1,16 @@ -{ config, lib, pkgs, ... }: +{ realPkgs, ... }: { programs.gpg = { enable = true; + package = realPkgs.gnupg; mutableKeys = false; mutableTrust = false; publicKeys = [ { - source = pkgs.fetchurl { + source = realPkgs.fetchurl { url = "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x44CF42371ADF842E12F116EAA9D3F98FCCF5460B"; hash = "sha256-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM="; @@ -17,7 +18,7 @@ trust = 1; # "unknown" } { - source = pkgs.fetchurl { + source = realPkgs.fetchurl { url = "https://www.rsync.net/resources/pubkey.txt"; sha256 = "16nzqfb1kvsxjkq919hxsawx6ydvip3md3qyhdmw54qx6drnxckl"; }; @@ -40,7 +41,7 @@ # Export Trust export WORKDIR=$(mktemp -d) - ${pkgs.gnupg}/bin/gpg -q --export-ownertrust > $WORKDIR/gpgtrust.txt + ${realPkgs.gnupg}/bin/gpg -q --export-ownertrust > $WORKDIR/gpgtrust.txt # Check Trust assertFileRegex $WORKDIR/gpgtrust.txt \ diff --git a/tests/modules/programs/gpg/mutable-keyfiles.nix b/tests/modules/programs/gpg/mutable-keyfiles.nix index 6ffcb7053..1c03c96bf 100644 --- a/tests/modules/programs/gpg/mutable-keyfiles.nix +++ b/tests/modules/programs/gpg/mutable-keyfiles.nix @@ -1,5 +1,3 @@ -{ config, lib, pkgs, ... }: - { programs.gpg = { enable = true; @@ -13,9 +11,6 @@ ]; }; - test.stubs.gnupg = { }; - test.stubs.systemd = { }; # depends on gnupg.override - nmt.script = '' assertFileContains activate "export GNUPGHOME=/home/hm-user/.gnupg" diff --git a/tests/modules/programs/gpg/override-defaults.nix b/tests/modules/programs/gpg/override-defaults.nix index e41043395..5e9275d83 100644 --- a/tests/modules/programs/gpg/override-defaults.nix +++ b/tests/modules/programs/gpg/override-defaults.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.gpg = { enable = true; diff --git a/tests/modules/programs/gradle/alternate-home-settings.nix b/tests/modules/programs/gradle/alternate-home-settings.nix index dc885ab19..c278302ba 100644 --- a/tests/modules/programs/gradle/alternate-home-settings.nix +++ b/tests/modules/programs/gradle/alternate-home-settings.nix @@ -1,26 +1,20 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { - config = { - programs.gradle = { - enable = true; - home = ".gbt"; - settings = { "org.gradle.caching" = true; }; - initScripts = { "some-script.gradle".text = "println 'hello world'"; }; - }; - - programs.java.package = - pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; - - test.stubs.gradle = { }; - - nmt.script = '' - assertFileContains home-path/etc/profile.d/hm-session-vars.sh \ - 'export GRADLE_USER_HOME="/home/hm-user/.gbt"' - assertFileExists home-files/.gbt/gradle.properties - assertFileExists home-files/.gbt/init.d/some-script.gradle - ''; + programs.gradle = { + enable = true; + home = ".gbt"; + settings = { "org.gradle.caching" = true; }; + initScripts = { "some-script.gradle".text = "println 'hello world'"; }; }; + + programs.java.package = + pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; + + nmt.script = '' + assertFileContains home-path/etc/profile.d/hm-session-vars.sh \ + 'export GRADLE_USER_HOME="/home/hm-user/.gbt"' + assertFileExists home-files/.gbt/gradle.properties + assertFileExists home-files/.gbt/init.d/some-script.gradle + ''; } diff --git a/tests/modules/programs/gradle/empty-settings.nix b/tests/modules/programs/gradle/empty-settings.nix index 8ed465751..6b9970843 100644 --- a/tests/modules/programs/gradle/empty-settings.nix +++ b/tests/modules/programs/gradle/empty-settings.nix @@ -1,17 +1,13 @@ { pkgs, ... }: { - config = { - programs.gradle.enable = true; + programs.gradle.enable = true; - programs.java.package = - pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; + programs.java.package = + pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; - test.stubs.gradle = { }; - - nmt.script = '' - assertPathNotExists home-files/.gradle - assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GRADLE_USER_HOME' - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.gradle + assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'GRADLE_USER_HOME' + ''; } diff --git a/tests/modules/programs/gradle/example-settings.nix b/tests/modules/programs/gradle/example-settings.nix index 19b8c070a..5944d66c4 100644 --- a/tests/modules/programs/gradle/example-settings.nix +++ b/tests/modules/programs/gradle/example-settings.nix @@ -1,42 +1,36 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { - config = { - programs.gradle = { - enable = true; - settings = { - "org.gradle.caching" = true; - "org.gradle.parallel" = true; - "org.gradle.java.home" = pkgs.jdk17; - "org.gradle.java.installations.paths" = "${pkgs.jdk8},${pkgs.jdk11}"; - }; + programs.gradle = { + enable = true; + settings = { + "org.gradle.caching" = true; + "org.gradle.parallel" = true; + "org.gradle.java.home" = pkgs.jdk17; + "org.gradle.java.installations.paths" = "${pkgs.jdk8},${pkgs.jdk11}"; }; - - programs.java.package = - pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; - - test.stubs = { - gradle = { }; - jdk = { }; - jdk8 = { }; - jdk11 = { }; - jdk17 = { }; - }; - - nmt.script = '' - assertFileExists home-files/.gradle/gradle.properties - assertFileContent home-files/.gradle/gradle.properties ${ - builtins.toFile "gradle.expected" '' - # Generated with Nix - - org.gradle.caching = true - org.gradle.java.home = @jdk17@ - org.gradle.java.installations.paths = @jdk8@,@jdk11@ - org.gradle.parallel = true - '' - } - ''; }; + + programs.java.package = + pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; + + test.stubs = { + jdk8 = { }; + jdk11 = { }; + jdk17 = { }; + }; + + nmt.script = '' + assertFileExists home-files/.gradle/gradle.properties + assertFileContent home-files/.gradle/gradle.properties ${ + builtins.toFile "gradle.expected" '' + # Generated with Nix + + org.gradle.caching = true + org.gradle.java.home = @jdk17@ + org.gradle.java.installations.paths = @jdk8@,@jdk11@ + org.gradle.parallel = true + '' + } + ''; } diff --git a/tests/modules/programs/gradle/init-scripts-settings.nix b/tests/modules/programs/gradle/init-scripts-settings.nix index 49d9a8dce..680368366 100644 --- a/tests/modules/programs/gradle/init-scripts-settings.nix +++ b/tests/modules/programs/gradle/init-scripts-settings.nix @@ -1,37 +1,31 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { - config = { - programs.gradle = { - enable = true; + programs.gradle = { + enable = true; - initScripts = { - "inline-init-script.gradle".text = '' - println 'inline-init-script' - ''; - "external-init-script.gradle".source = ./external-init-script.gradle; - }; + initScripts = { + "inline-init-script.gradle".text = '' + println 'inline-init-script' + ''; + "external-init-script.gradle".source = ./external-init-script.gradle; }; - - programs.java.package = - pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; - - test.stubs.gradle = { }; - - nmt.script = '' - assertFileExists home-files/.gradle/init.d/inline-init-script.gradle - assertFileContent home-files/.gradle/init.d/inline-init-script.gradle ${ - pkgs.writeText "gradle.expected" '' - println 'inline-init-script' - '' - } - - assertFileExists home-files/.gradle/init.d/external-init-script.gradle - assertFileContent home-files/.gradle/init.d/external-init-script.gradle ${ - ./external-init-script.gradle - } - ''; }; + + programs.java.package = + pkgs.runCommandLocal "java" { home = ""; } "mkdir $out"; + + nmt.script = '' + assertFileExists home-files/.gradle/init.d/inline-init-script.gradle + assertFileContent home-files/.gradle/init.d/inline-init-script.gradle ${ + pkgs.writeText "gradle.expected" '' + println 'inline-init-script' + '' + } + + assertFileExists home-files/.gradle/init.d/external-init-script.gradle + assertFileContent home-files/.gradle/init.d/external-init-script.gradle ${ + ./external-init-script.gradle + } + ''; } diff --git a/tests/modules/programs/granted/default.nix b/tests/modules/programs/granted/default.nix index da462752b..a4e79212b 100644 --- a/tests/modules/programs/granted/default.nix +++ b/tests/modules/programs/granted/default.nix @@ -1,4 +1,6 @@ { - granted-integration-enabled = ./integration-enabled.nix; - granted-integration-disabled = ./integration-disabled.nix; + granted-zsh-integration-enabled = ./zsh-integration-enabled.nix; + granted-zsh-integration-disabled = ./zsh-integration-disabled.nix; + granted-fish-integration-enabled = ./fish-integration-enabled.nix; + granted-fish-integration-disabled = ./fish-integration-disabled.nix; } diff --git a/tests/modules/programs/granted/fish-integration-disabled.nix b/tests/modules/programs/granted/fish-integration-disabled.nix new file mode 100644 index 000000000..9518c8934 --- /dev/null +++ b/tests/modules/programs/granted/fish-integration-disabled.nix @@ -0,0 +1,11 @@ +{ + programs = { + granted.enable = true; + granted.enableFishIntegration = false; + fish.enable = true; + }; + + nmt.script = '' + assertPathNotExists home-files/.config/fish/functions/assume.fish + ''; +} diff --git a/tests/modules/programs/granted/fish-integration-enabled.nix b/tests/modules/programs/granted/fish-integration-enabled.nix new file mode 100644 index 000000000..80e30873a --- /dev/null +++ b/tests/modules/programs/granted/fish-integration-enabled.nix @@ -0,0 +1,10 @@ +{ + programs = { + granted.enable = true; + fish.enable = true; + }; + + nmt.script = '' + assertFileExists home-files/.config/fish/functions/assume.fish + ''; +} diff --git a/tests/modules/programs/granted/integration-disabled.nix b/tests/modules/programs/granted/zsh-integration-disabled.nix similarity index 92% rename from tests/modules/programs/granted/integration-disabled.nix rename to tests/modules/programs/granted/zsh-integration-disabled.nix index 90f8d494a..2b3141cc7 100644 --- a/tests/modules/programs/granted/integration-disabled.nix +++ b/tests/modules/programs/granted/zsh-integration-disabled.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs = { granted.enable = true; @@ -7,8 +5,6 @@ zsh.enable = true; }; - test.stubs.granted = { }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileNotRegex \ diff --git a/tests/modules/programs/granted/integration-enabled.nix b/tests/modules/programs/granted/zsh-integration-enabled.nix similarity index 91% rename from tests/modules/programs/granted/integration-enabled.nix rename to tests/modules/programs/granted/zsh-integration-enabled.nix index 5bb903aae..25e70c8e9 100644 --- a/tests/modules/programs/granted/integration-enabled.nix +++ b/tests/modules/programs/granted/zsh-integration-enabled.nix @@ -1,13 +1,9 @@ -{ pkgs, ... }: - { programs = { granted.enable = true; zsh.enable = true; }; - test.stubs.granted = { }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileContains \ diff --git a/tests/modules/programs/helix/example-settings.nix b/tests/modules/programs/helix/example-settings.nix index c60883a12..69a5ef557 100644 --- a/tests/modules/programs/helix/example-settings.nix +++ b/tests/modules/programs/helix/example-settings.nix @@ -1,144 +1,138 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.helix = { - enable = true; + programs.helix = { + enable = true; - settings = { - theme = "base16"; - editor = { - line-number = "relative"; - lsp.display-messages = true; - }; - keys.normal = { - space.space = "file_picker"; - space.w = ":w"; - space.q = ":q"; - esc = [ "collapse_selection" "keep_primary_selection" ]; - }; + settings = { + theme = "base16"; + editor = { + line-number = "relative"; + lsp.display-messages = true; }; - - languages = { - language-server.typescript-language-server = let - typescript-language-server = config.lib.test.mkStubPackage { - outPath = "@typescript-language-server@"; - }; - typescript = - config.lib.test.mkStubPackage { outPath = "@typescript@"; }; - in { - command = - "${typescript-language-server}/bin/typescript-language-server"; - args = [ - "--stdio" - "--tsserver-path=${typescript}/lib/node_modules/typescript/lib" - ]; - }; - - language = [{ - name = "rust"; - auto-format = false; - }]; - }; - - ignores = [ ".build/" "!.gitignore" ]; - - themes = { - base16 = let - transparent = "none"; - gray = "#665c54"; - dark-gray = "#3c3836"; - white = "#fbf1c7"; - black = "#282828"; - red = "#fb4934"; - green = "#b8bb26"; - yellow = "#fabd2f"; - orange = "#fe8019"; - blue = "#83a598"; - magenta = "#d3869b"; - cyan = "#8ec07c"; - in { - "ui.menu" = transparent; - "ui.menu.selected" = { modifiers = [ "reversed" ]; }; - "ui.linenr" = { - fg = gray; - bg = dark-gray; - }; - "ui.popup" = { modifiers = [ "reversed" ]; }; - "ui.linenr.selected" = { - fg = white; - bg = black; - modifiers = [ "bold" ]; - }; - "ui.selection" = { - fg = black; - bg = blue; - }; - "ui.selection.primary" = { modifiers = [ "reversed" ]; }; - "comment" = { fg = gray; }; - "ui.statusline" = { - fg = white; - bg = dark-gray; - }; - "ui.statusline.inactive" = { - fg = dark-gray; - bg = white; - }; - "ui.help" = { - fg = dark-gray; - bg = white; - }; - "ui.cursor" = { modifiers = [ "reversed" ]; }; - "variable" = red; - "variable.builtin" = orange; - "constant.numeric" = orange; - "constant" = orange; - "attributes" = yellow; - "type" = yellow; - "ui.cursor.match" = { - fg = yellow; - modifiers = [ "underlined" ]; - }; - "string" = green; - "variable.other.member" = red; - "constant.character.escape" = cyan; - "function" = blue; - "constructor" = blue; - "special" = blue; - "keyword" = magenta; - "label" = magenta; - "namespace" = blue; - "diff.plus" = green; - "diff.delta" = yellow; - "diff.minus" = red; - "diagnostic" = { modifiers = [ "underlined" ]; }; - "ui.gutter" = { bg = black; }; - "info" = blue; - "hint" = dark-gray; - "debug" = dark-gray; - "warning" = yellow; - "error" = red; - }; + keys.normal = { + space.space = "file_picker"; + space.w = ":w"; + space.q = ":q"; + esc = [ "collapse_selection" "keep_primary_selection" ]; }; }; - test.stubs.helix = { }; + languages = { + language-server.typescript-language-server = let + typescript-language-server = config.lib.test.mkStubPackage { + outPath = "@typescript-language-server@"; + }; + typescript = + config.lib.test.mkStubPackage { outPath = "@typescript@"; }; + in { + command = + "${typescript-language-server}/bin/typescript-language-server"; + args = [ + "--stdio" + "--tsserver-path=${typescript}/lib/node_modules/typescript/lib" + ]; + }; - nmt.script = '' - assertFileContent \ - home-files/.config/helix/config.toml \ - ${./settings-expected.toml} - assertFileContent \ - home-files/.config/helix/languages.toml \ - ${./languages-expected.toml} - assertFileContent \ - home-files/.config/helix/ignore \ - ${./ignore-expected} - assertFileContent \ - home-files/.config/helix/themes/base16.toml \ - ${./theme-base16-expected.toml} - ''; + language = [{ + name = "rust"; + auto-format = false; + }]; + }; + + ignores = [ ".build/" "!.gitignore" ]; + + themes = { + base16 = let + transparent = "none"; + gray = "#665c54"; + dark-gray = "#3c3836"; + white = "#fbf1c7"; + black = "#282828"; + red = "#fb4934"; + green = "#b8bb26"; + yellow = "#fabd2f"; + orange = "#fe8019"; + blue = "#83a598"; + magenta = "#d3869b"; + cyan = "#8ec07c"; + in { + "ui.menu" = transparent; + "ui.menu.selected" = { modifiers = [ "reversed" ]; }; + "ui.linenr" = { + fg = gray; + bg = dark-gray; + }; + "ui.popup" = { modifiers = [ "reversed" ]; }; + "ui.linenr.selected" = { + fg = white; + bg = black; + modifiers = [ "bold" ]; + }; + "ui.selection" = { + fg = black; + bg = blue; + }; + "ui.selection.primary" = { modifiers = [ "reversed" ]; }; + "comment" = { fg = gray; }; + "ui.statusline" = { + fg = white; + bg = dark-gray; + }; + "ui.statusline.inactive" = { + fg = dark-gray; + bg = white; + }; + "ui.help" = { + fg = dark-gray; + bg = white; + }; + "ui.cursor" = { modifiers = [ "reversed" ]; }; + "variable" = red; + "variable.builtin" = orange; + "constant.numeric" = orange; + "constant" = orange; + "attributes" = yellow; + "type" = yellow; + "ui.cursor.match" = { + fg = yellow; + modifiers = [ "underlined" ]; + }; + "string" = green; + "variable.other.member" = red; + "constant.character.escape" = cyan; + "function" = blue; + "constructor" = blue; + "special" = blue; + "keyword" = magenta; + "label" = magenta; + "namespace" = blue; + "diff.plus" = green; + "diff.delta" = yellow; + "diff.minus" = red; + "diagnostic" = { modifiers = [ "underlined" ]; }; + "ui.gutter" = { bg = black; }; + "info" = blue; + "hint" = dark-gray; + "debug" = dark-gray; + "warning" = yellow; + "error" = red; + }; + }; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/helix/config.toml \ + ${./settings-expected.toml} + assertFileContent \ + home-files/.config/helix/languages.toml \ + ${./languages-expected.toml} + assertFileContent \ + home-files/.config/helix/ignore \ + ${./ignore-expected} + assertFileContent \ + home-files/.config/helix/themes/base16.toml \ + ${./theme-base16-expected.toml} + ''; } diff --git a/tests/modules/programs/hexchat/basic-configuration.nix b/tests/modules/programs/hexchat/basic-configuration.nix index 6371a0e0b..7fba91da7 100644 --- a/tests/modules/programs/hexchat/basic-configuration.nix +++ b/tests/modules/programs/hexchat/basic-configuration.nix @@ -1,61 +1,54 @@ -{ config, lib, pkgs, ... }: - { - config = { - programs.hexchat = { - enable = true; - overwriteConfigFiles = true; - channels = { - oftc = { - charset = "UTF-8 (Unicode)"; - userName = "user"; - password = "password"; - loginMethod = "sasl"; - nickname = "user"; - nickname2 = "user_"; - realName = "real_user"; - options = { - autoconnect = true; - forceSSL = true; - }; - servers = [ "irc.oftc.net" ]; - autojoin = [ "#home-manager" ]; - }; - efnet = { - options = { forceSSL = true; }; - servers = [ - "irc.choopa.net" - "irc.colosolutions.net" - "irc.mzima.net" - "irc.prison.net" - ]; - autojoin = [ "#computers" ]; + programs.hexchat = { + enable = true; + overwriteConfigFiles = true; + channels = { + oftc = { + charset = "UTF-8 (Unicode)"; + userName = "user"; + password = "password"; + loginMethod = "sasl"; + nickname = "user"; + nickname2 = "user_"; + realName = "real_user"; + options = { + autoconnect = true; + forceSSL = true; }; + servers = [ "irc.oftc.net" ]; + autojoin = [ "#home-manager" ]; }; - settings = { - dcc_dir = "/home/user/Downloads"; - irc_nick1 = "user"; - irc_nick2 = "user_"; - irc_nick3 = "user__"; - irc_user_name = "user"; - irc_real_name = "real user"; - text_font = "Monospace 14"; - text_font_main = "Monospace 14"; - gui_slist_skip = "1"; # Skip network list on start-up - gui_quit_dialog = "0"; + efnet = { + options = { forceSSL = true; }; + servers = [ + "irc.choopa.net" + "irc.colosolutions.net" + "irc.mzima.net" + "irc.prison.net" + ]; + autojoin = [ "#computers" ]; }; }; - - test.stubs.hexchat = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/hexchat/hexchat.conf \ - ${./basic-configuration-expected-main-config} - assertFileContent \ - home-files/.config/hexchat/servlist.conf \ - ${./basic-configuration-expected-serverlist-config} - ''; + settings = { + dcc_dir = "/home/user/Downloads"; + irc_nick1 = "user"; + irc_nick2 = "user_"; + irc_nick3 = "user__"; + irc_user_name = "user"; + irc_real_name = "real user"; + text_font = "Monospace 14"; + text_font_main = "Monospace 14"; + gui_slist_skip = "1"; # Skip network list on start-up + gui_quit_dialog = "0"; + }; }; + nmt.script = '' + assertFileContent \ + home-files/.config/hexchat/hexchat.conf \ + ${./basic-configuration-expected-main-config} + assertFileContent \ + home-files/.config/hexchat/servlist.conf \ + ${./basic-configuration-expected-serverlist-config} + ''; } diff --git a/tests/modules/programs/himalaya/basic-expected.toml b/tests/modules/programs/himalaya/basic-expected.toml index 16c70c868..15e2e65bf 100644 --- a/tests/modules/programs/himalaya/basic-expected.toml +++ b/tests/modules/programs/himalaya/basic-expected.toml @@ -1,32 +1,33 @@ [accounts."hm@example.com"] -backend = "imap" default = true display-name = "H. M. Test" email = "hm@example.com" +[accounts."hm@example.com".backend] +host = "imap.example.com" +login = "home.manager" +port = 993 +type = "imap" +[accounts."hm@example.com".backend.auth] +cmd = "password-command" +type = "password" -[accounts."hm@example.com".folder.alias] +[accounts."hm@example.com".backend.encryption] +type = "tls" + +[accounts."hm@example.com".folder.aliases] drafts = "Drafts" inbox = "Inbox" sent = "Sent" trash = "Trash" -[accounts."hm@example.com".imap] -encryption = "tls" -host = "imap.example.com" -login = "home.manager" -port = 993 - -[accounts."hm@example.com".imap.passwd] -cmd = "password-command" - -[accounts."hm@example.com".message.send] -backend = "smtp" - -[accounts."hm@example.com".smtp] -encryption = "tls" +[accounts."hm@example.com".message.send.backend] host = "smtp.example.com" login = "home.manager" port = 465 - -[accounts."hm@example.com".smtp.passwd] +type = "smtp" +[accounts."hm@example.com".message.send.backend.auth] cmd = "password-command" +type = "password" + +[accounts."hm@example.com".message.send.backend.encryption] +type = "tls" diff --git a/tests/modules/programs/himalaya/basic.nix b/tests/modules/programs/himalaya/basic.nix index f31a8464c..05fdef3f6 100644 --- a/tests/modules/programs/himalaya/basic.nix +++ b/tests/modules/programs/himalaya/basic.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; @@ -15,8 +11,6 @@ with lib; programs.himalaya = { enable = true; }; - test.stubs.himalaya = { }; - nmt.script = '' assertFileExists home-files/.config/himalaya/config.toml assertFileContent home-files/.config/himalaya/config.toml ${ diff --git a/tests/modules/programs/htop/empty-settings.nix b/tests/modules/programs/htop/empty-settings.nix index b8e43600f..d5b740397 100644 --- a/tests/modules/programs/htop/empty-settings.nix +++ b/tests/modules/programs/htop/empty-settings.nix @@ -1,15 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.htop.enable = true; + programs.htop.enable = true; - test.stubs.htop = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/htop - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/htop + ''; } diff --git a/tests/modules/programs/htop/example-settings.nix b/tests/modules/programs/htop/example-settings.nix index 71685434a..04c72f434 100644 --- a/tests/modules/programs/htop/example-settings.nix +++ b/tests/modules/programs/htop/example-settings.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { config = { @@ -36,8 +34,6 @@ with lib; (text "Systemd") ]); - test.stubs.htop = { }; - nmt.script = '' htoprc=home-files/.config/htop/htoprc assertFileExists $htoprc diff --git a/tests/modules/programs/htop/header_layout.nix b/tests/modules/programs/htop/header_layout.nix index aaf628522..e9de2bec9 100644 --- a/tests/modules/programs/htop/header_layout.nix +++ b/tests/modules/programs/htop/header_layout.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, pkgs, ... }: { config = with config.lib.htop; { @@ -13,8 +11,6 @@ with lib; column_meters_modes_1 = [ modes.Text modes.Text modes.Text modes.Text ]; }; - test.stubs.htop = { }; - # Test that the 'fields' key is written in addition to the customized # settings or htop won't read the options. nmt.script = let diff --git a/tests/modules/programs/htop/settings-without-fields.nix b/tests/modules/programs/htop/settings-without-fields.nix index f1efac2d4..e538a0756 100644 --- a/tests/modules/programs/htop/settings-without-fields.nix +++ b/tests/modules/programs/htop/settings-without-fields.nix @@ -1,14 +1,10 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { config = { programs.htop.enable = true; programs.htop.settings = { color_scheme = 6; }; - test.stubs.htop = { }; - # Test that the 'fields' key is written in addition to the customized # settings or htop won't read the options. nmt.script = let diff --git a/tests/modules/programs/hyfetch/empty-settings.nix b/tests/modules/programs/hyfetch/empty-settings.nix index badb5220f..e02f72842 100644 --- a/tests/modules/programs/hyfetch/empty-settings.nix +++ b/tests/modules/programs/hyfetch/empty-settings.nix @@ -1,15 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.hyfetch.enable = true; + programs.hyfetch.enable = true; - test.stubs.hyfetch = { }; - - nmt.script = '' - assertPathNotExists home-files/.config/hyfetch.json - ''; - }; + nmt.script = '' + assertPathNotExists home-files/.config/hyfetch.json + ''; } diff --git a/tests/modules/programs/hyfetch/settings.nix b/tests/modules/programs/hyfetch/settings.nix index 1cd98dc26..0210b65ed 100644 --- a/tests/modules/programs/hyfetch/settings.nix +++ b/tests/modules/programs/hyfetch/settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.hyfetch = { enable = true; @@ -17,8 +15,6 @@ }; }; - test.stubs.hyfetch = { }; - nmt.script = '' assertFileContent home-files/.config/hyfetch.json ${./hyfetch.json} ''; diff --git a/tests/modules/programs/hyprlock/basic-configuration.nix b/tests/modules/programs/hyprlock/basic-configuration.nix index c4f6821e6..606c1f75a 100644 --- a/tests/modules/programs/hyprlock/basic-configuration.nix +++ b/tests/modules/programs/hyprlock/basic-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.hyprlock = { enable = true; @@ -35,8 +33,6 @@ }; }; - test.stubs.hyprlock = { }; - nmt.script = '' assertFileContent \ home-files/.config/hypr/hyprlock.conf \ diff --git a/tests/modules/programs/hyprlock/complex-configuration.nix b/tests/modules/programs/hyprlock/complex-configuration.nix index 8544a8c52..b8a9f9817 100644 --- a/tests/modules/programs/hyprlock/complex-configuration.nix +++ b/tests/modules/programs/hyprlock/complex-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.hyprlock = { enable = true; @@ -173,8 +171,6 @@ }; }; - test.stubs.hyprlock = { }; - nmt.script = '' assertFileContent \ home-files/.config/hypr/hyprlock.conf \ diff --git a/tests/modules/programs/i3blocks/with-ordered-blocks.nix b/tests/modules/programs/i3blocks/with-ordered-blocks.nix index c2c9e6477..f7a81b9c3 100644 --- a/tests/modules/programs/i3blocks/with-ordered-blocks.nix +++ b/tests/modules/programs/i3blocks/with-ordered-blocks.nix @@ -1,9 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: let - expectedConfig = pkgs.writeText "i3blocks-expected-config" '' + expectedConfig = builtins.toFile "i3blocks-expected-config" '' [block1first] command=echo first interval=1 @@ -21,17 +19,17 @@ in { programs.i3blocks = { enable = true; package = config.lib.test.mkStubPackage { }; - bars = with lib; { + bars = { bar1 = { block1first = { command = "echo first"; interval = 1; }; - block2third = hm.dag.entryAfter [ "block3second" ] { + block2third = lib.hm.dag.entryAfter [ "block3second" ] { command = "echo third"; interval = 3; }; - block3second = hm.dag.entryAfter [ "block1first" ] { + block3second = lib.hm.dag.entryAfter [ "block1first" ] { command = "echo second"; interval = 2; }; @@ -41,11 +39,11 @@ in { command = "echo first"; interval = 1; }; - block2third = hm.dag.entryAfter [ "block3second" ] { + block2third = lib.hm.dag.entryAfter [ "block3second" ] { command = "echo third"; interval = 3; }; - block3second = hm.dag.entryAfter [ "block1first" ] { + block3second = lib.hm.dag.entryAfter [ "block1first" ] { command = "echo second"; interval = 2; }; @@ -53,8 +51,6 @@ in { }; }; - test.stubs.i3blocks = { }; - nmt.script = '' assertFileExists home-files/.config/i3blocks/bar1 assertFileExists home-files/.config/i3blocks/bar2 diff --git a/tests/modules/programs/i3status-rust/with-version-0311.nix b/tests/modules/programs/i3status-rust/with-version-0311.nix index d84cdd7cc..3f928c07b 100644 --- a/tests/modules/programs/i3status-rust/with-version-0311.nix +++ b/tests/modules/programs/i3status-rust/with-version-0311.nix @@ -1,13 +1,9 @@ -{ config, lib, pkgs, ... }: - { - config = { - programs.i3status-rust = { enable = true; }; + programs.i3status-rust = { enable = true; }; - test.stubs.i3status-rust = { version = "0.31.1"; }; + test.stubs.i3status-rust = { version = "0.31.1"; }; - test.asserts.assertions.expected = [ - "Only i3status-rust <0.31.0 or ≥0.31.2 is supported due to a config format incompatibility." - ]; - }; + test.asserts.assertions.expected = [ + "Only i3status-rust <0.31.0 or ≥0.31.2 is supported due to a config format incompatibility." + ]; } diff --git a/tests/modules/programs/i3status/with-custom.nix b/tests/modules/programs/i3status/with-custom.nix index 8b673b8ad..fcaa0c632 100644 --- a/tests/modules/programs/i3status/with-custom.nix +++ b/tests/modules/programs/i3status/with-custom.nix @@ -1,67 +1,61 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.i3status = { - enable = true; - enableDefault = false; + programs.i3status = { + enable = true; + enableDefault = false; - general = { - colors = true; - color_good = "#e0e0e0"; - color_degraded = "#d7ae00"; - color_bad = "#f69d6a"; - interval = 1; - }; - - package = config.lib.test.mkStubPackage { }; - - modules = { - "volume master" = { - position = 1; - settings = { - format = "♪ %volume"; - format_muted = "♪ muted (%volume)"; - device = "pulse:1"; - }; - }; - "disk /" = { - position = 2; - settings = { format = "/ %avail"; }; - }; - }; + general = { + colors = true; + color_good = "#e0e0e0"; + color_degraded = "#d7ae00"; + color_bad = "#f69d6a"; + interval = 1; }; - test.stubs.i3status = { }; + package = config.lib.test.mkStubPackage { }; - nmt.script = '' - assertFileContent \ - home-files/.config/i3status/config \ - ${ - pkgs.writeText "i3status-expected-config" '' - general { - color_bad = "#f69d6a" - color_degraded = "#d7ae00" - color_good = "#e0e0e0" - colors = true - interval = 1 - } - - order += "volume master" - order += "disk /" - disk / { - format = "/ %avail" - } - - volume master { - device = "pulse:1" - format = "♪ %volume" - format_muted = "♪ muted (%volume)" - } - '' - } - ''; + modules = { + "volume master" = { + position = 1; + settings = { + format = "♪ %volume"; + format_muted = "♪ muted (%volume)"; + device = "pulse:1"; + }; + }; + "disk /" = { + position = 2; + settings = { format = "/ %avail"; }; + }; + }; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/i3status/config \ + ${ + builtins.toFile "i3status-expected-config" '' + general { + color_bad = "#f69d6a" + color_degraded = "#d7ae00" + color_good = "#e0e0e0" + colors = true + interval = 1 + } + + order += "volume master" + order += "disk /" + disk / { + format = "/ %avail" + } + + volume master { + device = "pulse:1" + format = "♪ %volume" + format_muted = "♪ muted (%volume)" + } + '' + } + ''; } diff --git a/tests/modules/programs/i3status/with-default.nix b/tests/modules/programs/i3status/with-default.nix index d56ecc205..735dad1f0 100644 --- a/tests/modules/programs/i3status/with-default.nix +++ b/tests/modules/programs/i3status/with-default.nix @@ -1,71 +1,63 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.i3status = { - enable = true; - enableDefault = true; - }; - - test.stubs.i3status = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/i3status/config \ - ${ - pkgs.writeText "i3status-expected-config" '' - general { - colors = true - interval = 5 - } - - order += "ipv6" - order += "wireless _first_" - order += "ethernet _first_" - order += "battery all" - order += "disk /" - order += "load" - order += "memory" - order += "tztime local" - battery all { - format = "%status %percentage %remaining" - } - - disk / { - format = "%avail" - } - - ethernet _first_ { - format_down = "E: down" - format_up = "E: %ip (%speed)" - } - - ipv6 { - - } - - load { - format = "%1min" - } - - memory { - format = "%used | %available" - format_degraded = "MEMORY < %available" - threshold_degraded = "1G" - } - - tztime local { - format = "%Y-%m-%d %H:%M:%S" - } - - wireless _first_ { - format_down = "W: down" - format_up = "W: (%quality at %essid) %ip" - } - '' - } - ''; + programs.i3status = { + enable = true; + enableDefault = true; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/i3status/config \ + ${ + builtins.toFile "i3status-expected-config" '' + general { + colors = true + interval = 5 + } + + order += "ipv6" + order += "wireless _first_" + order += "ethernet _first_" + order += "battery all" + order += "disk /" + order += "load" + order += "memory" + order += "tztime local" + battery all { + format = "%status %percentage %remaining" + } + + disk / { + format = "%avail" + } + + ethernet _first_ { + format_down = "E: down" + format_up = "E: %ip (%speed)" + } + + ipv6 { + + } + + load { + format = "%1min" + } + + memory { + format = "%used | %available" + format_degraded = "MEMORY < %available" + threshold_degraded = "1G" + } + + tztime local { + format = "%Y-%m-%d %H:%M:%S" + } + + wireless _first_ { + format_down = "W: down" + format_up = "W: (%quality at %essid) %ip" + } + '' + } + ''; } diff --git a/tests/modules/programs/irssi/example-settings.nix b/tests/modules/programs/irssi/example-settings.nix index f279b03c8..bec6699a9 100644 --- a/tests/modules/programs/irssi/example-settings.nix +++ b/tests/modules/programs/irssi/example-settings.nix @@ -1,31 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.irssi = { - enable = true; - networks.oftc = { - nick = "nick"; - saslExternal = true; - server = { - address = "irc.oftc.net"; - port = 6697; - autoConnect = true; - ssl.certificateFile = - "${config.home.homeDirectory}/.irssi/certs/nick.pem"; - }; - channels.home-manager.autoJoin = true; + programs.irssi = { + enable = true; + networks.oftc = { + nick = "nick"; + saslExternal = true; + server = { + address = "irc.oftc.net"; + port = 6697; + autoConnect = true; + ssl.certificateFile = + "${config.home.homeDirectory}/.irssi/certs/nick.pem"; }; + channels.home-manager.autoJoin = true; }; - - test.stubs.irssi = { }; - - nmt.script = '' - assertFileContent \ - home-files/.irssi/config \ - ${./example-settings-expected.config} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.irssi/config \ + ${./example-settings-expected.config} + ''; } diff --git a/tests/modules/programs/joplin-desktop/basic-configuration.nix b/tests/modules/programs/joplin-desktop/basic-configuration.nix index 9f986798f..361e6f5d9 100644 --- a/tests/modules/programs/joplin-desktop/basic-configuration.nix +++ b/tests/modules/programs/joplin-desktop/basic-configuration.nix @@ -11,8 +11,6 @@ }; }; - test.stubs.joplin-desktop = { }; - nmt.script = '' assertFileContains activate \ '/home/hm-user/.config/joplin-desktop/settings.json' diff --git a/tests/modules/programs/jqp/basic-configuration.nix b/tests/modules/programs/jqp/basic-configuration.nix new file mode 100644 index 000000000..23b79310a --- /dev/null +++ b/tests/modules/programs/jqp/basic-configuration.nix @@ -0,0 +1,14 @@ +{ + programs = { + jqp = { + enable = true; + settings = { theme.name = "catppuccin-frappe"; }; + }; + }; + + nmt.script = '' + assertFileExists home-files/.jqp.yaml + assertFileContent home-files/.jqp.yaml \ + ${./basic-configuration.yaml} + ''; +} diff --git a/tests/modules/programs/jqp/basic-configuration.yaml b/tests/modules/programs/jqp/basic-configuration.yaml new file mode 100644 index 000000000..57f744234 --- /dev/null +++ b/tests/modules/programs/jqp/basic-configuration.yaml @@ -0,0 +1,2 @@ +theme: + name: catppuccin-frappe diff --git a/tests/modules/programs/jqp/default.nix b/tests/modules/programs/jqp/default.nix new file mode 100644 index 000000000..3ab8e24cb --- /dev/null +++ b/tests/modules/programs/jqp/default.nix @@ -0,0 +1 @@ +{ jqp-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/programs/jujutsu/empty-config.nix b/tests/modules/programs/jujutsu/empty-config.nix index 55b5d87e8..27a1c393e 100644 --- a/tests/modules/programs/jujutsu/empty-config.nix +++ b/tests/modules/programs/jujutsu/empty-config.nix @@ -6,8 +6,6 @@ let in { programs.jujutsu.enable = true; - test.stubs.jujutsu = { }; - nmt.script = '' assertPathNotExists 'home-files/${configDir}/jj/config.toml' ''; diff --git a/tests/modules/programs/k9s/deprecated-options.nix b/tests/modules/programs/k9s/deprecated-options.nix index a2bf4685a..97f779c3d 100644 --- a/tests/modules/programs/k9s/deprecated-options.nix +++ b/tests/modules/programs/k9s/deprecated-options.nix @@ -1,4 +1,6 @@ -{ config, lib, options, ... }: { +{ lib, options, ... }: + +{ programs.k9s = { enable = true; skin = { @@ -16,8 +18,6 @@ }; }; - test.stubs.k9s = { }; - test.asserts.warnings.enable = true; test.asserts.warnings.expected = [ "The option `programs.k9s.skin' defined in ${ diff --git a/tests/modules/programs/k9s/empty-settings.nix b/tests/modules/programs/k9s/empty-settings.nix index 355340054..05f859ee2 100644 --- a/tests/modules/programs/k9s/empty-settings.nix +++ b/tests/modules/programs/k9s/empty-settings.nix @@ -1,10 +1,9 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: +{ programs.k9s.enable = true; - xdg.enable = lib.mkIf pkgs.stdenv.isDarwin (lib.mkForce false); - - test.stubs.k9s = { }; + xdg.enable = lib.mkIf pkgs.stdenv.isDarwin false; nmt.script = let configDir = if !pkgs.stdenv.isDarwin then diff --git a/tests/modules/programs/k9s/example-settings.nix b/tests/modules/programs/k9s/example-settings.nix index 0000d81da..65d624e93 100644 --- a/tests/modules/programs/k9s/example-settings.nix +++ b/tests/modules/programs/k9s/example-settings.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - xdg.enable = lib.mkIf pkgs.stdenv.isDarwin (lib.mkForce false); + xdg.enable = lib.mkIf pkgs.stdenv.isDarwin false; programs.k9s = { enable = true; diff --git a/tests/modules/programs/k9s/partial-skin-settings.nix b/tests/modules/programs/k9s/partial-skin-settings.nix index ba2a61ce5..84fee27ec 100644 --- a/tests/modules/programs/k9s/partial-skin-settings.nix +++ b/tests/modules/programs/k9s/partial-skin-settings.nix @@ -1,5 +1,3 @@ -{ config, ... }: - # When not specified in `programs.k9s.settings.ui.skin`, # test that the first skin name (alphabetically) is used in the config file @@ -44,8 +42,6 @@ }; }; - test.stubs.k9s = { }; - nmt.script = '' assertFileExists home-files/.config/k9s/config.yaml assertFileContent \ diff --git a/tests/modules/programs/kakoune/no-plugins.nix b/tests/modules/programs/kakoune/no-plugins.nix index d1505751b..372491b1b 100644 --- a/tests/modules/programs/kakoune/no-plugins.nix +++ b/tests/modules/programs/kakoune/no-plugins.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ./stubs.nix ]; diff --git a/tests/modules/programs/kakoune/stubs.nix b/tests/modules/programs/kakoune/stubs.nix index 28a816418..bcfed4053 100644 --- a/tests/modules/programs/kakoune/stubs.nix +++ b/tests/modules/programs/kakoune/stubs.nix @@ -1,12 +1,22 @@ { - test.stubs.kakoune-unwrapped = { - name = "dummy-kakoune"; - version = "1"; - outPath = null; - buildScript = '' - mkdir -p $out/bin $out/share/kak/doc - touch $out/bin/kak - chmod +x $out/bin/kak - ''; + test.stubs = { + kakoune-test-plugin = { + outPath = null; + buildScript = '' + mkdir -p $out/share/kak/autoload/plugins + touch $out/share/kak/autoload/plugins/kakoune-test-plugin + ''; + }; + + kakoune-unwrapped = { + name = "dummy-kakoune"; + version = "1"; + outPath = null; + buildScript = '' + mkdir -p $out/bin $out/share/kak/doc + touch $out/bin/kak + chmod +x $out/bin/kak + ''; + }; }; } diff --git a/tests/modules/programs/kakoune/use-plugins.nix b/tests/modules/programs/kakoune/use-plugins.nix index de7b3a123..12719d55c 100644 --- a/tests/modules/programs/kakoune/use-plugins.nix +++ b/tests/modules/programs/kakoune/use-plugins.nix @@ -1,13 +1,11 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { imports = [ ./stubs.nix ]; programs.kakoune = { enable = true; - plugins = [ pkgs.kakounePlugins.prelude-kak ]; + plugins = [ pkgs.kakoune-test-plugin ]; }; nmt.script = '' diff --git a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix index 4beb4b9e5..4e7d9aa31 100644 --- a/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix +++ b/tests/modules/programs/kakoune/whitespace-highlighter-corner-cases.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ./stubs.nix ]; diff --git a/tests/modules/programs/kakoune/whitespace-highlighter.nix b/tests/modules/programs/kakoune/whitespace-highlighter.nix index 1c80fe5f2..7923906bd 100644 --- a/tests/modules/programs/kakoune/whitespace-highlighter.nix +++ b/tests/modules/programs/kakoune/whitespace-highlighter.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, ... }: { imports = [ ./stubs.nix ]; diff --git a/tests/modules/programs/khal/config.nix b/tests/modules/programs/khal/config.nix index c4a359458..2493e6fc2 100644 --- a/tests/modules/programs/khal/config.nix +++ b/tests/modules/programs/khal/config.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.khal = { enable = true; @@ -8,8 +6,8 @@ view.agenda_event_format = "{calendar-color}{cancelled}{start-end-time-style} {title}{repeat-symbol}{reset}"; }; - }; + accounts.calendar = { basePath = "$XDG_CONFIG_HOME/cal"; accounts = { @@ -91,8 +89,6 @@ }; }; - test.stubs = { khal = { }; }; - nmt.script = '' configFile=home-files/.config/khal/config assertFileExists $configFile diff --git a/tests/modules/programs/khard/basic_config.nix b/tests/modules/programs/khard/basic_config.nix index f6f0838c7..41a65dbe9 100644 --- a/tests/modules/programs/khard/basic_config.nix +++ b/tests/modules/programs/khard/basic_config.nix @@ -24,8 +24,6 @@ }; }; - test.stubs.khard = { }; - nmt.script = '' assertFileContent \ home-files/.config/khard/khard.conf \ diff --git a/tests/modules/programs/khard/dirty_path.nix b/tests/modules/programs/khard/dirty_path.nix index 07396a144..8256a73cf 100644 --- a/tests/modules/programs/khard/dirty_path.nix +++ b/tests/modules/programs/khard/dirty_path.nix @@ -12,8 +12,6 @@ programs.khard.enable = true; - test.stubs.khard = { }; - nmt.script = '' assertFileContent \ home-files/.config/khard/khard.conf \ diff --git a/tests/modules/programs/khard/empty_config.nix b/tests/modules/programs/khard/empty_config.nix index 9d19d11c9..dc4247d76 100644 --- a/tests/modules/programs/khard/empty_config.nix +++ b/tests/modules/programs/khard/empty_config.nix @@ -9,8 +9,6 @@ programs.khard.enable = true; - test.stubs.khard = { }; - nmt.script = '' assertFileContent \ home-files/.config/khard/khard.conf \ diff --git a/tests/modules/programs/khard/multiple_accounts.nix b/tests/modules/programs/khard/multiple_accounts.nix index 393510bf8..56ed82ab1 100644 --- a/tests/modules/programs/khard/multiple_accounts.nix +++ b/tests/modules/programs/khard/multiple_accounts.nix @@ -13,8 +13,6 @@ programs.khard.enable = true; - test.stubs.khard = { }; - nmt.script = '' assertFileContent \ home-files/.config/khard/khard.conf \ diff --git a/tests/modules/programs/kitty/default.nix b/tests/modules/programs/kitty/default.nix index 76016d516..054353e43 100644 --- a/tests/modules/programs/kitty/default.nix +++ b/tests/modules/programs/kitty/default.nix @@ -1,4 +1,5 @@ { kitty-example-settings = ./example-settings.nix; kitty-theme-to-themeFile = ./theme-to-themeFile.nix; + kitty-null-shellIntegration = ./null-shellIntegration.nix; } diff --git a/tests/modules/programs/kitty/example-settings-expected.conf b/tests/modules/programs/kitty/example-settings-expected.conf index 41a9cb772..b52d34d44 100644 --- a/tests/modules/programs/kitty/example-settings-expected.conf +++ b/tests/modules/programs/kitty/example-settings-expected.conf @@ -12,6 +12,9 @@ enable_audio_bell no scrollback_lines 10000 update_check_interval 0 +action_alias launch_tab launch --cwd=current --type=tab +action_alias launch_window launch --cwd=current --type=os-window + map ctrl+c copy_or_interrupt map ctrl+f>2 set_font_size 20 diff --git a/tests/modules/programs/kitty/example-settings.nix b/tests/modules/programs/kitty/example-settings.nix index 8f2e0b894..cd7a9a327 100644 --- a/tests/modules/programs/kitty/example-settings.nix +++ b/tests/modules/programs/kitty/example-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ lib, pkgs, ... }: { config = { programs.kitty = { enable = true; @@ -28,11 +24,14 @@ with lib; "ctrl+f>2" = "set_font_size 20"; }; + actionAliases = { + "launch_tab" = "launch --cwd=current --type=tab"; + "launch_window" = "launch --cwd=current --type=os-window"; + }; + environment = { LS_COLORS = "1"; }; }; - test.stubs.kitty = { }; - nmt.script = '' assertFileExists home-files/.config/kitty/kitty.conf assertFileContent \ diff --git a/tests/modules/programs/kitty/null-shellIntegration-expected.conf b/tests/modules/programs/kitty/null-shellIntegration-expected.conf new file mode 100644 index 000000000..75386d91e --- /dev/null +++ b/tests/modules/programs/kitty/null-shellIntegration-expected.conf @@ -0,0 +1,9 @@ +# Generated by Home Manager. +# See https://sw.kovidgoyal.net/kitty/conf.html + + + + + + + diff --git a/tests/modules/programs/kitty/null-shellIntegration.nix b/tests/modules/programs/kitty/null-shellIntegration.nix new file mode 100644 index 000000000..0346ee92b --- /dev/null +++ b/tests/modules/programs/kitty/null-shellIntegration.nix @@ -0,0 +1,18 @@ +{ + config = { + programs.kitty = { + enable = true; + + shellIntegration.mode = null; + }; + + test.stubs.kitty = { }; + + nmt.script = '' + assertFileExists home-files/.config/kitty/kitty.conf + assertFileContent \ + home-files/.config/kitty/kitty.conf \ + ${./null-shellIntegration-expected.conf} + ''; + }; +} diff --git a/tests/modules/programs/kitty/theme-to-themeFile.nix b/tests/modules/programs/kitty/theme-to-themeFile.nix index 84596bba9..988076670 100644 --- a/tests/modules/programs/kitty/theme-to-themeFile.nix +++ b/tests/modules/programs/kitty/theme-to-themeFile.nix @@ -1,24 +1,24 @@ -{ config, lib, pkgs, options, ... }: { - config = { - programs.kitty = { - enable = true; - theme = "Space Gray Eighties"; - }; +{ lib, options, realPkgs, ... }: - test.stubs.kitty = { }; - - test.asserts.warnings.enable = true; - test.asserts.warnings.expected = [ - ("The option `programs.kitty.theme' defined in ${ - lib.showFiles options.programs.kitty.theme.files - } has been changed to `programs.kitty.themeFile' that has a different" - + " type. Please read `programs.kitty.themeFile' documentation and" - + " update your configuration accordingly.") - ]; - - nmt.script = '' - assertFileExists home-files/.config/kitty/kitty.conf - assertFileRegex home-files/.config/kitty/kitty.conf "^include .*themes/SpaceGray_Eighties\.conf$" - ''; +{ + programs.kitty = { + enable = true; + theme = "Space Gray Eighties"; }; + + test.asserts.warnings.enable = true; + test.asserts.warnings.expected = [ + ("The option `programs.kitty.theme' defined in ${ + lib.showFiles options.programs.kitty.theme.files + } has been changed to `programs.kitty.themeFile' that has a different" + + " type. Please read `programs.kitty.themeFile' documentation and" + + " update your configuration accordingly.") + ]; + + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) kitty-themes; }) ]; + + nmt.script = '' + assertFileExists home-files/.config/kitty/kitty.conf + assertFileRegex home-files/.config/kitty/kitty.conf "^include .*themes/SpaceGray_Eighties\.conf$" + ''; } diff --git a/tests/modules/programs/kodi/example-addon-settings.nix b/tests/modules/programs/kodi/example-addon-settings.nix index c591d1ae3..da16965d0 100644 --- a/tests/modules/programs/kodi/example-addon-settings.nix +++ b/tests/modules/programs/kodi/example-addon-settings.nix @@ -1,6 +1,8 @@ { config, ... }: { + imports = [ ./kodi-stubs.nix ]; + programs.kodi = { enable = true; package = config.lib.test.mkStubPackage { }; diff --git a/tests/modules/programs/kodi/example-settings.nix b/tests/modules/programs/kodi/example-settings.nix index bdb48268a..74dd4a830 100644 --- a/tests/modules/programs/kodi/example-settings.nix +++ b/tests/modules/programs/kodi/example-settings.nix @@ -1,10 +1,8 @@ -{ config, ... }: - { + imports = [ ./kodi-stubs.nix ]; + programs.kodi = { enable = true; - package = config.lib.test.mkStubPackage { }; - settings = { videolibrary.showemptytvshows = "true"; }; }; diff --git a/tests/modules/programs/kodi/example-sources.nix b/tests/modules/programs/kodi/example-sources.nix index f49b50001..b06c92767 100644 --- a/tests/modules/programs/kodi/example-sources.nix +++ b/tests/modules/programs/kodi/example-sources.nix @@ -1,10 +1,8 @@ -{ config, ... }: - { + imports = [ ./kodi-stubs.nix ]; + programs.kodi = { enable = true; - package = config.lib.test.mkStubPackage { }; - sources = { video = { default = "movies"; @@ -22,7 +20,6 @@ ]; }; }; - }; nmt.script = '' diff --git a/tests/modules/programs/kodi/kodi-stubs.nix b/tests/modules/programs/kodi/kodi-stubs.nix new file mode 100644 index 000000000..b45a6e50b --- /dev/null +++ b/tests/modules/programs/kodi/kodi-stubs.nix @@ -0,0 +1,10 @@ +{ realPkgs, ... }: + +{ + nixpkgs.overlays = [ + (_: super: { + buildPackages = + super.buildPackages.extend (_: _: { inherit (realPkgs) libxslt; }); + }) + ]; +} diff --git a/tests/modules/programs/kubecolor/empty-config.nix b/tests/modules/programs/kubecolor/empty-config.nix index 732321c50..f88d334b0 100644 --- a/tests/modules/programs/kubecolor/empty-config.nix +++ b/tests/modules/programs/kubecolor/empty-config.nix @@ -12,8 +12,6 @@ in { }; }; - test.stubs.kubecolor = { }; - nmt.script = '' assertPathNotExists 'home-files/${configDir}/kube/color.yaml' ''; diff --git a/tests/modules/programs/lapce/default.nix b/tests/modules/programs/lapce/default.nix new file mode 100644 index 000000000..21726024d --- /dev/null +++ b/tests/modules/programs/lapce/default.nix @@ -0,0 +1,4 @@ +{ + lapce-example-keymaps = ./example-keymaps.nix; + lapce-example-settings = ./example-settings.nix; +} diff --git a/tests/modules/programs/lapce/example-keymaps-expected.toml b/tests/modules/programs/lapce/example-keymaps-expected.toml new file mode 100644 index 000000000..26d4403c4 --- /dev/null +++ b/tests/modules/programs/lapce/example-keymaps-expected.toml @@ -0,0 +1,3 @@ +[[keymaps]] +command = "open_log_file" +key = "Ctrl+Shift+L" diff --git a/tests/modules/programs/lapce/example-keymaps.nix b/tests/modules/programs/lapce/example-keymaps.nix new file mode 100644 index 000000000..bf6f0a76e --- /dev/null +++ b/tests/modules/programs/lapce/example-keymaps.nix @@ -0,0 +1,18 @@ +{ config, ... }: + +{ + programs.lapce = { + enable = true; + package = config.lib.test.mkStubPackage { }; + keymaps = [{ + command = "open_log_file"; + key = "Ctrl+Shift+L"; + }]; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/lapce-stable/keymaps.toml \ + ${./example-keymaps-expected.toml} + ''; +} diff --git a/tests/modules/programs/lapce/example-settings-expected.toml b/tests/modules/programs/lapce/example-settings-expected.toml new file mode 100644 index 000000000..e279a54a6 --- /dev/null +++ b/tests/modules/programs/lapce/example-settings-expected.toml @@ -0,0 +1,17 @@ +[core] +color-theme = "Custom" +custom-titlebar = false +icon-theme = "Material Icons" + +[editor] +bracket-pair-colorization = true +cursor-surrounding-lines = 4 +font-family = "FiraCode Nerd Bold Font, monospace" +font-size = 22 +highlight-matching-brackets = true +render-whitespace = "all" +tab-width = 2 + +[ui] +font-size = 20 +open-editors-visible = false diff --git a/tests/modules/programs/lapce/example-settings.nix b/tests/modules/programs/lapce/example-settings.nix new file mode 100644 index 000000000..4851ef391 --- /dev/null +++ b/tests/modules/programs/lapce/example-settings.nix @@ -0,0 +1,34 @@ +{ config, ... }: + +{ + programs.lapce = { + enable = true; + package = config.lib.test.mkStubPackage { }; + settings = { + core = { + custom-titlebar = false; + color-theme = "Custom"; + icon-theme = "Material Icons"; + }; + editor = { + font-family = "FiraCode Nerd Bold Font, monospace"; + font-size = 22; + tab-width = 2; + cursor-surrounding-lines = 4; + render-whitespace = "all"; + bracket-pair-colorization = true; + highlight-matching-brackets = true; + }; + ui = { + font-size = 20; + open-editors-visible = false; + }; + }; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/lapce-stable/settings.toml \ + ${./example-settings-expected.toml} + ''; +} diff --git a/tests/modules/programs/ledger/ledger.nix b/tests/modules/programs/ledger/ledger.nix index f120a654d..7a1f9e415 100644 --- a/tests/modules/programs/ledger/ledger.nix +++ b/tests/modules/programs/ledger/ledger.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.ledger = { enable = true; @@ -17,8 +15,6 @@ }; }; - test.stubs.ledger = { }; - nmt.script = '' assertFileContent home-files/.config/ledger/ledgerrc \ ${builtins.toFile "ledger-expected-settings" '' diff --git a/tests/modules/programs/less/less-with-custom-keys.nix b/tests/modules/programs/less/less-with-custom-keys.nix index 23d447189..4e9b4197d 100644 --- a/tests/modules/programs/less/less-with-custom-keys.nix +++ b/tests/modules/programs/less/less-with-custom-keys.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { programs.less = { enable = true; @@ -12,8 +8,6 @@ with lib; ''; }; - test.stubs.less = { }; - nmt.script = '' assertFileExists home-files/.config/lesskey assertFileContent home-files/.config/lesskey ${ diff --git a/tests/modules/programs/lesspipe/lesspipe.nix b/tests/modules/programs/lesspipe/lesspipe.nix index 70dcc954b..44f642466 100644 --- a/tests/modules/programs/lesspipe/lesspipe.nix +++ b/tests/modules/programs/lesspipe/lesspipe.nix @@ -1,8 +1,6 @@ { programs.lesspipe.enable = true; - test.stubs.lesspipe = { }; - nmt.script = '' assertFileContains home-path/etc/profile.d/hm-session-vars.sh \ 'export LESSOPEN="|@lesspipe@/bin/lesspipe.sh %s"' diff --git a/tests/modules/programs/lf/all-options.nix b/tests/modules/programs/lf/all-options.nix index 9632e7cf6..644959b3f 100644 --- a/tests/modules/programs/lf/all-options.nix +++ b/tests/modules/programs/lf/all-options.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - let pvScript = builtins.toFile "pv.sh" "cat $1"; expected = builtins.toFile "settings-expected" '' @@ -33,53 +29,49 @@ let ''; in { - config = { - programs.lf = { - enable = true; + programs.lf = { + enable = true; - cmdKeybindings = { - "" = "should-be-added"; - "" = null; - }; - - commands = { - added = '':echo "foo"''; - removed = null; - multiline = '' - :{{ - push gg - echo "bar" - push i - }}''; - }; - - extraConfig = '' - # More config... - ''; - - keybindings = { - aa = "should-be-added"; - ab = null; - }; - - previewer = { - keybinding = "i"; - source = pvScript; - }; - - settings = { - ignorecase = false; - icons = true; - tabstop = 4; - ratios = [ 2 2 3 ]; - }; + cmdKeybindings = { + "" = "should-be-added"; + "" = null; }; - test.stubs.lf = { }; + commands = { + added = '':echo "foo"''; + removed = null; + multiline = '' + :{{ + push gg + echo "bar" + push i + }}''; + }; - nmt.script = '' - assertFileExists home-files/.config/lf/lfrc - assertFileContent home-files/.config/lf/lfrc ${expected} + extraConfig = '' + # More config... ''; + + keybindings = { + aa = "should-be-added"; + ab = null; + }; + + previewer = { + keybinding = "i"; + source = pvScript; + }; + + settings = { + ignorecase = false; + icons = true; + tabstop = 4; + ratios = [ 2 2 3 ]; + }; }; + + nmt.script = '' + assertFileExists home-files/.config/lf/lfrc + assertFileContent home-files/.config/lf/lfrc ${expected} + ''; } diff --git a/tests/modules/programs/lf/minimal-options.nix b/tests/modules/programs/lf/minimal-options.nix index 078c776e7..c90382862 100644 --- a/tests/modules/programs/lf/minimal-options.nix +++ b/tests/modules/programs/lf/minimal-options.nix @@ -1,17 +1,10 @@ -{ config, lib, pkgs, ... }: +{ + programs.lf = { enable = true; }; -with lib; - -let expected = builtins.toFile "settings-expected" "\n\n\n\n\n\n\n\n\n\n\n"; -in { - config = { - programs.lf = { enable = true; }; - - test.stubs.lf = { }; - - nmt.script = '' + nmt.script = + let expected = builtins.toFile "settings-expected" "\n\n\n\n\n\n\n\n\n\n\n"; + in '' assertFileExists home-files/.config/lf/lfrc assertFileContent home-files/.config/lf/lfrc ${expected} ''; - }; } diff --git a/tests/modules/programs/lf/no-pv-keybind.nix b/tests/modules/programs/lf/no-pv-keybind.nix index c948cf0b5..c290f3e6d 100644 --- a/tests/modules/programs/lf/no-pv-keybind.nix +++ b/tests/modules/programs/lf/no-pv-keybind.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - let pvScript = builtins.toFile "pv.sh" "cat $1"; expected = builtins.toFile "settings-expected" '' @@ -21,22 +17,18 @@ let ''; in { - config = { - programs.lf = { - enable = true; + programs.lf = { + enable = true; - extraConfig = '' - # More config... - ''; - - previewer = { source = pvScript; }; - }; - - test.stubs.lf = { }; - - nmt.script = '' - assertFileExists home-files/.config/lf/lfrc - assertFileContent home-files/.config/lf/lfrc ${expected} + extraConfig = '' + # More config... ''; + + previewer = { source = pvScript; }; }; + + nmt.script = '' + assertFileExists home-files/.config/lf/lfrc + assertFileContent home-files/.config/lf/lfrc ${expected} + ''; } diff --git a/tests/modules/programs/lieer/lieer.nix b/tests/modules/programs/lieer/lieer.nix index 5e7847464..e6786c92d 100644 --- a/tests/modules/programs/lieer/lieer.nix +++ b/tests/modules/programs/lieer/lieer.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; config = { diff --git a/tests/modules/programs/looking-glass-client/empty-settings.nix b/tests/modules/programs/looking-glass-client/empty-settings.nix index 10c177a9e..5b2a8b9c4 100644 --- a/tests/modules/programs/looking-glass-client/empty-settings.nix +++ b/tests/modules/programs/looking-glass-client/empty-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.looking-glass-client = { enable = true; diff --git a/tests/modules/programs/looking-glass-client/example-settings.nix b/tests/modules/programs/looking-glass-client/example-settings.nix index 6ac8f0185..c85701580 100644 --- a/tests/modules/programs/looking-glass-client/example-settings.nix +++ b/tests/modules/programs/looking-glass-client/example-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.looking-glass-client = { enable = true; diff --git a/tests/modules/programs/lsd/example-icons-expected.yaml b/tests/modules/programs/lsd/example-icons-expected.yaml new file mode 100644 index 000000000..a640b3bc7 --- /dev/null +++ b/tests/modules/programs/lsd/example-icons-expected.yaml @@ -0,0 +1,9 @@ +extension: + go:  + hs:  +filetype: + dir: 📂 + file: 📄 +name: + .cargo:  + .trash:  diff --git a/tests/modules/programs/lsd/example-settings.nix b/tests/modules/programs/lsd/example-settings.nix index f9217a098..f911e22f8 100644 --- a/tests/modules/programs/lsd/example-settings.nix +++ b/tests/modules/programs/lsd/example-settings.nix @@ -1,44 +1,54 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.lsd = { - enable = true; - enableAliases = false; - settings = { - date = "relative"; - blocks = [ "date" "size" "name" ]; - layout = "oneline"; - sorting.dir-grouping = "first"; - ignore-globs = [ ".git" ".hg" ".bsp" ]; + programs.lsd = { + enable = true; + enableAliases = false; + settings = { + date = "relative"; + blocks = [ "date" "size" "name" ]; + layout = "oneline"; + sorting.dir-grouping = "first"; + ignore-globs = [ ".git" ".hg" ".bsp" ]; + }; + colors = { + date = { + day-old = "green"; + older = "dark_green"; }; - colors = { - date = { - day-old = "green"; - older = "dark_green"; - }; - size = { - none = "grey"; - small = "grey"; - medium = "yellow"; - large = "dark_yellow"; - }; + size = { + none = "grey"; + small = "grey"; + medium = "yellow"; + large = "dark_yellow"; + }; + }; + icons = { + name = { + ".trash" = ""; + ".cargo" = ""; + }; + extension = { + "go" = ""; + "hs" = ""; + }; + filetype = { + "dir" = "📂"; + "file" = "📄"; }; }; - - test.stubs.lsd = { }; - - nmt.script = '' - assertFileExists home-files/.config/lsd/config.yaml - assertFileExists home-files/.config/lsd/colors.yaml - assertFileContent \ - home-files/.config/lsd/config.yaml \ - ${./example-settings-expected.yaml} - assertFileContent \ - home-files/.config/lsd/colors.yaml \ - ${./example-colors-expected.yaml} - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/lsd/config.yaml + assertFileExists home-files/.config/lsd/colors.yaml + assertFileExists home-files/.config/lsd/icons.yaml + assertFileContent \ + home-files/.config/lsd/config.yaml \ + ${./example-settings-expected.yaml} + assertFileContent \ + home-files/.config/lsd/colors.yaml \ + ${./example-colors-expected.yaml} + assertFileContent \ + home-files/.config/lsd/icons.yaml \ + ${./example-icons-expected.yaml} + ''; } diff --git a/tests/modules/programs/man/apropos.nix b/tests/modules/programs/man/apropos.nix index a8ec35ead..ee30f8f8c 100644 --- a/tests/modules/programs/man/apropos.nix +++ b/tests/modules/programs/man/apropos.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.man = { diff --git a/tests/modules/programs/man/no-manpath.nix b/tests/modules/programs/man/no-manpath.nix index 1b8cfb40c..dc3a3a0cb 100644 --- a/tests/modules/programs/man/no-manpath.nix +++ b/tests/modules/programs/man/no-manpath.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.man = { enable = true; }; diff --git a/tests/modules/programs/mangohud/basic-configuration.conf b/tests/modules/programs/mangohud/basic-configuration.conf index 8ded2dbc0..87ecec5d6 100644 --- a/tests/modules/programs/mangohud/basic-configuration.conf +++ b/tests/modules/programs/mangohud/basic-configuration.conf @@ -6,7 +6,7 @@ cpu_stats cpu_temp cpu_text=CPU fps_limit=30,60 -legacy_layout=false +legacy_layout=0 media_player_name=spotify media_player_order=title,artist,album output_folder=/home/user/Documents/mangohud diff --git a/tests/modules/programs/mbsync/mbsync-master-slave-change.nix b/tests/modules/programs/mbsync/mbsync-master-slave-change.nix deleted file mode 100644 index c6861374b..000000000 --- a/tests/modules/programs/mbsync/mbsync-master-slave-change.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - imports = [ ../../accounts/email-test-accounts.nix ]; - - test.asserts.warnings.expected = [ - "mbsync channels no longer use masterPattern. Use farPattern in its place." - "mbsync channels no longer use slavePattern. Use nearPattern in its place." - ]; - - config = { - programs.mbsync = { - enable = true; - # programs.mbsync.groups and - # accounts.email.accounts..mbsync.groups should NOT be used at the - # same time. - # If they are, then the new version will take precedence. - groups.inboxes = { - "hm@example.com" = [ "Inbox1" "Inbox2" ]; - hm-account = [ "Inbox" ]; - }; - }; - - accounts.email.accounts = { - "hm@example.com".mbsync = { - enable = true; - groups.inboxes = { - channels = { - inbox1 = { - farPattern = "Inbox1"; - nearPattern = "Inboxes"; - }; - inbox2 = { - farPattern = "Inbox2"; - nearPattern = "Inboxes"; - }; - }; - }; - }; - - hm-account.mbsync = { - enable = true; - groups.hm-account = { - channels.earlierPatternMatch = { - farPattern = "Label"; - nearPattern = "SomethingUnderLabel"; - patterns = [ - "ThingUnderLabel" - "!NotThisMaildirThough" - ''"[Weird] Label?"'' - ]; - }; - channels.inbox = { - farPattern = "Inbox"; - nearPattern = "Inbox"; - }; - channels.strangeHostBoxName = { - farPattern = "[Weird]/Label Mess"; - nearPattern = "[AnotherWeird]/Label"; - }; - channels.patternMatch = { - farPattern = "Label"; - nearPattern = "SomethingUnderLabel"; - patterns = [ - "ThingUnderLabel" - "!NotThisMaildirThough" - ''"[Weird] Label?"'' - ]; - }; - }; - # No group should be printed. - groups.emptyGroup = { }; - # Group should be printed, but left with default channels. - groups.emptyChannels = { - channels.empty1 = { }; - channels.empty2 = { }; - }; - }; - }; - - test.asserts.warnings.expected = [ - "mbsync channels no longer use masterPattern. use farPattern in its place." - "mbsync channels no longer use slavePattern. Use nearPattern in its place." - ]; - - test.stubs.isync = { }; - - nmt.script = '' - assertFileExists home-files/.mbsyncrc - assertFileContent home-files/.mbsyncrc ${./mbsync-expected.conf} - ''; - }; -} diff --git a/tests/modules/programs/mbsync/mbsync.nix b/tests/modules/programs/mbsync/mbsync.nix index 3880a313a..506c0073b 100644 --- a/tests/modules/programs/mbsync/mbsync.nix +++ b/tests/modules/programs/mbsync/mbsync.nix @@ -1,86 +1,72 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - programs.mbsync = { - enable = true; - # programs.mbsync.groups and - # accounts.email.accounts..mbsync.groups should NOT be used at the - # same time. - # If they are, then the new version will take precedence. - groups.inboxes = { - "hm@example.com" = [ "Inbox1" "Inbox2" ]; - hm-account = [ "Inbox" ]; - }; + programs.mbsync = { + enable = true; + # programs.mbsync.groups and + # accounts.email.accounts..mbsync.groups should NOT be used at the + # same time. + # If they are, then the new version will take precedence. + groups.inboxes = { + "hm@example.com" = [ "Inbox1" "Inbox2" ]; + hm-account = [ "Inbox" ]; }; - - accounts.email.accounts = { - "hm@example.com".mbsync = { - enable = true; - extraConfig.account.TLSVersions = [ "+1.3" "+1.2" "-1.1" ]; - groups.inboxes = { - channels = { - inbox1 = { - farPattern = "Inbox1"; - nearPattern = "Inboxes"; - }; - inbox2 = { - farPattern = "Inbox2"; - nearPattern = "Inboxes"; - }; - }; - }; - }; - - hm-account.mbsync = { - enable = true; - groups.hm-account = { - channels.earlierPatternMatch = { - farPattern = "Label"; - nearPattern = "SomethingUnderLabel"; - patterns = [ - "ThingUnderLabel" - "!NotThisMaildirThough" - ''"[Weird] Label?"'' - ]; - }; - channels.inbox = { - farPattern = "Inbox"; - nearPattern = "Inbox"; - }; - channels.strangeHostBoxName = { - farPattern = "[Weird]/Label Mess"; - nearPattern = "[AnotherWeird]/Label"; - }; - channels.patternMatch = { - farPattern = "Label"; - nearPattern = "SomethingUnderLabel"; - patterns = [ - "ThingUnderLabel" - "!NotThisMaildirThough" - ''"[Weird] Label?"'' - ]; - }; - }; - # No group should be printed. - groups.emptyGroup = { }; - # Group should be printed, but left with default channels. - groups.emptyChannels = { - channels.empty1 = { }; - channels.empty2 = { }; - }; - }; - }; - - test.stubs.isync = { }; - - nmt.script = '' - assertFileExists home-files/.config/isyncrc - assertFileContent home-files/.config/isyncrc ${./mbsync-expected.conf} - ''; }; + + accounts.email.accounts = { + "hm@example.com".mbsync = { + enable = true; + extraConfig.account.TLSVersions = [ "+1.3" "+1.2" "-1.1" ]; + groups.inboxes = { + channels = { + inbox1 = { + farPattern = "Inbox1"; + nearPattern = "Inboxes"; + }; + inbox2 = { + farPattern = "Inbox2"; + nearPattern = "Inboxes"; + }; + }; + }; + }; + + hm-account.mbsync = { + enable = true; + groups.hm-account = { + channels.earlierPatternMatch = { + farPattern = "Label"; + nearPattern = "SomethingUnderLabel"; + patterns = + [ "ThingUnderLabel" "!NotThisMaildirThough" ''"[Weird] Label?"'' ]; + }; + channels.inbox = { + farPattern = "Inbox"; + nearPattern = "Inbox"; + }; + channels.strangeHostBoxName = { + farPattern = "[Weird]/Label Mess"; + nearPattern = "[AnotherWeird]/Label"; + }; + channels.patternMatch = { + farPattern = "Label"; + nearPattern = "SomethingUnderLabel"; + patterns = + [ "ThingUnderLabel" "!NotThisMaildirThough" ''"[Weird] Label?"'' ]; + }; + }; + # No group should be printed. + groups.emptyGroup = { }; + # Group should be printed, but left with default channels. + groups.emptyChannels = { + channels.empty1 = { }; + channels.empty2 = { }; + }; + }; + }; + + nmt.script = '' + assertFileExists home-files/.config/isyncrc + assertFileContent home-files/.config/isyncrc ${./mbsync-expected.conf} + ''; } diff --git a/tests/modules/programs/micro/micro.nix b/tests/modules/programs/micro/micro.nix index 92ab90e83..74d589f9e 100644 --- a/tests/modules/programs/micro/micro.nix +++ b/tests/modules/programs/micro/micro.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.micro = { enable = true; @@ -10,8 +8,6 @@ }; }; - test.stubs.micro = { }; - nmt.script = '' assertFileContent home-files/.config/micro/settings.json \ ${builtins.toFile "micro-expected-settings.json" '' diff --git a/tests/modules/programs/mise/default.nix b/tests/modules/programs/mise/default.nix index 511082a12..402e32639 100644 --- a/tests/modules/programs/mise/default.nix +++ b/tests/modules/programs/mise/default.nix @@ -4,4 +4,5 @@ mise-bash-integration = ./bash-integration.nix; mise-zsh-integration = ./zsh-integration.nix; mise-fish-integration = ./fish-integration.nix; + mise-nushell-integration = ./nushell-integration.nix; } diff --git a/tests/modules/programs/mise/nushell-integration.nix b/tests/modules/programs/mise/nushell-integration.nix new file mode 100644 index 000000000..926df987e --- /dev/null +++ b/tests/modules/programs/mise/nushell-integration.nix @@ -0,0 +1,21 @@ +{ config, ... }: { + programs = { + mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; + enable = true; + enableNushellIntegration = true; + }; + + nushell.enable = true; + }; + + nmt.script = '' + assertFileContains home-files/.config/nushell/env.nu \ + ' + let mise_path = $nu.default-config-dir | path join mise.nu + ^mise activate nu | save $mise_path --force + ' + assertFileContains home-files/.config/nushell/config.nu \ + 'use ($nu.default-config-dir | path join mise.nu)' + ''; +} diff --git a/tests/modules/programs/mods/basic-configuration.nix b/tests/modules/programs/mods/basic-configuration.nix new file mode 100644 index 000000000..31b97276a --- /dev/null +++ b/tests/modules/programs/mods/basic-configuration.nix @@ -0,0 +1,22 @@ +{ config, pkgs, ... }: { + config = { + programs.mods = { + enable = true; + package = pkgs.writeScriptBin "dummy-mods" ""; + settings = { + default-model = "llama3.2"; + apis = { + ollama = { + base-url = "http://localhost:11434/api"; + models = { "llama3.2" = { max-input-chars = 650000; }; }; + }; + }; + }; + }; + nmt.script = '' + assertFileExists home-files/.config/mods/mods.yml + assertFileContent home-files/.config/mods/mods.yml \ + ${./basic-configuration.yml} + ''; + }; +} diff --git a/tests/modules/programs/mods/basic-configuration.yml b/tests/modules/programs/mods/basic-configuration.yml new file mode 100644 index 000000000..aec63e220 --- /dev/null +++ b/tests/modules/programs/mods/basic-configuration.yml @@ -0,0 +1,7 @@ +apis: + ollama: + base-url: http://localhost:11434/api + models: + llama3.2: + max-input-chars: 650000 +default-model: llama3.2 diff --git a/tests/modules/programs/mods/default.nix b/tests/modules/programs/mods/default.nix new file mode 100644 index 000000000..cf9909b1b --- /dev/null +++ b/tests/modules/programs/mods/default.nix @@ -0,0 +1 @@ +{ mods-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/programs/mpv/mpv-example-settings-expected-config b/tests/modules/programs/mpv/mpv-example-settings-expected-config index e44239096..4f4c3cd2d 100644 --- a/tests/modules/programs/mpv/mpv-example-settings-expected-config +++ b/tests/modules/programs/mpv/mpv-example-settings-expected-config @@ -11,3 +11,5 @@ vo=%5%vdpau alang=%2%en profile-desc=%26%profile for dvd:// streams + +include=manual.conf \ No newline at end of file diff --git a/tests/modules/programs/mpv/mpv-example-settings.nix b/tests/modules/programs/mpv/mpv-example-settings.nix index 002e071c1..972ccfdbc 100644 --- a/tests/modules/programs/mpv/mpv-example-settings.nix +++ b/tests/modules/programs/mpv/mpv-example-settings.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: { - imports = [ ./mpv-stubs.nix ]; - programs.mpv = { enable = true; @@ -16,6 +14,8 @@ # script-binding uosc/video #! Video tracks ''; + includes = [ "manual.conf" ]; + config = { force-window = true; ytdl-format = "bestvideo+bestaudio"; diff --git a/tests/modules/programs/mpv/mpv-invalid-settings.nix b/tests/modules/programs/mpv/mpv-invalid-settings.nix index 896e34fa7..9f661cdd4 100644 --- a/tests/modules/programs/mpv/mpv-invalid-settings.nix +++ b/tests/modules/programs/mpv/mpv-invalid-settings.nix @@ -1,14 +1,18 @@ { config, lib, pkgs, ... }: { - imports = [ ./mpv-stubs.nix ]; - programs.mpv = { enable = true; package = pkgs.emptyDirectory; scripts = [ pkgs.mpvScript ]; }; + test.stubs = { + mpv = { extraAttrs.override = { ... }: pkgs.emptyDirectory; }; + + mpvScript = { extraAttrs = { scriptName = "something"; }; }; + }; + test.asserts.assertions.expected = [ '' The programs.mpv "package" option is mutually exclusive with "scripts" option.'' diff --git a/tests/modules/programs/mpv/mpv-stubs.nix b/tests/modules/programs/mpv/mpv-stubs.nix deleted file mode 100644 index caef8e69d..000000000 --- a/tests/modules/programs/mpv/mpv-stubs.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - nixpkgs.overlays = [ - (final: prev: { - mpvScript = prev.runCommandLocal "mpvScript" { scriptName = "something"; } - "mkdir $out"; - - mpv-unwrapped = let - lua = prev.emptyDirectory.overrideAttrs { - luaversion = "0"; - passthru.withPackages = pkgsFn: prev.emptyDirectory; - }; - mpv-unwrapped' = prev.mpv-unwrapped.override { inherit lua; }; - in mpv-unwrapped'.overrideAttrs { - buildInputs = [ ]; - nativeBuildInputs = [ ]; - builder = prev.writeShellScript "dummy" '' - PATH=${final.coreutils}/bin - mkdir -p $dev $doc $man $out/bin $out/Applications/mpv.app/Contents/MacOS - touch $out/bin/{mpv,umpv} \ - $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle} - chmod +x $out/bin/{mpv,umpv} \ - $out/Applications/mpv.app/Contents/MacOS/{mpv,mpv-bundle} - ''; - }; - }) - ]; - - test.stubs = { yt-dlp = { }; }; -} diff --git a/tests/modules/programs/mu/basic-configuration.nix b/tests/modules/programs/mu/basic-configuration.nix index edca63a70..9c180e1d4 100644 --- a/tests/modules/programs/mu/basic-configuration.nix +++ b/tests/modules/programs/mu/basic-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ../../accounts/email-test-accounts.nix ]; @@ -12,13 +10,11 @@ programs.mu.enable = true; - test.stubs.mu = { name = "mu"; }; - nmt.script = '' assertFileContains activate \ 'if [[ ! -d "/home/hm-user/.cache/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then' assertFileContains activate \ - 'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;' + 'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --muhome "/home/hm-user/.cache/mu" --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;' ''; } diff --git a/tests/modules/programs/mu/custom-configuration.nix b/tests/modules/programs/mu/custom-configuration.nix new file mode 100644 index 000000000..dbaf3d18f --- /dev/null +++ b/tests/modules/programs/mu/custom-configuration.nix @@ -0,0 +1,23 @@ +{ config, ... }: { + imports = [ ../../accounts/email-test-accounts.nix ]; + + accounts.email.accounts = { + "hm@example.com" = { + mu.enable = true; + aliases = [ "foo@example.com" ]; + }; + }; + + programs.mu = { + enable = true; + home = config.xdg.dataHome + "/mu"; + }; + + nmt.script = '' + assertFileContains activate \ + 'if [[ ! -d "/home/hm-user/.local/share/mu" || ! "$MU_SORTED_ADDRS" = "foo@example.com hm@example.com" ]]; then' + + assertFileContains activate \ + 'run @mu@/bin/mu init --maildir=/home/hm-user/Mail --muhome "/home/hm-user/.local/share/mu" --my-address=foo@example.com --my-address=hm@example.com $VERBOSE_ARG;' + ''; +} diff --git a/tests/modules/programs/mu/default.nix b/tests/modules/programs/mu/default.nix index bdd8b1560..8d150aef3 100644 --- a/tests/modules/programs/mu/default.nix +++ b/tests/modules/programs/mu/default.nix @@ -1 +1,4 @@ -{ mu-basic-configuration = ./basic-configuration.nix; } +{ + mu-basic-configuration = ./basic-configuration.nix; + mu-custom-configuration = ./custom-configuration.nix; +} diff --git a/tests/modules/programs/mujmap/mujmap-defaults.nix b/tests/modules/programs/mujmap/mujmap-defaults.nix index 704978997..d1a71f180 100644 --- a/tests/modules/programs/mujmap/mujmap-defaults.nix +++ b/tests/modules/programs/mujmap/mujmap-defaults.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; config = { diff --git a/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix b/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix index 03c3f542e..6ae87f832 100644 --- a/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix +++ b/tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; config = { diff --git a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix index ba1607ab8..71a89d91d 100644 --- a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix +++ b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-issue-3560.nix @@ -1,25 +1,16 @@ -{ pkgs, ... }: - { - config = { - # Minimal config reproducing - # https://github.com/nix-community/home-manager/issues/3560 - programs.ncmpcpp.enable = true; + # Minimal config reproducing + # https://github.com/nix-community/home-manager/issues/3560 + programs.ncmpcpp.enable = true; - services.mpd.enable = true; - services.mpd.musicDirectory = "~/music"; + services.mpd.enable = true; + services.mpd.musicDirectory = "~/music"; - test.stubs = { - ncmpcpp = { }; - mpd = { }; - }; + nmt.script = '' + assertFileContent \ + home-files/.config/ncmpcpp/config \ + ${./ncmpcpp-issue-3560-expected-config} - nmt.script = '' - assertFileContent \ - home-files/.config/ncmpcpp/config \ - ${./ncmpcpp-issue-3560-expected-config} - - assertPathNotExists home-files/.config/ncmpcpp/bindings - ''; - }; + assertPathNotExists home-files/.config/ncmpcpp/bindings + ''; } diff --git a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix index f977bddec..21cf961a0 100644 --- a/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix +++ b/tests/modules/programs/ncmpcpp-linux/ncmpcpp-use-mpd-config.nix @@ -1,23 +1,14 @@ -{ pkgs, ... }: - { - config = { - programs.ncmpcpp.enable = true; + programs.ncmpcpp.enable = true; - services.mpd.enable = true; - services.mpd.musicDirectory = "/home/user/music"; + services.mpd.enable = true; + services.mpd.musicDirectory = "/home/user/music"; - test.stubs = { - ncmpcpp = { }; - mpd = { }; - }; + nmt.script = '' + assertFileContent \ + home-files/.config/ncmpcpp/config \ + ${./ncmpcpp-use-mpd-config-expected-config} - nmt.script = '' - assertFileContent \ - home-files/.config/ncmpcpp/config \ - ${./ncmpcpp-use-mpd-config-expected-config} - - assertPathNotExists home-files/.config/ncmpcpp/bindings - ''; - }; + assertPathNotExists home-files/.config/ncmpcpp/bindings + ''; } diff --git a/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix b/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix index 554366509..3a7452a79 100644 --- a/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix +++ b/tests/modules/programs/ncmpcpp/ncmpcpp-empty-settings.nix @@ -1,15 +1,9 @@ -{ pkgs, ... }: - { - config = { - programs.ncmpcpp.enable = true; + programs.ncmpcpp.enable = true; - test.stubs.ncmpcpp = { }; + nmt.script = '' + assertPathNotExists home-files/.config/ncmpcpp/config - nmt.script = '' - assertPathNotExists home-files/.config/ncmpcpp/config - - assertPathNotExists home-files/.config/ncmpcpp/bindings - ''; - }; + assertPathNotExists home-files/.config/ncmpcpp/bindings + ''; } diff --git a/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix b/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix index a85ea552c..bf916dfbe 100644 --- a/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix +++ b/tests/modules/programs/ncmpcpp/ncmpcpp-example-settings.nix @@ -1,59 +1,53 @@ -{ pkgs, ... }: - { - config = { - programs.ncmpcpp = { - enable = true; - mpdMusicDir = "/home/user/music"; + programs.ncmpcpp = { + enable = true; + mpdMusicDir = "/home/user/music"; - settings = { - user_interface = "alternative"; - display_volume_level = false; - playlist_disable_highlight_delay = 0; - }; - - bindings = [ - { - key = "j"; - command = "scroll_down"; - } - { - key = "k"; - command = "scroll_up"; - } - { - key = "J"; - command = [ "select_item" "scroll_down" ]; - } - { - key = "K"; - command = [ "select_item" "scroll_up" ]; - } - { - key = "x"; - command = "delete_playlist_items"; - } - { - key = "x"; - command = "delete_browser_items"; - } - { - key = "x"; - command = "delete_stored_playlist"; - } - ]; + settings = { + user_interface = "alternative"; + display_volume_level = false; + playlist_disable_highlight_delay = 0; }; - test.stubs.ncmpcpp = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/ncmpcpp/config \ - ${./ncmpcpp-example-settings-expected-config} - - assertFileContent \ - home-files/.config/ncmpcpp/bindings \ - ${./ncmpcpp-example-settings-expected-bindings} - ''; + bindings = [ + { + key = "j"; + command = "scroll_down"; + } + { + key = "k"; + command = "scroll_up"; + } + { + key = "J"; + command = [ "select_item" "scroll_down" ]; + } + { + key = "K"; + command = [ "select_item" "scroll_up" ]; + } + { + key = "x"; + command = "delete_playlist_items"; + } + { + key = "x"; + command = "delete_browser_items"; + } + { + key = "x"; + command = "delete_stored_playlist"; + } + ]; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/ncmpcpp/config \ + ${./ncmpcpp-example-settings-expected-config} + + assertFileContent \ + home-files/.config/ncmpcpp/bindings \ + ${./ncmpcpp-example-settings-expected-bindings} + ''; } diff --git a/tests/modules/programs/ne/defprefs.nix b/tests/modules/programs/ne/defprefs.nix index 64d78d276..1fd8cd7f5 100644 --- a/tests/modules/programs/ne/defprefs.nix +++ b/tests/modules/programs/ne/defprefs.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - let defpref = '' defined through defaultPreferences @@ -12,24 +8,20 @@ let ''; in { - config = { - programs.ne = { - enable = true; - defaultPreferences = defpref; - automaticPreferences.".default" = autopref; - }; + programs.ne = { + enable = true; + defaultPreferences = defpref; + automaticPreferences.".default" = autopref; + }; - test.stubs.ne = { }; - - nmt = { - description = - "Check that it gracefully handles the case of both defaultPreferences and automaticPreferences.'.default' being set, defaulting to the former."; - script = '' - assertFileExists home-files/.ne/.default#ap - assertFileContent home-files/.ne/.default#ap ${ - builtins.toFile "defpref" defpref - } - ''; - }; + nmt = { + description = + "Check that it gracefully handles the case of both defaultPreferences and automaticPreferences.'.default' being set, defaulting to the former."; + script = '' + assertFileExists home-files/.ne/.default#ap + assertFileContent home-files/.ne/.default#ap ${ + builtins.toFile "defpref" defpref + } + ''; }; } diff --git a/tests/modules/programs/ne/passthroughs.nix b/tests/modules/programs/ne/passthroughs.nix index f753826f3..2024b3b6a 100644 --- a/tests/modules/programs/ne/passthroughs.nix +++ b/tests/modules/programs/ne/passthroughs.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, ... }: let @@ -44,29 +42,25 @@ let ''; in { - config = { - programs.ne = { - enable = true; - inherit keybindings; - inherit menus; - inherit virtualExtensions; - inherit automaticPreferences; - }; + programs.ne = { + enable = true; + inherit keybindings; + inherit menus; + inherit virtualExtensions; + inherit automaticPreferences; + }; - test.stubs.ne = { }; + nmt = { + description = "Check that configuration files are correctly written"; + script = lib.concatStringsSep "\n" [ + (checkFile ".keys" keybindings) + (checkFile ".extensions" virtualExtensions) + (checkFile ".menus" menus) - nmt = { - description = "Check that configuration files are correctly written"; - script = concatStringsSep "\n" [ - (checkFile ".keys" keybindings) - (checkFile ".extensions" virtualExtensions) - (checkFile ".menus" menus) - - # Generates a check command for each entry in automaticPreferences. - (concatStringsSep "\n" (mapAttrsToList - (extension: contents: checkFile "${extension}#ap" contents) - automaticPreferences)) - ]; - }; + # Generates a check command for each entry in automaticPreferences. + (lib.concatStringsSep "\n" (lib.mapAttrsToList + (extension: contents: checkFile "${extension}#ap" contents) + automaticPreferences)) + ]; }; } diff --git a/tests/modules/programs/neomutt/neomutt-no-folder-change.nix b/tests/modules/programs/neomutt/neomutt-no-folder-change.nix index 0e874c228..3d6aa86dd 100644 --- a/tests/modules/programs/neomutt/neomutt-no-folder-change.nix +++ b/tests/modules/programs/neomutt/neomutt-no-folder-change.nix @@ -1,29 +1,21 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - msmtp.enable = true; - neomutt.enable = true; - imap.port = 993; - }; + accounts.email.accounts = { + "hm@example.com" = { + msmtp.enable = true; + neomutt.enable = true; + imap.port = 993; }; - - programs.neomutt.enable = true; - programs.neomutt.changeFolderWhenSourcingAccount = false; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-no-folder-change-expected.conf - } - ''; }; + + programs.neomutt.enable = true; + programs.neomutt.changeFolderWhenSourcingAccount = false; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-no-folder-change-expected.conf + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-not-primary.nix b/tests/modules/programs/neomutt/neomutt-not-primary.nix index ccf5444a9..db1f2de64 100644 --- a/tests/modules/programs/neomutt/neomutt-not-primary.nix +++ b/tests/modules/programs/neomutt/neomutt-not-primary.nix @@ -1,25 +1,17 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com".maildir = null; - hm-account.neomutt.enable = true; - }; - - programs.neomutt.enable = true; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-not-primary-expected.conf - } - ''; + accounts.email.accounts = { + "hm@example.com".maildir = null; + hm-account.neomutt.enable = true; }; + + programs.neomutt.enable = true; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-not-primary-expected.conf + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-unmailboxes.nix b/tests/modules/programs/neomutt/neomutt-unmailboxes.nix index 162379b80..274fb5db8 100644 --- a/tests/modules/programs/neomutt/neomutt-unmailboxes.nix +++ b/tests/modules/programs/neomutt/neomutt-unmailboxes.nix @@ -1,30 +1,22 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - msmtp.enable = true; - neomutt.enable = true; - imap.port = 993; - }; + accounts.email.accounts = { + "hm@example.com" = { + msmtp.enable = true; + neomutt.enable = true; + imap.port = 993; }; - - programs.neomutt.enable = true; - programs.neomutt.unmailboxes = true; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-unmailboxes-expected.conf - } - ''; }; + + programs.neomutt.enable = true; + programs.neomutt.unmailboxes = true; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-unmailboxes-expected.conf + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix b/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix index 69fe4d9b5..1b420028f 100644 --- a/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix +++ b/tests/modules/programs/neomutt/neomutt-with-binds-invalid-settings.nix @@ -1,29 +1,21 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.neomutt = { - enable = true; + programs.neomutt = { + enable = true; - binds = [{ - action = "complete-query"; - key = ""; - map = [ ]; - }]; + binds = [{ + action = "complete-query"; + key = ""; + map = [ ]; + }]; - macros = [{ - action = "?^K="; - key = "c"; - map = [ ]; - }]; - }; - - test.stubs.neomutt = { }; - - test.asserts.assertions.expected = [ - "The 'programs.neomutt.(binds|macros).map' list must contain at least one element." - ]; + macros = [{ + action = "?^K="; + key = "c"; + map = [ ]; + }]; }; + + test.asserts.assertions.expected = [ + "The 'programs.neomutt.(binds|macros).map' list must contain at least one element." + ]; } diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix index 54012e9dd..f9d144dfd 100644 --- a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix +++ b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix @@ -1,70 +1,62 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 993; }; + }; - programs.neomutt = { - enable = true; - vimKeys = false; + programs.neomutt = { + enable = true; + vimKeys = false; - binds = [ - { - action = "complete-query"; - key = ""; - map = "editor"; - } - { - action = "sidebar-prev"; - key = "\\Cp"; - map = [ "index" "pager" ]; - } - ]; - - macros = [ - { - action = "?"; - key = "s"; - map = "index"; - } - { - action = "?^K="; - key = "c"; - map = [ "index" "pager" ]; - } - ]; - }; - - test.stubs.neomutt = { }; - - test.asserts.warnings.expected = [ - "Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See https://github.com/nix-community/home-manager/pull/1885." + binds = [ + { + action = "complete-query"; + key = ""; + map = "editor"; + } + { + action = "sidebar-prev"; + key = "\\Cp"; + map = [ "index" "pager" ]; + } ]; - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-with-binds-expected.conf + macros = [ + { + action = "?"; + key = "s"; + map = "index"; } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-expected + { + action = "?^K="; + key = "c"; + map = [ "index" "pager" ]; } - ''; + ]; }; + + test.asserts.warnings.expected = [ + "Specifying 'programs.neomutt.(binds|macros).map' as a string is deprecated, use a list of strings instead. See https://github.com/nix-community/home-manager/pull/1885." + ]; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-with-binds-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-binds.nix b/tests/modules/programs/neomutt/neomutt-with-binds.nix index 64ebf80f8..7f97ae9e8 100644 --- a/tests/modules/programs/neomutt/neomutt-with-binds.nix +++ b/tests/modules/programs/neomutt/neomutt-with-binds.nix @@ -1,66 +1,58 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 993; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - - binds = [ - { - action = "complete-query"; - key = ""; - map = [ "editor" ]; - } - { - action = "sidebar-prev"; - key = "\\Cp"; - map = [ "index" "pager" ]; - } - ]; - - macros = [ - { - action = "?"; - key = "s"; - map = [ "index" ]; - } - { - action = "?^K="; - key = "c"; - map = [ "index" "pager" ]; - } - ]; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-with-binds-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + + binds = [ + { + action = "complete-query"; + key = ""; + map = [ "editor" ]; + } + { + action = "sidebar-prev"; + key = "\\Cp"; + map = [ "index" "pager" ]; + } + ]; + + macros = [ + { + action = "?"; + key = "s"; + map = [ "index" ]; + } + { + action = "?^K="; + key = "c"; + map = [ "index" "pager" ]; + } + ]; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-with-binds-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-gpg.nix b/tests/modules/programs/neomutt/neomutt-with-gpg.nix index 2eed53583..1f542d747 100644 --- a/tests/modules/programs/neomutt/neomutt-with-gpg.nix +++ b/tests/modules/programs/neomutt/neomutt-with-gpg.nix @@ -1,32 +1,27 @@ -{ config, lib, pkgs, ... }: -with lib; { +{ imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - gpg = { - encryptByDefault = true; - signByDefault = true; - }; - neomutt.enable = true; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + gpg = { + encryptByDefault = true; + signByDefault = true; }; + neomutt.enable = true; + imap.port = 993; }; - - programs.neomutt.enable = true; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-gpg-expected.conf - } - ''; }; + + programs.neomutt.enable = true; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-gpg-expected.conf + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix b/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix index 10dcdbed6..65ce1f22c 100644 --- a/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix +++ b/tests/modules/programs/neomutt/neomutt-with-imap-type-mailboxes.nix @@ -1,57 +1,49 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - mailboxName = "someCustomName"; - extraMailboxes = [ - "Sent" - { - mailbox = "Junk Email"; - name = "Spam"; - type = "imap"; - } - { mailbox = "Trash"; } - ]; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; + mailboxName = "someCustomName"; + extraMailboxes = [ + "Sent" + { + mailbox = "Junk Email"; + name = "Spam"; + type = "imap"; + } + { mailbox = "Trash"; } + ]; }; + imap.port = 993; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${ - ./neomutt-with-imap-type-mailboxes-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-expected - } - - confFile=$(grep -o \ - '/nix/store/.*-account-command.sh/bin/account-command.sh' \ - $TESTED/home-files/.config/neomutt/neomuttrc) - assertFileContent "$(normalizeStorePaths "$confFile")" ${ - ./account-command.sh-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${ + ./neomutt-with-imap-type-mailboxes-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-expected + } + + confFile=$(grep -o \ + '/nix/store/.*-account-command.sh/bin/account-command.sh' \ + $TESTED/home-files/.config/neomutt/neomuttrc) + assertFileContent "$(normalizeStorePaths "$confFile")" ${ + ./account-command.sh-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-imap.nix b/tests/modules/programs/neomutt/neomutt-with-imap.nix index 3f234fde7..5d71aed68 100644 --- a/tests/modules/programs/neomutt/neomutt-with-imap.nix +++ b/tests/modules/programs/neomutt/neomutt-with-imap.nix @@ -1,44 +1,36 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - neomutt = { - enable = true; - mailboxType = "imap"; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + neomutt = { + enable = true; + mailboxType = "imap"; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 993; }; - - programs.neomutt.enable = true; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${ - ./neomutt-with-imap-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-imap-expected.conf - } - - confFile=$(grep -o \ - '/nix/store/.*-account-command.sh/bin/account-command.sh' \ - $TESTED/home-files/.config/neomutt/neomuttrc) - assertFileContent "$(normalizeStorePaths "$confFile")" ${ - ./account-command.sh-expected - } - ''; }; + + programs.neomutt.enable = true; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${ + ./neomutt-with-imap-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-imap-expected.conf + } + + confFile=$(grep -o \ + '/nix/store/.*-account-command.sh/bin/account-command.sh' \ + $TESTED/home-files/.config/neomutt/neomuttrc) + assertFileContent "$(normalizeStorePaths "$confFile")" ${ + ./account-command.sh-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-msmtp.nix b/tests/modules/programs/neomutt/neomutt-with-msmtp.nix index 48b2197d0..b711307b7 100644 --- a/tests/modules/programs/neomutt/neomutt-with-msmtp.nix +++ b/tests/modules/programs/neomutt/neomutt-with-msmtp.nix @@ -1,37 +1,29 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - msmtp.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + msmtp.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 993; }; - - programs.neomutt.enable = true; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-msmtp-expected.conf - } - ''; }; + + programs.neomutt.enable = true; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-msmtp-expected.conf + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix index fd4fedf01..1d1d2fa47 100644 --- a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix +++ b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes.nix @@ -1,49 +1,41 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - mailboxName = "someCustomName"; - extraMailboxes = [ - "Sent" - { - mailbox = "Junk Email"; - name = "Spam"; - } - { mailbox = "Trash"; } - ]; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; + mailboxName = "someCustomName"; + extraMailboxes = [ + "Sent" + { + mailbox = "Junk Email"; + name = "Spam"; + } + { mailbox = "Trash"; } + ]; }; + imap.port = 993; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-with-named-mailboxes-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-with-named-mailboxes-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-signature-command.nix b/tests/modules/programs/neomutt/neomutt-with-signature-command.nix index 97c2001f9..3700d0efe 100644 --- a/tests/modules/programs/neomutt/neomutt-with-signature-command.nix +++ b/tests/modules/programs/neomutt/neomutt-with-signature-command.nix @@ -1,45 +1,39 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; - signature = { - showSignature = "append"; - command = pkgs.writeScript "signature" "echo This is my signature"; - }; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; + }; + imap.port = 993; + signature = { + showSignature = "append"; + command = pkgs.writeScript "signature" "echo This is my signature"; }; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com") - assertFileContent "$expectedSignature" ${ - ./hm-example.com-signature-command-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com") + assertFileContent "$expectedSignature" ${ + ./hm-example.com-signature-command-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-signature.nix b/tests/modules/programs/neomutt/neomutt-with-signature.nix index 9461976d3..e8361e0a2 100644 --- a/tests/modules/programs/neomutt/neomutt-with-signature.nix +++ b/tests/modules/programs/neomutt/neomutt-with-signature.nix @@ -1,48 +1,40 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; - signature = { - showSignature = "append"; - text = '' - -- - Test Signature - ''; - }; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; + }; + imap.port = 993; + signature = { + showSignature = "append"; + text = '' + -- + Test Signature + ''; }; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com") - assertFileContent "$expectedSignature" ${ - ./hm-example.com-signature-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + expectedSignature=$(normalizeStorePaths "home-files/.config/neomutt/hm@example.com") + assertFileContent "$expectedSignature" ${ + ./hm-example.com-signature-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt-with-starttls.nix b/tests/modules/programs/neomutt/neomutt-with-starttls.nix index 09d37ff9e..441985cac 100644 --- a/tests/modules/programs/neomutt/neomutt-with-starttls.nix +++ b/tests/modules/programs/neomutt/neomutt-with-starttls.nix @@ -1,41 +1,33 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 143; - smtp.tls.useStartTls = true; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 143; + smtp.tls.useStartTls = true; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-starttls-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-starttls-expected + } + ''; } diff --git a/tests/modules/programs/neomutt/neomutt.nix b/tests/modules/programs/neomutt/neomutt.nix index 08c8f5bf3..65d74a4f9 100644 --- a/tests/modules/programs/neomutt/neomutt.nix +++ b/tests/modules/programs/neomutt/neomutt.nix @@ -1,40 +1,32 @@ -{ config, lib, pkgs, ... }: - -with lib; - { imports = [ ../../accounts/email-test-accounts.nix ]; - config = { - accounts.email.accounts = { - "hm@example.com" = { - notmuch.enable = true; - neomutt = { - enable = true; - extraConfig = '' - color status cyan default - ''; - }; - imap.port = 993; + accounts.email.accounts = { + "hm@example.com" = { + notmuch.enable = true; + neomutt = { + enable = true; + extraConfig = '' + color status cyan default + ''; }; + imap.port = 993; }; - - programs.neomutt = { - enable = true; - vimKeys = false; - }; - - test.stubs.neomutt = { }; - - nmt.script = '' - assertFileExists home-files/.config/neomutt/neomuttrc - assertFileExists home-files/.config/neomutt/hm@example.com - assertFileContent home-files/.config/neomutt/neomuttrc ${ - ./neomutt-expected.conf - } - assertFileContent home-files/.config/neomutt/hm@example.com ${ - ./hm-example.com-expected - } - ''; }; + + programs.neomutt = { + enable = true; + vimKeys = false; + }; + + nmt.script = '' + assertFileExists home-files/.config/neomutt/neomuttrc + assertFileExists home-files/.config/neomutt/hm@example.com + assertFileContent home-files/.config/neomutt/neomuttrc ${ + ./neomutt-expected.conf + } + assertFileContent home-files/.config/neomutt/hm@example.com ${ + ./hm-example.com-expected + } + ''; } diff --git a/tests/modules/programs/neovide/neovide.nix b/tests/modules/programs/neovide/neovide.nix index 774964f01..6f3e6525a 100644 --- a/tests/modules/programs/neovide/neovide.nix +++ b/tests/modules/programs/neovide/neovide.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.neovide = { enable = true; @@ -25,8 +23,6 @@ }; }; - test.stubs.neovide = { }; - nmt.script = '' assertFileExists home-files/.config/neovide/config.toml assertFileContent home-files/.config/neovide/config.toml ${./expected.toml} diff --git a/tests/modules/programs/neovim/coc-config.nix b/tests/modules/programs/neovim/coc-config.nix index c16514134..cdb879a0f 100644 --- a/tests/modules/programs/neovim/coc-config.nix +++ b/tests/modules/programs/neovim/coc-config.nix @@ -1,27 +1,23 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.neovim = { + imports = [ ./stubs.nix ]; + + programs.neovim = { + enable = true; + coc = { enable = true; - coc = { - enable = true; - settings = { - # my variable - foo = "bar"; - }; + settings = { + # my variable + foo = "bar"; }; }; - - nmt.script = '' - cocSettings="$TESTED/home-files/.config/nvim/coc-settings.json" - cocSettingsNormalized="$(normalizeStorePaths "$cocSettings")" - - assertFileExists "$cocSettings" - assertFileContent "$cocSettingsNormalized" "${./coc-config.expected}" - ''; }; + + nmt.script = '' + cocSettings="$TESTED/home-files/.config/nvim/coc-settings.json" + cocSettingsNormalized="$(normalizeStorePaths "$cocSettings")" + + assertFileExists "$cocSettings" + assertFileContent "$cocSettingsNormalized" "${./coc-config.expected}" + ''; } diff --git a/tests/modules/programs/neovim/extra-lua-init.nix b/tests/modules/programs/neovim/extra-lua-init.nix index 2abaa6e9e..32f02fb70 100644 --- a/tests/modules/programs/neovim/extra-lua-init.nix +++ b/tests/modules/programs/neovim/extra-lua-init.nix @@ -1,23 +1,20 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.neovim = { - enable = true; + imports = [ ./stubs.nix ]; - extraLuaConfig = '' - -- extraLuaConfig - ''; - }; - nmt.script = '' - nvimFolder="home-files/.config/nvim" - assertFileContent "$nvimFolder/init.lua" ${ - pkgs.writeText "init.lua-expected" '' - -- extraLuaConfig - '' - } + programs.neovim = { + enable = true; + + extraLuaConfig = '' + -- extraLuaConfig ''; }; + + nmt.script = '' + nvimFolder="home-files/.config/nvim" + assertFileContent "$nvimFolder/init.lua" ${ + builtins.toFile "init.lua-expected" '' + -- extraLuaConfig + '' + } + ''; } diff --git a/tests/modules/programs/neovim/no-init.nix b/tests/modules/programs/neovim/no-init.nix index 693bdedec..69d0d08d3 100644 --- a/tests/modules/programs/neovim/no-init.nix +++ b/tests/modules/programs/neovim/no-init.nix @@ -1,28 +1,26 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: { - config = { - programs.neovim = { - enable = true; - vimAlias = true; - withNodeJs = false; - withPython3 = true; - withRuby = false; + imports = [ ./stubs.nix ]; - extraPython3Packages = (ps: with ps; [ jedi pynvim ]); + programs.neovim = { + enable = true; + vimAlias = true; + withNodeJs = false; + withPython3 = true; + withRuby = false; - # plugins without associated config should not trigger the creation of init.vim - plugins = with pkgs.vimPlugins; [ - vim-fugitive - ({ plugin = vim-sensible; }) - ]; - }; - nmt.script = '' - nvimFolder="home-files/.config/nvim" - assertPathNotExists "$nvimFolder/init.vim" - assertPathNotExists "$nvimFolder/init.lua" - ''; + extraPython3Packages = (ps: with ps; [ jedi pynvim ]); + + # plugins without associated config should not trigger the creation of init.vim + plugins = with pkgs.vimPlugins; [ + vim-fugitive + ({ plugin = vim-sensible; }) + ]; }; + nmt.script = '' + nvimFolder="home-files/.config/nvim" + assertPathNotExists "$nvimFolder/init.vim" + assertPathNotExists "$nvimFolder/init.lua" + ''; } diff --git a/tests/modules/programs/neovim/plugin-config.nix b/tests/modules/programs/neovim/plugin-config.nix index e4921aae6..4b8c3abdc 100644 --- a/tests/modules/programs/neovim/plugin-config.nix +++ b/tests/modules/programs/neovim/plugin-config.nix @@ -1,34 +1,32 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, realPkgs, ... }: -with lib; - -{ - config = { - programs.neovim = { - enable = true; - extraConfig = '' - let g:hmExtraConfig='HM_EXTRA_CONFIG' - ''; - plugins = with pkgs.vimPlugins; [ - vim-nix - { - plugin = vim-commentary; - config = '' - let g:hmPlugins='HM_PLUGINS_CONFIG' - ''; - } - ]; - extraLuaPackages = [ pkgs.lua51Packages.luautf8 ]; - }; - - nmt.script = '' - vimout=$(mktemp) - echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \ - | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \ - > "$vimout" - assertFileContains "$vimout" "HM_EXTRA_CONFIG" - assertFileContains "$vimout" "HM_PLUGINS_CONFIG" +lib.mkIf config.test.enableBig { + programs.neovim = { + enable = true; + extraConfig = '' + let g:hmExtraConfig='HM_EXTRA_CONFIG' ''; + plugins = with pkgs.vimPlugins; [ + vim-nix + { + plugin = vim-commentary; + config = '' + let g:hmPlugins='HM_PLUGINS_CONFIG' + ''; + } + ]; + extraLuaPackages = ps: [ ps.luautf8 ]; }; + + _module.args.pkgs = lib.mkForce realPkgs; + + nmt.script = '' + vimout=$(mktemp) + echo "redir >> /dev/stdout | echo g:hmExtraConfig | echo g:hmPlugins | redir END" \ + | ${pkgs.neovim}/bin/nvim -es -u "$TESTED/home-files/.config/nvim/init.lua" \ + > "$vimout" || true + assertFileContains "$vimout" "HM_EXTRA_CONFIG" + assertFileContains "$vimout" "HM_PLUGINS_CONFIG" + ''; } diff --git a/tests/modules/programs/neovim/runtime.nix b/tests/modules/programs/neovim/runtime.nix index 7f39c8461..088f75ace 100644 --- a/tests/modules/programs/neovim/runtime.nix +++ b/tests/modules/programs/neovim/runtime.nix @@ -1,53 +1,51 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, realPkgs, ... }: -with lib; +lib.mkIf config.test.enableBig { + programs.neovim = lib.mkMerge [ + { + enable = true; + plugins = with pkgs.vimPlugins; [ + vim-nix + { + plugin = vim-commentary; + runtime = { + "after/ftplugin/c.vim".text = '' + " plugin-specific config + setlocal commentstring=//\ %s + setlocal comments=:// + ''; + }; + } + ]; + extraWrapperArgs = let buildDeps = with pkgs; [ stdenv.cc.cc zlib ]; + in [ + "--suffix" + "LIBRARY_PATH" + ":" + "${lib.makeLibraryPath buildDeps}" + "--suffix" + "PKG_CONFIG_PATH" + ":" + "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" buildDeps}" + ]; + } + { + extraPython3Packages = ps: with ps; [ jedi pynvim ]; + extraLuaPackages = ps: with ps; [ luacheck ]; + } + { + extraPython3Packages = ps: with ps; [ jedi pynvim ]; + extraLuaPackages = ps: with ps; [ luacheck ]; + } + ]; -{ - config = { - programs.neovim = lib.mkMerge [ - { - enable = true; - plugins = with pkgs.vimPlugins; [ - vim-nix - { - plugin = vim-commentary; - runtime = { - "after/ftplugin/c.vim".text = '' - " plugin-specific config - setlocal commentstring=//\ %s - setlocal comments=:// - ''; - }; - } - ]; - extraWrapperArgs = let buildDeps = with pkgs; [ stdenv.cc.cc zlib ]; - in [ - "--suffix" - "LIBRARY_PATH" - ":" - "${lib.makeLibraryPath buildDeps}" - "--suffix" - "PKG_CONFIG_PATH" - ":" - "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" buildDeps}" - ]; - } - { - extraPython3Packages = ps: with ps; [ jedi pynvim ]; - extraLuaPackages = ps: with ps; [ luacheck ]; - } - { - extraPython3Packages = with pkgs.python3Packages; [ jedi pynvim ]; - extraLuaPackages = with pkgs.lua51Packages; [ luacheck ]; - } - ]; + _module.args.pkgs = lib.mkForce realPkgs; - nmt.script = '' - ftplugin="home-files/.config/nvim/after/ftplugin/c.vim" - nvimbin="home-path/bin/nvim" - assertFileExists "$ftplugin" - assertFileRegex "$nvimbin" 'LIBRARY_PATH' - assertFileRegex "$nvimbin" 'PKG_CONFIG_PATH' - ''; - }; + nmt.script = '' + ftplugin="home-files/.config/nvim/after/ftplugin/c.vim" + nvimbin="home-path/bin/nvim" + assertFileExists "$ftplugin" + assertFileRegex "$nvimbin" 'LIBRARY_PATH' + assertFileRegex "$nvimbin" 'PKG_CONFIG_PATH' + ''; } diff --git a/tests/modules/programs/neovim/stubs.nix b/tests/modules/programs/neovim/stubs.nix new file mode 100644 index 000000000..edd5cebf2 --- /dev/null +++ b/tests/modules/programs/neovim/stubs.nix @@ -0,0 +1,35 @@ +{ lib, pkgs, ... }: + +{ + test.stubs = { + neovim-unwrapped = { + name = "neovim-unwrapped"; + outPath = null; + buildScript = '' + mkdir -p $out/bin $out/share/applications + echo "Name=Neovim" > $out/share/applications/nvim.desktop + + cp ${pkgs.writeShellScript "nvim" "exit 0"} $out/bin/nvim + chmod +x $out/bin/nvim + ''; + extraAttrs = { + lua = pkgs.writeTextDir "nix-support/utils.sh" '' + function _addToLuaPath() { + return 0 + } + ''; + + meta = let stub = "stub"; + in { + description = stub; + longDescription = stub; + homepage = stub; + mainProgram = stub; + license = [ stub ]; + maintainers = [ stub ]; + platforms = lib.platforms.all; + }; + }; + }; + }; +} diff --git a/tests/modules/programs/newsboat/newsboat-basics-2003.nix b/tests/modules/programs/newsboat/newsboat-basics-2003.nix index 26d5f4b32..592d0f8e6 100644 --- a/tests/modules/programs/newsboat/newsboat-basics-2003.nix +++ b/tests/modules/programs/newsboat/newsboat-basics-2003.nix @@ -1,33 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - home.stateVersion = "20.03"; + home.stateVersion = "20.03"; - programs.newsboat = { - enable = true; + programs.newsboat = { + enable = true; - urls = [ - { - url = "http://example.org/feed.xml"; - tags = [ "tag1" "tag2" ]; - title = "Cool feed"; - } + urls = [ + { + url = "http://example.org/feed.xml"; + tags = [ "tag1" "tag2" ]; + title = "Cool feed"; + } - { url = "http://example.org/feed2.xml"; } - ]; + { url = "http://example.org/feed2.xml"; } + ]; - queries = { "foo" = ''rssurl =~ "example.com"''; }; - }; - - test.stubs.newsboat = { }; - - nmt.script = '' - assertFileContent \ - home-files/.newsboat/urls \ - ${./newsboat-basics-urls-2003.txt} - ''; + queries = { "foo" = ''rssurl =~ "example.com"''; }; }; + + nmt.script = '' + assertFileContent \ + home-files/.newsboat/urls \ + ${./newsboat-basics-urls-2003.txt} + ''; } diff --git a/tests/modules/programs/newsboat/newsboat-basics-2105.nix b/tests/modules/programs/newsboat/newsboat-basics-2105.nix index ec0f33728..8cc46754b 100644 --- a/tests/modules/programs/newsboat/newsboat-basics-2105.nix +++ b/tests/modules/programs/newsboat/newsboat-basics-2105.nix @@ -1,34 +1,26 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - home.stateVersion = "21.05"; + home.stateVersion = "21.05"; - programs.newsboat = { - enable = true; + programs.newsboat = { + enable = true; - urls = [ - { - url = "http://example.org/feed.xml"; - tags = [ "tag1" "tag2" ]; - title = "Cool feed"; - } + urls = [ + { + url = "http://example.org/feed.xml"; + tags = [ "tag1" "tag2" ]; + title = "Cool feed"; + } - { url = "http://example.org/feed2.xml"; } - ]; + { url = "http://example.org/feed2.xml"; } + ]; - queries = { "foo" = ''rssurl =~ "example.com"''; }; - }; - - test.stubs.newsboat = { }; - - # The format didn't change since 20.03, just the location. - nmt.script = '' - assertFileContent \ - home-files/.config/newsboat/urls \ - ${./newsboat-basics-urls-2003.txt} - ''; + queries = { "foo" = ''rssurl =~ "example.com"''; }; }; + + # The format didn't change since 20.03, just the location. + nmt.script = '' + assertFileContent \ + home-files/.config/newsboat/urls \ + ${./newsboat-basics-urls-2003.txt} + ''; } diff --git a/tests/modules/programs/newsboat/newsboat-basics.nix b/tests/modules/programs/newsboat/newsboat-basics.nix index fe7f85070..fe417a87a 100644 --- a/tests/modules/programs/newsboat/newsboat-basics.nix +++ b/tests/modules/programs/newsboat/newsboat-basics.nix @@ -1,31 +1,23 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.newsboat = { - enable = true; + programs.newsboat = { + enable = true; - urls = [ - { - url = "http://example.org/feed.xml"; - tags = [ "tag1" "tag2" ]; - title = "Cool feed"; - } + urls = [ + { + url = "http://example.org/feed.xml"; + tags = [ "tag1" "tag2" ]; + title = "Cool feed"; + } - { url = "http://example.org/feed2.xml"; } - ]; + { url = "http://example.org/feed2.xml"; } + ]; - queries = { "foo" = ''rssurl =~ "example.com"''; }; - }; - - test.stubs.newsboat = { }; - - nmt.script = '' - assertFileContent \ - home-files/.newsboat/urls \ - ${./newsboat-basics-urls.txt} - ''; + queries = { "foo" = ''rssurl =~ "example.com"''; }; }; + + nmt.script = '' + assertFileContent \ + home-files/.newsboat/urls \ + ${./newsboat-basics-urls.txt} + ''; } diff --git a/tests/modules/programs/nheko/nheko-empty-settings.nix b/tests/modules/programs/nheko/nheko-empty-settings.nix index 65538d9eb..6979ba1df 100644 --- a/tests/modules/programs/nheko/nheko-empty-settings.nix +++ b/tests/modules/programs/nheko/nheko-empty-settings.nix @@ -8,8 +8,6 @@ let in { programs.nheko.enable = true; - test.stubs.nheko = { }; - nmt.script = '' assertPathNotExists "${configDir}/nheko/nheko.conf" ''; diff --git a/tests/modules/programs/nheko/nheko-example-settings.nix b/tests/modules/programs/nheko/nheko-example-settings.nix index 26599c5a0..4700db2ca 100644 --- a/tests/modules/programs/nheko/nheko-example-settings.nix +++ b/tests/modules/programs/nheko/nheko-example-settings.nix @@ -74,8 +74,6 @@ in { }; }; - test.stubs.nheko = { }; - nmt.script = '' assertFileContent \ "${configDir}/nheko/nheko.conf" \ diff --git a/tests/modules/programs/nix-index/assert-on-command-not-found.nix b/tests/modules/programs/nix-index/assert-on-command-not-found.nix index 94d7efc34..511dd7d0c 100644 --- a/tests/modules/programs/nix-index/assert-on-command-not-found.nix +++ b/tests/modules/programs/nix-index/assert-on-command-not-found.nix @@ -1,31 +1,27 @@ -{ lib, pkgs, ... }: +{ lib, ... }: { - config = { - programs.bash.enable = true; - programs.fish.enable = true; - programs.zsh.enable = true; + programs.bash.enable = true; + programs.fish.enable = true; + programs.zsh.enable = true; - programs.command-not-found.enable = true; + programs.command-not-found.enable = true; - # Needed to avoid error with dummy fish package. - xdg.dataFile."fish/home-manager_generated_completions".source = - lib.mkForce (builtins.toFile "empty" ""); + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); - test.stubs.zsh = { }; + programs.nix-index.enable = true; - programs.nix-index.enable = true; - - # 'command-not-found' does not have a 'fish' integration - test.asserts.assertions.expected = [ - '' - The 'programs.command-not-found.enable' option is mutually exclusive - with the 'programs.nix-index.enableBashIntegration' option. - '' - '' - The 'programs.command-not-found.enable' option is mutually exclusive - with the 'programs.nix-index.enableZshIntegration' option. - '' - ]; - }; + # 'command-not-found' does not have a 'fish' integration + test.asserts.assertions.expected = [ + '' + The 'programs.command-not-found.enable' option is mutually exclusive + with the 'programs.nix-index.enableBashIntegration' option. + '' + '' + The 'programs.command-not-found.enable' option is mutually exclusive + with the 'programs.nix-index.enableZshIntegration' option. + '' + ]; } diff --git a/tests/modules/programs/nix-index/integrations.nix b/tests/modules/programs/nix-index/integrations.nix index 2fd5253ac..6bcda0502 100644 --- a/tests/modules/programs/nix-index/integrations.nix +++ b/tests/modules/programs/nix-index/integrations.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: let fishRegex = '' @@ -7,36 +7,32 @@ let end ''; in { - config = { - programs.bash.enable = true; - programs.fish.enable = true; - programs.zsh.enable = true; + programs.bash.enable = true; + programs.fish.enable = true; + programs.zsh.enable = true; - # Needed to avoid error with dummy fish package. - xdg.dataFile."fish/home-manager_generated_completions".source = - lib.mkForce (builtins.toFile "empty" ""); + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); - test.stubs.zsh = { }; + programs.nix-index.enable = true; - programs.nix-index.enable = true; + nmt.script = '' + # Bash integration + assertFileExists home-files/.bashrc + assertFileRegex \ + home-files/.bashrc \ + 'source @nix-index@/etc/profile.d/command-not-found.sh' - nmt.script = '' - # Bash integration - assertFileExists home-files/.bashrc - assertFileRegex \ - home-files/.bashrc \ - 'source /nix/store/.*nix-index.*/etc/profile.d/command-not-found.sh' + # Zsh integration + assertFileExists home-files/.zshrc + assertFileRegex \ + home-files/.zshrc \ + 'source @nix-index@/etc/profile.d/command-not-found.sh' - # Zsh integration - assertFileExists home-files/.zshrc - assertFileRegex \ - home-files/.zshrc \ - 'source /nix/store/.*nix-index.*/etc/profile.d/command-not-found.sh' - - # Fish integration - assertFileExists home-files/.config/fish/config.fish - assertFileRegex \ - home-files/.config/fish/config.fish '${fishRegex}' - ''; - }; + # Fish integration + assertFileExists home-files/.config/fish/config.fish + assertFileRegex \ + home-files/.config/fish/config.fish '${fishRegex}' + ''; } diff --git a/tests/modules/programs/nix-your-shell/enable-shells.nix b/tests/modules/programs/nix-your-shell/enable-shells.nix index ab8c6909e..8c136da4d 100644 --- a/tests/modules/programs/nix-your-shell/enable-shells.nix +++ b/tests/modules/programs/nix-your-shell/enable-shells.nix @@ -13,12 +13,6 @@ zsh.enable = true; }; - test.stubs = { - nix-your-shell = { }; - nushell = { }; - zsh = { }; - }; - nmt.script = let nushellConfigDir = if pkgs.stdenv.isDarwin && !config.xdg.enable then "home-files/Library/Application Support/nushell" diff --git a/tests/modules/programs/nushell/config-expected.nu b/tests/modules/programs/nushell/config-expected.nu index a306fabd8..57bc16ee8 100644 --- a/tests/modules/programs/nushell/config-expected.nu +++ b/tests/modules/programs/nushell/config-expected.nu @@ -1,9 +1,31 @@ -let $config = { +load-env { + "ENV_CONVERSIONS": { + "PATH": { + "from_string": ({|s| $s | split row (char esep) }) + "to_string": ({|v| $v | str join (char esep) }) + } + } + "FOO": "BAR" + "LIST_VALUE": [ + "foo" + "bar" + ] + "PROMPT_COMMAND": ({|| "> "}) +} + +$env.config.display_errors.exit_code = false +$env.config.hooks.pre_execution = [ + ({|| "pre_execution hook"}) +] +$env.config.show_banner = false + +let config = { filesize_metric: false table_mode: rounded use_ls_colors: true } -alias ll = ls -a -alias lsname = (ls | get name) \ No newline at end of file +alias "ll" = ls -a +alias "multi word alias" = cd - +alias "z" = __zoxide_z diff --git a/tests/modules/programs/nushell/env-expected.nu b/tests/modules/programs/nushell/env-expected.nu index 50f6f767b..aacc37925 100644 --- a/tests/modules/programs/nushell/env-expected.nu +++ b/tests/modules/programs/nushell/env-expected.nu @@ -1,17 +1,2 @@ $env.FOO = 'BAR' - -load-env { - "ENV_CONVERSIONS": { - "PATH": { - "from_string": ({|s| $s | split row (char esep) }) - "to_string": ({|v| $v | str join (char esep) }) - } - } - "FOO": "BAR" - "LIST_VALUE": [ - "foo" - "bar" - ] - "PROMPT_COMMAND": ({|| "> "}) -} diff --git a/tests/modules/programs/nushell/example-settings.nix b/tests/modules/programs/nushell/example-settings.nix index e758000bf..cc9e8f8ec 100644 --- a/tests/modules/programs/nushell/example-settings.nix +++ b/tests/modules/programs/nushell/example-settings.nix @@ -1,11 +1,12 @@ -{ pkgs, config, lib, ... }: +{ pkgs, realPkgs, config, lib, ... }: { programs.nushell = { enable = true; + package = realPkgs.nushell; configFile.text = '' - let $config = { + let config = { filesize_metric: false table_mode: rounded use_ls_colors: true @@ -23,11 +24,19 @@ } ''; - plugins = [ pkgs.nushellPlugins.formats ]; + plugins = [ realPkgs.nushellPlugins.formats ]; shellAliases = { - "lsname" = "(ls | get name)"; "ll" = "ls -a"; + "multi word alias" = "cd -"; + "z" = "__zoxide_z"; + }; + + settings = { + show_banner = false; + display_errors.exit_code = false; + hooks.pre_execution = + [ (lib.hm.nushell.mkNushellInline ''{|| "pre_execution hook"}'') ]; }; environmentVariables = { diff --git a/tests/modules/programs/oh-my-posh/bash.nix b/tests/modules/programs/oh-my-posh/bash.nix index 2e3d93ac3..6818df8c7 100644 --- a/tests/modules/programs/oh-my-posh/bash.nix +++ b/tests/modules/programs/oh-my-posh/bash.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { bash.enable = true; @@ -10,8 +8,6 @@ }; }; - test.stubs.oh-my-posh = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/oh-my-posh/fish.nix b/tests/modules/programs/oh-my-posh/fish.nix index 07137b986..9e890db45 100644 --- a/tests/modules/programs/oh-my-posh/fish.nix +++ b/tests/modules/programs/oh-my-posh/fish.nix @@ -14,8 +14,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs.oh-my-posh = { }; - nmt.script = '' assertFileExists home-files/.config/fish/config.fish assertFileContains \ diff --git a/tests/modules/programs/oh-my-posh/nushell.nix b/tests/modules/programs/oh-my-posh/nushell.nix index da4ffafd3..2e5079e06 100644 --- a/tests/modules/programs/oh-my-posh/nushell.nix +++ b/tests/modules/programs/oh-my-posh/nushell.nix @@ -10,11 +10,6 @@ }; }; - test.stubs = { - oh-my-posh = { }; - nushell = { }; - }; - nmt.script = let configFile = if pkgs.stdenv.isDarwin && !config.xdg.enable then "home-files/Library/Application Support/nushell/config.nu" diff --git a/tests/modules/programs/oh-my-posh/zsh.nix b/tests/modules/programs/oh-my-posh/zsh.nix index 6d2a5bedb..0353a31e6 100644 --- a/tests/modules/programs/oh-my-posh/zsh.nix +++ b/tests/modules/programs/oh-my-posh/zsh.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { zsh.enable = true; @@ -10,11 +8,6 @@ }; }; - test.stubs = { - oh-my-posh = { }; - zsh = { }; - }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileContains \ diff --git a/tests/modules/programs/openstackclient/openstackclient.nix b/tests/modules/programs/openstackclient/openstackclient.nix index 0c5e1f0bc..48d3d38f8 100644 --- a/tests/modules/programs/openstackclient/openstackclient.nix +++ b/tests/modules/programs/openstackclient/openstackclient.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.openstackclient = { enable = true; @@ -22,8 +20,6 @@ }; - test.stubs.openstackclient = { }; - nmt.script = '' assertFileExists home-files/.config/openstack/clouds.yaml assertFileContent home-files/.config/openstack/clouds.yaml \ diff --git a/tests/modules/programs/pandoc/csl.nix b/tests/modules/programs/pandoc/csl.nix index 7384ec995..e23c53288 100644 --- a/tests/modules/programs/pandoc/csl.nix +++ b/tests/modules/programs/pandoc/csl.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { programs.pandoc = { enable = true; diff --git a/tests/modules/programs/pandoc/defaults.nix b/tests/modules/programs/pandoc/defaults.nix index e9288657b..8e3fe39aa 100644 --- a/tests/modules/programs/pandoc/defaults.nix +++ b/tests/modules/programs/pandoc/defaults.nix @@ -1,30 +1,30 @@ -{ config, lib, ... }: +{ config, lib, realPkgs, ... }: let cfg = config.programs.pandoc; -in { - config = lib.mkIf config.test.enableBig { - programs.pandoc = { - enable = true; +in lib.mkIf config.test.enableBig { + programs.pandoc = { + enable = true; - defaults = { - metadata = { author = "John Doe"; }; - pdf-engine = "xelatex"; - citeproc = true; - }; + defaults = { + metadata = { author = "John Doe"; }; + pdf-engine = "xelatex"; + citeproc = true; }; - - nmt.script = '' - assertFileContent ${cfg.defaultsFile} ${./defaults-expected.json} - - # Test that defaults are set by looking at the metadata for an empty file - # (it should contain the author that we set in defaults). - output=$(mktemp) - ${cfg.finalPackage}/bin/pandoc --standalone \ - -f markdown /dev/null \ - -t native -o "$output" - assertFileContent "$output" ${./output-expected} - ''; }; + + nixpkgs.overlays = [ (_: _: { inherit (realPkgs) pandoc; }) ]; + + nmt.script = '' + assertFileContent ${cfg.defaultsFile} ${./defaults-expected.json} + + # Test that defaults are set by looking at the metadata for an empty file + # (it should contain the author that we set in defaults). + output=$(mktemp) + ${cfg.finalPackage}/bin/pandoc --standalone \ + -f markdown /dev/null \ + -t native -o "$output" + assertFileContent "$output" ${./output-expected} + ''; } diff --git a/tests/modules/programs/pandoc/templates.nix b/tests/modules/programs/pandoc/templates.nix index f276381a3..f72e0b8ae 100644 --- a/tests/modules/programs/pandoc/templates.nix +++ b/tests/modules/programs/pandoc/templates.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { programs.pandoc = { enable = true; diff --git a/tests/modules/programs/papis/papis.nix b/tests/modules/programs/papis/papis.nix index 507056bed..19990633f 100644 --- a/tests/modules/programs/papis/papis.nix +++ b/tests/modules/programs/papis/papis.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.papis = { enable = true; @@ -23,8 +21,6 @@ }; }; - test.stubs.papis = { }; - nmt.script = '' assertFileContent home-files/.config/papis/config \ ${builtins.toFile "papis-expected-settings.ini" '' diff --git a/tests/modules/programs/pay-respects/integration-disabled.nix b/tests/modules/programs/pay-respects/integration-disabled.nix index fa0806d3d..a6453e354 100644 --- a/tests/modules/programs/pay-respects/integration-disabled.nix +++ b/tests/modules/programs/pay-respects/integration-disabled.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ programs = { pay-respects.enable = true; pay-respects.enableBashIntegration = false; @@ -11,12 +11,10 @@ nushell.enable = true; }; - test.stubs.pay-respects = { }; - nmt.script = '' - assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/dummy' - assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/dummy' - assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/dummy' - assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/dummy' + assertFileNotRegex home-files/.bashrc '@pay-respects@/bin/pay-respects' + assertFileNotRegex home-files/.zshrc '@pay-respects@/bin/pay-respects' + assertFileNotRegex home-files/.config/fish/config.fish '@pay-respects@/bin/pay-respects' + assertFileNotRegex home-files/.config/nushell/config.nu '@pay-respects@/bin/pay-respects' ''; } diff --git a/tests/modules/programs/pay-respects/integration-enabled.nix b/tests/modules/programs/pay-respects/integration-enabled.nix index d5b3d980c..c76463f2b 100644 --- a/tests/modules/programs/pay-respects/integration-enabled.nix +++ b/tests/modules/programs/pay-respects/integration-enabled.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ programs = { pay-respects.enable = true; bash.enable = true; @@ -7,27 +7,25 @@ nushell.enable = true; }; - test.stubs.pay-respects = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ home-files/.bashrc \ - 'eval "$(@pay-respects@/bin/dummy bash --alias)"' + 'eval "$(@pay-respects@/bin/pay-respects bash --alias)"' assertFileExists home-files/.zshrc assertFileContains \ home-files/.zshrc \ - 'eval "$(@pay-respects@/bin/dummy zsh --alias)"' + 'eval "$(@pay-respects@/bin/pay-respects zsh --alias)"' assertFileExists home-files/.config/fish/config.fish assertFileContains \ home-files/.config/fish/config.fish \ - '@pay-respects@/bin/dummy fish --alias | source' + '@pay-respects@/bin/pay-respects fish --alias | source' assertFileExists home-files/.config/nushell/config.nu assertFileContains \ home-files/.config/nushell/config.nu \ - '@pay-respects@/bin/dummy nushell --alias []' + '@pay-respects@/bin/pay-respects nushell --alias []' ''; } diff --git a/tests/modules/programs/pet/settings_21_05.nix b/tests/modules/programs/pet/settings_21_05.nix index cf7285487..595737600 100644 --- a/tests/modules/programs/pet/settings_21_05.nix +++ b/tests/modules/programs/pet/settings_21_05.nix @@ -1,17 +1,10 @@ -{ config, lib, pkgs, ... }: - -with lib; - { home.stateVersion = "21.05"; programs.pet = { enable = true; - selectcmdPackage = config.lib.test.mkStubPackage { }; settings.editor = "nvim"; }; - test.stubs.pet = { }; - nmt.script = '' assertFileContent home-files/.config/pet/config.toml \ ${ diff --git a/tests/modules/programs/pet/settings_21_11.nix b/tests/modules/programs/pet/settings_21_11.nix index 0b82d1f37..05bdc2449 100644 --- a/tests/modules/programs/pet/settings_21_11.nix +++ b/tests/modules/programs/pet/settings_21_11.nix @@ -1,12 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { home.stateVersion = "21.11"; programs.pet = { enable = true; - selectcmdPackage = config.lib.test.mkStubPackage { }; settings = { General = { backend = "Gitlab"; @@ -20,8 +15,6 @@ with lib; }; }; - test.stubs.pet = { }; - nmt.script = '' assertFileContent home-files/.config/pet/config.toml \ ${ diff --git a/tests/modules/programs/pet/snippets.nix b/tests/modules/programs/pet/snippets.nix index 6713b4f16..09dbd17d0 100644 --- a/tests/modules/programs/pet/snippets.nix +++ b/tests/modules/programs/pet/snippets.nix @@ -1,29 +1,14 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.pet = { - enable = true; - selectcmdPackage = pkgs.writeScriptBin "pet-cmd" "" // { - outPath = "@pet-cmd@"; - }; - snippets = [{ - description = "git: search full history for regex"; - command = "git log -p -G "; - tag = [ "git" "regex" ]; - }]; - }; - - nixpkgs.overlays = [ - (self: super: { - pet = pkgs.writeScriptBin "pet" "" // { outPath = "@pet@"; }; - }) - ]; - - nmt.script = '' - assertFileContent home-files/.config/pet/snippet.toml ${./snippet.toml} - ''; + programs.pet = { + enable = true; + snippets = [{ + description = "git: search full history for regex"; + command = "git log -p -G "; + tag = [ "git" "regex" ]; + }]; }; + + nmt.script = '' + assertFileContent home-files/.config/pet/snippet.toml ${./snippet.toml} + ''; } diff --git a/tests/modules/programs/pistol/associations.nix b/tests/modules/programs/pistol/associations.nix index 764060ba9..29158a489 100644 --- a/tests/modules/programs/pistol/associations.nix +++ b/tests/modules/programs/pistol/associations.nix @@ -20,8 +20,6 @@ ]; }; - test.stubs.pistol = { }; - nmt.script = let expected = builtins.toFile "config-expected" '' application/json bat %pistol-filename% diff --git a/tests/modules/programs/pistol/config.nix b/tests/modules/programs/pistol/config.nix index 1999befa6..8df524a3a 100644 --- a/tests/modules/programs/pistol/config.nix +++ b/tests/modules/programs/pistol/config.nix @@ -9,8 +9,6 @@ }; }; - test.stubs.pistol = { }; - test.asserts.assertions.expected = [ (let offendingFile = toString ./config.nix; in '' diff --git a/tests/modules/programs/pistol/double-association.nix b/tests/modules/programs/pistol/double-association.nix index 103f4d057..902c5c4aa 100644 --- a/tests/modules/programs/pistol/double-association.nix +++ b/tests/modules/programs/pistol/double-association.nix @@ -9,8 +9,6 @@ }]; }; - test.stubs.pistol = { }; - test.asserts.assertions.expected = ['' Each entry in programs.pistol.associations must contain exactly one of fpath or mime. diff --git a/tests/modules/programs/pistol/missing-association.nix b/tests/modules/programs/pistol/missing-association.nix index 6ea0a4486..ff47a2381 100644 --- a/tests/modules/programs/pistol/missing-association.nix +++ b/tests/modules/programs/pistol/missing-association.nix @@ -5,8 +5,6 @@ associations = [{ command = "bat %pistol-filename%"; }]; }; - test.stubs.pistol = { }; - test.asserts.assertions.expected = ['' Each entry in programs.pistol.associations must contain exactly one of fpath or mime. diff --git a/tests/modules/programs/pls/bash.nix b/tests/modules/programs/pls/bash.nix index dc1743997..2d3177a40 100644 --- a/tests/modules/programs/pls/bash.nix +++ b/tests/modules/programs/pls/bash.nix @@ -1,29 +1,20 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - bash.enable = true; + programs = { + bash.enable = true; - pls = { - enable = true; - enableAliases = true; - package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; - }; + pls = { + enable = true; + enableAliases = true; }; - - test.stubs.pls = { }; - - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileContains \ - home-files/.bashrc \ - "alias ls=@pls@/bin/pls" - assertFileContains \ - home-files/.bashrc \ - "alias ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" - ''; }; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileContains \ + home-files/.bashrc \ + "alias ls=@pls@/bin/pls" + assertFileContains \ + home-files/.bashrc \ + "alias ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" + ''; } diff --git a/tests/modules/programs/pls/fish.nix b/tests/modules/programs/pls/fish.nix index c745cd768..869feaf8c 100644 --- a/tests/modules/programs/pls/fish.nix +++ b/tests/modules/programs/pls/fish.nix @@ -1,33 +1,27 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, lib, ... }: { - config = { - programs = { - fish.enable = true; + programs = { + fish.enable = true; - pls = { - enable = true; - enableAliases = true; - package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; - }; + pls = { + enable = true; + enableAliases = true; + package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; }; - - # Needed to avoid error with dummy fish package. - xdg.dataFile."fish/home-manager_generated_completions".source = - mkForce (builtins.toFile "empty" ""); - - test.stubs.pls = { }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - assertFileContains \ - home-files/.config/fish/config.fish \ - "alias ls @pls@/bin/pls" - assertFileContains \ - home-files/.config/fish/config.fish \ - "alias ll '@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" - ''; }; + + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + assertFileContains \ + home-files/.config/fish/config.fish \ + "alias ls @pls@/bin/pls" + assertFileContains \ + home-files/.config/fish/config.fish \ + "alias ll '@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" + ''; } diff --git a/tests/modules/programs/pls/zsh.nix b/tests/modules/programs/pls/zsh.nix index bbe68abb5..40e5f1878 100644 --- a/tests/modules/programs/pls/zsh.nix +++ b/tests/modules/programs/pls/zsh.nix @@ -1,32 +1,23 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs = { - zsh.enable = true; + programs = { + zsh.enable = true; - pls = { - enable = true; - enableAliases = true; - package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; - }; + pls = { + enable = true; + enableAliases = true; + package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; }; - - test.stubs = { - pls = { }; - zsh = { }; - }; - - nmt.script = '' - assertFileExists home-files/.zshrc - assertFileContains \ - home-files/.zshrc \ - "alias -- ls=@pls@/bin/pls" - assertFileContains \ - home-files/.zshrc \ - "alias -- ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" - ''; }; + + nmt.script = '' + assertFileExists home-files/.zshrc + assertFileContains \ + home-files/.zshrc \ + "alias -- ls=@pls@/bin/pls" + assertFileContains \ + home-files/.zshrc \ + "alias -- ll='@pls@/bin/pls -d perm -d user -d group -d size -d mtime -d git'" + ''; } diff --git a/tests/modules/programs/poetry/custom-settings.nix b/tests/modules/programs/poetry/custom-settings.nix index fc9793067..376f8bf1f 100644 --- a/tests/modules/programs/poetry/custom-settings.nix +++ b/tests/modules/programs/poetry/custom-settings.nix @@ -9,8 +9,6 @@ }; }; - test.stubs.poetry = { }; - nmt.script = let expectedConfDir = if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config"; diff --git a/tests/modules/programs/poetry/default-settings.nix b/tests/modules/programs/poetry/default-settings.nix index 145cf18ad..31d910047 100644 --- a/tests/modules/programs/poetry/default-settings.nix +++ b/tests/modules/programs/poetry/default-settings.nix @@ -3,8 +3,6 @@ { programs.poetry = { enable = true; }; - test.stubs.poetry = { }; - nmt.script = let expectedConfDir = if pkgs.stdenv.isDarwin then "Library/Application Support" else ".config"; diff --git a/tests/modules/programs/powerline-go/bash.nix b/tests/modules/programs/powerline-go/bash.nix index a48e16fe0..bab8b38d3 100644 --- a/tests/modules/programs/powerline-go/bash.nix +++ b/tests/modules/programs/powerline-go/bash.nix @@ -1,33 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - bash.enable = true; + programs = { + bash.enable = true; - powerline-go = { - enable = true; - newline = true; - modules = [ "nix-shell" ]; - pathAliases = { "\\~/project/foo" = "prj-foo"; }; - settings = { - ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; - }; + powerline-go = { + enable = true; + newline = true; + modules = [ "nix-shell" ]; + pathAliases = { "\\~/project/foo" = "prj-foo"; }; + settings = { + ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; }; }; - - test.stubs.powerline-go = { }; - - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileContains \ - home-files/.bashrc \ - 'PS1=' - assertFileContains \ - home-files/.bashrc \ - '/bin/powerline-go -error $old_exit_status -shell bash -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' - ''; }; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileContains \ + home-files/.bashrc \ + 'PS1=' + assertFileContains \ + home-files/.bashrc \ + '/bin/powerline-go -error $old_exit_status -shell bash -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' + ''; } diff --git a/tests/modules/programs/powerline-go/bashmodulesright.nix b/tests/modules/programs/powerline-go/bashmodulesright.nix index 688c0fad7..6b7c2e3d3 100644 --- a/tests/modules/programs/powerline-go/bashmodulesright.nix +++ b/tests/modules/programs/powerline-go/bashmodulesright.nix @@ -1,34 +1,26 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - bash.enable = true; + programs = { + bash.enable = true; - powerline-go = { - enable = true; - newline = true; - modules = [ "nix-shell" ]; - modulesRight = [ "git" ]; - pathAliases = { "\\~/project/foo" = "prj-foo"; }; - settings = { - ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; - }; + powerline-go = { + enable = true; + newline = true; + modules = [ "nix-shell" ]; + modulesRight = [ "git" ]; + pathAliases = { "\\~/project/foo" = "prj-foo"; }; + settings = { + ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; }; }; - - test.stubs.powerline-go = { }; - - nmt.script = '' - assertFileExists home-files/.bashrc - assertFileContains \ - home-files/.bashrc \ - 'eval' - assertFileContains \ - home-files/.bashrc \ - '/bin/powerline-go -error $old_exit_status -shell bash -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' - ''; }; + + nmt.script = '' + assertFileExists home-files/.bashrc + assertFileContains \ + home-files/.bashrc \ + 'eval' + assertFileContains \ + home-files/.bashrc \ + '/bin/powerline-go -error $old_exit_status -shell bash -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' + ''; } diff --git a/tests/modules/programs/powerline-go/fish.nix b/tests/modules/programs/powerline-go/fish.nix index 4861d1ba1..f7749c2aa 100644 --- a/tests/modules/programs/powerline-go/fish.nix +++ b/tests/modules/programs/powerline-go/fish.nix @@ -1,34 +1,28 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, ... }: { - config = { - programs = { - fish.enable = true; + programs = { + fish.enable = true; - powerline-go = { - enable = true; - newline = true; - modules = [ "nix-shell" ]; - pathAliases = { "\\~/project/foo" = "prj-foo"; }; - settings = { - ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; - }; + powerline-go = { + enable = true; + newline = true; + modules = [ "nix-shell" ]; + pathAliases = { "\\~/project/foo" = "prj-foo"; }; + settings = { + ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; }; }; - - # Needed to avoid error with dummy fish package. - xdg.dataFile."fish/home-manager_generated_completions".source = - mkForce (builtins.toFile "empty" ""); - - test.stubs.powerline-go = { }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - assertFileContains \ - home-files/.config/fish/config.fish \ - '/bin/powerline-go -error $status -jobs (count (jobs -p)) -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' - ''; }; + + # Needed to avoid error with dummy fish package. + xdg.dataFile."fish/home-manager_generated_completions".source = + lib.mkForce (builtins.toFile "empty" ""); + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + assertFileContains \ + home-files/.config/fish/config.fish \ + '/bin/powerline-go -error $status -jobs (count (jobs -p)) -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' + ''; } diff --git a/tests/modules/programs/powerline-go/zsh.nix b/tests/modules/programs/powerline-go/zsh.nix index 21856e9d1..66845dd53 100644 --- a/tests/modules/programs/powerline-go/zsh.nix +++ b/tests/modules/programs/powerline-go/zsh.nix @@ -1,36 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - zsh.enable = true; + programs = { + zsh.enable = true; - powerline-go = { - enable = true; - newline = true; - modules = [ "nix-shell" ]; - pathAliases = { "\\~/project/foo" = "prj-foo"; }; - settings = { - ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; - }; + powerline-go = { + enable = true; + newline = true; + modules = [ "nix-shell" ]; + pathAliases = { "\\~/project/foo" = "prj-foo"; }; + settings = { + ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; }; }; - - test.stubs = { - powerline-go = { }; - zsh = { }; - }; - - nmt.script = '' - assertFileExists home-files/.zshrc - assertFileContains \ - home-files/.zshrc \ - 'PS1=' - assertFileContains \ - home-files/.zshrc \ - '/bin/powerline-go -error $? -shell zsh -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' - ''; }; + + nmt.script = '' + assertFileExists home-files/.zshrc + assertFileContains \ + home-files/.zshrc \ + 'PS1=' + assertFileContains \ + home-files/.zshrc \ + '/bin/powerline-go -error $? -shell zsh -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' + ''; } diff --git a/tests/modules/programs/powerline-go/zshmodulesright.nix b/tests/modules/programs/powerline-go/zshmodulesright.nix index ffe2e1d28..acd43b6fa 100644 --- a/tests/modules/programs/powerline-go/zshmodulesright.nix +++ b/tests/modules/programs/powerline-go/zshmodulesright.nix @@ -1,37 +1,26 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - zsh.enable = true; + programs = { + zsh.enable = true; - powerline-go = { - enable = true; - newline = true; - modules = [ "nix-shell" ]; - modulesRight = [ "git" ]; - pathAliases = { "\\~/project/foo" = "prj-foo"; }; - settings = { - ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; - }; + powerline-go = { + enable = true; + newline = true; + modules = [ "nix-shell" ]; + modulesRight = [ "git" ]; + pathAliases = { "\\~/project/foo" = "prj-foo"; }; + settings = { + ignore-repos = [ "/home/me/project1" "/home/me/project2" ]; }; }; - - test.stubs = { - powerline-go = { }; - zsh = { }; - }; - - nmt.script = '' - assertFileExists home-files/.zshrc - assertFileContains \ - home-files/.zshrc \ - 'eval' - assertFileContains \ - home-files/.zshrc \ - '/bin/powerline-go -error $? -shell zsh -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' - ''; }; + + nmt.script = '' + assertFileExists home-files/.zshrc + assertFileContains \ + home-files/.zshrc \ + 'eval' + assertFileContains \ + home-files/.zshrc \ + '/bin/powerline-go -error $? -shell zsh -eval -modules nix-shell -modules-right git -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2' + ''; } diff --git a/tests/modules/programs/pubs/pubs-example-settings.nix b/tests/modules/programs/pubs/pubs-example-settings.nix index 59f228009..773075d76 100644 --- a/tests/modules/programs/pubs/pubs-example-settings.nix +++ b/tests/modules/programs/pubs/pubs-example-settings.nix @@ -1,5 +1,3 @@ -{ config, lib, pkgs, ... }: - { programs.pubs = { enable = true; @@ -27,8 +25,6 @@ ''; }; - test.stubs.pubs = { }; - nmt.script = '' assertFileContent \ home-files/.pubsrc ${./pubs-example-settings-expected-pubsrc} diff --git a/tests/modules/programs/pyenv/bash.nix b/tests/modules/programs/pyenv/bash.nix index ac6a8f0c1..4ef778a3b 100644 --- a/tests/modules/programs/pyenv/bash.nix +++ b/tests/modules/programs/pyenv/bash.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs = { bash.enable = true; pyenv.enable = true; }; - test.stubs.pyenv = { name = "pyenv"; }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/pyenv/fish.nix b/tests/modules/programs/pyenv/fish.nix index 41b4911bb..f3628c666 100644 --- a/tests/modules/programs/pyenv/fish.nix +++ b/tests/modules/programs/pyenv/fish.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs = { fish.enable = true; pyenv.enable = true; }; - test.stubs.pyenv = { name = "pyenv"; }; - nmt.script = '' assertFileExists home-files/.config/fish/config.fish assertFileContains \ diff --git a/tests/modules/programs/pyenv/zsh.nix b/tests/modules/programs/pyenv/zsh.nix index da029fc2c..f36905300 100644 --- a/tests/modules/programs/pyenv/zsh.nix +++ b/tests/modules/programs/pyenv/zsh.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs = { zsh.enable = true; pyenv.enable = true; }; - test.stubs.pyenv = { name = "pyenv"; }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileContains \ diff --git a/tests/modules/programs/qcal/http-calendar.nix b/tests/modules/programs/qcal/http-calendar.nix index c32440601..bc5200ce2 100644 --- a/tests/modules/programs/qcal/http-calendar.nix +++ b/tests/modules/programs/qcal/http-calendar.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { programs.qcal.enable = true; accounts.calendar.accounts.test = { @@ -7,8 +5,6 @@ remote = { url = "https://example.com/events.ical"; }; }; - test.stubs = { qcal = { }; }; - nmt.script = '' assertFileExists home-files/.config/qcal/config.json assertFileContent home-files/.config/qcal/config.json ${ diff --git a/tests/modules/programs/qcal/mixed.nix b/tests/modules/programs/qcal/mixed.nix index d2241bdcb..0083d7945 100644 --- a/tests/modules/programs/qcal/mixed.nix +++ b/tests/modules/programs/qcal/mixed.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { programs.qcal.enable = true; accounts.calendar.accounts = { @@ -17,8 +15,6 @@ }; }; - test.stubs = { qcal = { }; }; - nmt.script = '' assertFileExists home-files/.config/qcal/config.json assertFileContent home-files/.config/qcal/config.json ${ diff --git a/tests/modules/programs/qcal/webdav-calendar.nix b/tests/modules/programs/qcal/webdav-calendar.nix index caefe1f16..9cfe5d32a 100644 --- a/tests/modules/programs/qcal/webdav-calendar.nix +++ b/tests/modules/programs/qcal/webdav-calendar.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { programs.qcal = { enable = true; @@ -15,8 +13,6 @@ }; }; - test.stubs = { qcal = { }; }; - nmt.script = '' assertFileExists home-files/.config/qcal/config.json assertFileContent home-files/.config/qcal/config.json ${ diff --git a/tests/modules/programs/qutebrowser/greasemonkey.nix b/tests/modules/programs/qutebrowser/greasemonkey.nix index d6e8713c7..9377a3951 100644 --- a/tests/modules/programs/qutebrowser/greasemonkey.nix +++ b/tests/modules/programs/qutebrowser/greasemonkey.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: let @@ -19,8 +17,6 @@ in { greasemonkey = [ greasemonkeyScript ]; }; - test.stubs.qutebrowser = { }; - nmt.script = let scriptDir = if pkgs.stdenv.hostPlatform.isDarwin then ".qutebrowser/greasemonkey" diff --git a/tests/modules/programs/qutebrowser/keybindings.nix b/tests/modules/programs/qutebrowser/keybindings.nix index 37ccfeba3..0e1400fde 100644 --- a/tests/modules/programs/qutebrowser/keybindings.nix +++ b/tests/modules/programs/qutebrowser/keybindings.nix @@ -21,8 +21,6 @@ }; }; - test.stubs.qutebrowser = { }; - nmt.script = let qutebrowserConfig = if pkgs.stdenv.hostPlatform.isDarwin then ".qutebrowser/config.py" @@ -32,7 +30,7 @@ assertFileContent \ home-files/${qutebrowserConfig} \ ${ - pkgs.writeText "qutebrowser-expected-config.py" '' + builtins.toFile "qutebrowser-expected-config.py" '' config.load_autoconfig(False) c.bindings.default = {} config.bind(",l", "config-cycle spellcheck.languages [\"en-GB\"] [\"en-US\"]", mode="normal") diff --git a/tests/modules/programs/qutebrowser/quickmarks.nix b/tests/modules/programs/qutebrowser/quickmarks.nix index 9437fc614..524808c51 100644 --- a/tests/modules/programs/qutebrowser/quickmarks.nix +++ b/tests/modules/programs/qutebrowser/quickmarks.nix @@ -10,8 +10,6 @@ }; }; - test.stubs.qutebrowser = { }; - nmt.script = let quickmarksFile = if pkgs.stdenv.hostPlatform.isDarwin then ".qutebrowser/quickmarks" @@ -21,7 +19,7 @@ assertFileContent \ home-files/${quickmarksFile} \ ${ - pkgs.writeText "qutebrowser-expected-quickmarks" '' + builtins.toFile "qutebrowser-expected-quickmarks" '' home-manager https://github.com/nix-community/home-manager nixpkgs https://github.com/NixOS/nixpkgs'' } diff --git a/tests/modules/programs/qutebrowser/settings.nix b/tests/modules/programs/qutebrowser/settings.nix index e2cf3915f..91a07132a 100644 --- a/tests/modules/programs/qutebrowser/settings.nix +++ b/tests/modules/programs/qutebrowser/settings.nix @@ -21,8 +21,6 @@ ''; }; - test.stubs.qutebrowser = { }; - nmt.script = let qutebrowserConfig = if pkgs.stdenv.hostPlatform.isDarwin then ".qutebrowser/config.py" @@ -32,7 +30,7 @@ assertFileContent \ home-files/${qutebrowserConfig} \ ${ - pkgs.writeText "qutebrowser-expected-config.py" '' + builtins.toFile "qutebrowser-expected-config.py" '' config.load_autoconfig(False) c.colors.hints.bg = "#000000" c.colors.hints.fg = "#ffffff" diff --git a/tests/modules/programs/ranger/configuration.nix b/tests/modules/programs/ranger/configuration.nix index 90541ac32..a9328a358 100644 --- a/tests/modules/programs/ranger/configuration.nix +++ b/tests/modules/programs/ranger/configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.ranger = { enable = true; @@ -31,8 +29,6 @@ ]; }; - test.stubs = { ranger = { }; }; - nmt.script = '' assertFileExists home-files/.config/ranger/rc.conf assertFileContent home-files/.config/ranger/rc.conf \ diff --git a/tests/modules/programs/rbw/empty-settings.nix b/tests/modules/programs/rbw/empty-settings.nix index aa25c876c..53b12fd7d 100644 --- a/tests/modules/programs/rbw/empty-settings.nix +++ b/tests/modules/programs/rbw/empty-settings.nix @@ -8,8 +8,6 @@ let else ".config/rbw/config.json"; in { - imports = [ ./rbw-stubs.nix ]; - programs.rbw.enable = true; nmt.script = '' diff --git a/tests/modules/programs/rbw/rbw-stubs.nix b/tests/modules/programs/rbw/rbw-stubs.nix deleted file mode 100644 index 77436232d..000000000 --- a/tests/modules/programs/rbw/rbw-stubs.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: - -{ - test.stubs.rbw = { }; - - nixpkgs.overlays = [ - (self: super: { - pinentry-gnome3 = - config.lib.test.mkStubPackage { outPath = "@pinentry-gnome3@"; }; - }) - ]; -} diff --git a/tests/modules/programs/rbw/settings.nix b/tests/modules/programs/rbw/settings.nix index ac5820186..5890fd9ac 100644 --- a/tests/modules/programs/rbw/settings.nix +++ b/tests/modules/programs/rbw/settings.nix @@ -8,18 +8,16 @@ let else ".config/rbw/config.json"; - expected = pkgs.writeText "rbw-expected.json" '' + expected = builtins.toFile "rbw-expected.json" '' { "base_url": "bitwarden.example.com", "email": "name@example.com", "identity_url": "identity.example.com", "lock_timeout": 300, - "pinentry": "@pinentry-gnome3@/bin/dummy" + "pinentry": "@pinentry-gnome3@/bin/pinentry" } ''; in { - imports = [ ./rbw-stubs.nix ]; - programs.rbw = { enable = true; settings = { diff --git a/tests/modules/programs/rbw/simple-settings.nix b/tests/modules/programs/rbw/simple-settings.nix index b690659a9..dbd05da24 100644 --- a/tests/modules/programs/rbw/simple-settings.nix +++ b/tests/modules/programs/rbw/simple-settings.nix @@ -8,7 +8,7 @@ let else ".config/rbw/config.json"; - expected = pkgs.writeText "rbw-expected.json" '' + expected = builtins.toFile "rbw-expected.json" '' { "base_url": null, "email": "name@example.com", @@ -18,8 +18,6 @@ let } ''; in { - imports = [ ./rbw-stubs.nix ]; - programs.rbw = { enable = true; settings = { email = "name@example.com"; }; diff --git a/tests/modules/programs/readline/prefer-xdg-dirs.nix b/tests/modules/programs/readline/prefer-xdg-dirs.nix index 869b8a2cb..b825b3bc2 100644 --- a/tests/modules/programs/readline/prefer-xdg-dirs.nix +++ b/tests/modules/programs/readline/prefer-xdg-dirs.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.preferXdgDirectories = true; diff --git a/tests/modules/programs/readline/using-all-options.nix b/tests/modules/programs/readline/using-all-options.nix index 85c9fc140..a2ae4fafb 100644 --- a/tests/modules/programs/readline/using-all-options.nix +++ b/tests/modules/programs/readline/using-all-options.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.readline = { diff --git a/tests/modules/programs/rio/empty-settings.nix b/tests/modules/programs/rio/empty-settings.nix index 064fc98fa..e89374d1f 100644 --- a/tests/modules/programs/rio/empty-settings.nix +++ b/tests/modules/programs/rio/empty-settings.nix @@ -1,10 +1,6 @@ -_: - { programs.rio.enable = true; - test.stubs.rio = { }; - nmt.script = '' assertPathNotExists home-files/.config/rio ''; diff --git a/tests/modules/programs/rio/example-settings.nix b/tests/modules/programs/rio/example-settings.nix index 68fec3577..48428556b 100644 --- a/tests/modules/programs/rio/example-settings.nix +++ b/tests/modules/programs/rio/example-settings.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, ... }: let - expected = pkgs.writeText "rio-expected.toml" '' + expected = builtins.toFile "rio-expected.toml" '' cursor = "_" padding-x = 0 performance = "Low" diff --git a/tests/modules/programs/rofi-pass/rofi-pass-config.nix b/tests/modules/programs/rofi-pass/rofi-pass-config.nix index 2028e840e..8e5e3592d 100644 --- a/tests/modules/programs/rofi-pass/rofi-pass-config.nix +++ b/tests/modules/programs/rofi-pass/rofi-pass-config.nix @@ -1,36 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.rofi = { - enable = true; + programs.rofi = { + enable = true; - pass = { - enable = true; - extraConfig = '' + pass = { + enable = true; + extraConfig = '' + # Extra config for rofi-pass + xdotool_delay=12 + ''; + }; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/rofi-pass/config \ + ${ + builtins.toFile "rofi-pass-expected-config" '' # Extra config for rofi-pass xdotool_delay=12 - ''; - }; - }; - test.stubs = { - rofi = { }; - rofi-pass = { }; - }; - - nmt.script = '' - assertFileContent \ - home-files/.config/rofi-pass/config \ - ${ - pkgs.writeText "rofi-pass-expected-config" '' - # Extra config for rofi-pass - xdotool_delay=12 - - '' - } - ''; - }; + '' + } + ''; } diff --git a/tests/modules/programs/rofi-pass/rofi-pass-root.nix b/tests/modules/programs/rofi-pass/rofi-pass-root.nix index 300e89db9..1455b689c 100644 --- a/tests/modules/programs/rofi-pass/rofi-pass-root.nix +++ b/tests/modules/programs/rofi-pass/rofi-pass-root.nix @@ -1,31 +1,20 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.rofi = { + programs.rofi = { + enable = true; + + pass = { enable = true; - - pass = { - enable = true; - stores = [ "~/.local/share/password-store" ]; - }; + stores = [ "~/.local/share/password-store" ]; }; - - test.stubs = { - rofi = { }; - rofi-pass = { }; - }; - - nmt.script = '' - assertFileContent \ - home-files/.config/rofi-pass/config \ - ${ - pkgs.writeText "rofi-pass-expected-config" '' - root=~/.local/share/password-store - '' - } - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/rofi-pass/config \ + ${ + builtins.toFile "rofi-pass-expected-config" '' + root=~/.local/share/password-store + '' + } + ''; } diff --git a/tests/modules/programs/rofi/config-with-deprecated-options.nix b/tests/modules/programs/rofi/config-with-deprecated-options.nix index b77c5ac9c..9cc3f281e 100644 --- a/tests/modules/programs/rofi/config-with-deprecated-options.nix +++ b/tests/modules/programs/rofi/config-with-deprecated-options.nix @@ -1,12 +1,9 @@ -{ ... }: - { programs.rofi = { enable = true; colors = { }; }; - test.stubs.rofi = { }; test.asserts.assertions.expected = [ (let offendingFile = toString ./config-with-deprecated-options.nix; in '' diff --git a/tests/modules/programs/rofi/custom-theme.nix b/tests/modules/programs/rofi/custom-theme.nix index 99c9a9896..04890078a 100644 --- a/tests/modules/programs/rofi/custom-theme.nix +++ b/tests/modules/programs/rofi/custom-theme.nix @@ -1,43 +1,37 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, ... }: { - config = { - programs.rofi = { - enable = true; + programs.rofi = { + enable = true; - theme = let inherit (config.lib.formats.rasi) mkLiteral; - in { - "@import" = "~/.cache/wal/colors-rofi-dark"; + theme = let inherit (config.lib.formats.rasi) mkLiteral; + in { + "@import" = "~/.cache/wal/colors-rofi-dark"; - "*" = { - background-color = mkLiteral "#000000"; - foreground-color = mkLiteral "rgba ( 250, 251, 252, 100 % )"; - border-color = mkLiteral "#FFFFFF"; - width = 512; - }; + "*" = { + background-color = mkLiteral "#000000"; + foreground-color = mkLiteral "rgba ( 250, 251, 252, 100 % )"; + border-color = mkLiteral "#FFFFFF"; + width = 512; + }; - "#inputbar" = { children = map mkLiteral [ "prompt" "entry" ]; }; + "#inputbar" = { children = map mkLiteral [ "prompt" "entry" ]; }; - "#textbox-prompt-colon" = { - expand = false; - str = ":"; - margin = mkLiteral "0px 0.3em 0em 0em"; - text-color = mkLiteral "@foreground-color"; - }; + "#textbox-prompt-colon" = { + expand = false; + str = ":"; + margin = mkLiteral "0px 0.3em 0em 0em"; + text-color = mkLiteral "@foreground-color"; }; }; - - test.stubs.rofi = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/rofi/config.rasi \ - ${./custom-theme-config.rasi} - assertFileContent \ - home-files/.local/share/rofi/themes/custom.rasi \ - ${./custom-theme.rasi} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/rofi/config.rasi \ + ${./custom-theme-config.rasi} + assertFileContent \ + home-files/.local/share/rofi/themes/custom.rasi \ + ${./custom-theme.rasi} + ''; } diff --git a/tests/modules/programs/rofi/valid-config.nix b/tests/modules/programs/rofi/valid-config.nix index c581c0efd..538d1c422 100644 --- a/tests/modules/programs/rofi/valid-config.nix +++ b/tests/modules/programs/rofi/valid-config.nix @@ -1,32 +1,24 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.rofi = { - enable = true; - font = "Droid Sans Mono 14"; - terminal = "/some/path"; - cycle = false; - window = { - background = "background"; - border = "border"; - separator = "separator"; - }; - extraConfig = { - modi = "drun,emoji,ssh"; - kb-primary-paste = "Control+V,Shift+Insert"; - kb-secondary-paste = "Control+v,Insert"; - }; + programs.rofi = { + enable = true; + font = "Droid Sans Mono 14"; + terminal = "/some/path"; + cycle = false; + window = { + background = "background"; + border = "border"; + separator = "separator"; + }; + extraConfig = { + modi = "drun,emoji,ssh"; + kb-primary-paste = "Control+V,Shift+Insert"; + kb-secondary-paste = "Control+v,Insert"; }; - - test.stubs.rofi = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/rofi/config.rasi \ - ${./valid-config-expected.rasi} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/rofi/config.rasi \ + ${./valid-config-expected.rasi} + ''; } diff --git a/tests/modules/programs/ruff/ruff.nix b/tests/modules/programs/ruff/ruff.nix index 26654d550..895719e84 100644 --- a/tests/modules/programs/ruff/ruff.nix +++ b/tests/modules/programs/ruff/ruff.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.ruff = { enable = true; @@ -14,8 +12,6 @@ }; }; - test.stubs.ruff = { }; - nmt.script = '' assertFileExists home-files/.config/ruff/ruff.toml assertFileContent home-files/.config/ruff/ruff.toml ${./expected.toml} diff --git a/tests/modules/programs/sagemath/sagemath.nix b/tests/modules/programs/sagemath/sagemath.nix index 2f30ac502..5aba153b2 100644 --- a/tests/modules/programs/sagemath/sagemath.nix +++ b/tests/modules/programs/sagemath/sagemath.nix @@ -10,8 +10,6 @@ ''; }; - test.stubs.sage = { }; - nmt.script = '' assertFileExists home-files/.config/sage/init.sage assertFileContent home-files/.config/sage/init.sage \ diff --git a/tests/modules/programs/sapling/sapling-basic.nix b/tests/modules/programs/sapling/sapling-basic.nix index 6f5caabf5..a893f9a4b 100644 --- a/tests/modules/programs/sapling/sapling-basic.nix +++ b/tests/modules/programs/sapling/sapling-basic.nix @@ -7,8 +7,6 @@ userEmail = "johndoe@example.com"; }; - test.stubs.sapling = { }; - nmt.script = let configfile = if pkgs.stdenv.isDarwin then "Library/Preferences/sapling/sapling.conf" diff --git a/tests/modules/programs/sapling/sapling-most.nix b/tests/modules/programs/sapling/sapling-most.nix index 7280e21ec..17916ee93 100644 --- a/tests/modules/programs/sapling/sapling-most.nix +++ b/tests/modules/programs/sapling/sapling-most.nix @@ -17,8 +17,6 @@ }; }; - test.stubs.sapling = { }; - nmt.script = let configfile = if pkgs.stdenv.isDarwin then "Library/Preferences/sapling/sapling.conf" diff --git a/tests/modules/programs/sbt/credentials.nix b/tests/modules/programs/sbt/credentials.nix index 1a79582ab..78bd3a1f2 100644 --- a/tests/modules/programs/sbt/credentials.nix +++ b/tests/modules/programs/sbt/credentials.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: let credentials = [ diff --git a/tests/modules/programs/sbt/deprecated-options.nix b/tests/modules/programs/sbt/deprecated-options.nix index c760354a4..6a16b52bd 100644 --- a/tests/modules/programs/sbt/deprecated-options.nix +++ b/tests/modules/programs/sbt/deprecated-options.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs.sbt = { enable = true; baseConfigPath = "gone"; }; - test.stubs.sbt = { }; - test.asserts.assertions.expected = [ (let offendingFile = toString ./deprecated-options.nix; in '' diff --git a/tests/modules/programs/sbt/plugins.nix b/tests/modules/programs/sbt/plugins.nix index b413de80e..02e46d56e 100644 --- a/tests/modules/programs/sbt/plugins.nix +++ b/tests/modules/programs/sbt/plugins.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: let dependencyGraph = { @@ -15,12 +13,14 @@ let }; plugins = [ dependencyGraph projectGraph ]; + pluginsExtra = [ "addDependencyTreePlugin" ]; pluginsSbtPath = ".sbt/1.0/plugins/plugins.sbt"; expectedPluginsSbt = pkgs.writeText "plugins.sbt" '' addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") addSbtPlugin("com.dwijnand" % "sbt-project-graph" % "0.4.0") + addDependencyTreePlugin ''; in { @@ -28,6 +28,7 @@ in { programs.sbt = { enable = true; plugins = plugins; + pluginsExtra = pluginsExtra; package = pkgs.writeScriptBin "sbt" ""; }; diff --git a/tests/modules/programs/sbt/user-config-path.nix b/tests/modules/programs/sbt/user-config-path.nix index ef7c2ca8a..799d77dcf 100644 --- a/tests/modules/programs/sbt/user-config-path.nix +++ b/tests/modules/programs/sbt/user-config-path.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ pkgs, ... }: let plugins = [{ diff --git a/tests/modules/programs/scmpuff/bash.nix b/tests/modules/programs/scmpuff/bash.nix index 8f97caa6f..4ec732cbb 100644 --- a/tests/modules/programs/scmpuff/bash.nix +++ b/tests/modules/programs/scmpuff/bash.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs = { scmpuff.enable = true; bash.enable = true; }; - test.stubs.scmpuff = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/scmpuff/fish.nix b/tests/modules/programs/scmpuff/fish.nix index a1abbffa3..5f44308d2 100644 --- a/tests/modules/programs/scmpuff/fish.nix +++ b/tests/modules/programs/scmpuff/fish.nix @@ -10,8 +10,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs.scmpuff = { }; - nmt.script = '' assertFileExists home-files/.config/fish/config.fish assertFileContains \ diff --git a/tests/modules/programs/scmpuff/no-aliases.nix b/tests/modules/programs/scmpuff/no-aliases.nix index 0636c8791..511e12f54 100644 --- a/tests/modules/programs/scmpuff/no-aliases.nix +++ b/tests/modules/programs/scmpuff/no-aliases.nix @@ -13,8 +13,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs.scmpuff = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/scmpuff/no-bash.nix b/tests/modules/programs/scmpuff/no-bash.nix index 5594738ae..8a656e5f8 100644 --- a/tests/modules/programs/scmpuff/no-bash.nix +++ b/tests/modules/programs/scmpuff/no-bash.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { scmpuff = { @@ -9,8 +7,6 @@ bash.enable = true; }; - test.stubs.scmpuff = { }; - nmt.script = '' assertFileNotRegex home-files/.bashrc '@scmpuff@' ''; diff --git a/tests/modules/programs/scmpuff/no-fish.nix b/tests/modules/programs/scmpuff/no-fish.nix index 977b8fd3a..f954d1c36 100644 --- a/tests/modules/programs/scmpuff/no-fish.nix +++ b/tests/modules/programs/scmpuff/no-fish.nix @@ -13,8 +13,6 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs.scmpuff = { }; - nmt.script = '' assertFileNotRegex home-files/.config/fish/config.fish '@scmpuff@' ''; diff --git a/tests/modules/programs/scmpuff/no-shell.nix b/tests/modules/programs/scmpuff/no-shell.nix index 8c33a2b27..ed2c7c086 100644 --- a/tests/modules/programs/scmpuff/no-shell.nix +++ b/tests/modules/programs/scmpuff/no-shell.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { scmpuff = { @@ -11,11 +9,6 @@ zsh.enable = true; }; - test.stubs = { - zsh = { }; - scmpuff = { }; - }; - nmt.script = '' assertFileNotRegex home-files/.zshrc '@scmpuff@' assertFileNotRegex home-files/.bashrc '@scmpuff@' diff --git a/tests/modules/programs/scmpuff/no-zsh.nix b/tests/modules/programs/scmpuff/no-zsh.nix index d6ed24490..d8208a16e 100644 --- a/tests/modules/programs/scmpuff/no-zsh.nix +++ b/tests/modules/programs/scmpuff/no-zsh.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { scmpuff = { @@ -9,11 +7,6 @@ zsh.enable = true; }; - test.stubs = { - zsh = { }; - scmpuff = { }; - }; - nmt.script = '' assertFileNotRegex home-files/.zshrc '@scmpuff@ init -s' ''; diff --git a/tests/modules/programs/scmpuff/zsh.nix b/tests/modules/programs/scmpuff/zsh.nix index 8a4e2e54c..0bb0caa8c 100644 --- a/tests/modules/programs/scmpuff/zsh.nix +++ b/tests/modules/programs/scmpuff/zsh.nix @@ -1,16 +1,9 @@ -{ ... }: - { programs = { scmpuff.enable = true; zsh.enable = true; }; - test.stubs = { - zsh = { }; - scmpuff = { }; - }; - nmt.script = '' assertFileExists home-files/.zshrc assertFileContains \ diff --git a/tests/modules/programs/sftpman/assert-on-no-sshkey.nix b/tests/modules/programs/sftpman/assert-on-no-sshkey.nix index 549b68902..990aacacb 100644 --- a/tests/modules/programs/sftpman/assert-on-no-sshkey.nix +++ b/tests/modules/programs/sftpman/assert-on-no-sshkey.nix @@ -1,21 +1,17 @@ { - config = { - programs.sftpman = { - enable = true; + programs.sftpman = { + enable = true; - mounts = { - mount1 = { - host = "host1.example.com"; - mountPoint = "/path/to/somewhere"; - user = "root"; - }; + mounts = { + mount1 = { + host = "host1.example.com"; + mountPoint = "/path/to/somewhere"; + user = "root"; }; }; - - test.stubs.sftpman = { }; - - test.asserts.assertions.expected = ['' - sftpman mounts using authentication type "publickey" but missing 'sshKey': mount1 - '']; }; + + test.asserts.assertions.expected = ['' + sftpman mounts using authentication type "publickey" but missing 'sshKey': mount1 + '']; } diff --git a/tests/modules/programs/sftpman/example-settings.nix b/tests/modules/programs/sftpman/example-settings.nix index 265f35525..b782fea2b 100644 --- a/tests/modules/programs/sftpman/example-settings.nix +++ b/tests/modules/programs/sftpman/example-settings.nix @@ -1,44 +1,40 @@ { - config = { - programs.sftpman = { - enable = true; - defaultSshKey = "/home/user/.ssh/id_ed25519"; + programs.sftpman = { + enable = true; + defaultSshKey = "/home/user/.ssh/id_ed25519"; - mounts = { - mount1 = { - host = "host1.example.com"; - mountPoint = "/path/to/somewhere"; - user = "root"; - mountOptions = [ "idmap=user" ]; - }; - mount2 = { - host = "host2.example.com"; - mountPoint = "/another/path"; - user = "someuser"; - authType = "password"; - sshKey = null; - }; - mount3 = { - host = "host3.example.com"; - mountPoint = "/yet/another/path"; - user = "user"; - sshKey = "/home/user/.ssh/id_rsa"; - }; + mounts = { + mount1 = { + host = "host1.example.com"; + mountPoint = "/path/to/somewhere"; + user = "root"; + mountOptions = [ "idmap=user" ]; + }; + mount2 = { + host = "host2.example.com"; + mountPoint = "/another/path"; + user = "someuser"; + authType = "password"; + sshKey = null; + }; + mount3 = { + host = "host3.example.com"; + mountPoint = "/yet/another/path"; + user = "user"; + sshKey = "/home/user/.ssh/id_rsa"; }; }; - - test.stubs.sftpman = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/sftpman/mounts/mount1.json \ - ${./expected-mount1.json} - assertFileContent \ - home-files/.config/sftpman/mounts/mount2.json \ - ${./expected-mount2.json} - assertFileContent \ - home-files/.config/sftpman/mounts/mount3.json \ - ${./expected-mount3.json} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/sftpman/mounts/mount1.json \ + ${./expected-mount1.json} + assertFileContent \ + home-files/.config/sftpman/mounts/mount2.json \ + ${./expected-mount2.json} + assertFileContent \ + home-files/.config/sftpman/mounts/mount3.json \ + ${./expected-mount3.json} + ''; } diff --git a/tests/modules/programs/sioyek/sioyek-basic-configuration.nix b/tests/modules/programs/sioyek/sioyek-basic-configuration.nix index 42eb13020..5948d3dc5 100644 --- a/tests/modules/programs/sioyek/sioyek-basic-configuration.nix +++ b/tests/modules/programs/sioyek/sioyek-basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { programs.sioyek = { enable = true; @@ -17,8 +15,6 @@ }; }; - test.stubs.sioyek = { }; - nmt = { description = "Sioyek basic setup with sample configuration"; script = '' diff --git a/tests/modules/programs/sm64ex/settings.nix b/tests/modules/programs/sm64ex/settings.nix index 04499f158..da0fc521c 100644 --- a/tests/modules/programs/sm64ex/settings.nix +++ b/tests/modules/programs/sm64ex/settings.nix @@ -1,80 +1,72 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.sm64ex = { - enable = true; + programs.sm64ex = { + enable = true; - settings = { - fullscreen = true; - window_x = 0; - window_y = 0; - window_w = 1920; - window_h = 1080; - vsync = 1; - texture_filtering = 1; - master_volume = 127; - music_volume = 127; - sfx_volume = 127; - env_volume = 127; - key_a = [ "0026" "1000" "1103" ]; - key_b = [ "0033" "1002" "1101" ]; - key_start = [ "0039" "1006" "ffff" ]; - key_l = [ "0034" "1007" "1104" ]; - key_r = [ "0036" "100a" "1105" ]; - key_z = [ "0025" "1009" "1102" ]; - key_cup = [ "100b" "ffff" "ffff" ]; - key_cdown = [ "100c" "ffff" "ffff" ]; - key_cleft = [ "100d" "ffff" "ffff" ]; - key_cright = [ "100e" "ffff" "ffff" ]; - key_stickup = [ "0011" "ffff" "ffff" ]; - key_stickdown = [ "001f" "ffff" "ffff" ]; - key_stickleft = [ "001e" "ffff" "ffff" ]; - key_stickright = [ "0020" "ffff" "ffff" ]; - stick_deadzone = 16; - rumble_strength = 10; - skip_intro = 1; - }; + settings = { + fullscreen = true; + window_x = 0; + window_y = 0; + window_w = 1920; + window_h = 1080; + vsync = 1; + texture_filtering = 1; + master_volume = 127; + music_volume = 127; + sfx_volume = 127; + env_volume = 127; + key_a = [ "0026" "1000" "1103" ]; + key_b = [ "0033" "1002" "1101" ]; + key_start = [ "0039" "1006" "ffff" ]; + key_l = [ "0034" "1007" "1104" ]; + key_r = [ "0036" "100a" "1105" ]; + key_z = [ "0025" "1009" "1102" ]; + key_cup = [ "100b" "ffff" "ffff" ]; + key_cdown = [ "100c" "ffff" "ffff" ]; + key_cleft = [ "100d" "ffff" "ffff" ]; + key_cright = [ "100e" "ffff" "ffff" ]; + key_stickup = [ "0011" "ffff" "ffff" ]; + key_stickdown = [ "001f" "ffff" "ffff" ]; + key_stickleft = [ "001e" "ffff" "ffff" ]; + key_stickright = [ "0020" "ffff" "ffff" ]; + stick_deadzone = 16; + rumble_strength = 10; + skip_intro = 1; }; - - test.stubs.sm64ex = { }; - - nmt.script = '' - assertFileContent \ - home-files/.local/share/sm64pc/sm64config.txt \ - ${ - pkgs.writeText "sm64ex-expected-settings" '' - env_volume 127 - fullscreen true - key_a 0026 1000 1103 - key_b 0033 1002 1101 - key_cdown 100c ffff ffff - key_cleft 100d ffff ffff - key_cright 100e ffff ffff - key_cup 100b ffff ffff - key_l 0034 1007 1104 - key_r 0036 100a 1105 - key_start 0039 1006 ffff - key_stickdown 001f ffff ffff - key_stickleft 001e ffff ffff - key_stickright 0020 ffff ffff - key_stickup 0011 ffff ffff - key_z 0025 1009 1102 - master_volume 127 - music_volume 127 - rumble_strength 10 - sfx_volume 127 - skip_intro 1 - stick_deadzone 16 - texture_filtering 1 - vsync 1 - window_h 1080 - window_w 1920 - window_x 0 - window_y 0'' - } - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.local/share/sm64pc/sm64config.txt \ + ${ + builtins.toFile "sm64ex-expected-settings" '' + env_volume 127 + fullscreen true + key_a 0026 1000 1103 + key_b 0033 1002 1101 + key_cdown 100c ffff ffff + key_cleft 100d ffff ffff + key_cright 100e ffff ffff + key_cup 100b ffff ffff + key_l 0034 1007 1104 + key_r 0036 100a 1105 + key_start 0039 1006 ffff + key_stickdown 001f ffff ffff + key_stickleft 001e ffff ffff + key_stickright 0020 ffff ffff + key_stickup 0011 ffff ffff + key_z 0025 1009 1102 + master_volume 127 + music_volume 127 + rumble_strength 10 + sfx_volume 127 + skip_intro 1 + stick_deadzone 16 + texture_filtering 1 + vsync 1 + window_h 1080 + window_w 1920 + window_x 0 + window_y 0'' + } + ''; } diff --git a/tests/modules/programs/spotify-player/settings.nix b/tests/modules/programs/spotify-player/settings.nix index e0442360b..cf90d1bf9 100644 --- a/tests/modules/programs/spotify-player/settings.nix +++ b/tests/modules/programs/spotify-player/settings.nix @@ -105,8 +105,6 @@ ]; }; - test.stubs.spotify-player = { }; - nmt.script = '' assertFileContent home-files/.config/spotify-player/app.toml ${./app.toml} assertFileContent home-files/.config/spotify-player/theme.toml ${ diff --git a/tests/modules/programs/ssh/default-config.nix b/tests/modules/programs/ssh/default-config.nix index 6d7e5508a..60a966130 100644 --- a/tests/modules/programs/ssh/default-config.nix +++ b/tests/modules/programs/ssh/default-config.nix @@ -1,13 +1,9 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: { config = { programs.ssh = { enable = true; }; home.file.assertions.text = builtins.toJSON - (map (a: a.message) (filter (a: !a.assertion) config.assertions)); + (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)); nmt.script = '' assertFileExists home-files/.ssh/config diff --git a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix index e841b5bcd..ce83b2c13 100644 --- a/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix +++ b/tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.ssh = { diff --git a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix b/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix index d0c3a7322..ae5c1fb9e 100644 --- a/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix +++ b/tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: { config = { programs.ssh = { enable = true; @@ -25,7 +21,7 @@ with lib; }; home.file.result.text = builtins.toJSON - (map (a: a.message) (filter (a: !a.assertion) config.assertions)); + (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)); nmt.script = '' assertFileExists home-files/.ssh/config diff --git a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix index e7ac454e8..0c05bb108 100644 --- a/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix +++ b/tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.ssh = { diff --git a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix index 890459c8a..9dca55abb 100644 --- a/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix +++ b/tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.ssh = { diff --git a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix index ece7d7953..645876078 100644 --- a/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix +++ b/tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.ssh = { diff --git a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix b/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix index b1228f4ef..c4f549e21 100644 --- a/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix +++ b/tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.ssh = { diff --git a/tests/modules/programs/ssh/match-blocks-attrs.nix b/tests/modules/programs/ssh/match-blocks-attrs.nix index d8584e3a0..21deb7e27 100644 --- a/tests/modules/programs/ssh/match-blocks-attrs.nix +++ b/tests/modules/programs/ssh/match-blocks-attrs.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: { config = { programs.ssh = { enable = true; @@ -12,7 +8,7 @@ with lib; proxyJump = "jump-host"; }; - ordered = hm.dag.entryAfter [ "xyz" ] { port = 1; }; + ordered = lib.hm.dag.entryAfter [ "xyz" ] { port = 1; }; xyz = { identityFile = "file"; @@ -49,7 +45,7 @@ with lib; }; home.file.assertions.text = builtins.toJSON - (map (a: a.message) (filter (a: !a.assertion) config.assertions)); + (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)); nmt.script = '' assertFileExists home-files/.ssh/config diff --git a/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix b/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix index aa1e40d05..01e91c0b6 100644 --- a/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix +++ b/tests/modules/programs/ssh/match-blocks-match-and-hosts.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, lib, ... }: { config = { programs.ssh = { enable = true; @@ -19,7 +15,7 @@ with lib; }; home.file.assertions.text = builtins.toJSON - (map (a: a.message) (filter (a: !a.assertion) config.assertions)); + (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions)); nmt.script = '' assertFileExists home-files/.ssh/config diff --git a/tests/modules/programs/starship/fish_with_interactive.nix b/tests/modules/programs/starship/fish_with_interactive.nix index 0ffd6fd4b..1fdc3d01c 100644 --- a/tests/modules/programs/starship/fish_with_interactive.nix +++ b/tests/modules/programs/starship/fish_with_interactive.nix @@ -1,27 +1,21 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - fish.enable = true; - starship.enable = true; - }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - - export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)" - export NOT_EXPECTED=" - if test \"\$TERM\" != dumb - /home/hm-user/.nix-profile/bin/starship init fish | source - - end" - - if [[ "$GOT" == "$NOT_EXPECTED" ]]; then - fail "Expected starship init to be inside the 'is-interactive' block but it wasn't." - fi - ''; + programs = { + fish.enable = true; + starship.enable = true; }; + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + + export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)" + export NOT_EXPECTED=" + if test \"\$TERM\" != dumb + /home/hm-user/.nix-profile/bin/starship init fish | source + + end" + + if [[ "$GOT" == "$NOT_EXPECTED" ]]; then + fail "Expected starship init to be inside the 'is-interactive' block but it wasn't." + fi + ''; } diff --git a/tests/modules/programs/starship/fish_with_transience.nix b/tests/modules/programs/starship/fish_with_transience.nix index c7a0fbf52..f78e1cfda 100644 --- a/tests/modules/programs/starship/fish_with_transience.nix +++ b/tests/modules/programs/starship/fish_with_transience.nix @@ -1,21 +1,15 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - fish.enable = true; + programs = { + fish.enable = true; - starship = { - enable = true; - enableTransience = true; - }; + starship = { + enable = true; + enableTransience = true; }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - assertFileRegex home-files/.config/fish/config.fish 'enable_transience' - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + assertFileRegex home-files/.config/fish/config.fish 'enable_transience' + ''; } diff --git a/tests/modules/programs/starship/fish_without_interactive.nix b/tests/modules/programs/starship/fish_without_interactive.nix index 0ec8f9646..52150715e 100644 --- a/tests/modules/programs/starship/fish_without_interactive.nix +++ b/tests/modules/programs/starship/fish_without_interactive.nix @@ -1,43 +1,37 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - fish.enable = true; + programs = { + fish.enable = true; - starship = { - enable = true; - enableInteractive = false; - }; + starship = { + enable = true; + enableInteractive = false; }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - - export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)" - export EXPECTED=" - if test \"\$TERM\" != dumb - /home/hm-user/.nix-profile/bin/starship init fish | source - - end" - - export MESSAGE=" - ========== - Expected - ========== - $EXPECTED - ========== - Got - ========== - $GOT - ========== - " - - if [[ "$GOT" != "$EXPECTED" ]]; then - fail "$MESSAGE" - fi - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + + export GOT="$(tail -n 5 `_abs home-files/.config/fish/config.fish`)" + export EXPECTED=" + if test \"\$TERM\" != dumb + /home/hm-user/.nix-profile/bin/starship init fish | source + + end" + + export MESSAGE=" + ========== + Expected + ========== + $EXPECTED + ========== + Got + ========== + $GOT + ========== + " + + if [[ "$GOT" != "$EXPECTED" ]]; then + fail "$MESSAGE" + fi + ''; } diff --git a/tests/modules/programs/starship/fish_without_transience.nix b/tests/modules/programs/starship/fish_without_transience.nix index 7ba8e67fc..a92d9cb20 100644 --- a/tests/modules/programs/starship/fish_without_transience.nix +++ b/tests/modules/programs/starship/fish_without_transience.nix @@ -1,17 +1,11 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs = { - fish.enable = true; - starship.enable = true; - }; - - nmt.script = '' - assertFileExists home-files/.config/fish/config.fish - assertFileNotRegex home-files/.config/fish/config.fish 'enable_transience' - ''; + programs = { + fish.enable = true; + starship.enable = true; }; + + nmt.script = '' + assertFileExists home-files/.config/fish/config.fish + assertFileNotRegex home-files/.config/fish/config.fish 'enable_transience' + ''; } diff --git a/tests/modules/programs/starship/settings.nix b/tests/modules/programs/starship/settings.nix index c3517cae7..69845d410 100644 --- a/tests/modules/programs/starship/settings.nix +++ b/tests/modules/programs/starship/settings.nix @@ -1,55 +1,49 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, ... }: { - config = { - programs.starship = { - enable = true; + programs.starship = { + enable = true; - settings = mkMerge [ - { - add_newline = false; - format = concatStrings [ - "$line_break" - "$package" - "$line_break" - "$character" - ]; - scan_timeout = 10; - character = { - success_symbol = "➜"; - error_symbol = "➜"; - }; - package.disabled = true; - memory_usage.threshold = -1; - aws.style = "bold blue"; - battery = { - charging_symbol = "⚡️"; - display = [{ - threshold = 10; - style = "bold red"; - }]; - }; - } - - { - aws.disabled = true; - - battery.display = [{ - threshold = 30; - style = "bold yellow"; + settings = lib.mkMerge [ + { + add_newline = false; + format = lib.concatStrings [ + "$line_break" + "$package" + "$line_break" + "$character" + ]; + scan_timeout = 10; + character = { + success_symbol = "➜"; + error_symbol = "➜"; + }; + package.disabled = true; + memory_usage.threshold = -1; + aws.style = "bold blue"; + battery = { + charging_symbol = "⚡️"; + display = [{ + threshold = 10; + style = "bold red"; }]; - } - ]; - }; + }; + } - test.stubs.starship = { }; + { + aws.disabled = true; - nmt.script = '' - assertFileContent \ - home-files/.config/starship.toml \ - ${./settings-expected.toml} - ''; + battery.display = [{ + threshold = 30; + style = "bold yellow"; + }]; + } + ]; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/starship.toml \ + ${./settings-expected.toml} + ''; } diff --git a/tests/modules/programs/swayimg/default.nix b/tests/modules/programs/swayimg/default.nix new file mode 100644 index 000000000..b2c3dfa9b --- /dev/null +++ b/tests/modules/programs/swayimg/default.nix @@ -0,0 +1,4 @@ +{ + swayimg-empty-settings = ./empty-settings.nix; + swayimg-example-settings = ./example-settings.nix; +} diff --git a/tests/modules/programs/swayimg/empty-settings.nix b/tests/modules/programs/swayimg/empty-settings.nix new file mode 100644 index 000000000..3ea1c2347 --- /dev/null +++ b/tests/modules/programs/swayimg/empty-settings.nix @@ -0,0 +1,7 @@ +{ + programs.swayimg.enable = true; + + nmt.script = '' + assertPathNotExists home-files/.config/swayimg + ''; +} diff --git a/tests/modules/programs/swayimg/example-settings-expected.ini b/tests/modules/programs/swayimg/example-settings-expected.ini new file mode 100644 index 000000000..f844feb6c --- /dev/null +++ b/tests/modules/programs/swayimg/example-settings-expected.ini @@ -0,0 +1,9 @@ +[info.viewer] +top_left=+name,+format + +[keys.viewer] +Shift+r=rand_file + +[viewer] +scale=fill +window=#10000010 diff --git a/tests/modules/programs/swayimg/example-settings.nix b/tests/modules/programs/swayimg/example-settings.nix new file mode 100644 index 000000000..a1c4adfd2 --- /dev/null +++ b/tests/modules/programs/swayimg/example-settings.nix @@ -0,0 +1,23 @@ +{ config, ... }: + +{ + programs.swayimg = { + enable = true; + package = config.lib.test.mkStubPackage { }; + + settings = { + viewer = { + window = "#10000010"; + scale = "fill"; + }; + "info.viewer" = { top_left = "+name,+format"; }; + "keys.viewer" = { "Shift+r" = "rand_file"; }; + }; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/swayimg/config \ + ${./example-settings-expected.ini} + ''; +} diff --git a/tests/modules/programs/swayr/basic-configuration.toml b/tests/modules/programs/swayr/basic-configuration.toml index 3252a632a..a7a6e68a5 100644 --- a/tests/modules/programs/swayr/basic-configuration.toml +++ b/tests/modules/programs/swayr/basic-configuration.toml @@ -13,10 +13,35 @@ workspace_format = "{indent}Workspace {name} [{layout}] on output {output [layout] auto_tile = false -auto_tile_min_window_width_per_output_width = [[800, 400], [1024, 500], [1280, 600], [1400, 680], [1440, 700], [1600, 780], [1680, 780], [1920, 920], [2048, 980], [2560, 1000], [3440, 1200], [3840, 1280], [4096, 1400], [4480, 1600], [7680, 2400]] +auto_tile_min_window_width_per_output_width = [ + [800, 400], + [1024, 500], + [1280, 600], + [1400, 680], + [1440, 700], + [1600, 780], + [1680, 780], + [1920, 920], + [2048, 980], + [2560, 1000], + [3440, 1200], + [3840, 1280], + [4096, 1400], + [4480, 1600], + [7680, 2400], +] [menu] -args = ["--show=dmenu", "--allow-markup", "--allow-images", "--insensitive", "--cache-file=/dev/null", "--parse-search", "--height=40%", "--prompt={prompt}"] +args = [ + "--show=dmenu", + "--allow-markup", + "--allow-images", + "--insensitive", + "--cache-file=/dev/null", + "--parse-search", + "--height=40%", + "--prompt={prompt}", +] executable = "wofi" [misc] diff --git a/tests/modules/programs/taskwarrior/taskwarrior.nix b/tests/modules/programs/taskwarrior/taskwarrior.nix index 163135a03..d3c91a29f 100644 --- a/tests/modules/programs/taskwarrior/taskwarrior.nix +++ b/tests/modules/programs/taskwarrior/taskwarrior.nix @@ -1,41 +1,32 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - programs.taskwarrior = { - enable = true; - package = pkgs.taskwarrior3; - colorTheme = "dark-violets-256"; - dataLocation = "/some/data/location"; - config = { - urgency.user.tag.next.coefficient = 42.42; - urgency.blocked.coefficient = -42; - }; - extraConfig = '' - include /my/stuff - urgency.user.tag.test.coefficient=-42.42 - ''; + programs.taskwarrior = { + enable = true; + colorTheme = "dark-violets-256"; + dataLocation = "/some/data/location"; + config = { + urgency.user.tag.next.coefficient = 42.42; + urgency.blocked.coefficient = -42; }; - - test.stubs.taskwarrior3 = { }; - - nmt.script = '' - assertFileExists home-files/.config/task/home-manager-taskrc - assertFileContent home-files/.config/task/home-manager-taskrc ${ - pkgs.writeText "taskwarrior.home-conf.expected" '' - data.location=/some/data/location - include dark-violets-256.theme - - urgency.blocked.coefficient=-42 - urgency.user.tag.next.coefficient=42.420000 - - include /my/stuff - urgency.user.tag.test.coefficient=-42.42 - - '' - } + extraConfig = '' + include /my/stuff + urgency.user.tag.test.coefficient=-42.42 ''; }; + + nmt.script = '' + assertFileExists home-files/.config/task/home-manager-taskrc + assertFileContent home-files/.config/task/home-manager-taskrc ${ + builtins.toFile "taskwarrior.home-conf.expected" '' + data.location=/some/data/location + include dark-violets-256.theme + + urgency.blocked.coefficient=-42 + urgency.user.tag.next.coefficient=42.420000 + + include /my/stuff + urgency.user.tag.test.coefficient=-42.42 + + '' + } + ''; } diff --git a/tests/modules/programs/terminator/config-file.nix b/tests/modules/programs/terminator/config-file.nix index 9e4e5d6e6..5cc020630 100644 --- a/tests/modules/programs/terminator/config-file.nix +++ b/tests/modules/programs/terminator/config-file.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs.terminator = { enable = true; @@ -9,11 +7,9 @@ }; }; - test.stubs.terminator = { }; - nmt.script = '' assertFileContent home-files/.config/terminator/config ${ - pkgs.writeText "expected" '' + builtins.toFile "expected" '' [global_config] borderless = True [profiles] diff --git a/tests/modules/programs/texlive/texlive-minimal.nix b/tests/modules/programs/texlive/texlive-minimal.nix index 1b13936be..8db048e58 100644 --- a/tests/modules/programs/texlive/texlive-minimal.nix +++ b/tests/modules/programs/texlive/texlive-minimal.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ lib, pkgs, ... }: { config = { programs.texlive.enable = true; @@ -14,7 +10,7 @@ with lib; combine = tpkgs: pkgs.symlinkJoin { name = "dummy-texlive-combine"; - paths = attrValues tpkgs; + paths = lib.attrValues tpkgs; }; }; }) diff --git a/tests/modules/programs/thefuck/integration-disabled.nix b/tests/modules/programs/thefuck/integration-disabled.nix index 456963596..b69293578 100644 --- a/tests/modules/programs/thefuck/integration-disabled.nix +++ b/tests/modules/programs/thefuck/integration-disabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { thefuck.enable = true; @@ -12,8 +10,6 @@ nushell.enable = true; }; - test.stubs.thefuck = { }; - nmt.script = '' assertFileNotRegex home-files/.bashrc '@thefuck@/bin/thefuck' assertPathNotExists home-files/.config/fish/functions/fuck.fish diff --git a/tests/modules/programs/thefuck/integration-enabled-instant.nix b/tests/modules/programs/thefuck/integration-enabled-instant.nix index 7b89276af..8d007e685 100644 --- a/tests/modules/programs/thefuck/integration-enabled-instant.nix +++ b/tests/modules/programs/thefuck/integration-enabled-instant.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { thefuck = { @@ -10,8 +8,6 @@ zsh.enable = true; }; - test.stubs.thefuck = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/thefuck/integration-enabled.nix b/tests/modules/programs/thefuck/integration-enabled.nix index fb220e6cb..dae5cebef 100644 --- a/tests/modules/programs/thefuck/integration-enabled.nix +++ b/tests/modules/programs/thefuck/integration-enabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs = { thefuck.enable = true; @@ -9,8 +7,6 @@ nushell.enable = true; }; - test.stubs.thefuck = { }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ diff --git a/tests/modules/programs/thunderbird/default.nix b/tests/modules/programs/thunderbird/default.nix index 487297784..0fddeec16 100644 --- a/tests/modules/programs/thunderbird/default.nix +++ b/tests/modules/programs/thunderbird/default.nix @@ -1 +1,5 @@ -{ thunderbird = ./thunderbird.nix; } +{ + thunderbird = ./thunderbird.nix; + thunderbird-with-firefox = ./thunderbird-with-firefox.nix; + thunderbird-native-messaging-host = ./thunderbird-native-messaging-host.nix; +} diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js new file mode 100644 index 000000000..2fe2fa39f --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-expected-first-darwin.js @@ -0,0 +1,85 @@ +// Generated by Home Manager. + +user_pref("general.useragent.override", ""); +user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.account.account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.server", "server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.identities", "id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562"); +user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.server", "server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.accountmanager.defaultaccount", "account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.attachPgpKey", false); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.autoEncryptDrafts", true); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.e2etechpref", 0); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.encryptionpolicy", 0); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.fullName", "H. M. Test"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.htmlSigText", "signature"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.is_gnupg_key_id", true); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.last_entered_external_gnupg_key_id", "ABC"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.openpgp_key_id", "ABC"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.protectSubject", true); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.sign_mail", false); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.smtpServer", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.useremail", "home-manager@example.com"); +user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.valid", true); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.autoEncryptDrafts", false); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.fullName", "H. M. Test Jr."); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.htmlSigText", ""); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.protectSubject", false); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.smtpServer", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.useremail", "hm@example.org"); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.valid", true); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.attachPgpKey", false); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.autoEncryptDrafts", true); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.e2etechpref", 0); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.encryptionpolicy", 0); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.fullName", "H. M. Test"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.htmlSigText", "signature"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.is_gnupg_key_id", true); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.last_entered_external_gnupg_key_id", "ABC"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.openpgp_key_id", "ABC"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.protectSubject", true); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.sign_mail", false); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.smtpServer", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.useremail", "hm@example.com"); +user_pref("mail.identity.id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.valid", true); +user_pref("mail.openpgp.allow_external_gnupg", true); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory", "Library/Thunderbird/Profiles/first/ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory-rel", "[ProfD]ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "imap.example.org"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.login_at_startup", true); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.name", "hm-account"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 143); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory", "Library/Thunderbird/Profiles/first/Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory-rel", "[ProfD]Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.hostname", "Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.name", "rss"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.type", "rss"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory", "Library/Thunderbird/Profiles/first/ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory-rel", "[ProfD]ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "imap.example.com"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.login_at_startup", true); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.name", "hm@example.com"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.port", 123); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.socketType", 3); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.type", "imap"); +user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.userName", "home.manager"); +user_pref("mail.smtp.defaultserver", "smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.authMethod", 3); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "smtp.example.org"); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 587); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.try_ssl", 2); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.username", "home.manager.jr"); +user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.authMethod", 3); +user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "smtp.example.com"); +user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.port", 456); +user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.try_ssl", 3); +user_pref("mail.smtpserver.smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.username", "home.manager"); +user_pref("mail.smtpservers", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,smtp_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("privacy.donottrackheader.enabled", true); + +user_pref("mail.html_compose", false); + diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-first.js b/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js similarity index 89% rename from tests/modules/programs/thunderbird/thunderbird-expected-first.js rename to tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js index 8499ef89e..6d5f57274 100644 --- a/tests/modules/programs/thunderbird/thunderbird-expected-first.js +++ b/tests/modules/programs/thunderbird/thunderbird-expected-first-linux.js @@ -3,9 +3,10 @@ user_pref("general.useragent.override", ""); user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.account.account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.server", "server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.identities", "id_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562"); user_pref("mail.account.account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.server", "server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); -user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); +user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc,account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f,account_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); user_pref("mail.accountmanager.defaultaccount", "account_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.attachPgpKey", false); user_pref("mail.identity.id_8bbcff78f53202c0bfaa490a2068e3e5d6e36872144c659952ecc0ada47d7562.autoEncryptDrafts", true); @@ -52,6 +53,11 @@ user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da50 user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3); user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap"); user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory", ".thunderbird/first/Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.directory-rel", "[ProfD]Mail/Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.hostname", "Feeds-c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.name", "rss"); +user_pref("mail.server.server_c6cc42837ed0a8041f93ff12c579a4af0dbe702461c97eef069f9f5f8dc4bfab.type", "rss"); user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory", ".thunderbird/first/ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.directory-rel", "[ProfD]ImapMail/cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f"); user_pref("mail.server.server_cda3f13b64c1db7d4b58ce07a31304a362d7dcaf14476bfabcca913ae41ada9f.hostname", "imap.example.com"); diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini new file mode 100644 index 000000000..030551a91 --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-darwin.ini @@ -0,0 +1,14 @@ +[General] +StartWithLastProfile=1 + +[Profile0] +Default=1 +IsRelative=1 +Name=first +Path=Profiles/first + +[Profile1] +Default=0 +IsRelative=1 +Name=second +Path=Profiles/second diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-profiles.ini b/tests/modules/programs/thunderbird/thunderbird-expected-profiles-linux.ini similarity index 100% rename from tests/modules/programs/thunderbird/thunderbird-expected-profiles.ini rename to tests/modules/programs/thunderbird/thunderbird-expected-profiles-linux.ini diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js b/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js new file mode 100644 index 000000000..d634568c8 --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-expected-second-darwin.js @@ -0,0 +1,34 @@ +// Generated by Home Manager. + +user_pref("general.useragent.override", ""); +user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.identities", "id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.account.account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.server", "server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.accountmanager.accounts", "account_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.autoEncryptDrafts", false); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.fullName", "H. M. Test Jr."); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.htmlSigText", ""); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.protectSubject", false); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.smtpServer", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.useremail", "hm@example.org"); +user_pref("mail.identity.id_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.valid", true); +user_pref("mail.openpgp.allow_external_gnupg", false); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory", "Library/Thunderbird/Profiles/second/ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.directory-rel", "[ProfD]ImapMail/bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "imap.example.org"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.login_at_startup", true); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.name", "hm-account"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 143); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.socketType", 3); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.type", "imap"); +user_pref("mail.server.server_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.userName", "home.manager.jr"); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.authMethod", 3); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.hostname", "smtp.example.org"); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.port", 587); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.try_ssl", 2); +user_pref("mail.smtpserver.smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc.username", "home.manager.jr"); +user_pref("mail.smtpservers", "smtp_bcd3ace52bed41febb6cdc2fb1303aebaa573e0d993872da503950901bb6c6fc"); +user_pref("privacy.donottrackheader.enabled", true); +user_pref("second", {"nested":{"evenFurtherNested":[1,2,3]}}); +user_pref("second.setting", "some-test-setting"); + + diff --git a/tests/modules/programs/thunderbird/thunderbird-expected-second.js b/tests/modules/programs/thunderbird/thunderbird-expected-second-linux.js similarity index 100% rename from tests/modules/programs/thunderbird/thunderbird-expected-second.js rename to tests/modules/programs/thunderbird/thunderbird-expected-second-linux.js diff --git a/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix new file mode 100644 index 000000000..57bef0f13 --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-native-messaging-host.nix @@ -0,0 +1,25 @@ +# Confirm that both Firefox and Thunderbird can be configured at the same time. +{ lib, realPkgs, ... }: +lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) { + programs.thunderbird = { + nativeMessagingHosts = with realPkgs; + [ + # NOTE: this is not a real Thunderbird native host module but Firefox; no + # native hosts are currently packaged for nixpkgs or elsewhere, so we + # have to improvise. Packaging wise, Firefox and Thunderbird native hosts + # are identical though. The test doesn't care if the host was meant for + # either as long as the right paths are present in the package. + browserpass + ]; + }; + + nmt.script = let + isDarwin = realPkgs.stdenv.hostPlatform.isDarwin; + nativeHostsDir = if isDarwin then + "Library/Mozilla/NativeMessagingHosts" + else + ".mozilla/native-messaging-hosts"; + in '' + assertFileExists home-files/${nativeHostsDir}/com.github.browserpass.native.json + ''; +} diff --git a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix new file mode 100644 index 000000000..0d23460d2 --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix @@ -0,0 +1,9 @@ +# Confirm that both Firefox and Thunderbird can be configured at the same time. +{ lib, realPkgs, ... }: +lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) { + programs.firefox = { + enable = true; + # Darwin doesn't support wrapped Firefox, using unwrapped instead + package = realPkgs.firefox-unwrapped; + }; +} diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix index 127083977..961b91359 100644 --- a/tests/modules/programs/thunderbird/thunderbird.nix +++ b/tests/modules/programs/thunderbird/thunderbird.nix @@ -1,4 +1,4 @@ -{ +{ lib, realPkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; accounts.email.accounts = { @@ -38,6 +38,13 @@ programs.thunderbird = { enable = true; + # Disable warning so that platforms' behavior is the same + darwinSetupWarning = false; + + # Darwin doesn't support wrapped Thunderbird, using unwrapped instead; + # using -latest- because ESR is currently broken on Darwin + package = realPkgs.thunderbird-latest-unwrapped; + profiles = { first = { isDefault = true; @@ -51,6 +58,8 @@ extraConfig = '' user_pref("mail.html_compose", false); ''; + + feedAccounts.rss = { }; }; second.settings = { @@ -65,27 +74,30 @@ }; }; - test.stubs.thunderbird = { }; + nmt.script = let + isDarwin = realPkgs.stdenv.hostPlatform.isDarwin; + configDir = if isDarwin then "Library/Thunderbird" else ".thunderbird"; + profilesDir = if isDarwin then "${configDir}/Profiles" else "${configDir}"; + platform = if isDarwin then "darwin" else "linux"; + in '' + assertFileExists home-files/${configDir}/profiles.ini + assertFileContent home-files/${configDir}/profiles.ini \ + ${./thunderbird-expected-profiles-${platform}.ini} - nmt.script = '' - assertFileExists home-files/.thunderbird/profiles.ini - assertFileContent home-files/.thunderbird/profiles.ini \ - ${./thunderbird-expected-profiles.ini} + assertFileExists home-files/${profilesDir}/first/user.js + assertFileContent home-files/${profilesDir}/first/user.js \ + ${./thunderbird-expected-first-${platform}.js} - assertFileExists home-files/.thunderbird/first/user.js - assertFileContent home-files/.thunderbird/first/user.js \ - ${./thunderbird-expected-first.js} + assertFileExists home-files/${profilesDir}/second/user.js + assertFileContent home-files/${profilesDir}/second/user.js \ + ${./thunderbird-expected-second-${platform}.js} - assertFileExists home-files/.thunderbird/second/user.js - assertFileContent home-files/.thunderbird/second/user.js \ - ${./thunderbird-expected-second.js} - - assertFileExists home-files/.thunderbird/first/chrome/userChrome.css - assertFileContent home-files/.thunderbird/first/chrome/userChrome.css \ + assertFileExists home-files/${profilesDir}/first/chrome/userChrome.css + assertFileContent home-files/${profilesDir}/first/chrome/userChrome.css \ <(echo "* { color: blue !important; }") - assertFileExists home-files/.thunderbird/first/chrome/userContent.css - assertFileContent home-files/.thunderbird/first/chrome/userContent.css \ + assertFileExists home-files/${profilesDir}/first/chrome/userContent.css + assertFileContent home-files/${profilesDir}/first/chrome/userContent.css \ <(echo "* { color: red !important; }") ''; } diff --git a/tests/modules/programs/tmate/tmate.nix b/tests/modules/programs/tmate/tmate.nix index 4beb84c11..76e07d881 100644 --- a/tests/modules/programs/tmate/tmate.nix +++ b/tests/modules/programs/tmate/tmate.nix @@ -1,5 +1,3 @@ -{ config, lib, pkgs, ... }: - { programs.tmate = { enable = true; @@ -8,8 +6,6 @@ extraConfig = ''set tmate-session-name "session-name"''; }; - test.stubs.tmate = { }; - nmt.script = let expectedConfig = '' set -g tmate-server-port 222 diff --git a/tests/modules/programs/tmux/default-shell.nix b/tests/modules/programs/tmux/default-shell.nix index af05eb0e7..f0718b8ad 100644 --- a/tests/modules/programs/tmux/default-shell.nix +++ b/tests/modules/programs/tmux/default-shell.nix @@ -1,7 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ pkgs, ... }: let substituteExpected = path: diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.nix b/tests/modules/programs/tmux/disable-confirmation-prompt.nix index aec1f66cf..7bcc08e16 100644 --- a/tests/modules/programs/tmux/disable-confirmation-prompt.nix +++ b/tests/modules/programs/tmux/disable-confirmation-prompt.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/tmux/emacs-with-plugins.nix b/tests/modules/programs/tmux/emacs-with-plugins.nix index 4a0382d8d..146c5fa8e 100644 --- a/tests/modules/programs/tmux/emacs-with-plugins.nix +++ b/tests/modules/programs/tmux/emacs-with-plugins.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ pkgs, ... }: { config = { programs.tmux = { aggressiveResize = true; diff --git a/tests/modules/programs/tmux/mouse-enabled.nix b/tests/modules/programs/tmux/mouse-enabled.nix index 6fc5b526e..5e674e21c 100644 --- a/tests/modules/programs/tmux/mouse-enabled.nix +++ b/tests/modules/programs/tmux/mouse-enabled.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/tmux/not-enabled.nix b/tests/modules/programs/tmux/not-enabled.nix index d5f08b36f..556aaef9e 100644 --- a/tests/modules/programs/tmux/not-enabled.nix +++ b/tests/modules/programs/tmux/not-enabled.nix @@ -1,7 +1,3 @@ -{ config, lib, ... }: - -with lib; - { config = { programs.tmux = { enable = false; }; diff --git a/tests/modules/programs/tmux/prefix.nix b/tests/modules/programs/tmux/prefix.nix index 9f97940e7..7777ad6df 100644 --- a/tests/modules/programs/tmux/prefix.nix +++ b/tests/modules/programs/tmux/prefix.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/tmux/secure-socket-enabled.nix b/tests/modules/programs/tmux/secure-socket-enabled.nix index 60b3f7087..eeb708f7c 100644 --- a/tests/modules/programs/tmux/secure-socket-enabled.nix +++ b/tests/modules/programs/tmux/secure-socket-enabled.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/tmux/shortcut-without-prefix.nix b/tests/modules/programs/tmux/shortcut-without-prefix.nix index 5c294ef97..635a9e10b 100644 --- a/tests/modules/programs/tmux/shortcut-without-prefix.nix +++ b/tests/modules/programs/tmux/shortcut-without-prefix.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/tmux/vi-all-true.nix b/tests/modules/programs/tmux/vi-all-true.nix index 8b9cf1a36..e04ea922e 100644 --- a/tests/modules/programs/tmux/vi-all-true.nix +++ b/tests/modules/programs/tmux/vi-all-true.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { config = { programs.tmux = { diff --git a/tests/modules/programs/todoman/config.nix b/tests/modules/programs/todoman/config.nix new file mode 100644 index 000000000..789f32168 --- /dev/null +++ b/tests/modules/programs/todoman/config.nix @@ -0,0 +1,19 @@ +{ + programs.todoman = { + enable = true; + glob = "*/*"; + extraConfig = '' + date_format = "%d.%m.%Y" + default_list = "test" + ''; + }; + + accounts.calendar.basePath = "base/path/calendar"; + + nmt.script = '' + configFile=home-files/.config/todoman/config.py + assertFileExists $configFile + assertFileContent $configFile ${./todoman-config-expected} + ''; +} + diff --git a/tests/modules/programs/todoman/default.nix b/tests/modules/programs/todoman/default.nix new file mode 100644 index 000000000..d429f9230 --- /dev/null +++ b/tests/modules/programs/todoman/default.nix @@ -0,0 +1 @@ +{ todoman-config = ./config.nix; } diff --git a/tests/modules/programs/todoman/todoman-config-expected b/tests/modules/programs/todoman/todoman-config-expected new file mode 100644 index 000000000..00da13e1a --- /dev/null +++ b/tests/modules/programs/todoman/todoman-config-expected @@ -0,0 +1,3 @@ +path = "/home/hm-user/base/path/calendar/*/*" +date_format = "%d.%m.%Y" +default_list = "test" diff --git a/tests/modules/programs/tofi/basic-configuration.nix b/tests/modules/programs/tofi/basic-configuration.nix index 28b289969..95da2d254 100644 --- a/tests/modules/programs/tofi/basic-configuration.nix +++ b/tests/modules/programs/tofi/basic-configuration.nix @@ -1,28 +1,23 @@ -{ config, pkgs, ... }: { - config = { - programs.tofi = { - enable = true; - package = pkgs.tofi; - settings = { - background-color = "#000000"; - border-width = 0; - font = "monospace"; - height = "100%"; - num-results = 5; - outline-width = 0; - padding-left = "35%"; - padding-top = "35%"; - result-spacing = 25; - width = "100%"; - }; +{ + programs.tofi = { + enable = true; + settings = { + background-color = "#000000"; + border-width = 0; + font = "monospace"; + height = "100%"; + num-results = 5; + outline-width = 0; + padding-left = "35%"; + padding-top = "35%"; + result-spacing = 25; + width = "100%"; }; - - test.stubs.tofi = { }; - - nmt.script = '' - assertFileExists home-files/.config/tofi/config - assertFileContent home-files/.config/tofi/config \ - ${./basic-configuration.conf} - ''; }; + + nmt.script = '' + assertFileExists home-files/.config/tofi/config + assertFileContent home-files/.config/tofi/config \ + ${./basic-configuration.conf} + ''; } diff --git a/tests/modules/programs/topgrade/settings.nix b/tests/modules/programs/topgrade/settings.nix index 1e893eb47..f9b2b3dee 100644 --- a/tests/modules/programs/topgrade/settings.nix +++ b/tests/modules/programs/topgrade/settings.nix @@ -26,8 +26,6 @@ ]; }; - test.stubs.topgrade = { }; - nmt.script = '' assertFileContent \ home-files/.config/topgrade.toml \ diff --git a/tests/modules/programs/translate-shell/translate-shell.nix b/tests/modules/programs/translate-shell/translate-shell.nix index 3c1d27bdd..2e6f61d9d 100644 --- a/tests/modules/programs/translate-shell/translate-shell.nix +++ b/tests/modules/programs/translate-shell/translate-shell.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.translate-shell = { enable = true; @@ -12,8 +10,6 @@ }; }; - test.stubs.translate-shell = { }; - nmt.script = '' assertFileContent home-files/.config/translate-shell/init.trans \ ${builtins.toFile "translate-shell-expected-settings.trans" '' diff --git a/tests/modules/programs/vifm/empty-settings.nix b/tests/modules/programs/vifm/empty-settings.nix index 4e1df9c18..4231546e7 100644 --- a/tests/modules/programs/vifm/empty-settings.nix +++ b/tests/modules/programs/vifm/empty-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { programs.vifm.enable = true; - test.stubs.vifm = { }; - nmt.script = '' assertPathNotExists home-files/.config/vifm ''; diff --git a/tests/modules/programs/vim-vint/basic-configuration.nix b/tests/modules/programs/vim-vint/basic-configuration.nix index 2e538f37f..8a17761d8 100644 --- a/tests/modules/programs/vim-vint/basic-configuration.nix +++ b/tests/modules/programs/vim-vint/basic-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.vim-vint = { enable = true; @@ -19,8 +17,6 @@ }; }; - test.stubs = { vim-vint = { }; }; - nmt.script = '' assertFileContent home-files/.config/.vintrc.yaml ${ ./basic-configuration.yaml diff --git a/tests/modules/programs/vinegar/default.nix b/tests/modules/programs/vinegar/default.nix new file mode 100644 index 000000000..0916c04ae --- /dev/null +++ b/tests/modules/programs/vinegar/default.nix @@ -0,0 +1,4 @@ +{ + vinegar-empty-settings = ./empty-settings.nix; + vinegar-example-settings = ./example-settings.nix; +} diff --git a/tests/modules/programs/vinegar/empty-settings.nix b/tests/modules/programs/vinegar/empty-settings.nix new file mode 100644 index 000000000..e7a480036 --- /dev/null +++ b/tests/modules/programs/vinegar/empty-settings.nix @@ -0,0 +1,7 @@ +{ + programs.vinegar.enable = true; + + nmt.script = '' + assertPathNotExists home-files/.config/vinegar/config.toml + ''; +} diff --git a/tests/modules/programs/vinegar/example-config-expected.toml b/tests/modules/programs/vinegar/example-config-expected.toml new file mode 100644 index 000000000..38878ce1c --- /dev/null +++ b/tests/modules/programs/vinegar/example-config-expected.toml @@ -0,0 +1,13 @@ +[env] +WINEFSYNC = "1" + +[studio] +dxvk = false +renderer = "Vulkan" + +[studio.env] +DXVK_HUD = "0" +MANGOHUD = "1" + +[studio.fflags] +DFIntTaskSchedulerTargetFps = 144 diff --git a/tests/modules/programs/vinegar/example-settings.nix b/tests/modules/programs/vinegar/example-settings.nix new file mode 100644 index 000000000..22ac75df5 --- /dev/null +++ b/tests/modules/programs/vinegar/example-settings.nix @@ -0,0 +1,28 @@ +{ config, ... }: { + programs.vinegar = { + enable = true; + package = config.lib.test.mkStubPackage { }; + + settings = { + env.WINEFSYNC = "1"; + + studio = { + dxvk = false; + renderer = "Vulkan"; + + fflags.DFIntTaskSchedulerTargetFps = 144; + + env = { + DXVK_HUD = "0"; + MANGOHUD = "1"; + }; + }; + }; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/vinegar/config.toml \ + ${./example-config-expected.toml} + ''; +} diff --git a/tests/modules/programs/vscode/keybindings.nix b/tests/modules/programs/vscode/keybindings.nix index 64212e29a..a0d3ea93f 100644 --- a/tests/modules/programs/vscode/keybindings.nix +++ b/tests/modules/programs/vscode/keybindings.nix @@ -1,5 +1,5 @@ # Test that keybindings.json is created correctly. -{ pkgs, ... }: +{ pkgs, lib, ... }: let bindings = [ @@ -25,15 +25,25 @@ let } ]; - keybindingsPath = if pkgs.stdenv.hostPlatform.isDarwin then - "Library/Application Support/Code/User/keybindings.json" - else - ".config/Code/User/keybindings.json"; + keybindingsPath = name: + if pkgs.stdenv.hostPlatform.isDarwin then + "Library/Application Support/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }keybindings.json" + else + ".config/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }keybindings.json"; - settingsPath = if pkgs.stdenv.hostPlatform.isDarwin then - "Library/Application Support/Code/User/settings.json" - else - ".config/Code/User/settings.json"; + settingsPath = name: + if pkgs.stdenv.hostPlatform.isDarwin then + "Library/Application Support/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }settings.json" + else + ".config/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }settings.json"; expectedKeybindings = pkgs.writeText "expected.json" '' [ @@ -65,14 +75,29 @@ let in { programs.vscode = { enable = true; - keybindings = bindings; - package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; }; + profiles = { + default.keybindings = bindings; + test.keybindings = bindings; + }; + package = pkgs.writeScriptBin "vscode" "" // { + pname = "vscode"; + version = "1.75.0"; + }; }; nmt.script = '' - assertFileExists "home-files/${keybindingsPath}" - assertFileContent "home-files/${keybindingsPath}" "${expectedKeybindings}" + assertFileExists "home-files/${keybindingsPath "default"}" + assertFileContent "home-files/${ + keybindingsPath "default" + }" "${expectedKeybindings}" - assertPathNotExists "home-files/${settingsPath}" + assertPathNotExists "home-files/${settingsPath "default"}" + + assertFileExists "home-files/${keybindingsPath "test"}" + assertFileContent "home-files/${ + keybindingsPath "test" + }" "${expectedKeybindings}" + + assertPathNotExists "home-files/${settingsPath "test"}" ''; } diff --git a/tests/modules/programs/vscode/snippets.nix b/tests/modules/programs/vscode/snippets.nix index a7ea44f76..eafa69186 100644 --- a/tests/modules/programs/vscode/snippets.nix +++ b/tests/modules/programs/vscode/snippets.nix @@ -1,13 +1,18 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - snippetsDir = if pkgs.stdenv.hostPlatform.isDarwin then - "Library/Application Support/Code/User/snippets" - else - ".config/Code/User/snippets"; + snippetsDir = name: + if pkgs.stdenv.hostPlatform.isDarwin then + "Library/Application Support/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }/snippets" + else + ".config/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }snippets"; - globalSnippetsPath = "${snippetsDir}/global.code-snippets"; + globalSnippetsPath = name: "${snippetsDir name}/global.code-snippets"; globalSnippetsExpectedContent = pkgs.writeText "global.code-snippet" '' { @@ -23,7 +28,7 @@ let } ''; - haskellSnippetsPath = "${snippetsDir}/haskell.json"; + haskellSnippetsPath = name: "${snippetsDir name}/haskell.json"; haskellSnippetsExpectedContent = pkgs.writeText "haskell.json" '' { @@ -39,10 +44,7 @@ let } ''; -in { - programs.vscode = { - enable = true; - package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; }; + snippets = { globalSnippets = { fixme = { prefix = [ "fixme" ]; @@ -61,11 +63,38 @@ in { }; }; - nmt.script = '' - assertFileExists "home-files/${globalSnippetsPath}" - assertFileContent "home-files/${globalSnippetsPath}" "${globalSnippetsExpectedContent}" +in { + programs.vscode = { + enable = true; + package = pkgs.writeScriptBin "vscode" "" // { + pname = "vscode"; + version = "1.75.0"; + }; + profiles = { + default = snippets; + test = snippets; + }; + }; - assertFileExists "home-files/${haskellSnippetsPath}" - assertFileContent "home-files/${haskellSnippetsPath}" "${haskellSnippetsExpectedContent}" + nmt.script = '' + assertFileExists "home-files/${globalSnippetsPath "default"}" + assertFileContent "home-files/${ + globalSnippetsPath "default" + }" "${globalSnippetsExpectedContent}" + + assertFileExists "home-files/${globalSnippetsPath "test"}" + assertFileContent "home-files/${ + globalSnippetsPath "test" + }" "${globalSnippetsExpectedContent}" + + assertFileExists "home-files/${haskellSnippetsPath "default"}" + assertFileContent "home-files/${ + haskellSnippetsPath "default" + }" "${haskellSnippetsExpectedContent}" + + assertFileExists "home-files/${haskellSnippetsPath "test"}" + assertFileContent "home-files/${ + haskellSnippetsPath "test" + }" "${haskellSnippetsExpectedContent}" ''; } diff --git a/tests/modules/programs/vscode/tasks.nix b/tests/modules/programs/vscode/tasks.nix index ea85b3d6c..f7b266a33 100644 --- a/tests/modules/programs/vscode/tasks.nix +++ b/tests/modules/programs/vscode/tasks.nix @@ -1,11 +1,16 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - tasksFilePath = if pkgs.stdenv.hostPlatform.isDarwin then - "Library/Application Support/Code/User/tasks.json" - else - ".config/Code/User/tasks.json"; + tasksFilePath = name: + if pkgs.stdenv.hostPlatform.isDarwin then + "Library/Application Support/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }tasks.json" + else + ".config/Code/User/${ + lib.optionalString (name != "default") "profiles/${name}/" + }tasks.json"; tasks = { version = "2.0.0"; @@ -32,12 +37,21 @@ let in { programs.vscode = { enable = true; - package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; }; - userTasks = tasks; + package = pkgs.writeScriptBin "vscode" "" // { + pname = "vscode"; + version = "1.75.0"; + }; + profiles = { + default.userTasks = tasks; + test.userTasks = tasks; + }; }; nmt.script = '' - assertFileExists "home-files/${tasksFilePath}" - assertFileContent "home-files/${tasksFilePath}" "${expectedTasks}" + assertFileExists "home-files/${tasksFilePath "default"}" + assertFileContent "home-files/${tasksFilePath "default"}" "${expectedTasks}" + + assertFileExists "home-files/${tasksFilePath "test"}" + assertFileContent "home-files/${tasksFilePath "test"}" "${expectedTasks}" ''; } diff --git a/tests/modules/programs/vscode/update-checks.nix b/tests/modules/programs/vscode/update-checks.nix index 1547bd36a..b75cda566 100644 --- a/tests/modules/programs/vscode/update-checks.nix +++ b/tests/modules/programs/vscode/update-checks.nix @@ -17,9 +17,14 @@ let in { programs.vscode = { enable = true; - package = pkgs.writeScriptBin "vscode" "" // { pname = "vscode"; }; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; + package = pkgs.writeScriptBin "vscode" "" // { + pname = "vscode"; + version = "1.75.0"; + }; + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + }; }; nmt.script = '' diff --git a/tests/modules/programs/watson/empty-settings.nix b/tests/modules/programs/watson/empty-settings.nix index 8e0474665..3dec3b76e 100644 --- a/tests/modules/programs/watson/empty-settings.nix +++ b/tests/modules/programs/watson/empty-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, pkgs, ... }: { programs.watson = { enable = true; package = config.lib.test.mkStubPackage { }; diff --git a/tests/modules/programs/watson/example-settings.nix b/tests/modules/programs/watson/example-settings.nix index f81f1ac85..11fd988aa 100644 --- a/tests/modules/programs/watson/example-settings.nix +++ b/tests/modules/programs/watson/example-settings.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, pkgs, ... }: { programs.watson = { enable = true; package = config.lib.test.mkStubPackage { }; diff --git a/tests/modules/programs/wezterm/bash-integration-default.nix b/tests/modules/programs/wezterm/bash-integration-default.nix index 84f34effb..3a63a6848 100644 --- a/tests/modules/programs/wezterm/bash-integration-default.nix +++ b/tests/modules/programs/wezterm/bash-integration-default.nix @@ -1,13 +1,9 @@ -{ ... }: - { programs.bash.enable = true; # Bash integration is enabled by default. programs.wezterm.enable = true; - test.stubs.wezterm = { }; - nmt.script = '' assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wezterm/bash-integration-disabled.nix b/tests/modules/programs/wezterm/bash-integration-disabled.nix index 43c5f5fd9..d0c65eb9a 100644 --- a/tests/modules/programs/wezterm/bash-integration-disabled.nix +++ b/tests/modules/programs/wezterm/bash-integration-disabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.bash.enable = true; @@ -8,8 +6,6 @@ enableBashIntegration = false; }; - test.stubs.wezterm = { }; - nmt.script = '' assertFileNotRegex home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wezterm/bash-integration-enabled.nix b/tests/modules/programs/wezterm/bash-integration-enabled.nix index 007bc0d1a..6371f8c6f 100644 --- a/tests/modules/programs/wezterm/bash-integration-enabled.nix +++ b/tests/modules/programs/wezterm/bash-integration-enabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.bash.enable = true; @@ -8,8 +6,6 @@ enableBashIntegration = true; }; - test.stubs.wezterm = { }; - nmt.script = '' assertFileContains home-files/.bashrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wezterm/empty-setting.nix b/tests/modules/programs/wezterm/empty-setting.nix index 2f2ffa084..fda2eb572 100644 --- a/tests/modules/programs/wezterm/empty-setting.nix +++ b/tests/modules/programs/wezterm/empty-setting.nix @@ -1,10 +1,6 @@ -{ ... }: - { programs.wezterm = { enable = true; }; - test.stubs.wezterm = { }; - nmt.script = let expected = builtins.toFile "wezterm.lua" '' -- Generated by Home Manager. diff --git a/tests/modules/programs/wezterm/example-setting.nix b/tests/modules/programs/wezterm/example-setting.nix index 2ed566a7e..640328060 100644 --- a/tests/modules/programs/wezterm/example-setting.nix +++ b/tests/modules/programs/wezterm/example-setting.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.wezterm = { enable = true; @@ -46,8 +44,6 @@ }; }; - test.stubs.wezterm = { }; - nmt.script = let expectedConfig = builtins.toFile "wezterm.lua" '' -- Generated by Home Manager. @@ -69,9 +65,27 @@ ''; expectedColorScheme = builtins.toFile "test.toml" '' [colors] - ansi = ["#222222", "#D14949", "#48874F", "#AFA75A", "#599797", "#8F6089", "#5C9FA8", "#8C8C8C"] + ansi = [ + "#222222", + "#D14949", + "#48874F", + "#AFA75A", + "#599797", + "#8F6089", + "#5C9FA8", + "#8C8C8C", + ] background = "#1B1B1B" - brights = ["#444444", "#FF6D6D", "#89FF95", "#FFF484", "#97DDFF", "#FDAAF2", "#85F5DA", "#E9E9E9"] + brights = [ + "#444444", + "#FF6D6D", + "#89FF95", + "#FFF484", + "#97DDFF", + "#FDAAF2", + "#85F5DA", + "#E9E9E9", + ] cursor_bg = "#BEAF8A" cursor_border = "#BEAF8A" cursor_fg = "#1B1B1B" diff --git a/tests/modules/programs/wezterm/zsh-integration-default.nix b/tests/modules/programs/wezterm/zsh-integration-default.nix index cc398c9d9..25abddabb 100644 --- a/tests/modules/programs/wezterm/zsh-integration-default.nix +++ b/tests/modules/programs/wezterm/zsh-integration-default.nix @@ -1,14 +1,9 @@ -{ ... }: - { programs.zsh.enable = true; # Zsh integration is enabled by default. programs.wezterm.enable = true; - test.stubs.wezterm = { }; - test.stubs.zsh = { }; - nmt.script = '' assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wezterm/zsh-integration-disabled.nix b/tests/modules/programs/wezterm/zsh-integration-disabled.nix index fe7375245..702e2cb7c 100644 --- a/tests/modules/programs/wezterm/zsh-integration-disabled.nix +++ b/tests/modules/programs/wezterm/zsh-integration-disabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.zsh.enable = true; @@ -8,9 +6,6 @@ enableZshIntegration = false; }; - test.stubs.wezterm = { }; - test.stubs.zsh = { }; - nmt.script = '' assertFileNotRegex home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wezterm/zsh-integration-enabled.nix b/tests/modules/programs/wezterm/zsh-integration-enabled.nix index 4e0928709..13efc53f2 100644 --- a/tests/modules/programs/wezterm/zsh-integration-enabled.nix +++ b/tests/modules/programs/wezterm/zsh-integration-enabled.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.zsh.enable = true; @@ -8,9 +6,6 @@ enableZshIntegration = true; }; - test.stubs.wezterm = { }; - test.stubs.zsh = { }; - nmt.script = '' assertFileContains home-files/.zshrc 'source "@wezterm@/etc/profile.d/wezterm.sh"' ''; diff --git a/tests/modules/programs/wlogout/layout-multiple.nix b/tests/modules/programs/wlogout/layout-multiple.nix index 108961aae..8e7e06a80 100644 --- a/tests/modules/programs/wlogout/layout-multiple.nix +++ b/tests/modules/programs/wlogout/layout-multiple.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { home.stateVersion = "22.11"; diff --git a/tests/modules/programs/wlogout/layout-single.nix b/tests/modules/programs/wlogout/layout-single.nix index bbb5d61e6..9bcac8211 100644 --- a/tests/modules/programs/wlogout/layout-single.nix +++ b/tests/modules/programs/wlogout/layout-single.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { home.stateVersion = "22.11"; diff --git a/tests/modules/programs/wlogout/styling.nix b/tests/modules/programs/wlogout/styling.nix index 6df6290fd..8233d25b6 100644 --- a/tests/modules/programs/wlogout/styling.nix +++ b/tests/modules/programs/wlogout/styling.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { home.stateVersion = "22.11"; diff --git a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix b/tests/modules/programs/wpaperd/wpaperd-example-settings.nix deleted file mode 100644 index 8869f68cc..000000000 --- a/tests/modules/programs/wpaperd/wpaperd-example-settings.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ ... }: - -{ - config = { - programs.wpaperd = { - enable = true; - settings = { - eDP-1 = { - path = "/home/foo/Pictures/Wallpaper"; - apply-shadow = true; - }; - DP-2 = { - path = "/home/foo/Pictures/Anime"; - sorting = "descending"; - }; - }; - }; - - test.stubs.wpaperd = { }; - - nmt.script = '' - assertFileContent home-files/.config/wpaperd/wallpaper.toml \ - ${./wpaperd-expected-settings.toml} - ''; - }; -} diff --git a/tests/modules/programs/xmobar/basic-configuration.nix b/tests/modules/programs/xmobar/basic-configuration.nix index bbd9420ea..897094417 100644 --- a/tests/modules/programs/xmobar/basic-configuration.nix +++ b/tests/modules/programs/xmobar/basic-configuration.nix @@ -1,8 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ +{ config, ... }: { config = { programs.xmobar = { enable = true; diff --git a/tests/modules/programs/yambar/empty-settings.nix b/tests/modules/programs/yambar/empty-settings.nix index 56cdf27d0..103ce595f 100644 --- a/tests/modules/programs/yambar/empty-settings.nix +++ b/tests/modules/programs/yambar/empty-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { programs.yambar.enable = true; - test.stubs.yambar = { }; - nmt.script = '' assertPathNotExists home-files/.config/yambar ''; diff --git a/tests/modules/programs/yambar/example-settings.nix b/tests/modules/programs/yambar/example-settings.nix index de572090c..19b3e203b 100644 --- a/tests/modules/programs/yambar/example-settings.nix +++ b/tests/modules/programs/yambar/example-settings.nix @@ -1,10 +1,6 @@ -{ config, ... }: - { programs.yambar = { enable = true; - package = config.lib.test.mkStubPackage { }; - settings = { bar = { location = "top"; diff --git a/tests/modules/programs/yazi/bash-integration-enabled.nix b/tests/modules/programs/yazi/bash-integration-enabled.nix index 474a989f9..3c590ff6d 100644 --- a/tests/modules/programs/yazi/bash-integration-enabled.nix +++ b/tests/modules/programs/yazi/bash-integration-enabled.nix @@ -1,5 +1,3 @@ -{ ... }: - let shellIntegration = '' function yy() { @@ -19,8 +17,6 @@ in { enableBashIntegration = true; }; - test.stubs.yazi = { }; - nmt.script = '' assertFileContains home-files/.bashrc '${shellIntegration}' ''; diff --git a/tests/modules/programs/yazi/fish-integration-enabled.nix b/tests/modules/programs/yazi/fish-integration-enabled.nix index 2231035b9..a07940f4b 100644 --- a/tests/modules/programs/yazi/fish-integration-enabled.nix +++ b/tests/modules/programs/yazi/fish-integration-enabled.nix @@ -1,27 +1,16 @@ -{ ... }: +{ config, ... }: -let - shellIntegration = '' - function yy - set tmp (mktemp -t "yazi-cwd.XXXXX") - yazi $argv --cwd-file="$tmp" - if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] - builtin cd -- "$cwd" - end - rm -f -- "$tmp" - end - ''; -in { +{ programs.fish.enable = true; programs.yazi = { enable = true; + shellWrapperName = "yy"; enableFishIntegration = true; }; - test.stubs.yazi = { }; - nmt.script = '' - assertFileContains home-files/.config/fish/config.fish '${shellIntegration}' + assertFileContent home-files/.config/fish/functions/${config.programs.yazi.shellWrapperName}.fish \ + ${./fish-integration-expected.fish} ''; } diff --git a/tests/modules/programs/yazi/fish-integration-expected.fish b/tests/modules/programs/yazi/fish-integration-expected.fish new file mode 100644 index 000000000..d8f11f284 --- /dev/null +++ b/tests/modules/programs/yazi/fish-integration-expected.fish @@ -0,0 +1,8 @@ +function yy + set -l tmp (mktemp -t "yazi-cwd.XXXXX") + command yazi $argv --cwd-file="$tmp" + if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] + builtin cd -- "$cwd" + end + rm -f -- "$tmp" +end diff --git a/tests/modules/programs/yazi/init-lua-string.nix b/tests/modules/programs/yazi/init-lua-string.nix index 999dd6bc6..b28d4a139 100644 --- a/tests/modules/programs/yazi/init-lua-string.nix +++ b/tests/modules/programs/yazi/init-lua-string.nix @@ -1,12 +1,10 @@ -{ ... }: { +{ programs.yazi = { enable = true; initLua = builtins.readFile ./init.lua; }; - test.stubs.yazi = { }; - nmt.script = '' assertFileContent home-files/.config/yazi/init.lua \ ${./init.lua} diff --git a/tests/modules/programs/yazi/nushell-integration-enabled.nix b/tests/modules/programs/yazi/nushell-integration-enabled.nix index a2de2d8b7..6753c74ee 100644 --- a/tests/modules/programs/yazi/nushell-integration-enabled.nix +++ b/tests/modules/programs/yazi/nushell-integration-enabled.nix @@ -20,8 +20,6 @@ in { enableNushellIntegration = true; }; - test.stubs.yazi = { }; - nmt.script = let configPath = if pkgs.stdenv.isDarwin && !config.xdg.enable then "home-files/Library/Application Support/nushell/config.nu" diff --git a/tests/modules/programs/yazi/settings.nix b/tests/modules/programs/yazi/settings.nix index 32b8a9d5f..f2e194f0e 100644 --- a/tests/modules/programs/yazi/settings.nix +++ b/tests/modules/programs/yazi/settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.yazi = { enable = true; @@ -88,8 +86,6 @@ }; }; - test.stubs.yazi = { }; - nmt.script = '' assertFileContent home-files/.config/yazi/keymap.toml \ ${./keymap-expected.toml} diff --git a/tests/modules/programs/yazi/zsh-integration-enabled.nix b/tests/modules/programs/yazi/zsh-integration-enabled.nix index 0c0ec217f..669b8a517 100644 --- a/tests/modules/programs/yazi/zsh-integration-enabled.nix +++ b/tests/modules/programs/yazi/zsh-integration-enabled.nix @@ -1,5 +1,3 @@ -{ ... }: - let shellIntegration = '' function yy() { @@ -19,8 +17,6 @@ in { enableBashIntegration = true; }; - test.stubs.yazi = { }; - nmt.script = '' assertFileContains home-files/.zshrc '${shellIntegration}' ''; diff --git a/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix b/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix index c28d44e57..37a0d034f 100644 --- a/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix +++ b/tests/modules/programs/yt-dlp/yt-dlp-extraConfig.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.yt-dlp = { enable = true; @@ -8,8 +6,6 @@ ''; }; - test.stubs.yt-dlp = { }; - nmt.script = '' assertFileExists home-files/.config/yt-dlp/config assertFileContent home-files/.config/yt-dlp/config ${ diff --git a/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix b/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix index 229f0438c..734a5c10a 100644 --- a/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix +++ b/tests/modules/programs/yt-dlp/yt-dlp-simple-config.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.yt-dlp = { enable = true; @@ -16,8 +14,6 @@ ''; }; - test.stubs.yt-dlp = { }; - nmt.script = '' assertFileExists home-files/.config/yt-dlp/config assertFileContent home-files/.config/yt-dlp/config ${ diff --git a/tests/modules/programs/zed-editor/default.nix b/tests/modules/programs/zed-editor/default.nix index 3c5c894fe..2fcd8da2c 100644 --- a/tests/modules/programs/zed-editor/default.nix +++ b/tests/modules/programs/zed-editor/default.nix @@ -1,5 +1,6 @@ { zed-extensions = ./extensions.nix; + zed-install-remote-server = ./install-remote-server.nix; zed-keymap = ./keymap.nix; zed-settings = ./settings.nix; } diff --git a/tests/modules/programs/zed-editor/install-remote-server.nix b/tests/modules/programs/zed-editor/install-remote-server.nix new file mode 100644 index 000000000..fdfbc095f --- /dev/null +++ b/tests/modules/programs/zed-editor/install-remote-server.nix @@ -0,0 +1,20 @@ +{ config, ... }: + +{ + programs.zed-editor = { + enable = true; + package = config.lib.test.mkStubPackage { version = "57"; } // { + remote_server = config.lib.test.mkStubPackage { + buildScript = '' + mkdir -p $out/bin + touch $out/bin/zed-remote-server-stable-57 + ''; + }; + }; + installRemoteServer = true; + }; + + nmt.script = '' + assertFileExists "home-files/.zed_server/zed-remote-server-stable-57" + ''; +} diff --git a/tests/modules/programs/zellij/enable-shells.nix b/tests/modules/programs/zellij/enable-shells.nix index c648cf7dd..63e13facc 100644 --- a/tests/modules/programs/zellij/enable-shells.nix +++ b/tests/modules/programs/zellij/enable-shells.nix @@ -17,25 +17,20 @@ xdg.dataFile."fish/home-manager_generated_completions".source = lib.mkForce (builtins.toFile "empty" ""); - test.stubs = { - zsh = { }; - zellij = { }; - }; - nmt.script = '' assertFileExists home-files/.bashrc assertFileContains \ home-files/.bashrc \ - 'eval "$(@zellij@/bin/dummy setup --generate-auto-start bash)"' + 'eval "$(@zellij@/bin/zellij setup --generate-auto-start bash)"' assertFileExists home-files/.zshrc assertFileContains \ home-files/.zshrc \ - 'eval "$(@zellij@/bin/dummy setup --generate-auto-start zsh)"' + 'eval "$(@zellij@/bin/zellij setup --generate-auto-start zsh)"' assertFileExists home-files/.config/fish/config.fish assertFileContains \ home-files/.config/fish/config.fish \ - 'eval (@zellij@/bin/dummy setup --generate-auto-start fish | string collect)' + 'eval (@zellij@/bin/zellij setup --generate-auto-start fish | string collect)' ''; } diff --git a/tests/modules/programs/zk/zk.nix b/tests/modules/programs/zk/zk.nix index 8907d1677..b22eb35d9 100644 --- a/tests/modules/programs/zk/zk.nix +++ b/tests/modules/programs/zk/zk.nix @@ -1,5 +1,3 @@ -{ ... }: - { programs.zk = { enable = true; @@ -21,8 +19,6 @@ }; }; - test.stubs.zk = { }; - nmt.script = '' assertFileExists home-files/.config/zk/config.toml assertFileContent home-files/.config/zk/config.toml ${./expected.toml} diff --git a/tests/modules/programs/zplug/modules.nix b/tests/modules/programs/zplug/modules.nix index 1256e33c2..ffb81d7c1 100644 --- a/tests/modules/programs/zplug/modules.nix +++ b/tests/modules/programs/zplug/modules.nix @@ -19,11 +19,6 @@ }; }; - test.stubs = { - zplug = { }; - zsh = { }; - }; - nmt.script = '' assertFileContains home-files/.zshrc \ 'source @zplug@/share/zplug/init.zsh' diff --git a/tests/modules/programs/zsh/default.nix b/tests/modules/programs/zsh/default.nix index 25aa3b470..38e704aac 100644 --- a/tests/modules/programs/zsh/default.nix +++ b/tests/modules/programs/zsh/default.nix @@ -9,4 +9,5 @@ zsh-prezto = ./prezto.nix; zsh-syntax-highlighting = ./syntax-highlighting.nix; zsh-abbr = ./zsh-abbr.nix; + zshrc-contents-priorities = ./zshrc-content-priorities.nix; } diff --git a/tests/modules/programs/zsh/history-ignore-pattern.nix b/tests/modules/programs/zsh/history-ignore-pattern.nix index 49865e846..2442c32f3 100644 --- a/tests/modules/programs/zsh/history-ignore-pattern.nix +++ b/tests/modules/programs/zsh/history-ignore-pattern.nix @@ -1,17 +1,12 @@ -{ ... }: - { imports = [ - ./zsh-stubs.nix ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "echo *" ]; }) ({ ... }: { config.programs.zsh.history.ignorePatterns = [ "rm *" ]; }) ]; - config = { - programs.zsh.enable = true; + programs.zsh.enable = true; - nmt.script = '' - assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'" - ''; - }; + nmt.script = '' + assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'" + ''; } diff --git a/tests/modules/programs/zsh/history-path-new-custom.nix b/tests/modules/programs/zsh/history-path-new-custom.nix index ee6deb883..497796186 100644 --- a/tests/modules/programs/zsh/history-path-new-custom.nix +++ b/tests/modules/programs/zsh/history-path-new-custom.nix @@ -1,17 +1,11 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; - - config = { - home.stateVersion = "20.03"; - programs.zsh = { - enable = true; - history.path = "$HOME/some/directory/zsh_history"; - }; - - nmt.script = '' - assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$' - ''; + home.stateVersion = "20.03"; + programs.zsh = { + enable = true; + history.path = "$HOME/some/directory/zsh_history"; }; + + nmt.script = '' + assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$' + ''; } diff --git a/tests/modules/programs/zsh/history-path-new-default.nix b/tests/modules/programs/zsh/history-path-new-default.nix index 3ead97597..4dfca0d06 100644 --- a/tests/modules/programs/zsh/history-path-new-default.nix +++ b/tests/modules/programs/zsh/history-path-new-default.nix @@ -1,14 +1,8 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; + home.stateVersion = "20.03"; + programs.zsh.enable = true; - config = { - home.stateVersion = "20.03"; - programs.zsh.enable = true; - - nmt.script = '' - assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$' - ''; - }; + nmt.script = '' + assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$' + ''; } diff --git a/tests/modules/programs/zsh/history-path-old-custom.nix b/tests/modules/programs/zsh/history-path-old-custom.nix index 25a2babf5..f4f5ac38d 100644 --- a/tests/modules/programs/zsh/history-path-old-custom.nix +++ b/tests/modules/programs/zsh/history-path-old-custom.nix @@ -1,17 +1,11 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; - - config = { - home.stateVersion = "19.09"; - programs.zsh = { - enable = true; - history.path = "some/directory/zsh_history"; - }; - - nmt.script = '' - assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$' - ''; + home.stateVersion = "19.09"; + programs.zsh = { + enable = true; + history.path = "some/directory/zsh_history"; }; + + nmt.script = '' + assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/some/directory/zsh_history"$' + ''; } diff --git a/tests/modules/programs/zsh/history-path-old-default.nix b/tests/modules/programs/zsh/history-path-old-default.nix index b988ddb62..8e4debb32 100644 --- a/tests/modules/programs/zsh/history-path-old-default.nix +++ b/tests/modules/programs/zsh/history-path-old-default.nix @@ -1,14 +1,8 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; + home.stateVersion = "19.03"; + programs.zsh.enable = true; - config = { - home.stateVersion = "19.03"; - programs.zsh.enable = true; - - nmt.script = '' - assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$' - ''; - }; + nmt.script = '' + assertFileRegex home-files/.zshrc '^HISTFILE="$HOME/.zsh_history"$' + ''; } diff --git a/tests/modules/programs/zsh/history-substring-search.nix b/tests/modules/programs/zsh/history-substring-search.nix index a5f28b724..94c2bae9c 100644 --- a/tests/modules/programs/zsh/history-substring-search.nix +++ b/tests/modules/programs/zsh/history-substring-search.nix @@ -1,23 +1,17 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; - - config = { - programs.zsh = { + programs.zsh = { + enable = true; + historySubstringSearch = { enable = true; - historySubstringSearch = { - enable = true; - searchDownKey = "^[[B"; - searchUpKey = [ "^[[A" "\\eOA" ]; - }; + searchDownKey = "^[[B"; + searchUpKey = [ "^[[A" "\\eOA" ]; }; - - # Written with regex to ensure we don't end up missing newlines in the future - nmt.script = '' - assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[B\" history-substring-search-down$" - assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[A\" history-substring-search-up$" - assertFileRegex home-files/.zshrc "^bindkey \"\\\\eOA\" history-substring-search-up$" - ''; }; + + # Written with regex to ensure we don't end up missing newlines in the future + nmt.script = '' + assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[B\" history-substring-search-down$" + assertFileRegex home-files/.zshrc "^bindkey \"\^\[\[A\" history-substring-search-up$" + assertFileRegex home-files/.zshrc "^bindkey \"\\\\eOA\" history-substring-search-up$" + ''; } diff --git a/tests/modules/programs/zsh/prezto.nix b/tests/modules/programs/zsh/prezto.nix index 7ce609063..ffb5d1835 100644 --- a/tests/modules/programs/zsh/prezto.nix +++ b/tests/modules/programs/zsh/prezto.nix @@ -1,10 +1,19 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; - programs.zsh.prezto.enable = true; + test.stubs = { + zsh-prezto = { + outPath = null; + buildScript = '' + mkdir -p $out/share/zsh-prezto/runcoms + echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile + echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin + echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout + echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv + ''; + }; + }; + nmt.script = '' assertFileExists home-files/.zpreztorc ''; diff --git a/tests/modules/programs/zsh/session-variables.nix b/tests/modules/programs/zsh/session-variables.nix index 45c63d236..0aa20c8c2 100644 --- a/tests/modules/programs/zsh/session-variables.nix +++ b/tests/modules/programs/zsh/session-variables.nix @@ -1,22 +1,18 @@ { config, ... }: { - imports = [ ./zsh-stubs.nix ]; + programs.zsh = { + enable = true; - config = { - programs.zsh = { - enable = true; - - sessionVariables = { - V1 = "v1"; - V2 = "v2-${config.programs.zsh.sessionVariables.V1}"; - }; + sessionVariables = { + V1 = "v1"; + V2 = "v2-${config.programs.zsh.sessionVariables.V1}"; }; - - nmt.script = '' - assertFileExists home-files/.zshenv - assertFileRegex home-files/.zshenv 'export V1="v1"' - assertFileRegex home-files/.zshenv 'export V2="v2-v1"' - ''; }; + + nmt.script = '' + assertFileExists home-files/.zshenv + assertFileRegex home-files/.zshenv 'export V1="v1"' + assertFileRegex home-files/.zshenv 'export V2="v2-v1"' + ''; } diff --git a/tests/modules/programs/zsh/syntax-highlighting.nix b/tests/modules/programs/zsh/syntax-highlighting.nix index 2bd581473..ed7626fcb 100644 --- a/tests/modules/programs/zsh/syntax-highlighting.nix +++ b/tests/modules/programs/zsh/syntax-highlighting.nix @@ -1,24 +1,20 @@ { pkgs, ... }: { - imports = [ ./zsh-stubs.nix ]; - - config = { - programs.zsh = { + programs.zsh = { + enable = true; + syntaxHighlighting = { enable = true; - syntaxHighlighting = { - enable = true; - package = pkgs.hello; - highlighters = [ "brackets" "pattern" "cursor" ]; - styles.comment = "fg=#6c6c6c"; - patterns."rm -rf *" = "fg=white,bold,bg=red"; - }; + package = pkgs.hello; + highlighters = [ "brackets" "pattern" "cursor" ]; + styles.comment = "fg=#6c6c6c"; + patterns."rm -rf *" = "fg=white,bold,bg=red"; }; - - nmt.script = '' - assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" - assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)" - assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=(comment 'fg=#6c6c6c')" - ''; }; + + nmt.script = '' + assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)" + assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES[comment]='fg=#6c6c6c'" + ''; } diff --git a/tests/modules/programs/zsh/zsh-abbr.nix b/tests/modules/programs/zsh/zsh-abbr.nix index f08345e05..5be5e2b03 100644 --- a/tests/modules/programs/zsh/zsh-abbr.nix +++ b/tests/modules/programs/zsh/zsh-abbr.nix @@ -1,8 +1,4 @@ -{ ... }: - { - imports = [ ./zsh-stubs.nix ]; - programs.zsh.zsh-abbr = { enable = true; abbreviations = { ga = "git add"; }; diff --git a/tests/modules/programs/zsh/zsh-stubs.nix b/tests/modules/programs/zsh/zsh-stubs.nix deleted file mode 100644 index d9e275aab..000000000 --- a/tests/modules/programs/zsh/zsh-stubs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ ... }: - -{ - test.stubs = { - hello = { }; - nix-zsh-completions = { }; - zsh = { }; - zsh-abbr = { }; - zsh-history-substring-search = { }; - zsh-prezto = { - outPath = null; - buildScript = '' - mkdir -p $out/share/zsh-prezto/runcoms - echo '# zprofile' > $out/share/zsh-prezto/runcoms/zprofile - echo '# zlogin' > $out/share/zsh-prezto/runcoms/zlogin - echo '# zlogout' > $out/share/zsh-prezto/runcoms/zlogout - echo '# zshenv' > $out/share/zsh-prezto/runcoms/zshenv - ''; - }; - zsh-syntax-highlighting = { }; - }; -} diff --git a/tests/modules/programs/zsh/zshrc-content-priorities.nix b/tests/modules/programs/zsh/zshrc-content-priorities.nix new file mode 100644 index 000000000..5245bef58 --- /dev/null +++ b/tests/modules/programs/zsh/zshrc-content-priorities.nix @@ -0,0 +1,36 @@ +{ lib, ... }: { + programs.zsh = { + enable = true; + + initContent = lib.mkMerge [ + (lib.mkBefore '' + # High priority (mkBefore) + echo "High priority content" + '') + + (lib.mkAfter '' + # Low priority (mkAfter) + echo "Low priority content" + '') + + '' + # Default priority + echo "Default priority content" + '' + ]; + + zprof.enable = true; + }; + + nmt.script = '' + assertFileExists home-files/.zshrc + + assertFileContains home-files/.zshrc "zmodload zsh/zprof" + assertFileContains home-files/.zshrc "High priority content" + assertFileContains home-files/.zshrc "Default priority content" + assertFileContains home-files/.zshrc "Low priority content" + + assertFileRegex home-files/.zshrc '^zmodload zsh/zprof' + assertFileRegex home-files/.zshrc 'echo "Low priority content"$' + ''; +} diff --git a/tests/modules/services/activitywatch/basic-setup.nix b/tests/modules/services/activitywatch/basic-setup.nix index a8ba1cb49..d3a14ae87 100644 --- a/tests/modules/services/activitywatch/basic-setup.nix +++ b/tests/modules/services/activitywatch/basic-setup.nix @@ -5,7 +5,6 @@ let stubPackage = config.lib.test.mkStubPackage { }; in { services.activitywatch = { enable = true; - package = stubPackage; settings = { port = 3012; custom_static = { custom-watcher = stubPackage; }; diff --git a/tests/modules/services/activitywatch/empty-server-settings.nix b/tests/modules/services/activitywatch/empty-server-settings.nix index 89c65b1f0..3b0c50051 100644 --- a/tests/modules/services/activitywatch/empty-server-settings.nix +++ b/tests/modules/services/activitywatch/empty-server-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { services.activitywatch.enable = true; - test.stubs.activitywatch = { }; - nmt.script = '' assertFileExists home-files/.config/systemd/user/activitywatch.service assertFileExists home-files/.config/systemd/user/activitywatch.target diff --git a/tests/modules/services/avizo/with-settings.nix b/tests/modules/services/avizo/with-settings.nix index 4c54f261d..80b219392 100644 --- a/tests/modules/services/avizo/with-settings.nix +++ b/tests/modules/services/avizo/with-settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.avizo = { enable = true; @@ -14,8 +12,6 @@ }; }; - test.stubs.avizo = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/avizo.service assertFileExists $serviceFile diff --git a/tests/modules/services/avizo/without-settings.nix b/tests/modules/services/avizo/without-settings.nix index 49a960614..b6bf03cff 100644 --- a/tests/modules/services/avizo/without-settings.nix +++ b/tests/modules/services/avizo/without-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { services.avizo.enable = true; - test.stubs.avizo = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/avizo.service assertFileExists $serviceFile diff --git a/tests/modules/services/barrier/basic-configuration.nix b/tests/modules/services/barrier/basic-configuration.nix index e7e393184..7a9ad097a 100644 --- a/tests/modules/services/barrier/basic-configuration.nix +++ b/tests/modules/services/barrier/basic-configuration.nix @@ -1,13 +1,9 @@ -{ ... }: - { services.barrier.client = { enable = true; server = "testServer"; }; - test.stubs.barrier = { }; - nmt.script = '' clientServiceFile=home-files/.config/systemd/user/barrierc.service diff --git a/tests/modules/services/blanket/basic-configuration.nix b/tests/modules/services/blanket/basic-configuration.nix index 740c4d08d..f4ded9e9c 100644 --- a/tests/modules/services/blanket/basic-configuration.nix +++ b/tests/modules/services/blanket/basic-configuration.nix @@ -1,9 +1,5 @@ -{ ... }: - { - services.blanket = { enable = true; }; - - test.stubs.blanket = { }; + services.blanket.enable = true; nmt.script = '' clientServiceFile=home-files/.config/systemd/user/blanket.service @@ -20,7 +16,7 @@ RestartSec=5 [Unit] - After=graphical-session-pre.target + After=graphical-session.target Description=Blanket daemon PartOf=graphical-session.target PartOf=pipewire.service diff --git a/tests/modules/services/borgmatic/basic-configuration.nix b/tests/modules/services/borgmatic/basic-configuration.nix index 3763b98fa..85c8efd57 100644 --- a/tests/modules/services/borgmatic/basic-configuration.nix +++ b/tests/modules/services/borgmatic/basic-configuration.nix @@ -1,22 +1,16 @@ -{ config, pkgs, ... }: - { - config = { - services.borgmatic = { - enable = true; - frequency = "weekly"; - }; - - test.stubs.borgmatic = { }; - - nmt.script = '' - assertFileContent \ - $(normalizeStorePaths home-files/.config/systemd/user/borgmatic.service) \ - ${./basic-configuration.service} - - assertFileContent \ - home-files/.config/systemd/user/borgmatic.timer \ - ${./basic-configuration.timer} - ''; + services.borgmatic = { + enable = true; + frequency = "weekly"; }; + + nmt.script = '' + assertFileContent \ + $(normalizeStorePaths home-files/.config/systemd/user/borgmatic.service) \ + ${./basic-configuration.service} + + assertFileContent \ + home-files/.config/systemd/user/borgmatic.timer \ + ${./basic-configuration.timer} + ''; } diff --git a/tests/modules/services/borgmatic/basic-configuration.service b/tests/modules/services/borgmatic/basic-configuration.service index 8b760293a..82d4d8363 100644 --- a/tests/modules/services/borgmatic/basic-configuration.service +++ b/tests/modules/services/borgmatic/basic-configuration.service @@ -1,5 +1,5 @@ [Service] -ExecStart=/nix/store/00000000000000000000000000000000-systemd/bin/systemd-inhibit \ +ExecStart=@systemd@/bin/systemd-inhibit \ --who="borgmatic" \ --what="sleep:shutdown" \ --why="Prevent interrupting scheduled backup" \ diff --git a/tests/modules/services/cachix-agent/basic-setup.nix b/tests/modules/services/cachix-agent/basic-setup.nix index 22c088900..9371d8343 100644 --- a/tests/modules/services/cachix-agent/basic-setup.nix +++ b/tests/modules/services/cachix-agent/basic-setup.nix @@ -1,14 +1,9 @@ -{ config, ... }: - { services.cachix-agent = { enable = true; - package = config.lib.test.mkStubPackage { outPath = "@cachix-agent@"; }; name = "test-agent"; }; - test.stubs.nix = { }; - nmt.script = '' assertFileContent \ home-files/.config/systemd/user/cachix-agent.service \ @@ -20,7 +15,7 @@ [Service] Environment=PATH=@nix@/bin EnvironmentFile=/home/hm-user/.config/cachix-agent.token - ExecStart=@cachix-agent@/bin/cachix deploy agent test-agent home-manager + ExecStart=@cachix@/bin/cachix deploy agent test-agent home-manager KillMode=process Restart=on-failure diff --git a/tests/modules/services/cliphist/cliphist-extra-options.nix b/tests/modules/services/cliphist/cliphist-extra-options.nix index dcf097c6c..60a3ce7aa 100644 --- a/tests/modules/services/cliphist/cliphist-extra-options.nix +++ b/tests/modules/services/cliphist/cliphist-extra-options.nix @@ -1,15 +1,10 @@ -{ ... }: { +{ services.cliphist = { enable = true; allowImages = true; extraOptions = [ "-max-dedupe-search" "10" "-max-items" "500" ]; }; - test.stubs = { - cliphist = { }; - wl-clipboard = { }; - }; - nmt.script = '' servicePath=home-files/.config/systemd/user diff --git a/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix new file mode 100644 index 000000000..64c804723 --- /dev/null +++ b/tests/modules/services/cliphist/cliphist-multiple-session-targets.nix @@ -0,0 +1,13 @@ +{ + services.cliphist = { + enable = true; + + systemdTargets = [ "sway-session.target" "hyprland-session.target" ]; + }; + + nmt.script = '' + assertFileExists home-files/.config/systemd/user/cliphist.service + assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service + assertFileExists home-files/.config/systemd/user/hyprland-session.target.wants/cliphist.service + ''; +} diff --git a/tests/modules/services/cliphist/cliphist-sway-session-target.nix b/tests/modules/services/cliphist/cliphist-sway-session-target.nix index 25da0f137..a3d13ad10 100644 --- a/tests/modules/services/cliphist/cliphist-sway-session-target.nix +++ b/tests/modules/services/cliphist/cliphist-sway-session-target.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, options, ... }: { services.cliphist = { @@ -6,12 +6,15 @@ systemdTarget = "sway-session.target"; }; - test.stubs = { - cliphist = { }; - wl-clipboard = { }; - }; - nmt.script = '' assertFileExists home-files/.config/systemd/user/cliphist.service + assertFileExists home-files/.config/systemd/user/sway-session.target.wants/cliphist.service ''; + + test.asserts.warnings.expected = [ + "The option `services.cliphist.systemdTarget' defined in ${ + lib.showFiles options.services.cliphist.systemdTarget.files + } has been renamed to `services.cliphist.systemdTargets'." + ]; + } diff --git a/tests/modules/services/cliphist/default.nix b/tests/modules/services/cliphist/default.nix index d74a469b1..de05e0d00 100644 --- a/tests/modules/services/cliphist/default.nix +++ b/tests/modules/services/cliphist/default.nix @@ -1,4 +1,5 @@ { cliphist-sway-session-target = ./cliphist-sway-session-target.nix; cliphist-extra-options = ./cliphist-extra-options.nix; + cliphist-multiple-session-targets = ./cliphist-multiple-session-targets.nix; } diff --git a/tests/modules/services/clipman/clipman-sway-session-target.nix b/tests/modules/services/clipman/clipman-sway-session-target.nix index 129ab554f..aa33a0730 100644 --- a/tests/modules/services/clipman/clipman-sway-session-target.nix +++ b/tests/modules/services/clipman/clipman-sway-session-target.nix @@ -1,5 +1,3 @@ -{ ... }: - { home.stateVersion = "21.11"; @@ -8,11 +6,6 @@ systemdTarget = "sway-session.target"; }; - test.stubs = { - clipman = { }; - wl-clipboard = { }; - }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/clipman.service) assertFileContent "$serviceFile" ${./clipman-sway-session-target.service} diff --git a/tests/modules/services/clipse/clipse-sway-session-target.nix b/tests/modules/services/clipse/clipse-sway-session-target.nix new file mode 100644 index 000000000..d3223cf6f --- /dev/null +++ b/tests/modules/services/clipse/clipse-sway-session-target.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + services.clipse = { + enable = true; + systemdTarget = "sway-session.target"; + }; + + test.stubs = { + clipse = { }; + wl-clipboard = { }; + }; + + nmt.script = '' + assertFileExists home-files/.config/systemd/user/clipse.service + ''; +} diff --git a/tests/modules/services/clipse/default.nix b/tests/modules/services/clipse/default.nix new file mode 100644 index 000000000..f92f1b679 --- /dev/null +++ b/tests/modules/services/clipse/default.nix @@ -0,0 +1 @@ +{ clipse-sway-session-target = ./clipse-sway-session-target.nix; } diff --git a/tests/modules/services/comodoro/comodoro.nix b/tests/modules/services/comodoro/comodoro.nix index 35974ecd7..3c34951ec 100644 --- a/tests/modules/services/comodoro/comodoro.nix +++ b/tests/modules/services/comodoro/comodoro.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.comodoro = { enable = true; @@ -7,8 +5,6 @@ protocols = [ "tcp" ]; }; - test.stubs.comodoro = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/comodoro.service) assertFileContent "$serviceFile" ${./expected.service} diff --git a/tests/modules/services/conky/basic-configuration.nix b/tests/modules/services/conky/basic-configuration.nix index 479a19239..15a0e3d30 100644 --- a/tests/modules/services/conky/basic-configuration.nix +++ b/tests/modules/services/conky/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { services.conky = { enable = true; @@ -14,8 +12,6 @@ ''; }; - test.stubs.conky = { }; - nmt.script = '' serviceFile="$TESTED/home-files/.config/systemd/user/conky.service" diff --git a/tests/modules/services/copyq/basic-configuration.nix b/tests/modules/services/copyq/basic-configuration.nix index f90872815..6394e393f 100644 --- a/tests/modules/services/copyq/basic-configuration.nix +++ b/tests/modules/services/copyq/basic-configuration.nix @@ -1,17 +1,11 @@ -{ ... }: - { - config = { - services.copyq = { - enable = true; - systemdTarget = "sway-session.target"; - }; - - test.stubs.copyq = { }; - - nmt.script = '' - serviceFile=home-files/.config/systemd/user/copyq.service - assertFileContent $serviceFile ${./basic-expected.service} - ''; + services.copyq = { + enable = true; + systemdTarget = "sway-session.target"; }; + + nmt.script = '' + serviceFile=home-files/.config/systemd/user/copyq.service + assertFileContent $serviceFile ${./basic-expected.service} + ''; } diff --git a/tests/modules/services/copyq/basic-expected.service b/tests/modules/services/copyq/basic-expected.service index f20c23bbc..28f56356a 100644 --- a/tests/modules/services/copyq/basic-expected.service +++ b/tests/modules/services/copyq/basic-expected.service @@ -3,7 +3,7 @@ WantedBy=sway-session.target [Service] Environment=QT_QPA_PLATFORM=xcb -ExecStart=@copyq@/bin/copyq +ExecStart=@CopyQ@/bin/copyq Restart=on-failure [Unit] diff --git a/tests/modules/services/copyq/dont-force-x-configuration.nix b/tests/modules/services/copyq/dont-force-x-configuration.nix index a233ae264..7948d2409 100644 --- a/tests/modules/services/copyq/dont-force-x-configuration.nix +++ b/tests/modules/services/copyq/dont-force-x-configuration.nix @@ -1,17 +1,11 @@ -{ ... }: - { - config = { - services.copyq = { - enable = true; - forceXWayland = false; - }; - - test.stubs.copyq = { }; - - nmt.script = '' - serviceFile=home-files/.config/systemd/user/copyq.service - assertFileContent $serviceFile ${./dont-force-x-expected.service} - ''; + services.copyq = { + enable = true; + forceXWayland = false; }; + + nmt.script = '' + serviceFile=home-files/.config/systemd/user/copyq.service + assertFileContent $serviceFile ${./dont-force-x-expected.service} + ''; } diff --git a/tests/modules/services/copyq/dont-force-x-expected.service b/tests/modules/services/copyq/dont-force-x-expected.service index 7680f1fe5..0ecdbaf50 100644 --- a/tests/modules/services/copyq/dont-force-x-expected.service +++ b/tests/modules/services/copyq/dont-force-x-expected.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@copyq@/bin/copyq +ExecStart=@CopyQ@/bin/copyq Restart=on-failure [Unit] diff --git a/tests/modules/services/darkman/basic-configuration.nix b/tests/modules/services/darkman/basic-configuration.nix index 4c3e85470..8e1a33bc6 100644 --- a/tests/modules/services/darkman/basic-configuration.nix +++ b/tests/modules/services/darkman/basic-configuration.nix @@ -23,8 +23,6 @@ ''; }; - test.stubs.python = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/darkman.service) darkModeScriptFile=$(normalizeStorePaths home-files/.local/share/dark-mode.d/color-scheme-dark) diff --git a/tests/modules/services/darkman/no-configuration.nix b/tests/modules/services/darkman/no-configuration.nix index 1ab6346f4..50802eb42 100644 --- a/tests/modules/services/darkman/no-configuration.nix +++ b/tests/modules/services/darkman/no-configuration.nix @@ -1,11 +1,6 @@ { services.darkman.enable = true; - test.stubs = { - python = { }; - darkman = { }; - }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/darkman.service) @@ -17,7 +12,7 @@ [Service] BusName=nl.whynothugo.darkman - ExecStart=@darkman@/bin/dummy run + ExecStart=@darkman@/bin/darkman run Restart=on-failure Slice=background.slice TimeoutStopSec=15 diff --git a/tests/modules/services/devilspie2/configuration.nix b/tests/modules/services/devilspie2/configuration.nix index 14bdc6f0c..a6b819878 100644 --- a/tests/modules/services/devilspie2/configuration.nix +++ b/tests/modules/services/devilspie2/configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.devilspie2 = { enable = true; @@ -19,8 +17,6 @@ ''; }; - test.stubs.devilspie2 = { }; - nmt.script = '' configlua=home-files/.config/devilspie2/config.lua diff --git a/tests/modules/services/dropbox/basic-configuration.nix b/tests/modules/services/dropbox/basic-configuration.nix index 9b8a6d651..8e3096ea0 100644 --- a/tests/modules/services/dropbox/basic-configuration.nix +++ b/tests/modules/services/dropbox/basic-configuration.nix @@ -7,13 +7,10 @@ path = "${config.home.homeDirectory}/dropbox"; }; - test.stubs.dropbox-cli = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/dropbox.service assertFileExists $serviceFile ''; - }; } diff --git a/tests/modules/services/espanso-darwin/basic-configuration.nix b/tests/modules/services/espanso-darwin/basic-configuration.nix index 4a2f2ee77..cd9d2f297 100644 --- a/tests/modules/services/espanso-darwin/basic-configuration.nix +++ b/tests/modules/services/espanso-darwin/basic-configuration.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ services.espanso = { enable = true; configs = { default = { show_notifications = false; }; }; @@ -36,8 +36,6 @@ }; }; - test.stubs.espanso = { }; - nmt.script = '' serviceFile="LaunchAgents/org.nix-community.home.espanso.plist" serviceFileNormalized="$(normalizeStorePaths "$serviceFile")" diff --git a/tests/modules/services/espanso/basic-configuration.nix b/tests/modules/services/espanso/basic-configuration.nix index 6d04c53d2..93c6a5a2d 100644 --- a/tests/modules/services/espanso/basic-configuration.nix +++ b/tests/modules/services/espanso/basic-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.espanso = { enable = true; @@ -38,8 +36,6 @@ }; }; - test.stubs.espanso = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/espanso.service assertFileExists "$serviceFile" diff --git a/tests/modules/services/flameshot/empty-settings.nix b/tests/modules/services/flameshot/empty-settings.nix index 2c700c49d..14e35d826 100644 --- a/tests/modules/services/flameshot/empty-settings.nix +++ b/tests/modules/services/flameshot/empty-settings.nix @@ -1,9 +1,5 @@ -{ ... }: - { - services.flameshot = { enable = true; }; - - test.stubs.flameshot = { }; + services.flameshot.enable = true; nmt.script = '' assertPathNotExists home-files/.config/flameshot/flameshot.ini diff --git a/tests/modules/services/flameshot/example-settings.nix b/tests/modules/services/flameshot/example-settings.nix index d61b93e93..25aa4f75c 100644 --- a/tests/modules/services/flameshot/example-settings.nix +++ b/tests/modules/services/flameshot/example-settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.flameshot = { enable = true; @@ -12,8 +10,6 @@ }; }; - test.stubs.flameshot = { }; - nmt.script = '' assertFileContent \ home-files/.config/flameshot/flameshot.ini \ diff --git a/tests/modules/services/fluidsynth/service.nix b/tests/modules/services/fluidsynth/service.nix index ce0427b83..2cefeabb1 100644 --- a/tests/modules/services/fluidsynth/service.nix +++ b/tests/modules/services/fluidsynth/service.nix @@ -1,13 +1,9 @@ -{ ... }: - { services.fluidsynth.enable = true; services.fluidsynth.soundService = "pipewire-pulse"; services.fluidsynth.soundFont = "/path/to/soundFont"; services.fluidsynth.extraOptions = [ "--sample-rate 96000" ]; - test.stubs.fluidsynth = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/fluidsynth.service diff --git a/tests/modules/services/fusuma/expected-service.service b/tests/modules/services/fusuma/expected-service.service index 585d8a85e..e84077daf 100644 --- a/tests/modules/services/fusuma/expected-service.service +++ b/tests/modules/services/fusuma/expected-service.service @@ -6,6 +6,6 @@ Environment=PATH=@coreutils@/bin:@xdotool@/bin:@xorg.xprop@/bin ExecStart=@fusuma@/bin/fusuma [Unit] -After=graphical-session-pre.target +After=graphical-session.target Description=Fusuma services PartOf=graphical-session.target diff --git a/tests/modules/services/fusuma/fusuma-stubs.nix b/tests/modules/services/fusuma/fusuma-stubs.nix new file mode 100644 index 000000000..b2904b7d0 --- /dev/null +++ b/tests/modules/services/fusuma/fusuma-stubs.nix @@ -0,0 +1,11 @@ +{ realPkgs, ... }: + +{ + nixpkgs.overlays = [ + (_: super: { + inherit (realPkgs) remarshal; + python3Packages = super.python3Packages.overrideScope + (self: super: { inherit (realPkgs.python3Packages) pyyaml; }); + }) + ]; +} diff --git a/tests/modules/services/fusuma/service.nix b/tests/modules/services/fusuma/service.nix index 8041bf7b8..028054e4e 100644 --- a/tests/modules/services/fusuma/service.nix +++ b/tests/modules/services/fusuma/service.nix @@ -1,9 +1,10 @@ { config, ... }: { + imports = [ ./fusuma-stubs.nix ]; + services.fusuma = { enable = true; - package = config.lib.test.mkStubPackage { outPath = "@fusuma@"; }; extraPackages = [ (config.lib.test.mkStubPackage { outPath = "@coreutils@"; }) (config.lib.test.mkStubPackage { outPath = "@xdotool@"; }) diff --git a/tests/modules/services/fusuma/settings.nix b/tests/modules/services/fusuma/settings.nix index a1500cb21..da329673d 100644 --- a/tests/modules/services/fusuma/settings.nix +++ b/tests/modules/services/fusuma/settings.nix @@ -1,10 +1,12 @@ -{ config, ... }: +{ config, pkgs, ... }: { + imports = [ ./fusuma-stubs.nix ]; + services.fusuma = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@fusuma@"; }; - extraPackages = [ (config.lib.test.mkStubPackage { }) ]; + extraPackages = [ pkgs.xdotool ]; settings = { threshold = { swipe = 1; }; diff --git a/tests/modules/services/git-sync/basic.nix b/tests/modules/services/git-sync/basic.nix index 0412f93b1..88c180201 100644 --- a/tests/modules/services/git-sync/basic.nix +++ b/tests/modules/services/git-sync/basic.nix @@ -10,21 +10,18 @@ }; }; - test.stubs.openssh = { name = "openssh"; }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/git-sync-test.service assertFileExists $serviceFile - serviceFile=$(normalizeStorePaths $serviceFile) assertFileContent $serviceFile ${ builtins.toFile "expected" '' [Install] WantedBy=default.target [Service] - Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin + Environment=PATH=@openssh@/bin:@git@/bin Environment=GIT_SYNC_DIRECTORY=/a/path Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path/to/repo.git' diff --git a/tests/modules/services/git-sync/whitespace.nix b/tests/modules/services/git-sync/whitespace.nix index 871843553..9097b4ff8 100644 --- a/tests/modules/services/git-sync/whitespace.nix +++ b/tests/modules/services/git-sync/whitespace.nix @@ -1,9 +1,6 @@ -{ config, ... }: - { services.git-sync = { enable = true; - package = config.lib.test.mkStubPackage { outPath = "@git-sync@"; }; repositories = { testWithWhitespace = { path = "/a path"; @@ -12,21 +9,18 @@ }; }; - test.stubs.openssh = { name = "openssh"; }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/git-sync-testWithWhitespace.service assertFileExists $serviceFile - serviceFile=$(normalizeStorePaths $serviceFile) assertFileContent $serviceFile ${ builtins.toFile "expected" '' [Install] WantedBy=default.target [Service] - Environment=PATH=@openssh@/bin:/nix/store/00000000000000000000000000000000-git/bin + Environment=PATH=@openssh@/bin:@git@/bin Environment=GIT_SYNC_DIRECTORY='/a path' Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync Environment=GIT_SYNC_REPOSITORY='git+ssh://user@example.com:/~user/path to/repo.git' diff --git a/tests/modules/services/glance/default-settings.nix b/tests/modules/services/glance/default-settings.nix index 7b35db779..fbd9159cc 100644 --- a/tests/modules/services/glance/default-settings.nix +++ b/tests/modules/services/glance/default-settings.nix @@ -1,10 +1,6 @@ -{ ... }: - { services.glance.enable = true; - test.stubs.glance = { }; - nmt.script = '' configFile=home-files/.config/glance/glance.yml serviceFile=home-files/.config/systemd/user/glance.service diff --git a/tests/modules/services/glance/example-settings.nix b/tests/modules/services/glance/example-settings.nix index 9e2101d2e..6b9dd59f3 100644 --- a/tests/modules/services/glance/example-settings.nix +++ b/tests/modules/services/glance/example-settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.glance = { enable = true; @@ -21,8 +19,6 @@ }; }; - test.stubs.glance = { }; - nmt.script = '' configFile=home-files/.config/glance/glance.yml serviceFile=home-files/.config/systemd/user/glance.service diff --git a/tests/modules/services/glance/glance.service b/tests/modules/services/glance/glance.service index 07b82d1d9..2f89ca23a 100644 --- a/tests/modules/services/glance/glance.service +++ b/tests/modules/services/glance/glance.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=@glance@/bin/dummy --config /home/hm-user/.config/glance/glance.yml +ExecStart=@glance@/bin/glance --config /home/hm-user/.config/glance/glance.yml [Unit] Description=Glance feed dashboard server diff --git a/tests/modules/services/gpg-agent/default-homedir.nix b/tests/modules/services/gpg-agent/default-homedir.nix index 9c13520ae..ba7178078 100644 --- a/tests/modules/services/gpg-agent/default-homedir.nix +++ b/tests/modules/services/gpg-agent/default-homedir.nix @@ -1,29 +1,19 @@ { config, lib, pkgs, ... }: -with lib; +lib.mkIf pkgs.stdenv.isLinux { + services.gpg-agent.enable = true; + services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; + programs.gpg.enable = true; -mkIf pkgs.stdenv.isLinux { - config = { - services.gpg-agent.enable = true; - services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3; - programs.gpg.enable = true; + nmt.script = '' + in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}" + if [[ $in != "%t/gnupg/S.gpg-agent" ]] + then + echo $in + fail "gpg-agent socket directory not set to default value" + fi - test.stubs = { - gnupg = { }; - systemd = { }; # depends on gnupg.override - pinentry-gnome3 = { }; - }; - - nmt.script = '' - in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}" - if [[ $in != "%t/gnupg/S.gpg-agent" ]] - then - echo $in - fail "gpg-agent socket directory not set to default value" - fi - - configFile=home-files/.gnupg/gpg-agent.conf - assertFileRegex $configFile "pinentry-program @pinentry-gnome3@/bin/dummy" - ''; - }; + configFile=home-files/.gnupg/gpg-agent.conf + assertFileRegex $configFile "pinentry-program @pinentry-gnome3@/bin/pinentry" + ''; } diff --git a/tests/modules/services/gpg-agent/override-homedir.nix b/tests/modules/services/gpg-agent/override-homedir.nix index 82dec0f95..9cebadf3c 100644 --- a/tests/modules/services/gpg-agent/override-homedir.nix +++ b/tests/modules/services/gpg-agent/override-homedir.nix @@ -1,32 +1,25 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, pkgs, ... }: let inherit (pkgs.stdenv) isDarwin; in { - config = { - services.gpg-agent.enable = true; - services.gpg-agent.pinentryPackage = null; # Don't build pinentry package. - programs.gpg = { - enable = true; - homedir = "/path/to/hash"; - package = config.lib.test.mkStubPackage { outPath = "@gpg@"; }; - }; - - test.stubs.gnupg = { }; - test.stubs.systemd = { }; # depends on gnupg.override - - nmt.script = if isDarwin then '' - serviceFile=LaunchAgents/org.nix-community.home.gpg-agent.plist - assertFileExists "$serviceFile" - assertFileContent "$serviceFile" ${./expected-agent.plist} - '' else '' - in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}" - if [[ $in != "%t/gnupg/d.wp4h7ks5zxy4dodqadgpbbpz/S.gpg-agent" ]] - then - echo $in - fail "gpg-agent socket directory is malformed" - fi - ''; + services.gpg-agent.enable = true; + services.gpg-agent.pinentryPackage = null; # Don't build pinentry package. + programs.gpg = { + enable = true; + homedir = "/path/to/hash"; + package = config.lib.test.mkStubPackage { outPath = "@gpg@"; }; }; + + nmt.script = if isDarwin then '' + serviceFile=LaunchAgents/org.nix-community.home.gpg-agent.plist + assertFileExists "$serviceFile" + assertFileContent "$serviceFile" ${./expected-agent.plist} + '' else '' + in="${config.systemd.user.sockets.gpg-agent.Socket.ListenStream}" + if [[ $in != "%t/gnupg/d.wp4h7ks5zxy4dodqadgpbbpz/S.gpg-agent" ]] + then + echo $in + fail "gpg-agent socket directory is malformed" + fi + ''; } diff --git a/tests/modules/services/hypridle/basic-configuration.nix b/tests/modules/services/hypridle/basic-configuration.nix index 461f70a51..83347bcc7 100644 --- a/tests/modules/services/hypridle/basic-configuration.nix +++ b/tests/modules/services/hypridle/basic-configuration.nix @@ -1,9 +1,6 @@ -{ pkgs, ... }: - { services.hypridle = { enable = true; - package = pkgs.hypridle; settings = { general = { @@ -26,8 +23,6 @@ }; }; - test.stubs.hypridle = { }; - nmt.script = '' config=home-files/.config/hypr/hypridle.conf clientServiceFile=home-files/.config/systemd/user/hypridle.service diff --git a/tests/modules/services/hypridle/no-configuration.nix b/tests/modules/services/hypridle/no-configuration.nix index 805e49561..5b0b23cd5 100644 --- a/tests/modules/services/hypridle/no-configuration.nix +++ b/tests/modules/services/hypridle/no-configuration.nix @@ -1,10 +1,6 @@ -{ pkgs, ... }: - { services.hypridle.enable = true; - test.stubs.hypridle = { }; - nmt.script = '' config=home-files/.config/hypr/hypridle.conf clientServiceFile=home-files/.config/systemd/user/hypridle.service diff --git a/tests/modules/services/hyprpaper/basic-configuration.nix b/tests/modules/services/hyprpaper/basic-configuration.nix index 7bf944fbd..dc583575c 100644 --- a/tests/modules/services/hyprpaper/basic-configuration.nix +++ b/tests/modules/services/hyprpaper/basic-configuration.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { services.hyprpaper = { enable = true; @@ -18,8 +16,6 @@ }; }; - test.stubs.hyprpaper = { }; - nmt.script = '' config=home-files/.config/hypr/hyprpaper.conf clientServiceFile=home-files/.config/systemd/user/hyprpaper.service diff --git a/tests/modules/services/hyprpaper/no-configuration.nix b/tests/modules/services/hyprpaper/no-configuration.nix index 15775e886..a6ed41a82 100644 --- a/tests/modules/services/hyprpaper/no-configuration.nix +++ b/tests/modules/services/hyprpaper/no-configuration.nix @@ -1,13 +1,9 @@ -{ pkgs, ... }: - { services.hyprpaper = { enable = true; settings = { }; }; - test.stubs.hyprpaper = { }; - nmt.script = '' config=home-files/.config/hypr/hyprpaper.conf clientServiceFile=home-files/.config/systemd/user/hyprpaper.service diff --git a/tests/modules/services/imapnotify-darwin/launchd.nix b/tests/modules/services/imapnotify-darwin/launchd.nix index 5502ebbfc..22630d701 100644 --- a/tests/modules/services/imapnotify-darwin/launchd.nix +++ b/tests/modules/services/imapnotify-darwin/launchd.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, pkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; @@ -28,8 +26,6 @@ with lib; }); }; - test.stubs.notmuch = { }; - nmt.script = let serviceFileName = "org.nix-community.home.imapnotify-hm-example.com.plist"; in '' diff --git a/tests/modules/services/imapnotify/imapnotify.nix b/tests/modules/services/imapnotify/imapnotify.nix index 5a9e2b003..680405fa5 100644 --- a/tests/modules/services/imapnotify/imapnotify.nix +++ b/tests/modules/services/imapnotify/imapnotify.nix @@ -1,6 +1,4 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ config, pkgs, ... }: { imports = [ ../../accounts/email-test-accounts.nix ]; @@ -13,6 +11,7 @@ with lib; imapnotify = { enable = true; boxes = [ "Inbox" ]; + extraArgs = [ "--wait 1" ]; onNotify = '' ${pkgs.notmuch}/bin/notmuch new ''; @@ -28,8 +27,6 @@ with lib; }); }; - test.stubs.notmuch = { }; - nmt.script = '' serviceFile="home-files/.config/systemd/user/imapnotify-hm-example.com.service" serviceFileNormalized="$(normalizeStorePaths "$serviceFile")" diff --git a/tests/modules/services/imapnotify/imapnotify.service b/tests/modules/services/imapnotify/imapnotify.service index cc1ba77b8..8168e501e 100644 --- a/tests/modules/services/imapnotify/imapnotify.service +++ b/tests/modules/services/imapnotify/imapnotify.service @@ -4,7 +4,7 @@ WantedBy=default.target [Service] Environment=PATH= Environment=NOTMUCH_CONFIG=/home/hm-user/.config/notmuch/default/config -ExecStart=@goimapnotify@/bin/goimapnotify -conf '/nix/store/00000000000000000000000000000000-imapnotify-hm-example.com-config.json' +ExecStart=@goimapnotify@/bin/goimapnotify -conf '/nix/store/00000000000000000000000000000000-imapnotify-hm-example.com-config.json' --wait 1 Restart=always RestartSec=30 Type=simple diff --git a/tests/modules/services/lieer/lieer-service.nix b/tests/modules/services/lieer/lieer-service.nix index 796afc072..cd2cde2e2 100644 --- a/tests/modules/services/lieer/lieer-service.nix +++ b/tests/modules/services/lieer/lieer-service.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ../../accounts/email-test-accounts.nix ]; @@ -16,8 +14,6 @@ }; }; - test.stubs.lieer = { }; - nmt.script = '' assertFileExists home-files/.config/systemd/user/lieer-hm-example-com.service assertFileExists home-files/.config/systemd/user/lieer-hm-example-com.timer diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service new file mode 100644 index 000000000..b0827a39d --- /dev/null +++ b/tests/modules/services/linux-wallpaperengine/basic-configuration-expected.service @@ -0,0 +1,11 @@ +[Install] +WantedBy=graphical-session.target + +[Service] +ExecStart=@linux-wallpaperengine@/bin/linux-wallpaperengine --assets-dir /some/path/to/assets --clamping border --fps 6 --scaling fit --screen-root HDMI-1 --bg 12345678 --no-audio-processing --noautomute --screen-root DP-1 --silent --scaling fill --fps 12 --bg 87654321 +Restart=on-failure + +[Unit] +After=graphical-session.target +Description=Implementation of Wallpaper Engine on Linux +PartOf=graphical-session.target diff --git a/tests/modules/services/linux-wallpaperengine/basic-configuration.nix b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix new file mode 100644 index 000000000..afb2e964d --- /dev/null +++ b/tests/modules/services/linux-wallpaperengine/basic-configuration.nix @@ -0,0 +1,31 @@ +{ + services.linux-wallpaperengine = { + enable = true; + assetsPath = "/some/path/to/assets"; + clamping = "border"; + wallpapers = [ + { + monitor = "HDMI-1"; + wallpaperId = "12345678"; + scaling = "fit"; + fps = 6; + } + { + monitor = "DP-1"; + wallpaperId = "87654321"; + extraOptions = [ "--scaling fill" "--fps 12" ]; + audio = { + silent = true; + automute = false; + processing = false; + }; + } + ]; + }; + + nmt.script = '' + assertFileContent \ + home-files/.config/systemd/user/linux-wallpaperengine.service \ + ${./basic-configuration-expected.service} + ''; +} diff --git a/tests/modules/services/linux-wallpaperengine/default.nix b/tests/modules/services/linux-wallpaperengine/default.nix new file mode 100644 index 000000000..430aa129d --- /dev/null +++ b/tests/modules/services/linux-wallpaperengine/default.nix @@ -0,0 +1 @@ +{ linux-wallpaperengine-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/services/macos-remap-keys/basic-agent.plist b/tests/modules/services/macos-remap-keys/basic-agent.plist new file mode 100644 index 000000000..b59f97d99 --- /dev/null +++ b/tests/modules/services/macos-remap-keys/basic-agent.plist @@ -0,0 +1,22 @@ + + + + + KeepAlive + + SuccessfulExit + + + Label + org.nix-community.home.remap-keys + ProgramArguments + + /usr/bin/hidutil + property + --set + { "UserKeyMapping": [ { "HIDKeyboardModifierMappingSrc": 0x700000039, "HIDKeyboardModifierMappingDst": 0x70000002A } ] } + + RunAtLoad + + + \ No newline at end of file diff --git a/tests/modules/services/macos-remap-keys/basic-configuration.nix b/tests/modules/services/macos-remap-keys/basic-configuration.nix new file mode 100644 index 000000000..7cc0b9018 --- /dev/null +++ b/tests/modules/services/macos-remap-keys/basic-configuration.nix @@ -0,0 +1,12 @@ +{ + services.macos-remap-keys = { + enable = true; + keyboard = { Capslock = "Backspace"; }; + }; + + nmt.script = '' + launchAgent=LaunchAgents/org.nix-community.home.remap-keys.plist + assertFileExists "$launchAgent" + assertFileContent "$launchAgent" ${./basic-agent.plist} + ''; +} diff --git a/tests/modules/services/macos-remap-keys/default.nix b/tests/modules/services/macos-remap-keys/default.nix new file mode 100644 index 000000000..796110f76 --- /dev/null +++ b/tests/modules/services/macos-remap-keys/default.nix @@ -0,0 +1 @@ +{ macos-remap-keys-basic-configuration = ./basic-configuration.nix; } diff --git a/tests/modules/services/mopidy/basic-configuration.nix b/tests/modules/services/mopidy/basic-configuration.nix index 99aaeece8..26bc1c846 100644 --- a/tests/modules/services/mopidy/basic-configuration.nix +++ b/tests/modules/services/mopidy/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { services.mopidy = { enable = true; diff --git a/tests/modules/services/mopidy/mopidy-scan.nix b/tests/modules/services/mopidy/mopidy-scan.nix index 16b04292a..be7fe700a 100644 --- a/tests/modules/services/mopidy/mopidy-scan.nix +++ b/tests/modules/services/mopidy/mopidy-scan.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { services.mopidy = { @@ -16,8 +16,6 @@ chmod +x $out/bin/mopidy ''; }; - - mopidy-local = { }; }; nmt.script = '' diff --git a/tests/modules/services/mpd-mpris/configuration-basic.nix b/tests/modules/services/mpd-mpris/configuration-basic.nix index de7c594f3..afe1c3df1 100644 --- a/tests/modules/services/mpd-mpris/configuration-basic.nix +++ b/tests/modules/services/mpd-mpris/configuration-basic.nix @@ -1,10 +1,6 @@ -{ ... }: - { services.mpd-mpris = { enable = true; }; - test.stubs.mpd-mpris = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/mpd-mpris.service assertFileContent "$serviceFile" ${./configuration-basic.service} diff --git a/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix b/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix index a3a6b38d9..f1f8c8641 100644 --- a/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix +++ b/tests/modules/services/mpd-mpris/configuration-with-local-mpd.nix @@ -1,13 +1,9 @@ -{ ... }: - { services.mpd-mpris = { enable = true; mpd.useLocal = true; }; - test.stubs.mpd-mpris = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/mpd-mpris.service assertFileContent "$serviceFile" ${./configuration-with-local-mpd.service} diff --git a/tests/modules/services/mpd-mpris/configuration-with-password.nix b/tests/modules/services/mpd-mpris/configuration-with-password.nix index b10958253..5c5c6a936 100644 --- a/tests/modules/services/mpd-mpris/configuration-with-password.nix +++ b/tests/modules/services/mpd-mpris/configuration-with-password.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.mpd-mpris = { enable = true; @@ -11,8 +9,6 @@ }; }; - test.stubs.mpd-mpris = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/mpd-mpris.service assertFileContent "$serviceFile" ${./configuration-with-password.service} diff --git a/tests/modules/services/mpd/basic-configuration.conf b/tests/modules/services/mpd/basic-configuration.conf index 59b3568b3..810f2b736 100644 --- a/tests/modules/services/mpd/basic-configuration.conf +++ b/tests/modules/services/mpd/basic-configuration.conf @@ -1,11 +1,7 @@ music_directory "/my/music/dir" playlist_directory "/home/hm-user/.local/share/mpd/playlists" db_file "/home/hm-user/.local/share/mpd/tag_cache" - state_file "/home/hm-user/.local/share/mpd/state" sticker_file "/home/hm-user/.local/share/mpd/sticker.sql" -bind_to_address "127.0.0.1" - - - +bind_to_address "127.0.0.1" diff --git a/tests/modules/services/mpd/basic-configuration.nix b/tests/modules/services/mpd/basic-configuration.nix index 6ae0e91fc..9254a2cee 100644 --- a/tests/modules/services/mpd/basic-configuration.nix +++ b/tests/modules/services/mpd/basic-configuration.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { services.mpd = { enable = true; @@ -11,8 +7,6 @@ with lib; home.stateVersion = "22.11"; - test.stubs.mpd = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service) assertFileContent "$serviceFile" ${./basic-configuration.service} diff --git a/tests/modules/services/mpd/basic-configuration.service b/tests/modules/services/mpd/basic-configuration.service index feb155ac4..3ea4d8218 100644 --- a/tests/modules/services/mpd/basic-configuration.service +++ b/tests/modules/services/mpd/basic-configuration.service @@ -4,7 +4,7 @@ WantedBy=default.target [Service] Environment=PATH=/home/hm-user/.nix-profile/bin ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose -ExecStartPre=/nix/store/00000000000000000000000000000000-bash/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'" +ExecStartPre=@bash-interactive@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'" Type=notify [Unit] diff --git a/tests/modules/services/mpd/before-state-version-22_11.nix b/tests/modules/services/mpd/before-state-version-22_11.nix index f29859ace..3bc1af4cc 100644 --- a/tests/modules/services/mpd/before-state-version-22_11.nix +++ b/tests/modules/services/mpd/before-state-version-22_11.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { services.mpd = { enable = true; @@ -10,8 +6,6 @@ with lib; home.stateVersion = "18.09"; - test.stubs.mpd = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service) assertFileContent "$serviceFile" ${./basic-configuration.service} diff --git a/tests/modules/services/mpd/start-when-needed.nix b/tests/modules/services/mpd/start-when-needed.nix index 31017c9e3..ae39c92d8 100644 --- a/tests/modules/services/mpd/start-when-needed.nix +++ b/tests/modules/services/mpd/start-when-needed.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { services.mpd = { enable = true; @@ -12,8 +8,6 @@ with lib; home.stateVersion = "22.11"; - test.stubs.mpd = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service) assertFileContent "$serviceFile" ${./start-when-needed.service} diff --git a/tests/modules/services/mpd/start-when-needed.service b/tests/modules/services/mpd/start-when-needed.service index ac98a3f97..fd5d83fbd 100644 --- a/tests/modules/services/mpd/start-when-needed.service +++ b/tests/modules/services/mpd/start-when-needed.service @@ -1,7 +1,7 @@ [Service] Environment=PATH=/home/hm-user/.nix-profile/bin ExecStart=@mpd@/bin/mpd --no-daemon /nix/store/00000000000000000000000000000000-mpd.conf --verbose -ExecStartPre=/nix/store/00000000000000000000000000000000-bash/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'" +ExecStartPre=@bash-interactive@/bin/bash -c "/nix/store/00000000000000000000000000000000-coreutils/bin/mkdir -p '/home/hm-user/.local/share/mpd' '/home/hm-user/.local/share/mpd/playlists'" Type=notify [Unit] diff --git a/tests/modules/services/mpd/xdg-music-dir.conf b/tests/modules/services/mpd/xdg-music-dir.conf index 56fe71b49..22157d844 100644 --- a/tests/modules/services/mpd/xdg-music-dir.conf +++ b/tests/modules/services/mpd/xdg-music-dir.conf @@ -1,11 +1,7 @@ music_directory "/home/hm-user/Music" playlist_directory "/home/hm-user/.local/share/mpd/playlists" db_file "/home/hm-user/.local/share/mpd/tag_cache" - state_file "/home/hm-user/.local/share/mpd/state" sticker_file "/home/hm-user/.local/share/mpd/sticker.sql" -bind_to_address "127.0.0.1" - - - +bind_to_address "127.0.0.1" diff --git a/tests/modules/services/mpd/xdg-music-dir.nix b/tests/modules/services/mpd/xdg-music-dir.nix index 6df2cec46..bcaeeece2 100644 --- a/tests/modules/services/mpd/xdg-music-dir.nix +++ b/tests/modules/services/mpd/xdg-music-dir.nix @@ -1,7 +1,3 @@ -{ config, lib, pkgs, ... }: - -with lib; - { services.mpd = { enable = true; @@ -12,8 +8,6 @@ with lib; home.stateVersion = "22.11"; - test.stubs.mpd = { }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/mpd.service) assertFileContent "$serviceFile" ${./basic-configuration.service} diff --git a/tests/modules/services/mpdris2/basic-configuration.nix b/tests/modules/services/mpdris2/basic-configuration.nix index b8c595be2..f98f61ad8 100644 --- a/tests/modules/services/mpdris2/basic-configuration.nix +++ b/tests/modules/services/mpdris2/basic-configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.mpdris2 = { enable = true; @@ -9,8 +7,6 @@ services.mpd.musicDirectory = "/home/hm-user/music"; - test.stubs.mpdris2 = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/mpdris2.service assertFileContent "$serviceFile" ${./basic-configuration.service} diff --git a/tests/modules/services/mpdris2/basic-configuration.service b/tests/modules/services/mpdris2/basic-configuration.service index 2ea4656c7..9d58a9e51 100644 --- a/tests/modules/services/mpdris2/basic-configuration.service +++ b/tests/modules/services/mpdris2/basic-configuration.service @@ -3,7 +3,7 @@ WantedBy=default.target [Service] BusName=org.mpris.MediaPlayer2.mpd -ExecStart=@mpdris2@/bin/mpDris2 +ExecStart=@mpDris2@/bin/mpDris2 Restart=on-failure RestartSec=5s Type=simple diff --git a/tests/modules/services/mpdris2/with-password.nix b/tests/modules/services/mpdris2/with-password.nix index af4ef33cc..496d26e63 100644 --- a/tests/modules/services/mpdris2/with-password.nix +++ b/tests/modules/services/mpdris2/with-password.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.mpdris2 = { enable = true; @@ -12,8 +10,6 @@ services.mpd.musicDirectory = "/home/hm-user/music"; - test.stubs.mpdris2 = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/mpdris2.service assertFileContent "$serviceFile" ${./basic-configuration.service} diff --git a/tests/modules/services/nix-gc-darwin/basic.nix b/tests/modules/services/nix-gc-darwin/basic.nix index f09309fe0..707ae44e6 100644 --- a/tests/modules/services/nix-gc-darwin/basic.nix +++ b/tests/modules/services/nix-gc-darwin/basic.nix @@ -1,5 +1,3 @@ -{ ... }: - { nix.gc = { automatic = true; @@ -7,8 +5,6 @@ options = "--delete-older-than 30d"; }; - test.stubs.nix = { name = "nix"; }; - nmt.script = '' serviceFile=LaunchAgents/org.nix-community.home.nix-gc.plist diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/basic.nix index 1fc019da7..a6b06f246 100644 --- a/tests/modules/services/nix-gc/basic.nix +++ b/tests/modules/services/nix-gc/basic.nix @@ -1,5 +1,3 @@ -{ ... }: - { nix.gc = { automatic = true; @@ -8,8 +6,6 @@ options = "--delete-older-than 30d --max-freed $((64 * 1024**3))"; }; - test.stubs.nix = { name = "nix"; }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/nix-gc.service diff --git a/tests/modules/services/ollama/darwin/basic.nix b/tests/modules/services/ollama/darwin/basic.nix new file mode 100644 index 000000000..bb072a977 --- /dev/null +++ b/tests/modules/services/ollama/darwin/basic.nix @@ -0,0 +1,22 @@ +{ lib, pkgs, ... }: + +lib.mkMerge [ + { + services.ollama = { + enable = true; + host = "localhost"; + port = 11111; + environmentVariables = { + OLLAMA_LLM_LIBRARY = "cpu"; + HIP_VISIBLE_DEVICES = "0,1"; + }; + }; + } + (lib.mkIf pkgs.stdenv.isDarwin { + nmt.script = '' + serviceFile=LaunchAgents/org.nix-community.home.ollama.plist + assertFileExists "$serviceFile" + assertFileContent "$serviceFile" ${./expected-agent.plist} + ''; + }) +] diff --git a/tests/modules/services/ollama/darwin/default.nix b/tests/modules/services/ollama/darwin/default.nix new file mode 100644 index 000000000..418446cd6 --- /dev/null +++ b/tests/modules/services/ollama/darwin/default.nix @@ -0,0 +1 @@ +{ ollama-darwin = ./basic.nix; } diff --git a/tests/modules/services/ollama/darwin/expected-agent.plist b/tests/modules/services/ollama/darwin/expected-agent.plist new file mode 100644 index 000000000..97ed3c8ae --- /dev/null +++ b/tests/modules/services/ollama/darwin/expected-agent.plist @@ -0,0 +1,31 @@ + + + + + EnvironmentVariables + + HIP_VISIBLE_DEVICES + 0,1 + OLLAMA_HOST + localhost:11111 + OLLAMA_LLM_LIBRARY + cpu + + KeepAlive + + Crashed + + SuccessfulExit + + + Label + org.nix-community.home.ollama + ProcessType + Background + ProgramArguments + + @ollama@/bin/ollama + serve + + + \ No newline at end of file diff --git a/tests/modules/services/ollama/linux/basic.nix b/tests/modules/services/ollama/linux/basic.nix new file mode 100644 index 000000000..2480d8466 --- /dev/null +++ b/tests/modules/services/ollama/linux/basic.nix @@ -0,0 +1,9 @@ +{ + services.ollama.enable = true; + + nmt.script = '' + serviceFile="home-files/.config/systemd/user/ollama.service" + assertFileRegex "$serviceFile" 'After=network\.target' + assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=127.0.0.1:11434' + ''; +} diff --git a/tests/modules/services/ollama/linux/default.nix b/tests/modules/services/ollama/linux/default.nix new file mode 100644 index 000000000..a0c82ae86 --- /dev/null +++ b/tests/modules/services/ollama/linux/default.nix @@ -0,0 +1,4 @@ +{ + ollama-linux = ./basic.nix; + ollama-set-environment-variables = ./set-environment-variables.nix; +} diff --git a/tests/modules/services/ollama/linux/set-environment-variables.nix b/tests/modules/services/ollama/linux/set-environment-variables.nix new file mode 100644 index 000000000..672c6dddd --- /dev/null +++ b/tests/modules/services/ollama/linux/set-environment-variables.nix @@ -0,0 +1,18 @@ +{ + services.ollama = { + enable = true; + host = "localhost"; + port = 11111; + environmentVariables = { + OLLAMA_LLM_LIBRARY = "cpu"; + HIP_VISIBLE_DEVICES = "0,1"; + }; + }; + + nmt.script = '' + serviceFile="home-files/.config/systemd/user/ollama.service" + assertFileRegex "$serviceFile" 'Environment=OLLAMA_HOST=localhost:11111' + assertFileRegex "$serviceFile" 'Environment=OLLAMA_LLM_LIBRARY=cpu' + assertFileRegex "$serviceFile" 'Environment=HIP_VISIBLE_DEVICES=0,1' + ''; +} diff --git a/tests/modules/services/parcellite/parcellite-expected.service b/tests/modules/services/parcellite/parcellite-expected.service index f1e7e2333..7e0865aa7 100644 --- a/tests/modules/services/parcellite/parcellite-expected.service +++ b/tests/modules/services/parcellite/parcellite-expected.service @@ -6,7 +6,7 @@ ExecStart=@parcellite@/bin/parcellite --no-icon Restart=on-abort [Unit] -After=graphical-session-pre.target +After=graphical-session.target After=tray.target Description=Lightweight GTK+ clipboard manager PartOf=graphical-session.target diff --git a/tests/modules/services/pasystray/expected.service b/tests/modules/services/pasystray/expected.service index 7bea7f215..871f01255 100644 --- a/tests/modules/services/pasystray/expected.service +++ b/tests/modules/services/pasystray/expected.service @@ -6,7 +6,7 @@ Environment=PATH=@paprefs@/bin:@pavucontrol@/bin ExecStart=@pasystray@/bin/pasystray -g [Unit] -After=graphical-session-pre.target +After=graphical-session.target After=tray.target Description=PulseAudio system tray PartOf=graphical-session.target diff --git a/tests/modules/services/pasystray/service.nix b/tests/modules/services/pasystray/service.nix index 5b8548c8b..34b3291bc 100644 --- a/tests/modules/services/pasystray/service.nix +++ b/tests/modules/services/pasystray/service.nix @@ -1,17 +1,9 @@ -{ ... }: - { services.pasystray = { enable = true; extraOptions = [ "-g" ]; }; - test.stubs = { - pasystray = { }; - paprefs = { }; - pavucontrol = { }; - }; - nmt.script = '' serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/pasystray.service) assertFileContent "$serviceFile" ${./expected.service} diff --git a/tests/modules/services/pbgopy/service.nix b/tests/modules/services/pbgopy/service.nix index 465024537..8093eed52 100644 --- a/tests/modules/services/pbgopy/service.nix +++ b/tests/modules/services/pbgopy/service.nix @@ -1,16 +1,12 @@ -{ config, pkgs, ... }: { - config = { - services.pbgopy.enable = true; +{ + services.pbgopy.enable = true; - test.stubs.pbgopy = { }; + nmt.script = '' + serviceFile=home-files/.config/systemd/user/pbgopy.service - nmt.script = '' - serviceFile=home-files/.config/systemd/user/pbgopy.service + assertFileExists $serviceFile - assertFileExists $serviceFile - - assertFileContains $serviceFile \ - 'ExecStart=@pbgopy@/bin/pbgopy serve --port 9090 --ttl 24h' - ''; - }; + assertFileContains $serviceFile \ + 'ExecStart=@pbgopy@/bin/pbgopy serve --port 9090 --ttl 24h' + ''; } diff --git a/tests/modules/services/picom/picom-basic-configuration-expected.service b/tests/modules/services/picom/picom-basic-configuration-expected.service index f5d0efeb0..c0463eeff 100644 --- a/tests/modules/services/picom/picom-basic-configuration-expected.service +++ b/tests/modules/services/picom/picom-basic-configuration-expected.service @@ -2,11 +2,11 @@ WantedBy=graphical-session.target [Service] -ExecStart=@picom@/bin/dummy --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends +ExecStart=@picom@/bin/picom --config /nix/store/00000000000000000000000000000000-hm_picompicom.conf --legacy-backends Restart=always RestartSec=3 [Unit] -After=graphical-session-pre.target +After=graphical-session.target Description=Picom X11 compositor PartOf=graphical-session.target diff --git a/tests/modules/services/picom/picom-basic-configuration.nix b/tests/modules/services/picom/picom-basic-configuration.nix index 1c2689799..065c40b52 100644 --- a/tests/modules/services/picom/picom-basic-configuration.nix +++ b/tests/modules/services/picom/picom-basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { services.picom = { enable = true; @@ -22,8 +20,6 @@ extraArgs = [ "--legacy-backends" ]; }; - test.stubs.picom = { }; - nmt.script = '' assertFileContent \ home-files/.config/picom/picom.conf \ diff --git a/tests/modules/services/podman-linux/build-expected.service b/tests/modules/services/podman-linux/build-expected.service new file mode 100644 index 000000000..ab4064c22 --- /dev/null +++ b/tests/modules/services/podman-linux/build-expected.service @@ -0,0 +1,30 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman build configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-bld.build +[X-Build] +Environment= +File=/nix/store/00000000000000000000000000000000-Containerfile +ImageTag=homemanager/my-bld +Label=nix.home-manager.managed=true +TLSVerify=true + +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +RemainAfterExit=yes +TimeoutStartSec=300 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman build --tls-verify --tag homemanager/my-bld --label nix.home-manager.managed=true --file /nix/store/00000000000000000000000000000000-Containerfile +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for build my-bld +RequiresMountsFor=%t/containers +SourcePath=/nix/store/00000000000000000000000000000000-home-build-podman-my-bld/quadlets/podman-my-bld.build diff --git a/tests/modules/services/podman-linux/build.nix b/tests/modules/services/podman-linux/build.nix new file mode 100644 index 000000000..27052c6a4 --- /dev/null +++ b/tests/modules/services/podman-linux/build.nix @@ -0,0 +1,44 @@ +{ pkgs, ... }: + +{ + imports = [ ./podman-stubs.nix ]; + + services.podman = { + enable = true; + builds = { + "my-bld" = { + file = let + containerFile = pkgs.writeTextFile { + name = "Containerfile"; + text = '' + FROM docker.io/alpine:latest + ''; + }; + in "${containerFile}"; + }; + + "my-bld-2" = { + file = "https://www.github.com/././Containerfile"; + extraConfig = { + Build.ImageTag = [ "locahost/somethingelse" "localhost/anothertag" ]; + }; + }; + }; + }; + + test.asserts.assertions.expected = [ + '' + In 'my-bld-2' config. Build.ImageTag: '[ "locahost/somethingelse" "localhost/anothertag" ]' does not contain 'homemanager/my-bld-2'.'' + ]; + + nmt.script = '' + configPath=home-files/.config/systemd/user + buildFile=$configPath/podman-my-bld-build.service + + assertFileExists $buildFile + + buildFile=$(normalizeStorePaths $buildFile) + + assertFileContent $buildFile ${./build-expected.service} + ''; +} diff --git a/tests/modules/services/podman-linux/configuration.nix b/tests/modules/services/podman-linux/configuration.nix index b1c0d596b..a45524f8c 100644 --- a/tests/modules/services/podman-linux/configuration.nix +++ b/tests/modules/services/podman-linux/configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { services.podman = { enable = true; diff --git a/tests/modules/services/podman-linux/container-expected.service b/tests/modules/services/podman-linux/container-expected.service index d40e24bec..df5bcb2a0 100644 --- a/tests/modules/services/podman-linux/container-expected.service +++ b/tests/modules/services/podman-linux/container-expected.service @@ -43,7 +43,6 @@ ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --na [Unit] Wants=podman-user-wait-network-online.service After=podman-user-wait-network-online.service -After=network.target Before=fake.target Description=home-manager test SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container diff --git a/tests/modules/services/podman-linux/container.nix b/tests/modules/services/podman-linux/container.nix index 102a7fb10..fa9c654d4 100644 --- a/tests/modules/services/podman-linux/container.nix +++ b/tests/modules/services/podman-linux/container.nix @@ -1,6 +1,6 @@ -{ ... }: - { + imports = [ ./podman-stubs.nix ]; + services.podman = { enable = true; containers = { diff --git a/tests/modules/services/podman-linux/default.nix b/tests/modules/services/podman-linux/default.nix index a5ba9467e..c7f04bdaf 100644 --- a/tests/modules/services/podman-linux/default.nix +++ b/tests/modules/services/podman-linux/default.nix @@ -1,7 +1,10 @@ { podman-configuration = ./configuration.nix; podman-container = ./container.nix; + podman-build = ./build.nix; + podman-image = ./image.nix; podman-integration = ./integration.nix; podman-manifest = ./manifest.nix; podman-network = ./network.nix; + podman-volume = ./volume.nix; } diff --git a/tests/modules/services/podman-linux/image-expected.service b/tests/modules/services/podman-linux/image-expected.service new file mode 100644 index 000000000..2a2e688e3 --- /dev/null +++ b/tests/modules/services/podman-linux/image-expected.service @@ -0,0 +1,28 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman image configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-img.image +[X-Image] +Image=docker.io/alpine:latest +TLSVerify=true + +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare +RemainAfterExit=yes +TimeoutStartSec=300 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman image pull --tls-verify docker.io/alpine:latest +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for image my-img +SourcePath=/nix/store/00000000000000000000000000000000-home-image-podman-my-img/quadlets/podman-my-img.image +RequiresMountsFor=%t/containers diff --git a/tests/modules/services/podman-linux/image.nix b/tests/modules/services/podman-linux/image.nix new file mode 100644 index 000000000..98560e34d --- /dev/null +++ b/tests/modules/services/podman-linux/image.nix @@ -0,0 +1,18 @@ +{ + imports = [ ./podman-stubs.nix ]; + + services.podman = { + enable = true; + images = { "my-img" = { image = "docker.io/alpine:latest"; }; }; + }; + + nmt.script = '' + configPath=home-files/.config/systemd/user + imageFile=$configPath/podman-my-img-image.service + assertFileExists $imageFile + + imageFile=$(normalizeStorePaths $imageFile) + + assertFileContent $imageFile ${./image-expected.service} + ''; +} diff --git a/tests/modules/services/podman-linux/integration-build-expected.service b/tests/modules/services/podman-linux/integration-build-expected.service new file mode 100644 index 000000000..ab4064c22 --- /dev/null +++ b/tests/modules/services/podman-linux/integration-build-expected.service @@ -0,0 +1,30 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman build configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-bld.build +[X-Build] +Environment= +File=/nix/store/00000000000000000000000000000000-Containerfile +ImageTag=homemanager/my-bld +Label=nix.home-manager.managed=true +TLSVerify=true + +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +RemainAfterExit=yes +TimeoutStartSec=300 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman build --tls-verify --tag homemanager/my-bld --label nix.home-manager.managed=true --file /nix/store/00000000000000000000000000000000-Containerfile +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for build my-bld +RequiresMountsFor=%t/containers +SourcePath=/nix/store/00000000000000000000000000000000-home-build-podman-my-bld/quadlets/podman-my-bld.build diff --git a/tests/modules/services/podman-linux/integration-container-bld-expected.service b/tests/modules/services/podman-linux/integration-container-bld-expected.service new file mode 100644 index 000000000..7201fea35 --- /dev/null +++ b/tests/modules/services/podman-linux/integration-container-bld-expected.service @@ -0,0 +1,38 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager podman container configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-container-bld.container +[X-Container] +ContainerName=my-container-bld +Environment= +Image=localhost/homemanager/my-bld +Label=nix.home-manager.managed=true + +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +Environment=PATH=/run/wrappers/bin:/run/current-system/sw/bin:/home/hm-user/.nix-profile/bin +Restart=always +TimeoutStopSec=30 +Environment=PODMAN_SYSTEMD_UNIT=%n +KillMode=mixed +ExecStop=/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid +ExecStopPost=-/nix/store/00000000000000000000000000000000-podman/bin/podman rm -v -f -i --cidfile=%t/%N.cid +Delegate=yes +Type=notify +NotifyAccess=all +SyslogIdentifier=%N +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container-bld --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon -d --label nix.home-manager.managed=true localhost/homemanager/my-bld + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +After=podman-my-bld-build.service +Description=Service for container my-container-bld +Requires=podman-my-bld-build.service +SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container-bld/quadlets/podman-my-container-bld.container +RequiresMountsFor=%t/containers diff --git a/tests/modules/services/podman-linux/integration-container-expected.service b/tests/modules/services/podman-linux/integration-container-expected.service index 528d9c18e..ca92559d4 100644 --- a/tests/modules/services/podman-linux/integration-container-expected.service +++ b/tests/modules/services/podman-linux/integration-container-expected.service @@ -11,6 +11,7 @@ Image=docker.io/alpine:latest Label=nix.home-manager.managed=true Network=my-net Network=externalnet +Volume=my-vol:/data [Install] WantedBy=default.target @@ -28,14 +29,17 @@ Delegate=yes Type=notify NotifyAccess=all SyslogIdentifier=%N -ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-net --network externalnet --sdnotify=conmon -d --label nix.home-manager.managed=true docker.io/alpine:latest +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman run --name my-container --cidfile=%t/%N.cid --replace --rm --cgroups=split --network my-net --network externalnet --sdnotify=conmon -d -v my-vol:/data --label nix.home-manager.managed=true docker.io/alpine:latest [Unit] Wants=podman-user-wait-network-online.service After=podman-user-wait-network-online.service -After=network.target +After=podman-my-img-image.service After=podman-my-net-network.service +After=podman-my-vol-volume.service Description=Service for container my-container +Requires=podman-my-img-image.service Requires=podman-my-net-network.service +Requires=podman-my-vol-volume.service SourcePath=/nix/store/00000000000000000000000000000000-home-container-podman-my-container/quadlets/podman-my-container.container RequiresMountsFor=%t/containers diff --git a/tests/modules/services/podman-linux/integration-image-expected.service b/tests/modules/services/podman-linux/integration-image-expected.service new file mode 100644 index 000000000..2a2e688e3 --- /dev/null +++ b/tests/modules/services/podman-linux/integration-image-expected.service @@ -0,0 +1,28 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman image configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-img.image +[X-Image] +Image=docker.io/alpine:latest +TLSVerify=true + +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare +RemainAfterExit=yes +TimeoutStartSec=300 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman image pull --tls-verify docker.io/alpine:latest +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for image my-img +SourcePath=/nix/store/00000000000000000000000000000000-home-image-podman-my-img/quadlets/podman-my-img.image +RequiresMountsFor=%t/containers diff --git a/tests/modules/services/podman-linux/integration-network-expected.service b/tests/modules/services/podman-linux/integration-network-expected.service index 49acd4b9f..5af3bccea 100644 --- a/tests/modules/services/podman-linux/integration-network-expected.service +++ b/tests/modules/services/podman-linux/integration-network-expected.service @@ -15,7 +15,7 @@ NetworkName=my-net Subnet=192.168.123.0/24 [Service] -Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin +Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare RemainAfterExit=yes TimeoutStartSec=15 diff --git a/tests/modules/services/podman-linux/integration-volume-expected.service b/tests/modules/services/podman-linux/integration-volume-expected.service new file mode 100644 index 000000000..da5d36968 --- /dev/null +++ b/tests/modules/services/podman-linux/integration-volume-expected.service @@ -0,0 +1,33 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman volume configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-vol.volume +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin +ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare +RemainAfterExit=yes +TimeoutStartSec=15 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman volume create --ignore --opt copy --opt device=tmpfs --opt type=tmpfs --label nix.home-manager.managed=true --label nix.home-manager.preserve=false my-vol +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for volume my-vol +SourcePath=/nix/store/00000000000000000000000000000000-home-volume-podman-my-vol/quadlets/podman-my-vol.volume +RequiresMountsFor=%t/containers + +[X-Volume] +Copy=true +Device=tmpfs +Label=nix.home-manager.managed=true +Label=nix.home-manager.preserve=false +Type=tmpfs +VolumeName=my-vol diff --git a/tests/modules/services/podman-linux/integration.nix b/tests/modules/services/podman-linux/integration.nix index de213092d..26aef7019 100644 --- a/tests/modules/services/podman-linux/integration.nix +++ b/tests/modules/services/podman-linux/integration.nix @@ -1,29 +1,69 @@ -{ ... }: +{ pkgs, ... }: { + imports = [ ./podman-stubs.nix ]; + services.podman = { enable = true; - containers."my-container" = { - image = "docker.io/alpine:latest"; - network = [ "my-net" "externalnet" ]; + builds."my-bld" = { + file = let + containerFile = pkgs.writeTextFile { + name = "Containerfile"; + text = '' + FROM docker.io/alpine:latest + ''; + }; + in "${containerFile}"; }; + containers = { + "my-container" = { + image = "my-img"; + network = [ "my-net" "externalnet" ]; + volumes = [ "my-vol:/data" ]; + }; + "my-container-bld" = { image = "my-bld"; }; + }; + images."my-img" = { image = "docker.io/alpine:latest"; }; networks."my-net" = { gateway = "192.168.123.1"; subnet = "192.168.123.0/24"; }; + volumes."my-vol" = { + device = "tmpfs"; + preserve = false; + type = "tmpfs"; + }; }; nmt.script = '' configPath=home-files/.config/systemd/user + buildFile=$configPath/podman-my-bld-build.service containerFile=$configPath/podman-my-container.service + containerBldFile=$configPath/podman-my-container-bld.service + imageFile=$configPath/podman-my-img-image.service networkFile=$configPath/podman-my-net-network.service + volumeFile=$configPath/podman-my-vol-volume.service + assertFileExists $buildFile assertFileExists $containerFile + assertFileExists $containerBldFile + assertFileExists $imageFile assertFileExists $networkFile + assertFileExists $volumeFile + buildFile=$(normalizeStorePaths $buildFile) containerFile=$(normalizeStorePaths $containerFile) + containerBldFile=$(normalizeStorePaths $containerBldFile) + imageFile=$(normalizeStorePaths $imageFile) networkFile=$(normalizeStorePaths $networkFile) + volumeFile=$(normalizeStorePaths $volumeFile) + assertFileContent $buildFile ${./integration-build-expected.service} assertFileContent $containerFile ${./integration-container-expected.service} + assertFileContent $containerBldFile ${ + ./integration-container-bld-expected.service + } + assertFileContent $imageFile ${./integration-image-expected.service} assertFileContent $networkFile ${./integration-network-expected.service} + assertFileContent $volumeFile ${./integration-volume-expected.service} ''; } diff --git a/tests/modules/services/podman-linux/manifest.nix b/tests/modules/services/podman-linux/manifest.nix index b692ea7ae..13a0ab387 100644 --- a/tests/modules/services/podman-linux/manifest.nix +++ b/tests/modules/services/podman-linux/manifest.nix @@ -1,6 +1,6 @@ -{ ... }: - { + imports = [ ./podman-stubs.nix ]; + services.podman = { enable = true; containers."my-container-1" = { diff --git a/tests/modules/services/podman-linux/network-expected.service b/tests/modules/services/podman-linux/network-expected.service index 1017a17e7..6d3cf8633 100644 --- a/tests/modules/services/podman-linux/network-expected.service +++ b/tests/modules/services/podman-linux/network-expected.service @@ -19,7 +19,7 @@ PodmanArgs=--log-level=debug Subnet=192.168.1.0/24 [Service] -Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:/nix/store/00000000000000000000000000000000-shadow/bin:/nix/store/00000000000000000000000000000000-coreutils/bin +Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare RemainAfterExit=yes TimeoutStartSec=15 diff --git a/tests/modules/services/podman-linux/network.nix b/tests/modules/services/podman-linux/network.nix index b6a46eba5..0f53b0d5d 100644 --- a/tests/modules/services/podman-linux/network.nix +++ b/tests/modules/services/podman-linux/network.nix @@ -1,6 +1,6 @@ -{ ... }: - { + imports = [ ./podman-stubs.nix ]; + services.podman = { enable = true; networks = { diff --git a/tests/modules/services/podman-linux/podman-stubs.nix b/tests/modules/services/podman-linux/podman-stubs.nix new file mode 100644 index 000000000..70f3bfbc6 --- /dev/null +++ b/tests/modules/services/podman-linux/podman-stubs.nix @@ -0,0 +1,5 @@ +{ realPkgs, ... }: + +{ + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) podman skopeo; }) ]; +} diff --git a/tests/modules/services/podman-linux/volume-expected.service b/tests/modules/services/podman-linux/volume-expected.service new file mode 100644 index 000000000..73d4c049f --- /dev/null +++ b/tests/modules/services/podman-linux/volume-expected.service @@ -0,0 +1,36 @@ +# Automatically generated by /nix/store/00000000000000000000000000000000-podman/lib/systemd/user-generators/podman-user-generator +# +# Automatically generated by home-manager for podman volume configuration +# DO NOT EDIT THIS FILE DIRECTLY +# +# my-vol.volume +[Install] +WantedBy=default.target +WantedBy=multi-user.target + +[Service] +Environment=PATH=/run/wrappers/bin:/usr/bin:/bin:/usr/sbin:/sbin:@shadow@/bin:/nix/store/00000000000000000000000000000000-coreutils/bin +ExecStartPre=/nix/store/00000000000000000000000000000000-await-podman-unshare +RemainAfterExit=yes +TimeoutStartSec=15 +ExecStart=/nix/store/00000000000000000000000000000000-podman/bin/podman volume create --ignore --opt copy --opt device=tmpfs --opt type=tmpfs --opt o=uid=1000,gid=1000 --label nix.home-manager.managed=true --label nix.home-manager.preserve=true --module=/etc/nvd.conf my-vol +SyslogIdentifier=%N +Type=oneshot + +[Unit] +Wants=podman-user-wait-network-online.service +After=podman-user-wait-network-online.service +Description=Service for volume my-vol +SourcePath=/nix/store/00000000000000000000000000000000-home-volume-podman-my-vol/quadlets/podman-my-vol.volume +RequiresMountsFor=%t/containers + +[X-Volume] +Copy=true +Device=tmpfs +Group=1000 +Label=nix.home-manager.managed=true +Label=nix.home-manager.preserve=true +PodmanArgs=--module=/etc/nvd.conf +Type=tmpfs +User=1000 +VolumeName=my-vol diff --git a/tests/modules/services/podman-linux/volume.nix b/tests/modules/services/podman-linux/volume.nix new file mode 100644 index 000000000..885662b2f --- /dev/null +++ b/tests/modules/services/podman-linux/volume.nix @@ -0,0 +1,35 @@ +{ + imports = [ ./podman-stubs.nix ]; + + services.podman = { + enable = true; + volumes = { + "my-vol" = { + device = "tmpfs"; + extraConfig = { Volume = { User = 1000; }; }; + extraPodmanArgs = [ "--module=/etc/nvd.conf" ]; + group = 1000; + type = "tmpfs"; + }; + + "my-vol-2" = { + extraConfig = { Volume = { VolumeName = "some-other-volume-name"; }; }; + }; + }; + }; + + test.asserts.assertions.expected = [ + '' + In 'my-vol-2' config. Volume.VolumeName: 'some-other-volume-name' does not match expected type: value "my-vol-2" (singular enum)'' + ]; + + nmt.script = '' + configPath=home-files/.config/systemd/user + volumeFile=$configPath/podman-my-vol-volume.service + assertFileExists $volumeFile + + volumeFile=$(normalizeStorePaths $volumeFile) + + assertFileContent $volumeFile ${./volume-expected.service} + ''; +} diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service index 35eaf519f..a877b60f8 100644 --- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration-expected.service @@ -7,7 +7,7 @@ Restart=on-failure RestartSec=3 [Unit] -After=graphical-session-pre.target +After=graphical-session.target Description=Gammastep colour temperature adjuster Documentation=https://gitlab.com/chinstrap/gammastep/ PartOf=graphical-session.target diff --git a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix index 6f0454bf3..06093154d 100644 --- a/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix +++ b/tests/modules/services/redshift-gammastep/gammastep-basic-configuration.nix @@ -1,30 +1,24 @@ -{ config, pkgs, ... }: - { - config = { - services.gammastep = { - enable = true; - provider = "manual"; - dawnTime = "6:00-7:45"; - duskTime = "18:35-20:15"; - settings = { - general = { - adjustment-method = "randr"; - gamma = 0.8; - }; - randr = { screen = 0; }; + services.gammastep = { + enable = true; + provider = "manual"; + dawnTime = "6:00-7:45"; + duskTime = "18:35-20:15"; + settings = { + general = { + adjustment-method = "randr"; + gamma = 0.8; }; + randr = { screen = 0; }; }; - - test.stubs.gammastep = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/gammastep/config.ini \ - ${./gammastep-basic-configuration-file-expected.conf} - assertFileContent \ - home-files/.config/systemd/user/gammastep.service \ - ${./gammastep-basic-configuration-expected.service} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/gammastep/config.ini \ + ${./gammastep-basic-configuration-file-expected.conf} + assertFileContent \ + home-files/.config/systemd/user/gammastep.service \ + ${./gammastep-basic-configuration-expected.service} + ''; } diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service index 5dce5dc19..7177fab8f 100644 --- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service +++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration-expected.service @@ -7,7 +7,7 @@ Restart=on-failure RestartSec=3 [Unit] -After=graphical-session-pre.target +After=graphical-session.target Description=Redshift colour temperature adjuster Documentation=http://jonls.dk/redshift/ PartOf=graphical-session.target diff --git a/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix b/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix index 691d01e25..0ecb3ec81 100644 --- a/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix +++ b/tests/modules/services/redshift-gammastep/redshift-basic-configuration.nix @@ -1,30 +1,24 @@ -{ config, pkgs, ... }: - { - config = { - services.redshift = { - enable = true; - provider = "manual"; - latitude = 0.0; - longitude = "0.0"; - settings = { - redshift = { - adjustment-method = "randr"; - gamma = 0.8; - }; - randr = { screen = 0; }; + services.redshift = { + enable = true; + provider = "manual"; + latitude = 0.0; + longitude = "0.0"; + settings = { + redshift = { + adjustment-method = "randr"; + gamma = 0.8; }; + randr = { screen = 0; }; }; - - test.stubs.redshift = { }; - - nmt.script = '' - assertFileContent \ - home-files/.config/redshift/redshift.conf \ - ${./redshift-basic-configuration-file-expected.conf} - assertFileContent \ - home-files/.config/systemd/user/redshift.service \ - ${./redshift-basic-configuration-expected.service} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/redshift/redshift.conf \ + ${./redshift-basic-configuration-file-expected.conf} + assertFileContent \ + home-files/.config/systemd/user/redshift.service \ + ${./redshift-basic-configuration-expected.service} + ''; } diff --git a/tests/modules/services/screen-locker/basic-configuration.nix b/tests/modules/services/screen-locker/basic-configuration.nix index 9eee2a8e2..1cf4fabe2 100644 --- a/tests/modules/services/screen-locker/basic-configuration.nix +++ b/tests/modules/services/screen-locker/basic-configuration.nix @@ -1,30 +1,30 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - config = { - services.screen-locker = { + services.screen-locker = { + enable = true; + inactiveInterval = 5; + lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; + lockCmdEnv = [ "DISPLAY=:0" "XAUTHORITY=/custom/path/.Xauthority" ]; + xss-lock = { extraOptions = [ "-test" ]; }; + xautolock = { enable = true; - inactiveInterval = 5; - lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; - xss-lock = { extraOptions = [ "-test" ]; }; - xautolock = { - enable = true; - detectSleep = true; - extraOptions = [ "-test" ]; - }; + detectSleep = true; + extraOptions = [ "-test" ]; }; - - test.stubs.i3lock = { }; - test.stubs.xss-lock = { }; - - nmt.script = '' - xssService=home-files/.config/systemd/user/xss-lock.service - xautolockService=home-files/.config/systemd/user/xautolock-session.service - - assertFileExists $xssService - assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000' - assertFileExists $xautolockService - assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*' - ''; }; + + nmt.script = '' + xssService=home-files/.config/systemd/user/xss-lock.service + xautolockService=home-files/.config/systemd/user/xautolock-session.service + + assertFileExists $xssService + assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000' + assertFileRegex $xssService 'Environment=DISPLAY=:0' + assertFileRegex $xssService 'Environment=XAUTHORITY=/custom/path/.Xauthority' + assertFileRegex $xssService 'Restart=always' + assertFileExists $xautolockService + assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*' + assertFileRegex $xautolockService 'Restart=always' + ''; } diff --git a/tests/modules/services/screen-locker/moved-options.nix b/tests/modules/services/screen-locker/moved-options.nix index 4c9cad19e..bb49b0489 100644 --- a/tests/modules/services/screen-locker/moved-options.nix +++ b/tests/modules/services/screen-locker/moved-options.nix @@ -1,36 +1,30 @@ { config, pkgs, options, lib, ... }: { - config = { - services.screen-locker = { - enable = true; - inactiveInterval = 5; - lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; - xssLockExtraOptions = [ "-test" ]; - xautolockExtraOptions = [ "-test" ]; - enableDetectSleep = true; - }; - - test.stubs.i3lock = { }; - test.stubs.xss-lock = { }; - - # Use the same verification script as the basic configuration. The result - # with the old options should be identical. - nmt.script = (import ./basic-configuration.nix { - inherit config pkgs; - }).config.nmt.script; - - test.asserts.warnings.expected = with lib; - let - renamed = { - xssLockExtraOptions = "xss-lock.extraOptions"; - xautolockExtraOptions = "xautolock.extraOptions"; - enableDetectSleep = "xautolock.detectSleep"; - }; - in mapAttrsToList (old: new: - builtins.replaceStrings [ "\n" ] [ " " ] '' - The option `services.screen-locker.${old}' defined in - ${showFiles options.services.screen-locker.${old}.files} - has been renamed to `services.screen-locker.${new}'.'') renamed; + services.screen-locker = { + enable = true; + inactiveInterval = 5; + lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; + lockCmdEnv = [ "DISPLAY=:0" "XAUTHORITY=/custom/path/.Xauthority" ]; + xssLockExtraOptions = [ "-test" ]; + xautolockExtraOptions = [ "-test" ]; + enableDetectSleep = true; }; + + # Use the same verification script as the basic configuration. The result + # with the old options should be identical. + nmt.script = + (import ./basic-configuration.nix { inherit config pkgs; }).nmt.script; + + test.asserts.warnings.expected = let + renamed = { + xssLockExtraOptions = "xss-lock.extraOptions"; + xautolockExtraOptions = "xautolock.extraOptions"; + enableDetectSleep = "xautolock.detectSleep"; + }; + in lib.mapAttrsToList (old: new: + builtins.replaceStrings [ "\n" ] [ " " ] '' + The option `services.screen-locker.${old}' defined in + ${lib.showFiles options.services.screen-locker.${old}.files} + has been renamed to `services.screen-locker.${new}'.'') renamed; } diff --git a/tests/modules/services/screen-locker/no-xautolock.nix b/tests/modules/services/screen-locker/no-xautolock.nix index 7ec5152b0..5883d09b6 100644 --- a/tests/modules/services/screen-locker/no-xautolock.nix +++ b/tests/modules/services/screen-locker/no-xautolock.nix @@ -1,27 +1,22 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - config = { - services.screen-locker = { - enable = true; - inactiveInterval = 5; - lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; - xss-lock = { - extraOptions = [ "-test" ]; - screensaverCycle = 5; - }; - xautolock = { enable = false; }; + services.screen-locker = { + enable = true; + inactiveInterval = 5; + lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c AA0000"; + xss-lock = { + extraOptions = [ "-test" ]; + screensaverCycle = 5; }; - - test.stubs.i3lock = { }; - test.stubs.xss-lock = { }; - - nmt.script = '' - xssService=home-files/.config/systemd/user/xss-lock.service - - assertFileExists $xssService - assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000' - assertFileRegex $xssService 'ExecStartPre=.*/xset s 300 5' - ''; + xautolock = { enable = false; }; }; + + nmt.script = '' + xssService=home-files/.config/systemd/user/xss-lock.service + + assertFileExists $xssService + assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000' + assertFileRegex $xssService 'ExecStartPre=.*/xset s 300 5' + ''; } diff --git a/tests/modules/services/signaturepdf/basic-configuration.nix b/tests/modules/services/signaturepdf/basic-configuration.nix index 66c1b0834..0cfe0c3e8 100644 --- a/tests/modules/services/signaturepdf/basic-configuration.nix +++ b/tests/modules/services/signaturepdf/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { services.signaturepdf = { enable = true; @@ -7,10 +5,7 @@ extraConfig = { upload_max_filesize = "24M"; }; }; - test.stubs = { - signaturepdf = { outPath = "/signaturepdf"; }; - xdg-utils = { }; - }; + test.stubs.signaturepdf = { outPath = "/signaturepdf"; }; nmt.script = '' assertFileContent \ diff --git a/tests/modules/services/snixembed/basic-configuration.nix b/tests/modules/services/snixembed/basic-configuration.nix index fd8ec4701..3d999dcd6 100644 --- a/tests/modules/services/snixembed/basic-configuration.nix +++ b/tests/modules/services/snixembed/basic-configuration.nix @@ -1,13 +1,9 @@ -{ ... }: - { services.snixembed = { enable = true; beforeUnits = [ "safeeyes.service" ]; }; - test.stubs = { snixembed = { outPath = "/snixembed"; }; }; - nmt.script = '' assertFileContent \ home-files/.config/systemd/user/snixembed.service \ diff --git a/tests/modules/services/snixembed/basic-configuration.service b/tests/modules/services/snixembed/basic-configuration.service index 97e87664b..5bcfc29ec 100644 --- a/tests/modules/services/snixembed/basic-configuration.service +++ b/tests/modules/services/snixembed/basic-configuration.service @@ -2,7 +2,7 @@ WantedBy=graphical-session.target [Service] -ExecStart=/snixembed/bin/dummy +ExecStart=@snixembed@/bin/snixembed Restart=on-failure RestartSec=3 diff --git a/tests/modules/services/swayidle/basic-configuration.nix b/tests/modules/services/swayidle/basic-configuration.nix index c863883bb..51a254ff9 100644 --- a/tests/modules/services/swayidle/basic-configuration.nix +++ b/tests/modules/services/swayidle/basic-configuration.nix @@ -44,7 +44,7 @@ WantedBy=graphical-session.target [Service] - Environment=PATH=/nix/store/00000000000000000000000000000000-bash/bin + Environment=PATH=@bash-interactive@/bin ExecStart=@swayidle@/bin/dummy -w timeout 50 'notify-send -t 10000 -- "Screen lock in 10 seconds"' timeout 60 'swaylock -fF' timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -fF' lock 'swaylock -fF' Restart=always Type=simple diff --git a/tests/modules/services/syncthing/common/expected-agent.plist b/tests/modules/services/syncthing/common/expected-agent.plist index 3b9a28ff2..72ec9d0dd 100644 --- a/tests/modules/services/syncthing/common/expected-agent.plist +++ b/tests/modules/services/syncthing/common/expected-agent.plist @@ -15,12 +15,7 @@ Background ProgramArguments - @syncthing@/bin/syncthing - -no-browser - -no-restart - -logflags=0 - -foo - -bar "baz" + @syncthing-wrapper@ \ No newline at end of file diff --git a/tests/modules/services/syncthing/common/extra-options.nix b/tests/modules/services/syncthing/common/extra-options.nix index f861e2a63..226a5906b 100644 --- a/tests/modules/services/syncthing/common/extra-options.nix +++ b/tests/modules/services/syncthing/common/extra-options.nix @@ -2,13 +2,16 @@ lib.mkMerge [ { + test.stubs.writers = { + extraAttrs.writeBash = (name: fn: "@syncthing-wrapper@"); + }; + services.syncthing = { enable = true; extraOptions = [ "-foo" ''-bar "baz"'' ]; }; - - test.stubs.syncthing = { }; } + (lib.mkIf pkgs.stdenv.isLinux { nmt.script = '' assertFileExists home-files/.config/systemd/user/syncthing.service @@ -16,6 +19,7 @@ lib.mkMerge [ "ExecStart=@syncthing@/bin/syncthing -no-browser -no-restart -no-upgrade '-gui-address=127.0.0.1:8384' '-logflags=0' -foo '-bar \"baz\"'" ''; }) + (lib.mkIf pkgs.stdenv.isDarwin { nmt.script = '' serviceFile=LaunchAgents/org.nix-community.home.syncthing.plist diff --git a/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix b/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix index ca018c2d8..355da3214 100644 --- a/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix +++ b/tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix @@ -1,19 +1,11 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - services.syncthing.tray = true; + services.syncthing.tray = true; - test.asserts.warnings.expected = [ - "Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257." - ]; + test.asserts.warnings.expected = [ + "Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257." + ]; - test.stubs.syncthingtray-minimal = { }; - - nmt.script = '' - assertFileExists home-files/.config/systemd/user/syncthingtray.service - ''; - }; + nmt.script = '' + assertFileExists home-files/.config/systemd/user/syncthingtray.service + ''; } diff --git a/tests/modules/services/syncthing/linux/tray.nix b/tests/modules/services/syncthing/linux/tray.nix index 5ff3c2841..a1a426a12 100644 --- a/tests/modules/services/syncthing/linux/tray.nix +++ b/tests/modules/services/syncthing/linux/tray.nix @@ -1,21 +1,7 @@ -{ config, lib, pkgs, ... }: - -with lib; - { - config = { - services.syncthing.tray.enable = true; + services.syncthing.tray.enable = true; - nixpkgs.overlays = [ - (self: super: { - syncthingtray-minimal = - pkgs.runCommandLocal "syncthingtray" { pname = "syncthingtray"; } - "mkdir $out"; - }) - ]; - - nmt.script = '' - assertFileExists home-files/.config/systemd/user/syncthingtray.service - ''; - }; + nmt.script = '' + assertFileExists home-files/.config/systemd/user/syncthingtray.service + ''; } diff --git a/tests/modules/services/tldr-update/default.nix b/tests/modules/services/tldr-update/default.nix new file mode 100644 index 000000000..f67047037 --- /dev/null +++ b/tests/modules/services/tldr-update/default.nix @@ -0,0 +1 @@ +{ tldr-update = ./tldr-update.nix; } diff --git a/tests/modules/services/tldr-update/tldr-update.nix b/tests/modules/services/tldr-update/tldr-update.nix new file mode 100644 index 000000000..90daeed12 --- /dev/null +++ b/tests/modules/services/tldr-update/tldr-update.nix @@ -0,0 +1,21 @@ +{ config, ... }: + +{ + config = { + home.stateVersion = "24.11"; + + services.tldr-update = { + enable = true; + package = config.lib.test.mkStubPackage { outPath = "@tldr@"; }; + period = "monthly"; + }; + + nmt.script = '' + serviceFile=$(normalizeStorePaths home-files/.config/systemd/user/tldr-update.service) + assertFileContent "$serviceFile" ${./tldr-update.service} + + timerFile=$(normalizeStorePaths home-files/.config/systemd/user/tldr-update.timer) + assertFileContent "$timerFile" ${./tldr-update.timer} + ''; + }; +} diff --git a/tests/modules/services/tldr-update/tldr-update.service b/tests/modules/services/tldr-update/tldr-update.service new file mode 100644 index 000000000..69adaebac --- /dev/null +++ b/tests/modules/services/tldr-update/tldr-update.service @@ -0,0 +1,8 @@ +[Service] +ExecStart=@tldr@/bin/dummy --update + +Type=oneshot + +[Unit] +Description=Update tldr CLI cache +Documentation=https://tldr.sh/ diff --git a/tests/modules/services/tldr-update/tldr-update.timer b/tests/modules/services/tldr-update/tldr-update.timer new file mode 100644 index 000000000..26b6326a0 --- /dev/null +++ b/tests/modules/services/tldr-update/tldr-update.timer @@ -0,0 +1,9 @@ +[Install] +WantedBy=timers.target + +[Timer] +OnCalendar=monthly +Persistent=true + +[Unit] +Description=Update tldr CLI cache diff --git a/tests/modules/services/trayscale/hide-window.nix b/tests/modules/services/trayscale/hide-window.nix index 72181e898..fafb00c3d 100644 --- a/tests/modules/services/trayscale/hide-window.nix +++ b/tests/modules/services/trayscale/hide-window.nix @@ -1,11 +1,9 @@ -{ ... }: { +{ services.trayscale = { enable = true; hideWindow = true; }; - test.stubs = { trayscale = { }; }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/trayscale.service assertFileExists $serviceFile diff --git a/tests/modules/services/trayscale/show-window.nix b/tests/modules/services/trayscale/show-window.nix index 62157ab54..7ac11c902 100644 --- a/tests/modules/services/trayscale/show-window.nix +++ b/tests/modules/services/trayscale/show-window.nix @@ -1,11 +1,9 @@ -{ ... }: { +{ services.trayscale = { enable = true; hideWindow = false; }; - test.stubs = { trayscale = { }; }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/trayscale.service assertFileExists $serviceFile diff --git a/tests/modules/services/twmn/basic-configuration.nix b/tests/modules/services/twmn/basic-configuration.nix index 5da926e48..1779f0ae8 100644 --- a/tests/modules/services/twmn/basic-configuration.nix +++ b/tests/modules/services/twmn/basic-configuration.nix @@ -1,51 +1,47 @@ { - config = { - services.twmn = { - enable = true; - duration = 4242; - host = "example.com"; - port = 9006; - screen = 0; - soundCommand = "/path/sound/command"; - icons.critical = "/path/icon/critical"; - icons.info = "/path/icon/info"; - icons.warning = "/path/icon/warning"; - text = { - color = "#FF00FF"; - font.family = "Noto Sans"; - font.size = 16; - font.variant = "italic"; - maxLength = 80; - }; - window = { - alwaysOnTop = true; - color = "black"; - height = 20; - offset.x = 20; - offset.y = -60; - opacity = 80; - position = "center"; - animation = { - easeIn.curve = 27; - easeIn.duration = 314; - easeOut.curve = 13; - easeOut.duration = 168; - bounce.enable = true; - bounce.duration = 271; - }; + services.twmn = { + enable = true; + duration = 4242; + host = "example.com"; + port = 9006; + screen = 0; + soundCommand = "/path/sound/command"; + icons.critical = "/path/icon/critical"; + icons.info = "/path/icon/info"; + icons.warning = "/path/icon/warning"; + text = { + color = "#FF00FF"; + font.family = "Noto Sans"; + font.size = 16; + font.variant = "italic"; + maxLength = 80; + }; + window = { + alwaysOnTop = true; + color = "black"; + height = 20; + offset.x = 20; + offset.y = -60; + opacity = 80; + position = "center"; + animation = { + easeIn.curve = 27; + easeIn.duration = 314; + easeOut.curve = 13; + easeOut.duration = 168; + bounce.enable = true; + bounce.duration = 271; }; }; - - test.stubs.twmn = { }; - - nmt.script = '' - serviceFile="home-files/.config/systemd/user/twmnd.service" - assertFileExists "$serviceFile" - assertFileRegex "$serviceFile" 'X-Restart-Triggers=.*twmn\.conf' - assertFileRegex "$serviceFile" 'ExecStart=@twmn@/bin/twmnd' - assertFileExists "home-files/.config/twmn/twmn.conf" - assertFileContent "home-files/.config/twmn/twmn.conf" \ - ${./basic-configuration.conf} - ''; }; + + nmt.script = '' + serviceFile="home-files/.config/systemd/user/twmnd.service" + assertFileExists "$serviceFile" + assertFileRegex "$serviceFile" 'X-Restart-Triggers=.*twmn\.conf' + assertFileRegex "$serviceFile" 'ExecStart=@twmn@/bin/twmnd' + assertFileExists "home-files/.config/twmn/twmn.conf" + assertFileContent "home-files/.config/twmn/twmn.conf" \ + ${./basic-configuration.conf} + ''; } diff --git a/tests/modules/services/udiskie/basic.nix b/tests/modules/services/udiskie/basic.nix index 5fa623c3e..0c07276b8 100644 --- a/tests/modules/services/udiskie/basic.nix +++ b/tests/modules/services/udiskie/basic.nix @@ -1,15 +1,11 @@ { - config = { - services.udiskie.enable = true; + services.udiskie.enable = true; - test.stubs.udiskie = { }; - - nmt.script = '' - serviceFile="home-files/.config/systemd/user/udiskie.service" - assertFileRegex "$serviceFile" 'After=tray\.target' - assertFileRegex "$serviceFile" 'Requires=tray\.target' - assertFileContent "home-files/.config/udiskie/config.yml" \ - ${./basic.yml} - ''; - }; + nmt.script = '' + serviceFile="home-files/.config/systemd/user/udiskie.service" + assertFileRegex "$serviceFile" 'After=tray\.target' + assertFileRegex "$serviceFile" 'Requires=tray\.target' + assertFileContent "home-files/.config/udiskie/config.yml" \ + ${./basic.yml} + ''; } diff --git a/tests/modules/services/udiskie/no-tray.nix b/tests/modules/services/udiskie/no-tray.nix index 0c7ede0bd..aa9ca9310 100644 --- a/tests/modules/services/udiskie/no-tray.nix +++ b/tests/modules/services/udiskie/no-tray.nix @@ -1,18 +1,14 @@ { - config = { - services.udiskie = { - enable = true; - tray = "never"; - }; - - test.stubs.udiskie = { }; - - nmt.script = '' - serviceFile="home-files/.config/systemd/user/udiskie.service" - assertFileNotRegex "$serviceFile" 'After=tray\.target' - assertFileNotRegex "$serviceFile" 'Requires=tray\.target' - assertFileContent "home-files/.config/udiskie/config.yml" \ - ${./no-tray.yml} - ''; + services.udiskie = { + enable = true; + tray = "never"; }; + + nmt.script = '' + serviceFile="home-files/.config/systemd/user/udiskie.service" + assertFileNotRegex "$serviceFile" 'After=tray\.target' + assertFileNotRegex "$serviceFile" 'Requires=tray\.target' + assertFileContent "home-files/.config/udiskie/config.yml" \ + ${./no-tray.yml} + ''; } diff --git a/tests/modules/services/volnoti/package-option.nix b/tests/modules/services/volnoti/package-option.nix index ab403cdb2..c199a3a8f 100644 --- a/tests/modules/services/volnoti/package-option.nix +++ b/tests/modules/services/volnoti/package-option.nix @@ -9,8 +9,6 @@ }; }; - test.stubs.volnoti = { }; - nmt.script = '' serviceFile=home-files/.config/systemd/user/volnoti.service assertFileExists $serviceFile diff --git a/tests/modules/services/window-managers/bspwm/configuration.nix b/tests/modules/services/window-managers/bspwm/configuration.nix index cd2bfa2e3..9d58bb932 100644 --- a/tests/modules/services/window-managers/bspwm/configuration.nix +++ b/tests/modules/services/window-managers/bspwm/configuration.nix @@ -29,8 +29,6 @@ startupPrograms = [ "foo" "bar || qux" ]; }; - test.stubs.bspwm = { }; - nmt.script = '' bspwmrc=home-files/.config/bspwm/bspwmrc assertFileExists "$bspwmrc" diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix index bd7fb4881..44ed150b9 100644 --- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix +++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-no-tags.nix @@ -1,10 +1,6 @@ -{ lib, pkgs, ... }: - { xsession.windowManager.herbstluftwm = { enable = true; }; - test.stubs.herbstluftwm = { }; - nmt.script = '' autostart=home-files/.config/herbstluftwm/autostart assertFileExists "$autostart" diff --git a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix index e351e78f9..23e1a97d3 100644 --- a/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix +++ b/tests/modules/services/window-managers/herbstluftwm/herbstluftwm-simple-config.nix @@ -1,5 +1,3 @@ -{ lib, pkgs, ... }: - { xsession.windowManager.herbstluftwm = { enable = true; @@ -31,8 +29,6 @@ ''; }; - test.stubs.herbstluftwm = { }; - nmt.script = '' autostart=home-files/.config/herbstluftwm/autostart assertFileExists "$autostart" diff --git a/tests/modules/services/window-managers/hyprland/default.nix b/tests/modules/services/window-managers/hyprland/default.nix index ae431939c..4d6ba1f1a 100644 --- a/tests/modules/services/window-managers/hyprland/default.nix +++ b/tests/modules/services/window-managers/hyprland/default.nix @@ -1,6 +1,9 @@ { hyprland-simple-config = ./simple-config.nix; hyprland-multiple-devices-config = ./multiple-devices-config.nix; + hyprland-null-all-packages-config = ./null-all-packages-config.nix; + hyprland-null-package-config = ./null-package-config.nix; + hyprland-null-portal-package-config = ./null-portal-package-config.nix; hyprland-sourceFirst-false-config = ./sourceFirst-false-config.nix; hyprland-inconsistent-config = ./inconsistent-config.nix; } diff --git a/tests/modules/services/window-managers/hyprland/inconsistent-config.nix b/tests/modules/services/window-managers/hyprland/inconsistent-config.nix index 0f9a18e5b..c475d9c86 100644 --- a/tests/modules/services/window-managers/hyprland/inconsistent-config.nix +++ b/tests/modules/services/window-managers/hyprland/inconsistent-config.nix @@ -1,10 +1,6 @@ -{ config, lib, ... }: - -{ +{ config, ... }: { wayland.windowManager.hyprland = { enable = true; - package = lib.makeOverridable - (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { }; plugins = [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ]; }; diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf b/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf index 5d9102973..d0e82572d 100644 --- a/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf +++ b/tests/modules/services/window-managers/hyprland/multiple-devices-config.conf @@ -1,4 +1,4 @@ -exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target plugin=/path/to/plugin1 plugin=/nix/store/00000000000000000000000000000000-foo/lib/libfoo.so $mod=SUPER diff --git a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix index 86d60c632..7e27de042 100644 --- a/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix +++ b/tests/modules/services/window-managers/hyprland/multiple-devices-config.nix @@ -1,10 +1,8 @@ -{ config, lib, ... }: +{ config, ... }: { wayland.windowManager.hyprland = { enable = true; - package = lib.makeOverridable - (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { }; plugins = [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ]; settings = { diff --git a/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix new file mode 100644 index 000000000..e20b98e83 --- /dev/null +++ b/tests/modules/services/window-managers/hyprland/null-all-packages-config.nix @@ -0,0 +1,19 @@ +{ + wayland.windowManager.hyprland = { + enable = true; + package = null; + portalPackage = null; + + settings = { + cursor = { + enable_hyprcursor = true; + sync_gsettings_theme = true; + }; + }; + }; + + nmt.script = '' + config=home-files/.config/hypr/hyprland.conf + assertFileExists "$config" + ''; +} diff --git a/tests/modules/services/window-managers/hyprland/null-package-config.nix b/tests/modules/services/window-managers/hyprland/null-package-config.nix new file mode 100644 index 000000000..dc89fcda1 --- /dev/null +++ b/tests/modules/services/window-managers/hyprland/null-package-config.nix @@ -0,0 +1,31 @@ +{ + wayland.windowManager.hyprland = { + enable = true; + package = null; + settings = { + cursor = { + enable_hyprcursor = true; + sync_gsettings_theme = true; + }; + }; + }; + + test.asserts.warnings.expected = ['' + xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you + should either set `xdg.portal.config` or `xdg.portal.configPackages` + to specify which portal backend to use for the requested interface. + + https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in + + If you simply want to keep the behaviour in < 1.17, which uses the first + portal implementation found in lexicographical order, use the following: + + xdg.portal.config.common.default = "*"; + '']; + test.asserts.warnings.enable = true; + + nmt.script = '' + config=home-files/.config/hypr/hyprland.conf + assertFileExists "$config" + ''; +} diff --git a/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix new file mode 100644 index 000000000..65ae67535 --- /dev/null +++ b/tests/modules/services/window-managers/hyprland/null-portal-package-config.nix @@ -0,0 +1,19 @@ +{ + wayland.windowManager.hyprland = { + enable = true; + + portalPackage = null; + + settings = { + cursor = { + enable_hyprcursor = true; + sync_gsettings_theme = true; + }; + }; + }; + + nmt.script = '' + config=home-files/.config/hypr/hyprland.conf + assertFileExists "$config" + ''; +} diff --git a/tests/modules/services/window-managers/hyprland/simple-config.conf b/tests/modules/services/window-managers/hyprland/simple-config.conf index 29dcd7cd8..c076f5382 100644 --- a/tests/modules/services/window-managers/hyprland/simple-config.conf +++ b/tests/modules/services/window-managers/hyprland/simple-config.conf @@ -1,4 +1,4 @@ -exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target plugin=/path/to/plugin1 plugin=/nix/store/00000000000000000000000000000000-foo/lib/libfoo.so $mod=SUPER diff --git a/tests/modules/services/window-managers/hyprland/simple-config.nix b/tests/modules/services/window-managers/hyprland/simple-config.nix index e7b11ffe1..820fcc3e2 100644 --- a/tests/modules/services/window-managers/hyprland/simple-config.nix +++ b/tests/modules/services/window-managers/hyprland/simple-config.nix @@ -1,10 +1,8 @@ -{ config, lib, ... }: +{ config, ... }: { wayland.windowManager.hyprland = { enable = true; - package = lib.makeOverridable - (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { }; plugins = [ "/path/to/plugin1" (config.lib.test.mkStubPackage { name = "foo"; }) ]; settings = { diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf index 3dc8c39c0..e3d54eff0 100644 --- a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf +++ b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.conf @@ -1,4 +1,4 @@ -exec-once = /nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target +exec-once = @dbus@/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target bezier=smoothOut, 0.36, 0, 0.66, -0.56 bezier=smoothIn, 0.25, 1, 0.5, 1 bezier=overshot, 0.4,0.8,0.2,1.2 diff --git a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix index 4161cd751..06cfdf453 100644 --- a/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix +++ b/tests/modules/services/window-managers/hyprland/sourceFirst-false-config.nix @@ -1,10 +1,6 @@ -{ config, lib, ... }: - { wayland.windowManager.hyprland = { enable = true; - package = lib.makeOverridable - (attrs: config.lib.test.mkStubPackage { name = "hyprland"; }) { }; settings = { source = [ "sourced.conf" ]; diff --git a/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix b/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix index abb4112a7..7524fbee8 100644 --- a/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix +++ b/tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ./i3-stubs.nix ]; diff --git a/tests/modules/services/window-managers/i3/i3-followmouse.nix b/tests/modules/services/window-managers/i3/i3-followmouse.nix index db84abd1f..9477d89d1 100644 --- a/tests/modules/services/window-managers/i3/i3-followmouse.nix +++ b/tests/modules/services/window-managers/i3/i3-followmouse.nix @@ -1,5 +1,3 @@ -{ ... }: - { xsession.windowManager.i3 = { enable = true; diff --git a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix index fefff9904..1aa0c9bcc 100644 --- a/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix +++ b/tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ./i3-stubs.nix ]; diff --git a/tests/modules/services/window-managers/i3/i3-fonts.nix b/tests/modules/services/window-managers/i3/i3-fonts.nix index 061f7a0bd..1f3ae01c1 100644 --- a/tests/modules/services/window-managers/i3/i3-fonts.nix +++ b/tests/modules/services/window-managers/i3/i3-fonts.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ./i3-stubs.nix ]; diff --git a/tests/modules/services/window-managers/i3/i3-null-config.nix b/tests/modules/services/window-managers/i3/i3-null-config.nix index 8433b0c7f..d0be9a60b 100644 --- a/tests/modules/services/window-managers/i3/i3-null-config.nix +++ b/tests/modules/services/window-managers/i3/i3-null-config.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ./i3-stubs.nix ]; diff --git a/tests/modules/services/window-managers/i3/i3-stubs.nix b/tests/modules/services/window-managers/i3/i3-stubs.nix index cfb892ace..f0d96944f 100644 --- a/tests/modules/services/window-managers/i3/i3-stubs.nix +++ b/tests/modules/services/window-managers/i3/i3-stubs.nix @@ -2,8 +2,6 @@ # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e., # not containing hashes, version numbers etc. test.stubs = { - dmenu = { }; - i3 = { buildScript = '' mkdir -p $out/bin @@ -11,9 +9,5 @@ chmod 755 $out/bin/i3 ''; }; - - i3-gaps = { }; - - i3status = { }; }; } diff --git a/tests/modules/services/window-managers/i3/i3-workspace-default.nix b/tests/modules/services/window-managers/i3/i3-workspace-default.nix index 733d619fd..f9fd598df 100644 --- a/tests/modules/services/window-managers/i3/i3-workspace-default.nix +++ b/tests/modules/services/window-managers/i3/i3-workspace-default.nix @@ -1,5 +1,3 @@ -{ ... }: - { imports = [ ./i3-stubs.nix ]; diff --git a/tests/modules/services/window-managers/i3/i3-workspace-output.nix b/tests/modules/services/window-managers/i3/i3-workspace-output.nix index 4e31acdef..028e891b1 100644 --- a/tests/modules/services/window-managers/i3/i3-workspace-output.nix +++ b/tests/modules/services/window-managers/i3/i3-workspace-output.nix @@ -1,5 +1,3 @@ -{ ... }: - let i3 = { ws1 = "1"; diff --git a/tests/modules/services/window-managers/river/configuration.nix b/tests/modules/services/window-managers/river/configuration.nix index 9532006fc..10e4d4db7 100644 --- a/tests/modules/services/window-managers/river/configuration.nix +++ b/tests/modules/services/window-managers/river/configuration.nix @@ -1,5 +1,3 @@ -{ ... }: - { wayland.windowManager.river = { enable = true; @@ -78,11 +76,6 @@ ''; }; - test.stubs = { - river = { }; - xwayland = { }; - }; - nmt.script = '' riverInit=home-files/.config/river/init assertFileExists "$riverInit" diff --git a/tests/modules/services/window-managers/river/init b/tests/modules/services/window-managers/river/init index 8662dc910..c266ca9e9 100755 --- a/tests/modules/services/window-managers/river/init +++ b/tests/modules/services/window-managers/river/init @@ -62,6 +62,6 @@ extra config ### SYSTEMD INTEGRATION ### -/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target +@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop river-session.target && systemctl --user start river-session.target diff --git a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix index 3ba13b4d3..7145cbc44 100644 --- a/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix +++ b/tests/modules/services/window-managers/spectrwm/spectrwm-simple-config.nix @@ -1,5 +1,3 @@ -{ ... }: - { xsession.windowManager.spectrwm = { enable = true; @@ -14,8 +12,6 @@ unbindings = [ "MOD+Return" ]; }; - test.stubs.spectrwm = { }; - nmt.script = '' assertFileContent \ home-files/.config/spectrwm/spectrwm.conf ${ diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf index 100193192..c1c046620 100644 --- a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf +++ b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.conf @@ -108,4 +108,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix index 9488d00f6..0cda0a661 100644 --- a/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix +++ b/tests/modules/services/window-managers/sway/sway-bar-focused-colors.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; @@ -19,7 +17,7 @@ nmt.script = '' assertFileExists home-files/.config/sway/config - assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \ + assertFileContent home-files/.config/sway/config \ ${./sway-bar-focused-colors.conf} ''; } diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf index 28513fcd5..e913c7d0e 100644 --- a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf +++ b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.conf @@ -107,5 +107,5 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" exec_always pkill flashfocus; flasfocus & diff --git a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix index cf316988b..8adf112ba 100644 --- a/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix +++ b/tests/modules/services/window-managers/sway/sway-bindkeys-to-code-and-extra-config.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; @@ -20,7 +18,7 @@ nmt.script = '' assertFileExists home-files/.config/sway/config - assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \ + assertFileContent home-files/.config/sway/config \ ${./sway-bindkeys-to-code-and-extra-config.conf} ''; } diff --git a/tests/modules/services/window-managers/sway/sway-check-config.nix b/tests/modules/services/window-managers/sway/sway-check-config.nix index e566e4fda..83558ecee 100644 --- a/tests/modules/services/window-managers/sway/sway-check-config.nix +++ b/tests/modules/services/window-managers/sway/sway-check-config.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, realPkgs, ... }: lib.mkIf config.test.enableBig { wayland.windowManager.sway = { @@ -6,6 +6,8 @@ lib.mkIf config.test.enableBig { checkConfig = true; }; + nixpkgs.overlays = [ (self: super: { inherit (realPkgs) xvfb-run; }) ]; + nmt.script = '' assertFileExists home-files/.config/sway/config ''; diff --git a/tests/modules/services/window-managers/sway/sway-default.conf b/tests/modules/services/window-managers/sway/sway-default.conf index cefe4e0af..e47db636a 100644 --- a/tests/modules/services/window-managers/sway/sway-default.conf +++ b/tests/modules/services/window-managers/sway/sway-default.conf @@ -105,4 +105,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-default.nix b/tests/modules/services/window-managers/sway/sway-default.nix index c62effbe8..cf21cbafa 100644 --- a/tests/modules/services/window-managers/sway/sway-default.nix +++ b/tests/modules/services/window-managers/sway/sway-default.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf index f4f60ddf0..3ad8c181b 100644 --- a/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf +++ b/tests/modules/services/window-managers/sway/sway-followmouse-expected.conf @@ -83,4 +83,4 @@ mode "resize" { bindsym l resize grow width 10 px } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf index c10dbd90d..50f6a11d7 100644 --- a/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf +++ b/tests/modules/services/window-managers/sway/sway-followmouse-legacy-expected.conf @@ -83,4 +83,4 @@ mode "resize" { bindsym l resize grow width 10 px } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix b/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix index 3bce48507..425931b83 100644 --- a/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix +++ b/tests/modules/services/window-managers/sway/sway-followmouse-legacy.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-followmouse.nix b/tests/modules/services/window-managers/sway/sway-followmouse.nix index de2e91b39..7b0bcfeb8 100644 --- a/tests/modules/services/window-managers/sway/sway-followmouse.nix +++ b/tests/modules/services/window-managers/sway/sway-followmouse.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-modules.conf b/tests/modules/services/window-managers/sway/sway-modules.conf index d36a164ee..85ca8338a 100644 --- a/tests/modules/services/window-managers/sway/sway-modules.conf +++ b/tests/modules/services/window-managers/sway/sway-modules.conf @@ -117,4 +117,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-modules.nix b/tests/modules/services/window-managers/sway/sway-modules.nix index 287dec176..d9a566c60 100644 --- a/tests/modules/services/window-managers/sway/sway-modules.nix +++ b/tests/modules/services/window-managers/sway/sway-modules.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-no-xwayland.nix b/tests/modules/services/window-managers/sway/sway-no-xwayland.nix index 5eded3b88..d754d67d5 100644 --- a/tests/modules/services/window-managers/sway/sway-no-xwayland.nix +++ b/tests/modules/services/window-managers/sway/sway-no-xwayland.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; @@ -16,7 +14,7 @@ assertFileExists home-files/.config/sway/config assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \ ${ - pkgs.writeText "expected" '' + builtins.toFile "expected" '' xwayland disable '' } diff --git a/tests/modules/services/window-managers/sway/sway-null-config.nix b/tests/modules/services/window-managers/sway/sway-null-config.nix index 46e4df23e..38e2082fa 100644 --- a/tests/modules/services/window-managers/sway/sway-null-config.nix +++ b/tests/modules/services/window-managers/sway/sway-null-config.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; @@ -13,7 +11,7 @@ nmt.script = '' assertFileExists home-files/.config/sway/config - assertFileContent $(normalizeStorePaths home-files/.config/sway/config) \ - ${pkgs.writeText "expected" ""} + assertFileContent home-files/.config/sway/config \ + ${builtins.toFile "expected" ""} ''; } diff --git a/tests/modules/services/window-managers/sway/sway-null-package.conf b/tests/modules/services/window-managers/sway/sway-null-package.conf index 9df934b2f..0cb9d9d40 100644 --- a/tests/modules/services/window-managers/sway/sway-null-package.conf +++ b/tests/modules/services/window-managers/sway/sway-null-package.conf @@ -105,4 +105,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-null-package.nix b/tests/modules/services/window-managers/sway/sway-null-package.nix index 042830d18..3ab770813 100644 --- a/tests/modules/services/window-managers/sway/sway-null-package.nix +++ b/tests/modules/services/window-managers/sway/sway-null-package.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - # Enables the default bar configuration home.stateVersion = "20.09"; diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.conf b/tests/modules/services/window-managers/sway/sway-post-2003.conf index 9df934b2f..0cb9d9d40 100644 --- a/tests/modules/services/window-managers/sway/sway-post-2003.conf +++ b/tests/modules/services/window-managers/sway/sway-post-2003.conf @@ -105,4 +105,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-post-2003.nix b/tests/modules/services/window-managers/sway/sway-post-2003.nix index 3617a3b1c..73934382e 100644 --- a/tests/modules/services/window-managers/sway/sway-post-2003.nix +++ b/tests/modules/services/window-managers/sway/sway-post-2003.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - home.stateVersion = "20.09"; wayland.windowManager.sway = { diff --git a/tests/modules/services/window-managers/sway/sway-stubs.nix b/tests/modules/services/window-managers/sway/sway-stubs.nix deleted file mode 100644 index f946dfa78..000000000 --- a/tests/modules/services/window-managers/sway/sway-stubs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - # Avoid unnecessary downloads in CI jobs and/or make out paths constant, i.e., - # not containing hashes, version numbers etc. - test.stubs = { - dmenu = { }; - foot = { }; - i3status = { }; - sway = { version = "1"; }; - sway-unwrapped = { version = "1"; }; - swaybg = { }; - xwayland = { }; - }; -} diff --git a/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix b/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix index 5c32c19cd..84c41ac57 100644 --- a/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix +++ b/tests/modules/services/window-managers/sway/sway-systemd-autostart.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf index 3710c5392..e0534715b 100644 --- a/tests/modules/services/window-managers/sway/sway-systemd-variables.conf +++ b/tests/modules/services/window-managers/sway/sway-systemd-variables.conf @@ -105,4 +105,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-systemd-variables.nix b/tests/modules/services/window-managers/sway/sway-systemd-variables.nix index f0b42ecc1..b8f342210 100644 --- a/tests/modules/services/window-managers/sway/sway-systemd-variables.nix +++ b/tests/modules/services/window-managers/sway/sway-systemd-variables.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf index 4fe872821..b70c17515 100644 --- a/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf +++ b/tests/modules/services/window-managers/sway/sway-workspace-default-expected.conf @@ -104,4 +104,4 @@ bar { } } -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-workspace-default.nix b/tests/modules/services/window-managers/sway/sway-workspace-default.nix index e5637fd94..ef24f38a9 100644 --- a/tests/modules/services/window-managers/sway/sway-workspace-default.nix +++ b/tests/modules/services/window-managers/sway/sway-workspace-default.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf index 7148d0030..241866f36 100644 --- a/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf +++ b/tests/modules/services/window-managers/sway/sway-workspace-output-expected.conf @@ -110,4 +110,4 @@ workspace "ABC" output "DP" workspace "3: Test" output "HDMI" workspace "!"§$%&/(){}[]=?\*#<>-_.:,;²³" output "DVI" workspace "Multiple" output "DVI" "HDMI" "DP" -exec "/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" +exec "@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE; systemctl --user reset-failed && systemctl --user start sway-session.target && swaymsg -mt subscribe '[]' || true && systemctl --user stop sway-session.target" diff --git a/tests/modules/services/window-managers/sway/sway-workspace-output.nix b/tests/modules/services/window-managers/sway/sway-workspace-output.nix index dcbff91e1..2f8816bc4 100644 --- a/tests/modules/services/window-managers/sway/sway-workspace-output.nix +++ b/tests/modules/services/window-managers/sway/sway-workspace-output.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let i3 = { @@ -10,8 +10,6 @@ let }; in { - imports = [ ./sway-stubs.nix ]; - wayland.windowManager.sway = { enable = true; package = config.lib.test.mkStubPackage { outPath = "@sway@"; }; diff --git a/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix b/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix index 56782547f..f6fce496d 100644 --- a/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix +++ b/tests/modules/services/window-managers/sway/swaynag-empty-settings.nix @@ -1,5 +1,3 @@ -{ ... }: - { wayland.windowManager.sway.swaynag = { enable = true; diff --git a/tests/modules/services/window-managers/sway/swaynag-example-settings.nix b/tests/modules/services/window-managers/sway/swaynag-example-settings.nix index 513d185da..63a9f6a1d 100644 --- a/tests/modules/services/window-managers/sway/swaynag-example-settings.nix +++ b/tests/modules/services/window-managers/sway/swaynag-example-settings.nix @@ -1,30 +1,26 @@ -{ config, lib, pkgs, ... }: - { - config = { - wayland.windowManager.sway.swaynag = { - enable = true; + wayland.windowManager.sway.swaynag = { + enable = true; - settings = { - "" = { - edge = "bottom"; - font = "Dina 12"; - }; + settings = { + "" = { + edge = "bottom"; + font = "Dina 12"; + }; - green = { - edge = "top"; - background = "00AA00"; - text = "FFFFFF"; - button-background = "00CC00"; - message-padding = 10; - }; + green = { + edge = "top"; + background = "00AA00"; + text = "FFFFFF"; + button-background = "00CC00"; + message-padding = 10; }; }; - - nmt.script = '' - assertFileContent \ - home-files/.config/swaynag/config \ - ${./swaynag-example-settings-expected.conf} - ''; }; + + nmt.script = '' + assertFileContent \ + home-files/.config/swaynag/config \ + ${./swaynag-example-settings-expected.conf} + ''; } diff --git a/tests/modules/services/window-managers/wayfire/configuration.ini b/tests/modules/services/window-managers/wayfire/configuration.ini index a40480412..1467c269a 100644 --- a/tests/modules/services/window-managers/wayfire/configuration.ini +++ b/tests/modules/services/window-managers/wayfire/configuration.ini @@ -1,5 +1,5 @@ [autostart] -systemdActivation=/nix/store/00000000000000000000000000000000-dbus/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop wayfire-session.target && systemctl --user start wayfire-session.target +systemdActivation=@dbus@/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP NIXOS_OZONE_WL XCURSOR_THEME XCURSOR_SIZE && systemctl --user stop wayfire-session.target && systemctl --user start wayfire-session.target [command] binding_terminal=alacritty diff --git a/tests/modules/services/window-managers/wayfire/configuration.nix b/tests/modules/services/window-managers/wayfire/configuration.nix index 07042329e..940fb76ae 100644 --- a/tests/modules/services/window-managers/wayfire/configuration.nix +++ b/tests/modules/services/window-managers/wayfire/configuration.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ wayland.windowManager.wayfire = { enable = true; package = null; @@ -15,8 +15,6 @@ wayfireConfig=home-files/.config/wayfire.ini assertFileExists "$wayfireConfig" - - normalizedConfig=$(normalizeStorePaths "$wayfireConfig") - assertFileContent "$normalizedConfig" "${./configuration.ini}" + assertFileContent "$wayfireConfig" "${./configuration.ini}" ''; } diff --git a/tests/modules/services/window-managers/wayfire/wf-shell.nix b/tests/modules/services/window-managers/wayfire/wf-shell.nix index 2c8221d80..f7700ff33 100644 --- a/tests/modules/services/window-managers/wayfire/wf-shell.nix +++ b/tests/modules/services/window-managers/wayfire/wf-shell.nix @@ -1,10 +1,9 @@ -{ pkgs, ... }: { +{ wayland.windowManager.wayfire = { enable = true; package = null; wf-shell = { enable = true; - package = pkgs.mkStubPackage { }; settings = { panel = { widgets_left = "menu spacing4 launchers window-list"; @@ -18,8 +17,6 @@ wfShellConfig=home-files/.config/wf-shell.ini assertFileExists "$wfShellConfig" - - normalizedConfig=$(normalizeStorePaths "$wfShellConfig") - assertFileContent "$normalizedConfig" "${./wf-shell.ini}" + assertFileContent "$wfShellConfig" "${./wf-shell.ini}" ''; } diff --git a/tests/modules/services/wlsunset/wlsunset-service-expected.service b/tests/modules/services/wlsunset/wlsunset-service-expected.service index fecd05b9f..d4006618f 100644 --- a/tests/modules/services/wlsunset/wlsunset-service-expected.service +++ b/tests/modules/services/wlsunset/wlsunset-service-expected.service @@ -5,5 +5,6 @@ WantedBy=test.target ExecStart=@wlsunset@/bin/wlsunset -L 128.8 -T 6000 -g 0.6 -l 12.3 -t 3500 [Unit] +After=graphical-session.target Description=Day/night gamma adjustments for Wayland compositors. PartOf=graphical-session.target diff --git a/tests/modules/programs/wpaperd/default.nix b/tests/modules/services/wpaperd/default.nix similarity index 100% rename from tests/modules/programs/wpaperd/default.nix rename to tests/modules/services/wpaperd/default.nix diff --git a/tests/modules/services/wpaperd/wpaperd-example-settings.nix b/tests/modules/services/wpaperd/wpaperd-example-settings.nix new file mode 100644 index 000000000..30cb0ffc3 --- /dev/null +++ b/tests/modules/services/wpaperd/wpaperd-example-settings.nix @@ -0,0 +1,21 @@ +{ + services.wpaperd = { + enable = true; + settings = { + eDP-1 = { + path = "/home/foo/Pictures/Wallpaper"; + apply-shadow = true; + }; + DP-2 = { + path = "/home/foo/Pictures/Anime"; + sorting = "descending"; + + }; + }; + }; + + nmt.script = '' + assertFileContent home-files/.config/wpaperd/wallpaper.toml \ + ${./wpaperd-expected-settings.toml} + ''; +} diff --git a/tests/modules/programs/wpaperd/wpaperd-expected-settings.toml b/tests/modules/services/wpaperd/wpaperd-expected-settings.toml similarity index 100% rename from tests/modules/programs/wpaperd/wpaperd-expected-settings.toml rename to tests/modules/services/wpaperd/wpaperd-expected-settings.toml diff --git a/tests/modules/services/yubikey-agent-darwin/default.nix b/tests/modules/services/yubikey-agent-darwin/default.nix new file mode 100644 index 000000000..5594aa8e8 --- /dev/null +++ b/tests/modules/services/yubikey-agent-darwin/default.nix @@ -0,0 +1 @@ +{ yubikey-agent-darwin = ./service.nix; } diff --git a/tests/modules/services/yubikey-agent-darwin/service.nix b/tests/modules/services/yubikey-agent-darwin/service.nix new file mode 100644 index 000000000..99b68dc6f --- /dev/null +++ b/tests/modules/services/yubikey-agent-darwin/service.nix @@ -0,0 +1,49 @@ +{ config, ... }: + +{ + services.yubikey-agent = { + enable = true; + package = config.lib.test.mkStubPackage { outPath = "@yubikey-agent@"; }; + }; + + nmt.script = '' + serviceFile=LaunchAgents/org.nix-community.home.yubikey-agent.plist + assertFileExists "$serviceFile" + assertFileContent "$serviceFile" ${ + builtins.toFile "expected-agent.plist" '' + + + + + KeepAlive + + Crashed + + SuccessfulExit + + + Label + org.nix-community.home.yubikey-agent + ProcessType + Background + ProgramArguments + + @yubikey-agent@/bin/yubikey-agent + -l + /tmp/yubikey-agent.sock + + Sockets + + Listener + + SockPathMode + 384 + SockPathName + /tmp/yubikey-agent.sock + + + + '' + } + ''; +} diff --git a/tests/modules/services/yubikey-agent/default.nix b/tests/modules/services/yubikey-agent/default.nix new file mode 100644 index 000000000..d2ff5a353 --- /dev/null +++ b/tests/modules/services/yubikey-agent/default.nix @@ -0,0 +1 @@ +{ yubikey-agent = ./service.nix; } diff --git a/tests/modules/services/yubikey-agent/service.nix b/tests/modules/services/yubikey-agent/service.nix new file mode 100644 index 000000000..90ff5cc72 --- /dev/null +++ b/tests/modules/services/yubikey-agent/service.nix @@ -0,0 +1,49 @@ +{ config, ... }: + +{ + services.yubikey-agent = { + enable = true; + package = config.lib.test.mkStubPackage { outPath = "@yubikey-agent@"; }; + }; + + nmt.script = '' + serviceFile=home-files/.config/systemd/user/yubikey-agent.service + socketFile=home-files/.config/systemd/user/yubikey-agent.socket + + assertFileExists $serviceFile + assertFileExists $socketFile + + assertFileContent $serviceFile ${ + builtins.toFile "expected-service" '' + [Service] + ExecStart=@yubikey-agent@/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock + ReadWritePaths=%t + Type=simple + + [Unit] + After=yubikey-agent.socket + Description=Seamless ssh-agent for YubiKeys + Documentation=https://github.com/FiloSottile/yubikey-agent + RefuseManualStart=true + Requires=yubikey-agent.socket + '' + } + + assertFileContent $socketFile ${ + builtins.toFile "expected-socket" '' + [Install] + WantedBy=sockets.target + + [Socket] + DirectoryMode=0700 + ListenStream=%t/yubikey-agent/yubikey-agent.sock + RuntimeDirectory=yubikey-agent + SocketMode=0600 + + [Unit] + Description=Unix domain socket for Yubikey SSH agent + Documentation=https://github.com/FiloSottile/yubikey-agent + '' + } + ''; +} diff --git a/tests/modules/systemd/timers.nix b/tests/modules/systemd/timers.nix index b9d167e3b..2d48e9fde 100644 --- a/tests/modules/systemd/timers.nix +++ b/tests/modules/systemd/timers.nix @@ -1,5 +1,3 @@ -{ ... }: - { systemd.user.timers.test-timer = { Unit = { Description = "A basic test timer"; }; diff --git a/tests/modules/targets-darwin/darwin.nix b/tests/modules/targets-darwin/darwin.nix index 511ae87fd..640b17783 100644 --- a/tests/modules/targets-darwin/darwin.nix +++ b/tests/modules/targets-darwin/darwin.nix @@ -1,14 +1,9 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ pkgs, ... }: let - darwinTestApp = pkgs.runCommandLocal "target-darwin-example-app" { } '' mkdir -p $out/Applications touch $out/Applications/example-app ''; - in { config = { home.packages = [ darwinTestApp ]; diff --git a/tests/modules/targets-darwin/user-defaults.nix b/tests/modules/targets-darwin/user-defaults.nix index bb23f718d..a99baf6d0 100644 --- a/tests/modules/targets-darwin/user-defaults.nix +++ b/tests/modules/targets-darwin/user-defaults.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { config = { targets.darwin = { @@ -10,9 +8,9 @@ nmt.script = '' assertFileRegex activate \ - "/usr/bin/defaults import 'com.apple.desktopservices' /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.desktopservices\\.plist" + "/usr/bin/defaults import com.apple.desktopservices /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.desktopservices\\.plist" assertFileRegex activate \ - "/usr/bin/defaults -currentHost import 'com.apple.controlcenter' /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.controlcenter\\.plist" + "/usr/bin/defaults -currentHost import com.apple.controlcenter /nix/store/[a-z0-9]\\{32\\}-com\\.apple\\.controlcenter\\.plist" ''; }; } diff --git a/tests/modules/targets-linux/generic-linux.nix b/tests/modules/targets-linux/generic-linux.nix index 88cec8a00..aba0e39d0 100644 --- a/tests/modules/targets-linux/generic-linux.nix +++ b/tests/modules/targets-linux/generic-linux.nix @@ -1,9 +1,6 @@ -{ config, lib, pkgs, ... }: - -with lib; - +{ lib, pkgs, ... }: let - expectedXdgDataDirs = concatStringsSep ":" [ + expectedXdgDataDirs = lib.concatStringsSep ":" [ "\${NIX_STATE_DIR:-/nix/var/nix}/profiles/default/share" "/home/hm-user/.nix-profile/share" "/usr/share/ubuntu" @@ -12,7 +9,6 @@ let "/var/lib/snapd/desktop" "/foo" ]; - in { config = { targets.genericLinux.enable = true; diff --git a/tests/modules/xresources/empty.nix b/tests/modules/xresources/empty.nix index e02e0fbfe..3c4102781 100644 --- a/tests/modules/xresources/empty.nix +++ b/tests/modules/xresources/empty.nix @@ -1,5 +1,3 @@ -{ ... }: - { xresources.properties = { }; diff --git a/tests/modules/xresources/xresources.nix b/tests/modules/xresources/xresources.nix index 3f8a83678..5fead37da 100644 --- a/tests/modules/xresources/xresources.nix +++ b/tests/modules/xresources/xresources.nix @@ -1,5 +1,3 @@ -{ ... }: - { xresources = { properties = { diff --git a/tests/stubs.nix b/tests/stubs.nix index b9c933ac8..66d7265e6 100644 --- a/tests/stubs.nix +++ b/tests/stubs.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: - -with lib; - let + inherit (lib) mkOption types; stubType = types.submodule ({ name, ... }: { options = { @@ -15,19 +13,24 @@ let outPath = mkOption { type = types.nullOr types.str; default = "@${name}@"; - defaultText = literalExpression ''"@''${name}@"''; + defaultText = lib.literalExpression ''"@''${name}@"''; }; version = mkOption { type = types.nullOr types.str; default = null; - defaultText = literalExpression "pkgs.\${name}.version or null"; + defaultText = lib.literalExpression "pkgs.\${name}.version or null"; }; buildScript = mkOption { type = types.str; default = defaultBuildScript; }; + + extraAttrs = mkOption { + type = types.attrsOf types.anything; + default = { }; + }; }; }); @@ -37,7 +40,7 @@ let defaultBuildScript; mkStubPackage = { name ? "dummy", outPath ? null, version ? null - , buildScript ? defaultBuildScript }: + , buildScript ? defaultBuildScript, extraAttrs ? { } }: let pkg = if name == "dummy" && buildScript == defaultBuildScript then dummyPackage @@ -46,35 +49,52 @@ let pname = name; meta.mainProgram = name; } buildScript; - in pkg // optionalAttrs (outPath != null) { - inherit outPath; - # Prevent getOutput from descending into outputs - outputSpecified = true; + stubbedPkg = pkg // lib.optionalAttrs (outPath != null) { + inherit outPath; - # Allow the original package to be used in derivation inputs - __spliced = { - buildHost = pkg; - hostTarget = pkg; - }; - } // optionalAttrs (version != null) { inherit version; }; + # Prevent getOutput from descending into outputs + outputSpecified = true; + + # Allow the original package to be used in derivation inputs + __spliced = { + buildHost = pkg; + hostTarget = pkg; + }; + } // lib.optionalAttrs (version != null) { inherit version; } + // extraAttrs; + in stubbedPkg; in { - options.test.stubs = mkOption { - type = types.attrsOf stubType; - default = { }; - description = - "Package attributes that should be replaced by a stub package."; + options.test = { + stubs = mkOption { + type = types.attrsOf stubType; + default = { }; + description = + "Package attributes that should be replaced by a stub package."; + }; + + stubOverlays = mkOption { + type = types.anything; + default = [ ]; + internal = true; + }; + + unstubs = mkOption { + type = types.listOf types.anything; + default = [ ]; + }; }; config = { lib.test.mkStubPackage = mkStubPackage; - nixpkgs.overlays = [ (self: super: { inherit mkStubPackage; }) ] - ++ optional (config.test.stubs != { }) (self: super: - mapAttrs (n: v: - mkStubPackage (v // optionalAttrs (v.version == null) { - version = super.${n}.version or null; - })) config.test.stubs); + test.stubOverlays = [ ] ++ lib.optional (config.test.stubs != { }) + (self: super: + lib.mapAttrs (n: v: + builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v + // lib.optionalAttrs (v.version == null) { + version = super.${n}.version or null; + }))) config.test.stubs) ++ config.test.unstubs; }; }