From f7414548ec28db7e7dd6e94f2d0728ef6cdd611e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 17:20:14 +0300 Subject: [PATCH] try this home manager config --- flake.nix | 14 +++++++++----- hosts/nixOnDroidHosts/atreus/configuration.nix | 15 +++++++++++++++ hosts/nixOnDroidHosts/luoji/configuration.nix | 17 ++++++++++++++++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 8824afb..30f520b 100644 --- a/flake.nix +++ b/flake.nix @@ -92,15 +92,19 @@ modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); + makeNixOnDroidConfig = + configName: + nix-on-droid.lib.nixOnDroidConfiguration { + extraSpecialArgs = { inherit inputs outputs; }; + pkgs = import nixpkgs { system = "aarch64-linux"; }; + modules = [ ./hosts/nixOnDroidHosts/${configName}/configuration.nix ]; + }; + nixOnDroidConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixOnDroidHosts); treefmtEval = forAllSystems (system: treefmt-nix.lib.evalModule (makePkgs system) ./treefmt.nix); in { nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames makeNixosConfig; - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - extraSpecialArgs = { inherit inputs outputs; }; - pkgs = import nixpkgs { system = "aarch64-linux"; }; - modules = [ ./hosts/nixOnDroidHosts/atreus/configuration.nix ]; - }; + nixOnDroidConfigurations = nixpkgs.lib.genAttrs nixOnDroidConfigNames makeNixOnDroidConfig; darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { system = "x86_64-darwin"; modules = [ ./hosts/darwinHosts/prometheus/configuration.nix ]; diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index 28c4c0f..6202b78 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -1,5 +1,6 @@ { pkgs, + inputs, ... }: { @@ -12,6 +13,17 @@ experimental-features = nix-command flakes ''; + # Configure home-manager + home-manager = { + backupFileExtension = "hm-bak"; + useGlobalPkgs = true; + + config = { + home.stateVersion = "24.05"; + # Add your home-manager config here + }; + }; + build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." @@ -40,6 +52,9 @@ openssh just nh + # agenix tools + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + age (pkgs.writeShellScriptBin "lg-rerouting" '' ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting '') diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index 3e1025d..6202b78 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -1,17 +1,29 @@ { pkgs, + inputs, ... }: { user.userName = "osbm"; # Read the changelog before changing this value - system.stateVersion = "25.11"; + system.stateVersion = "24.05"; # Set up nix for flakes nix.extraOptions = '' experimental-features = nix-command flakes ''; + # Configure home-manager + home-manager = { + backupFileExtension = "hm-bak"; + useGlobalPkgs = true; + + config = { + home.stateVersion = "24.05"; + # Add your home-manager config here + }; + }; + build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." @@ -40,6 +52,9 @@ openssh just nh + # agenix tools + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + age (pkgs.writeShellScriptBin "lg-rerouting" '' ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting '')