From ccc55e6fa45fa8bba9dd892600fa1fd449fa4746 Mon Sep 17 00:00:00 2001 From: Daryl Ronningen Date: Mon, 2 Jan 2023 00:56:35 -0800 Subject: [PATCH] nix-on-droid config --- devices/pixel/base.nix | 30 +++++++++ devices/wsl/base.nix | 2 +- flake.lock | 135 +++++++++++++++++++++++++++++++++++------ flake.nix | 15 ++++- users/relms/base.nix | 3 - 5 files changed, 163 insertions(+), 22 deletions(-) create mode 100644 devices/pixel/base.nix diff --git a/devices/pixel/base.nix b/devices/pixel/base.nix new file mode 100644 index 0000000..7e642a5 --- /dev/null +++ b/devices/pixel/base.nix @@ -0,0 +1,30 @@ +{pkgs, lib, ...}: { + system.stateVersion = "22.11"; + + time.timeZone = "America/Los_Angeles"; + + user.shell = "${pkgs.fish}/bin/fish"; + + nix = { + extraOptions = '' + experimental-features = nix-command flakes + ''; + }; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + config = {pkgs, ...}: { + imports = [ + ../../users/relms/base.nix + ../../users/relms/shell.nix + ../../users/relms/dev.nix + ]; + + manual.manpages.enable = false; + services.gpg-agent.pinentryFlavor = lib.mkForce "curses"; + programs.neovim.enable = lib.mkForce false; + }; + }; +} diff --git a/devices/wsl/base.nix b/devices/wsl/base.nix index 9663548..cb340b9 100644 --- a/devices/wsl/base.nix +++ b/devices/wsl/base.nix @@ -9,5 +9,5 @@ networking.hostName = "wsl"; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; } diff --git a/flake.lock b/flake.lock index 46376aa..c33842e 100644 --- a/flake.lock +++ b/flake.lock @@ -36,7 +36,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1672349765, @@ -77,6 +79,55 @@ "type": "github" } }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1666720474, + "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, + "nix-on-droid": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nmd": "nmd_2" + }, + "locked": { + "lastModified": 1670198918, + "narHash": "sha256-oNlUhAM0/a3pDdCMmBWA+CLrDAIYJqAAMyrDp8fNSM4=", + "owner": "t184256", + "repo": "nix-on-droid", + "rev": "b00cb5e7e2a47d85a019119069b153cda4002d0a", + "type": "github" + }, + "original": { + "owner": "t184256", + "repo": "nix-on-droid", + "type": "github" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", @@ -117,6 +168,70 @@ "type": "github" } }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1669834992, + "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "type": "github" + } + }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmd_2": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nur": { "locked": { "lastModified": 1672635614, @@ -136,28 +251,14 @@ "inputs": { "home-manager": "home-manager", "neovim": "neovim", + "nix-on-droid": "nix-on-droid", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nur": "nur", - "utils": "utils_2" + "utils": "utils" } }, "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { "inputs": { "flake-utils": "flake-utils" }, diff --git a/flake.nix b/flake.nix index 04f4e41..ed594c3 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.utils.follows = "utils"; nur.url = "github:nix-community/NUR"; @@ -17,6 +18,10 @@ nixos-wsl.url = "github:nix-community/nixos-wsl"; nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; nixos-wsl.inputs.flake-utils.follows = "utils"; + + nix-on-droid.url = "github:t184256/nix-on-droid"; + nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; + nix-on-droid.inputs.home-manager.follows = "home-manager"; }; outputs = { self, @@ -26,6 +31,7 @@ neovim, nur, nixos-wsl, + nix-on-droid, ... }: let modules = { @@ -63,7 +69,6 @@ }; }; pkgs = import nixpkgs { - system = "x86_64-linux"; overlays = [nur.overlay (utils.lib.genPkgOverlay neovim "neovim")]; }; in { @@ -101,6 +106,14 @@ modules = modules.home.common ++ modules.home.dev ++ modules.home.gui; }; + nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { + inherit pkgs; + system = "aarch64-linux"; + + modules = [./devices/pixel/base.nix]; + }; + + formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; }; } diff --git a/users/relms/base.nix b/users/relms/base.nix index e3bea9c..309f1bb 100644 --- a/users/relms/base.nix +++ b/users/relms/base.nix @@ -4,9 +4,6 @@ pkgs, ... }: { - home.username = "relms"; - home.homeDirectory = "/home/relms"; - home.stateVersion = "22.11"; programs.home-manager.enable = true;