From 2ed248f0054017ea46accee983de2f8debb2c798 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sat, 5 Oct 2024 07:41:43 +0000 Subject: [PATCH] initial install for droid --- flake.lock | 154 +++++++++++++++++++++++++++++++++ flake.nix | 19 +++- home/core/default.nix | 1 + home/profiles/cli/default.nix | 2 +- home/profiles/nvim/default.nix | 8 +- hosts/droid/default.nix | 15 ++++ 6 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 hosts/droid/default.nix diff --git a/flake.lock b/flake.lock index dede2c0f..9d0f299d 100644 --- a/flake.lock +++ b/flake.lock @@ -284,6 +284,29 @@ "type": "github" } }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1705252799, + "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, "nix-matrix-appservices": { "inputs": { "devshell": "devshell", @@ -305,6 +328,34 @@ "type": "gitlab" } }, + "nix-on-droid": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-docs": "nixpkgs-docs", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nmd": "nmd_2" + }, + "locked": { + "lastModified": 1720396533, + "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "owner": "nix-community", + "repo": "nix-on-droid", + "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "nix-on-droid", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1643502816, @@ -352,6 +403,38 @@ "type": "github" } }, + "nixpkgs-docs": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1723938990, @@ -368,6 +451,60 @@ "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": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset" + }, + "locked": { + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", + "owner": "~rycee", + "repo": "nmd", + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", + "type": "sourcehut" + }, + "original": { + "owner": "~rycee", + "repo": "nmd", + "type": "sourcehut" + } + }, + "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": 1724040334, @@ -414,6 +551,7 @@ "hardware": "hardware", "home-manager": "home-manager_2", "nix-matrix-appservices": "nix-matrix-appservices", + "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur": "nur", @@ -444,6 +582,22 @@ "type": "github" } }, + "scss-reset": { + "flake": false, + "locked": { + "lastModified": 1631450058, + "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", + "owner": "andreymatin", + "repo": "scss-reset", + "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", + "type": "github" + }, + "original": { + "owner": "andreymatin", + "repo": "scss-reset", + "type": "github" + } + }, "superdirt-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 60e29038..0238e44a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,9 @@ unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - # ngipkgs.url = "github:Chickensoupwithrice/ngipkgs?ref=aynish/atomic-server-module"; - # ngipkgs-local.url = "path:/home/anish/usr/ngipkgs"; + nix-on-droid.url = "github:nix-community/nix-on-droid/release-24.05"; + nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; + nix-on-droid.inputs.home-manager.follows = "home-manager"; # Home manager home-manager.url = "github:nix-community/home-manager/release-24.05"; @@ -60,6 +61,7 @@ , unstable , nixos-hardware , home-manager + , nix-on-droid , deploy-rs , agenix , disko @@ -252,6 +254,19 @@ }; }; + nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { + pkgs = import nixpkgs { system = "aarch64-linux"; }; + modules = [ + ./hosts/droid + { + home-manager = { + config = ./home/core/default.nix; + useGlobalPkgs = true; + }; + } + ]; + }; + deploy.nodes = { box = { hostname = "mossnet.lan"; diff --git a/home/core/default.nix b/home/core/default.nix index f712f44d..efc73711 100644 --- a/home/core/default.nix +++ b/home/core/default.nix @@ -4,6 +4,7 @@ ../profiles/cli ../profiles/direnv ../profiles/git + ../profiles/nvim ]; home.stateVersion = "22.05"; } diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index 065c8365..d0908883 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -62,7 +62,7 @@ pandoc taskwarrior-tui python3Packages.howdoi - vimwiki-cli + # vimwiki-cli (pkgs.writeScriptBin "jq-repl" '' #!/usr/bin/env bash diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index a2597b1f..6b9a3101 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -856,7 +856,7 @@ in extraPackages = with pkgs // customPlugins; [ # used to compile tree-sitter grammar python-with-my-packages - nodejs + #nodejs clojure-lsp clojure nil @@ -866,7 +866,7 @@ in zls gopls gcc - nodePackages_latest.pyright + # nodePackages_latest.pyright shellcheck proselint statix @@ -948,10 +948,10 @@ in vim-sexp-mappings-for-regular-people fennel-vim - vim-tidal + #vim-tidal # experimental nvim-luapad - scnvim + #scnvim leap vim-beancount # vimtex diff --git a/hosts/droid/default.nix b/hosts/droid/default.nix new file mode 100644 index 00000000..24edc457 --- /dev/null +++ b/hosts/droid/default.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: +{ + imports = [ + # ../profiles/core + ]; + environment.packages = with pkgs; [ + openssh + ]; + + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + system.stateVersion = "24.05"; +}