Commit graph

292 commits

Author SHA1 Message Date
Alexander Sosedkin
9ee03e218d ci.nix: simplify to single arch 2021-12-17 00:21:33 +01:00
Alexander Sosedkin
7aeb529aab drop i686 support without simplifying code 2021-12-17 00:21:33 +01:00
Tobias Happ
c53afdbcbb docs: clean up leading asterisks 2021-12-16 21:37:48 +01:00
Tobias Happ
b5325c18f6 session-init: fix option type and description 2021-12-15 22:42:54 +01:00
Tobias Happ
7e00a63733 session-init: consistently use the config for resolving home directory
It is not helpful to switch between `$HOME` and the config option for
resolving the path of the home directory.
2021-12-15 22:42:54 +01:00
Tobias Happ
bb8470da1d session-init: only add to NIX_PATH if value is not present yet 2021-12-15 22:42:54 +01:00
Tobias Happ
dcd8c07cd8 login: source session init in shell configs
If a shell is not started via login-inner (e.g. via ssh) it will not
source the sessionInit script. The solution is to source this file in
the respective config files for bash and zsh (more shell support can be
easily added).

The -u option is not necessary for the few lines in login-inner and
should not be activated after sourcing sessionInit in bash or zsh setup.
2021-12-15 22:42:54 +01:00
Zhong Jianxin
543c3bfdee Remove set +u/-u
Lots of zsh plugins fail to load when login via sshd:

```
$ ssh -p 8022 nix-on-droid@192.168.0.1
(eval):28: __zoxide_hooked: parameter not set
(eval):8: precmd_functions[(r)_direnv_hook]: parameter not set
async_init:1: ASYNC_INIT_DONE: parameter not set
prompt_pure_setup:10: prompt_newline: parameter not set
/nix/store/drwh7ngjshx794jvrvfvaz7wacjhkywi-zsh-fast-syntax-highlighting-1.54/share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh:48: ZPLG_CUR_PLUGIN: parameter not set
```
2021-12-15 22:42:54 +01:00
Tobias Happ
4ade388b9a tests: do not create out link from proot build 2021-12-15 22:04:43 +01:00
Tobias Happ
3114584c57 bootstrap: ensure that the correct pkgs instance is used 2021-12-15 22:04:43 +01:00
Tobias Happ
52efd98b5e tests: add cleanup logic for changed nix-channels 2021-12-15 22:04:43 +01:00
Tobias Happ
d8f098c8e5 tests: only expose env variables in setup that are used 2021-12-15 22:04:43 +01:00
Tobias Happ
619e53ac72 tests: simplify clean up logic for ~/.config/nixpkgs 2021-12-15 22:04:43 +01:00
Tobias Happ
0c2f293502 tests: only backup ~/.config/nixpkgs
Other files/directories are not modified by the general test setup.
2021-12-15 22:04:43 +01:00
Tobias Happ
e687e46e2f tests: update flake tests to use new --flake argument 2021-12-15 22:04:43 +01:00
Tobias Happ
248632699e tests: increase readability through small helper functions 2021-12-15 22:04:43 +01:00
Tobias Happ
7f983228fe tests: add assertions only relevant for the specific test case 2021-12-15 22:04:43 +01:00
Tobias Happ
726f74d9ec tests: restore the initial generation before each test
When developing it can happen to break the nix-on-droid script. If so,
this fix will ensure that each test has a working nix-on-droid script
available.
2021-12-15 22:04:43 +01:00
Tobias Happ
9477418fe6 tests: use bats pretty formatter 2021-12-15 22:04:43 +01:00
Tobias Happ
9f5f608d2b docs: update README for new flake support 2021-12-15 22:04:43 +01:00
Tobias Happ
49eb3efe98 flake: update lib module for more flexibilty 2021-12-15 22:04:43 +01:00
Tobias Happ
3d3441de44 nix-on-droid: add native support for flakes 2021-12-15 22:04:43 +01:00
Tobias Happ
c0568ad13a nix-on-droid: fix shellcheck issues 2021-12-15 22:04:43 +01:00
Tobias Happ
75d0c7c565 pkgs: use new args of ./modules 2021-12-15 22:04:43 +01:00
Tobias Happ
403336d4c4 modules: introduce more arguments at top-level 2021-12-15 22:04:43 +01:00
Alexander Sosedkin
7bae16e16d README: assorted fixes 2021-12-15 11:32:37 +01:00
Tobias Happ
b5ffc6d7df home-manager: add extraSpecialArgs and sharedModules options 2021-12-14 22:31:03 +01:00
Tobias Happ
38241f6363 activation: add VERBOSE env var in option description 2021-12-14 22:30:33 +01:00
Tobias Happ
b446b6572e ci: do not attempt to push to cachix on PR builds
Secrets are not available when triggered by a PR. Therefore,
CACHIX_SIGNING_KEY is not defined and cachix will always fail.
2021-12-14 22:30:21 +01:00
Alexander Sosedkin
856d931972 deduplicate proot for device and proot for fakedroid 2021-12-13 21:01:34 +01:00
Alexander Sosedkin
a6b8efbae3 tests/fakedroid: emulate a nix-on-droid-like env for testing 2021-12-13 21:01:34 +01:00
Alexander Sosedkin
343ec2ccc2 tests/on-device: add 2021-12-12 11:56:48 +01:00
Alexander Sosedkin
b775b46a7c modules/environment/login/login-inner: correct greeting 2021-12-12 11:56:48 +01:00
Zhaofeng Li
74ff681bc9 Rename home-manager argument to home-manager-path 2021-12-12 02:16:59 +01:00
Zhaofeng Li
0b83ab6bf1 flake.nix: Clean up, allow overriding pkgs
`outputs.overlays` is supposed to be an attribute set of overlays,
and `outputs.overlay` should contain a single overlay.
2021-12-12 02:16:59 +01:00
Zhaofeng Li
b1086df532 modules: Accept a path-like for home-manager
We don't actually use the initialized attrset for anything
other than its path.
2021-12-12 02:16:59 +01:00
Tobias Happ
8972fbf3da nixpkgs: always provide the option definitions
This allows evaluation of configurations where nixpkgs.* options are
used even when in a flake setup with unchanged default values.
2021-12-11 22:44:53 +01:00
Tobias Happ
7b9ba13632 session-init: add support for nix 2.4
See https://github.com/NixOS/nixpkgs/issues/149791.
2021-12-11 22:44:53 +01:00
Tobias Happ
43fafe1736 home-manager: remove support for 19.09 releases 2021-12-11 22:44:53 +01:00
Tobias Happ
1ad8c7ac48 Fix static cross compiling of proot 2021-12-11 22:44:53 +01:00
Alexander Sosedkin
983fe12a88 pkgs/cross-compiling/proot-termux: update 2021-12-11 22:44:53 +01:00
Tobias Happ
f4036a5335 Update pinned nixpkgs version 2021-12-11 22:44:53 +01:00
Tobias Happ
05542e9fa8 Release 21.11 2021-12-11 22:44:53 +01:00
Tobias Happ
be67cc42b4 Remove workaround in default nix-on-droid config
Workaround is with home-manager 21.11 no longer needed.
2021-12-11 22:44:53 +01:00
Tobias Happ
ef55157fb7 Update stateVersions and channel versions to 21.11 2021-12-11 22:44:53 +01:00
Tobias Happ
b30833b210 Remove deprecated workaround for make 2021-12-11 22:44:53 +01:00
Alexander Sosedkin
1629d13fd7 pkgs/nix-directory: stop using qemu-user to init nix db 2021-12-08 23:17:33 +01:00
Shamrock Lee
6b9e3fbbec activation.nix: fix for "activation from build result" (revised)
Solve #111
2021-11-28 23:29:06 +01:00
lucasew
d0b83e6397 expose options
Signed-off-by: lucasew <lucas59356@gmail.com>
2021-11-19 22:17:23 +01:00
Shamrock Lee
5c838f508b nix-on-droid.nix.default: fix the overlays inheritance of the home-manager config 2021-10-22 12:09:16 +02:00