chris
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove nixOnDroid

main
Christopher James Hayward 3 years ago
parent
8ef59fc273
commit
47522cedf2
Signed by: chris GPG Key ID: 3025DCBD46F81C0F
3 changed files with 0 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      README.org
  2. 76
      flake.lock
  3. 11
      flake.nix

46
README.org
View File

@ -115,16 +115,12 @@ RUN nix-shell /etc/dotfiles/shell.nix
<<os-home-manager>> <<os-home-manager>>
<<os-emacs-overlay>> <<os-emacs-overlay>>
<<os-nixos-hardware>> <<os-nixos-hardware>>
<<os-nix-on-droid>>
}; };
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: { outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: {
nixosConfigurations = { nixosConfigurations = {
<<host-default>> <<host-default>>
}; };
nixOnDroidConfigurations = {
<<host-android>>
};
}; };
} }
#+END_SRC #+END_SRC
@ -170,16 +166,6 @@ emacs-overlay.url = "github:nix-community/emacs-overlay";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
#+END_SRC #+END_SRC
** Nix On Droid
[[https://github.com/t184256/nix-on-droid][Nix On Droid]] is a deployment of the [[https://nixos.org/manual/nix/stable/Nix][Nix Package Manager]] on [[https://android.com][Android]], in a single-click installable package. It does not require =root=, user namespace support, or disabling SELinux, but relies on =proot=. It has no relation to the Termux distribution.
#+NAME: os-nix-on-droid
#+BEGIN_SRC nix
nix-on-droid.url = "github:t184256/nix-on-droid/master";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
#+END_SRC
* Development Shells * Development Shells
The command ~nix-shell~ will build the dependencies of the specified derivation, but not the derivation itself. It will then start an interactive shell in which all environment variables defined by the derivation /path/ have been set to their corresponding values. The command ~nix-shell~ will build the dependencies of the specified derivation, but not the derivation itself. It will then start an interactive shell in which all environment variables defined by the derivation /path/ have been set to their corresponding values.
@ -588,38 +574,6 @@ The file system for this host is a single 24GB =QCOW= file, a format for disk im
} }
#+END_SRC #+END_SRC
** Android
This is my [[https://samsung.com/us/mobile/galaxy-s10/buy/][Samsung Galaxy S10+]] running [[https://github.com/t184256/nix-on-droid][Nix On Droid]] with the experimental support for [[https://nixos.wiki/wiki/Flakes][Flakes]] being used to manage the configuration.
#+NAME: host-android
#+BEGIN_SRC nix
android = {
device = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
config = ./hosts/android/nix-on-droid.nix;
system = "aarch64-linux";
specialArgs = { inherit inputs; };
};
};
#+END_SRC
Build and activate the configuration with ~nix-on-droid switch --flake .#android~. Currently this cannot be built with a pure flake because of hardcoded store paths for =proot=. Every evaluation will be executed with the =--impure= flag.
#+BEGIN_SRC nix :noweb yes :tangle hosts/android/nix-on-droid.nix
# <<file-warning>>
{ pkgs, ... }:
{
environment.packages = [
pkgs.git
pkgs.vim
pkgs.pass
pkgs.gnupg
pkgs.openssh
];
}
#+END_SRC
* Module Definitions * Module Definitions
Modules are files combined by [[https://nixos.org/][NixOS]] to produce the full system configuration. Modules wre introduced to allow extending NixOS without modifying its source code. They also allow splitting up =configuration.nix=, making the system configuration easier to maintain and use. Modules are files combined by [[https://nixos.org/][NixOS]] to produce the full system configuration. Modules wre introduced to allow extending NixOS without modifying its source code. They also allow splitting up =configuration.nix=, making the system configuration easier to maintain and use.

76
flake.lock
View File

@ -15,36 +15,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -65,50 +35,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nix-on-droid",
"nixpkgs"
]
},
"locked": {
"lastModified": 1650059391,
"narHash": "sha256-2kYYStLpPCcYToW+uZTP0jxmdR95URCret/vfpzJn4s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7add9ce2e5c517fcc4b25b3ed13e7e28cd325034",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nix-on-droid": {
"inputs": {
"flake-utils": "flake-utils_2",
"home-manager": "home-manager_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1641155977,
"narHash": "sha256-50h+3soki1I+plc+4gzzvO2yaGg/8UDsLNQotXg649c=",
"owner": "t184256",
"repo": "nix-on-droid",
"rev": "07c4406897104c7be56094b0865e4c37aa72ec8f",
"type": "github"
},
"original": {
"owner": "t184256",
"ref": "master",
"repo": "nix-on-droid",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1649849514, "lastModified": 1649849514,
@ -157,9 +83,7 @@
"root": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-on-droid": "nix-on-droid",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"

11
flake.nix
View File

@ -9,8 +9,6 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nix-on-droid.url = "github:t184256/nix-on-droid/master";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: { outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: {
@ -43,14 +41,5 @@
]; ];
}; };
}; };
nixOnDroidConfigurations = {
android = {
device = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
config = ./hosts/android/nix-on-droid.nix;
system = "aarch64-linux";
specialArgs = { inherit inputs; };
};
};
};
}; };
} }
Write Preview
Loading…
Cancel
Save