update nixosConfigurations

This commit is contained in:
Andreas Schaafsma 2024-10-08 06:19:00 +02:00
parent 93b7000b39
commit f63ccb92ca
2 changed files with 47 additions and 39 deletions

View File

@ -15,47 +15,53 @@
installedPackages = (import ./installed-packages { inherit pkgs; }); installedPackages = (import ./installed-packages { inherit pkgs; });
in in
{ {
nixosConfigurations = { nixosConfigurations.nixos-wsl = nixpkgs.lib.nixosSystem {
nixos = nixpkgs.lib.nixosSystem { inherit system;
inherit system; modules = [
modules = [ nixos-wsl.nixosModules.default
nixos-wsl.nixosModules.default ./systems/drivebystation-nixos-wsl/configuration.nix
./systems/drivebystation-nixos-wsl/configuration.nix {
{ system.stateVersion = "24.05";
system.stateVersion = "24.05"; wsl.enable = true;
wsl.enable = true; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; environment.systemPackages = [
environment.systemPackages = [
] ]
++ installedPackages.mkPackages.packages; ++ installedPackages.mkPackages.packages;
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
package = pkgs.nix-ld-rs; package = pkgs.nix-ld-rs;
}; };
} }
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
th0nkpad-nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.th0nkpad-nixos = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
./systems/th0nkpad-nixos/configuration.nix ./systems/th0nkpad-nixos/configuration.nix
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.05";
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
environment.systemPackages = [ environment.systemPackages = [
] ]
++ installedPackages.mkPackages.packages; ++ installedPackages.mkPackages.packages;
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
package = pkgs.nix-ld-rs; package = pkgs.nix-ld-rs;
}; };
} services.flatpak.enable = true;
]; systemd.services.flatpak-repo = {
specialArgs = { inherit inputs; }; wantedBy = [ "multi-user.target" ];
}; path = [ pkgs.flatpak ];
script = ''
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
'';
};
}
];
specialArgs = { inherit inputs; };
}; };
}; };
} }

View File

@ -89,6 +89,8 @@
description = "Andreas"; description = "Andreas";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [ packages = with pkgs; [
flatpak
gnome-software
# thunderbird # thunderbird
]; ];
}; };