Compare commits

..

No commits in common. "063cb5d99c12a5fd1eba6f26cf82236081565e39" and "3499eae4d296ce8f5b954a92cc83e9e5900508a1" have entirely different histories.

2 changed files with 64 additions and 78 deletions

134
flake.nix
View File

@ -27,78 +27,68 @@
home-manager,
... }: {
nixosConfigurations = {
galvatron =
let
system = "aarch64-linux";
# specialArgs = { inherit nixpkgs-unstable; };
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
# nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true;
# experimentalGPUInstallMode = "driver";
# experimentalGPUInstallMode = "overlay";
};
boot.loader.efi.canTouchEfiVariables = false;
networking.hostName = "galvatron";
sound.enable = false;
}
./galvatron/hardware-configuration.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
starscream =
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
networking.hostName = "starscream";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/starscream-hw.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
knockout =
let
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
./configuration.nix {
networking.hostName = "knockout";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/knockout-hw.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
}
]; # end of modules
in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
galvatron = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
# specialArgs = { inherit nixpkgs-unstable; };
modules = [
./configuration.nix {
# nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true;
# experimentalGPUInstallMode = "driver";
# experimentalGPUInstallMode = "overlay";
};
boot.loader.efi.canTouchEfiVariables = false;
networking.hostName = "galvatron";
sound.enable = false;
}
./galvatron/hardware-configuration.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
}
];
};
starscream = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix {
networking.hostName = "starscream";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/starscream-hw.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
}
];
};
knockout = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix {
networking.hostName = "knockout";
boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true;
}
./hardware/knockout-hw.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
}
];
};
};
};
}

View File

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, ... }:
{ lib, config, pkgs, ... }:
with lib.hm.gvariant;
{
@ -21,7 +21,6 @@ with lib.hm.gvariant;
pkgs.mpv
pkgs.fzf
pkgs.nerdfonts
pkgs.eza
# pkgs.gnupg
# pkgs.python3
# (pkgs.python3.withPackages(
@ -84,10 +83,7 @@ with lib.hm.gvariant;
# programs.gdb = {
# enable = true;
# };
home.file.".emacs.d" = {
source = inputs.emacs-config;
recursive = true;
};
# home.file.".local/src/emacs".source = inputs.emacs-config;
# programs.dconf.enable = true;
home.file.".local/share/backgrounds/mojave.jpg".source = builtins.fetchurl {
url = "https://www.teahub.io/photos/full/154-1542362_mac-os-mojave-screenshot.jpg";