diff --git a/.gitignore b/.gitignore index a52cbb0..9465c04 100755 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ old/ +result/ diff --git a/flake.nix b/flake.nix index f055741..4e49f38 100755 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,12 @@ mkPiImage = modules: (nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - specialArgs = { inherit impermanence nixos-hardware; }; + specialArgs = { inherit impermanence nixos-hardware home-manager; }; modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" impermanence.nixosModules.impermanence nixos-hardware.nixosModules.raspberry-pi-4 + home-manager.nixosModules.home-manager ] ++ modules; }).config.system.build.sdImage; in { @@ -92,11 +93,21 @@ ./modules/common.nix ./modules/pi-common.nix ./hosts/pi-car/configuration.nix + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.k3t = ./home/car.nix; + } ]; pi-htpc = mkPiImage [ ./modules/common.nix ./modules/pi-common.nix ./hosts/pi-htpc/configuration.nix + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.k3t = ./home/desktop.nix; + } ]; }; }; diff --git a/modules/desktop-common.nix b/modules/desktop-common.nix index c702348..7daf4a8 100755 --- a/modules/desktop-common.nix +++ b/modules/desktop-common.nix @@ -199,6 +199,7 @@ users.users.k3t = { packages = with pkgs; [ + joplin-desktop qbittorrent kdePackages.kate jellyfin-desktop