Compare commits

..

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

2 changed files with 64 additions and 78 deletions

View File

@ -27,11 +27,9 @@
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; };
specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
# nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ]; # nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
@ -53,13 +51,10 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
} }
]; # end of modules ];
in };
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; starscream = nixpkgs.lib.nixosSystem {
starscream =
let
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
networking.hostName = "starscream"; networking.hostName = "starscream";
@ -74,13 +69,10 @@
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to 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 = nixpkgs.lib.nixosSystem {
knockout =
let
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
networking.hostName = "knockout"; networking.hostName = "knockout";
@ -93,12 +85,10 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix # 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, 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";