mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mir:063cb5d99c12a5fd1eba6f26cf82236081565e39
Branches Tags
mir:main
..
compare: mir:3499eae4d296ce8f5b954a92cc83e9e5900508a1
Branches Tags
mir:main

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

2 changed files with 64 additions and 78 deletions
Show Stats Expand all files Collapse all files

134
flake.nix
View File

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

8
home.nix
View File

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, ... }:
with lib.hm.gvariant; with lib.hm.gvariant;
{ {
@ -21,7 +21,6 @@ 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(
@ -84,10 +83,7 @@ with lib.hm.gvariant;
# programs.gdb = { # programs.gdb = {
# enable = true; # enable = true;
# }; # };
home.file.".emacs.d" = { # home.file.".local/src/emacs".source = inputs.emacs-config;
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";