Commit graph

119 commits

Author SHA1 Message Date
Zhong Jianxin
f88b0825c5 Provide fake /proc/stat if it's not readable
to make unpatched htop work
2021-12-21 14:52:51 +01:00
Alexander Sosedkin
98eca42af0 login: enable --sysvipc proot extension
Fixes: #114
2021-12-17 14:41:21 +01:00
Alexander Sosedkin
e87f42e3a2 modules/upgrade: fix missing /dev/shm on upgrade from <21.11
Fixes: #162
2021-12-17 12:46:55 +01:00
Alexander Sosedkin
0beab12f8d modules/environment/login: 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
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
403336d4c4 modules: introduce more arguments at top-level 2021-12-15 22:04:43 +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
Alexander Sosedkin
856d931972 deduplicate proot for device and proot for fakedroid 2021-12-13 21:01:34 +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
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
Alexander Sosedkin
983fe12a88 pkgs/cross-compiling/proot-termux: update 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
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
Alexander Sosedkin
3b4fd630ae login.nix: fixup, remove double-binding of /dev/shm
Reported-by: Zhong Jianxin <azuwis@gmail.com>
2021-10-22 11:38:38 +02:00
Zhong Jianxin
149e5c8869 Bind /dev/shm
POSIX semaphores need /dev/shm to work. Without this, python
multiprocessing gives errors:

```
Traceback (most recent call last):
  ...
  File "/usr/lib/python2.7/multiprocessing/synchronize.py", line 75, in __init__
    sl = self._semlock = _multiprocessing.SemLock(kind, value, maxvalue)
OSError: [Errno 13] Permission denied
```

Co-authored-by: Alexander Sosedkin <monk@unboiled.info>
Co-authored-by: Tobias Happ <tobias.happ@gmx.de>
2021-10-22 11:27:04 +02:00
Zhong Jianxin
31fd02ba4a Run shell as login shell
So shell rc files (.profile/.bashrc/.zshrc/...) will be loaded
2021-10-22 11:26:30 +02:00
Shamrock Lee
3aa377bf01 activation.nix: fix for "activation from build result"
Solve #111
2021-09-19 19:17:49 +02:00
Alexander Sosedkin
97e1e71b84 modules/build/activation: use config.nix.package 2021-07-27 22:01:03 +02:00
Tobias Happ
e4d19673af nix: add package option 2021-07-27 22:01:03 +02:00
Alexander Sosedkin
c4efd68279 replace references to 20.09 with 21.05 2021-06-26 19:01:42 +02:00
Alexander Sosedkin
08e047bb2c modules/workaround-make: deprecate 2021-06-26 19:01:42 +02:00
Alexander Sosedkin
6d7edfc20b pkgs: update talloc and proot 2021-06-26 19:01:42 +02:00
Alexander Sosedkin
9fcce0d7df pkgs: update toolchain and nixpkgs for 21.05 2021-06-26 19:01:42 +02:00
Tobias Happ
36df7dac11 ca: add certificates in /etc/ssl/certs 2021-05-28 02:25:17 +02:00
Tobias Happ
0a97cefe07 user: add options to manually set uid and gid 2021-05-28 02:22:39 +02:00
Tobias Happ
ee772f1e1d nix: allow configuration of nix.conf 2021-05-28 02:22:39 +02:00
Tobias Happ
92b2897b7c networking: set resolv.conf in networking module 2021-05-28 02:22:39 +02:00
Tobias Happ
cfcb4acf16 networking: add basic /etc files for networking 2021-05-28 02:22:39 +02:00
Alexander Sosedkin
0dec5d4c97 modules/user: use runCommandLocal for idDerivation 2021-01-17 18:06:46 +01:00
Bruno Bigras
9c7c0a9672 add flake.nix
Co-authored-by: Tobias Happ <Gerschtli@users.noreply.github.com>
2021-01-17 18:06:46 +01:00
Bruno Bigras
abf7f56cb6 use the same nixpkgs and home-manager
Co-authored-by: Tobias Happ <Gerschtli@users.noreply.github.com>
2021-01-17 18:06:46 +01:00
Alexander Sosedkin
7bd0ebcef3 modules/home-manager: link profile to /etc 2020-11-27 21:04:17 +01:00
Alexander Sosedkin
11a963ec62 nix-on-droid.nix.default: suggest inheriting overlays 2020-11-27 21:04:17 +01:00
Alexander Sosedkin
d6c50d76b0 CHANGELOG.md: point users towards #91 2020-11-27 21:04:17 +01:00
Alexander Sosedkin
951a93757d modules/workaround-make: add workaround for make
See #91 for context.
2020-11-27 21:04:17 +01:00
Alexander Sosedkin
7b5a103e4a build/config: add config.build.extraProotOptions 2020-11-27 21:04:17 +01:00