Fix oops
This commit is contained in:
parent
5ed5de1655
commit
23d8f04cf2
105
droid.nix
105
droid.nix
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, unstable, fenix, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "21.11";
|
system.stateVersion = "21.11";
|
||||||
|
@ -10,4 +10,107 @@
|
||||||
GDK_DPI_SCALE = "2";
|
GDK_DPI_SCALE = "2";
|
||||||
GDK_SCALE = "2";
|
GDK_SCALE = "2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Have to put packages here, as it does not have environment.systemPackages
|
||||||
|
environment.packages = with pkgs;
|
||||||
|
[
|
||||||
|
###
|
||||||
|
## utils-core
|
||||||
|
###
|
||||||
|
# Basic command line utilities
|
||||||
|
wget
|
||||||
|
tmux
|
||||||
|
nano
|
||||||
|
unzip
|
||||||
|
any-nix-shell
|
||||||
|
htop
|
||||||
|
# Spell check
|
||||||
|
hunspell
|
||||||
|
hunspellDicts.en-us
|
||||||
|
# Rust rewrites of common shell utilities
|
||||||
|
unstable.starship
|
||||||
|
exa
|
||||||
|
bat
|
||||||
|
fd
|
||||||
|
sd
|
||||||
|
du-dust
|
||||||
|
ripgrep
|
||||||
|
ripgrep-all
|
||||||
|
tokei
|
||||||
|
hyperfine
|
||||||
|
unstable.bottom
|
||||||
|
dogdns
|
||||||
|
unstable.zenith
|
||||||
|
duf
|
||||||
|
# CLI Markdown renderer
|
||||||
|
glow
|
||||||
|
# Command line file manager
|
||||||
|
broot
|
||||||
|
# Much better curl
|
||||||
|
unstable.httpie
|
||||||
|
# CLI spreadsheets
|
||||||
|
visidata
|
||||||
|
# User friendly cut
|
||||||
|
choose
|
||||||
|
# Cheatsheet manager
|
||||||
|
cheat
|
||||||
|
# Ping with a graph
|
||||||
|
gping
|
||||||
|
# Man but terse
|
||||||
|
tealdeer
|
||||||
|
# Pandoc for documentation
|
||||||
|
unstable.pandoc
|
||||||
|
# For nslookup
|
||||||
|
dnsutils
|
||||||
|
# Feh image viewer
|
||||||
|
feh
|
||||||
|
# Mosh for better high-latency ssh
|
||||||
|
mosh
|
||||||
|
###
|
||||||
|
## devel-core
|
||||||
|
###
|
||||||
|
# Full version of git
|
||||||
|
unstable.gitFull
|
||||||
|
# Git addons
|
||||||
|
git-secret
|
||||||
|
unstable.git-lfs
|
||||||
|
delta
|
||||||
|
# General development requirements
|
||||||
|
python3Full
|
||||||
|
cmake
|
||||||
|
libtool
|
||||||
|
gnumake
|
||||||
|
nixpkgs-fmt
|
||||||
|
# jq for interacting with JSON
|
||||||
|
jq
|
||||||
|
jc
|
||||||
|
# Viewer for deeply nested JSON
|
||||||
|
fx
|
||||||
|
# Direnv for nix-shell niceness
|
||||||
|
direnv
|
||||||
|
###
|
||||||
|
## devel-rust
|
||||||
|
###
|
||||||
|
# Use rustup to get the compiler
|
||||||
|
rustup
|
||||||
|
# Install the latest rust analyzer
|
||||||
|
fenix.rust-analyzer
|
||||||
|
# Sccache for faster builds
|
||||||
|
sccache
|
||||||
|
# Misc cargo utilites
|
||||||
|
cargo-binutils # Allow invoking the llvm tools included with the toolchain
|
||||||
|
cargo-edit # Command line Cargo.toml manipulation
|
||||||
|
cargo-asm # Dump the generated assembly
|
||||||
|
cargo-fuzz # front end for fuzz testing rust
|
||||||
|
cargo-license # Audit the licenses of dependencies
|
||||||
|
cargo-criterion # Benchmarking front end
|
||||||
|
cargo-audit # Check dependencies for known CVEs
|
||||||
|
cargo-bloat # Find out what's taking up space in the executable
|
||||||
|
cargo-udeps # Find unused dependencies
|
||||||
|
cargo-expand # Dump expanded macros
|
||||||
|
unstable.cargo-tarpaulin # Code coverage
|
||||||
|
cargo-play # Quickly execute code outside of a crate
|
||||||
|
# For building stuff that uses protocol buffers
|
||||||
|
protobuf
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -273,17 +273,13 @@
|
||||||
tablet = nix-on-droid.lib.nixOnDroidConfiguration {
|
tablet = nix-on-droid.lib.nixOnDroidConfiguration {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
config = ./droid.nix;
|
config = ./droid.nix;
|
||||||
extraModules = [
|
|
||||||
./applications/devel-core.nix
|
|
||||||
./applications/utils-core.nix
|
|
||||||
];
|
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
unstable = import nixpkgs-unstable {
|
unstable = import nixpkgs-unstable {
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
overlays = [ emacs.overlay ];
|
overlays = [ emacs.overlay ];
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
};
|
};
|
||||||
fenix = fenix.packages.x86_64-darwin;
|
fenix = fenix.packages.aarch64-linux;
|
||||||
doomEmacs = nix-doom-emacs.hmModule;
|
doomEmacs = nix-doom-emacs.hmModule;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue