fix errors on nixos-rebuild

This commit is contained in:
greyweather committed 2026-07-04 22:17:51 +01:00
1 parent be100cfe97
commit f05f9df813
5 files changed
+19 -17

No files matched your search

+5 -2
View File
@@ -36,7 +36,7 @@
outputs = {self,nixpkgs,home-manager,plasma-manager,...}@inputs: { outputs = {self,nixpkgs,home-manager,plasma-manager,...}@inputs: {
nixosConfigurations = builtins.listToAttrs (map (name: { nixosConfigurations = builtins.listToAttrs (map (name: {
name = name; inherit name;
value = nixpkgs.lib.nixosSystem { value = nixpkgs.lib.nixosSystem {
modules = [ modules = [
./hosts/${name} ./hosts/${name}
@@ -47,14 +47,17 @@
users.grey = ./hosts/${name}/home.nix; users.grey = ./hosts/${name}/home.nix;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
hostname = name;
stateVersion = "26.05";
}; };
}; };
} }
]; ];
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit name; hostname = name;
system = "x86-64-linux"; system = "x86-64-linux";
stateVersion = "26.05";
}; };
}; };
}) ["takamaki" "kitagawa" "nixos-vm"]); }) ["takamaki" "kitagawa" "nixos-vm"]);
+4 -1
View File
@@ -1,8 +1,11 @@
{ {
config, config,
pkgs, pkgs,
specialArgs,
... ...
}: { }: {
networking.hostName = specialArgs.hostname; # Define your hostname.
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
@@ -68,5 +71,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "26.05"; # Did you read the comment? system.stateVersion = specialArgs.stateVersion; # Did you read the comment?
} }
+3 -5
View File
@@ -1,12 +1,10 @@
{ {
config, config,
pkgs, pkgs,
specialArgs,
... ...
}: { }: {
home.username = "grey"; home.stateVersion = specialArgs.stateVersion;
home.homeDirectory = "/home/grey";
home.stateVersion = system.stateVersion;
programs.git = { programs.git = {
enable = true; enable = true;
@@ -44,7 +42,7 @@
Port = 22; Port = 22;
User = "git"; User = "git";
IdentityFile = "~/.ssh/id_github"; IdentityFile = "~/.ssh/id_github";
} };
}; };
}; };
+4 -6
View File
@@ -7,18 +7,16 @@
pkgs, pkgs,
... ...
}: let }: let
name = "nixos-vm";
modules-dir = ../../modules; modules-dir = ../../modules;
in { in {
imports = [ imports = [
./hardware-configuration.nix
../../global-default.nix ../../global-default.nix
${modules-dir}/nh.nix ./hardware-configuration.nix
${modules-dir}/plasma-desktop.nix "${modules-dir}/nh.nix"
${modules-dir}/home-manager.nix "${modules-dir}/plasma-desktop.nix"
"${modules-dir}/home-manager.nix"
]; ];
networking.hostName = name; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary # Configure network proxy if necessary
+3 -3
View File
@@ -9,9 +9,9 @@ global-configs-dir = ../../global-configs;
in { in {
imports = [ imports = [
../../global-home.nix ../../global-home.nix
${global-configs-dir}/plasma.nix "${global-configs-dir}/plasma.nix"
${global-configs-dir}/fastfetch.nix "${global-configs-dir}/fastfetch.nix"
${global-configs-dir}/zen-browser.nix "${global-configs-dir}/zen-browser.nix"
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [