Compare commits

..

2 Commits

2 changed files with 78 additions and 64 deletions

134
flake.nix
View File

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

View File

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