diff --git a/dots/.config/nvim/flake.lock b/dots/.config/nvim/flake.lock index 80365fe..111907f 100644 --- a/dots/.config/nvim/flake.lock +++ b/dots/.config/nvim/flake.lock @@ -42,11 +42,11 @@ }, "nixCats": { "locked": { - "lastModified": 1769085828, - "narHash": "sha256-TjhFIAtS628+/r3IuYWPcNa++mUMMDDG8PbSfFHXBiA=", + "lastModified": 1769578476, + "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "43fbf4d12b0a613f1a792503da4bb2bf270173c7", + "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769433173, - "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index d468e26..1fe5ac3 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1769486619, - "narHash": "sha256-MEBKRsOj9s65KRvvugu4i7ytW2eASk67pFDgxgwsEr4=", + "lastModified": 1769745834, + "narHash": "sha256-/7EzWXFrHiF2LiuQPFUD1jhICcRa30QVa/uQCPu1Q/g=", "owner": "rycee", "repo": "nur-expressions", - "rev": "02ae5ccdcbe8defe6047840a7b46e67e215bef69", + "rev": "ec30ecfdee4b0df2325c2672db21684e806f4b69", "type": "gitlab" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1769450270, - "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=", + "lastModified": 1769776025, + "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a10c1e8f5ad2589414407f4851c221cb66270257", + "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0", "type": "github" }, "original": { @@ -177,6 +177,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-github-actions": { "inputs": { "nixpkgs": [ @@ -198,6 +221,34 @@ "type": "github" } }, + "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" + } + }, "nix-secrets": { "flake": false, "locked": { @@ -218,11 +269,11 @@ }, "nixCats": { "locked": { - "lastModified": 1769085828, - "narHash": "sha256-TjhFIAtS628+/r3IuYWPcNa++mUMMDDG8PbSfFHXBiA=", + "lastModified": 1769578476, + "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "43fbf4d12b0a613f1a792503da4bb2bf270173c7", + "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d", "type": "github" }, "original": { @@ -270,11 +321,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -284,6 +335,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": 1743689281, @@ -300,6 +383,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" + } + }, "nvim": { "inputs": { "mcp-hub": "mcp-hub", @@ -443,6 +580,7 @@ "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", + "nix-on-droid": "nix-on-droid", "nix-secrets": "nix-secrets", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", @@ -451,6 +589,22 @@ "sops-nix": "sops-nix" } }, + "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" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 255078b..5e9c075 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,11 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-on-droid = { + url = "github:nix-community/nix-on-droid/release-24.05"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; nixgl = { url = "github:nix-community/nixGL"; inputs.nixpkgs.follows = "nixpkgs"; @@ -49,6 +54,7 @@ sops-nix, nix-secrets, home-manager, + nix-on-droid, nixgl, firefox-addons, nvim, @@ -88,6 +94,22 @@ }; }; }; + # https://github.com/nix-community/nix-on-droid/blob/master/templates/advanced/flake.nix + nixOnDroidConfigurations = { + pixel = nix-on-droid.lib.nixOnDroidConfiguration { + modules = [ ./phone ]; + extraSpecialArgs = { + inherit inputs outputs dotsPath; + }; + pkgs = import nixpkgs { + system = "aarch64-linux"; + overlays = [ + nix-on-droid.overlays.default + ]; + }; + home-manager-path = home-manager.outPath; + }; + }; colmenaHive = import ./deploy/colmena.nix { inherit diff --git a/phone/default.nix b/phone/default.nix new file mode 100644 index 0000000..514d28a --- /dev/null +++ b/phone/default.nix @@ -0,0 +1,26 @@ +{ + pkgs, + ... +}: + +{ + environment.packages = with pkgs; [ + inputs.nvim.packages.x86_64-linux.nvim + ]; + + environment.etcBackupExtension = ".bak"; + + system.stateVersion = "24.05"; + + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + time.timeZone = "Europe/Brussels"; + + home-manager = { + config = ./home.nix; + backupFileExtension = "hm-bak"; + useGlobalPkgs = true; + }; +} diff --git a/phone/home.nix b/phone/home.nix new file mode 100644 index 0000000..13c6855 --- /dev/null +++ b/phone/home.nix @@ -0,0 +1,3 @@ +{ + home.stateVersion = "24.05"; +}