gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning up specialArgs

Browse source
This commit is contained in:
Gerg-L 2023-02-23 20:28:46 -05:00
parent 3befa64d21
commit 3d8dd7c92c
5 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -48,10 +48,9 @@
gerg-desktop = unstable.lib.nixosSystem { gerg-desktop = unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs self; inherit self;
settings = { settings = {
username = "gerg"; username = "gerg";
hostname = "gerg-desktop";
}; };
}; };
@ -69,10 +68,9 @@
game-laptop = unstable.lib.nixosSystem { game-laptop = unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs self; inherit self;
settings = { settings = {
username = "games"; username = "games";
hostname = "game-laptop";
}; };
}; };
modules = [ modules = [
@ -83,10 +81,9 @@
moms-laptop = unstable.lib.nixosSystem { moms-laptop = unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs self; inherit self;
settings = { settings = {
username = "jo"; username = "jo";
hostname = "moms-laptop";
}; };
}; };
modules = [ modules = [

11
modules/nix.nix
View file

@ -1,9 +1,4 @@
{ inputs: {
nix,
unstable,
...
}: {
inputs,
lib, lib,
self, self,
settings, settings,
@ -26,12 +21,12 @@
inputs inputs
) )
// { // {
nixpkgs.flake = unstable; nixpkgs.flake = inputs.unstable;
system.flake = self; system.flake = self;
} }
); );
#automatically add registry entries to nixPath #automatically add registry entries to nixPath
nixPath = (lib.mapAttrsToList (name: value: name + "=" + value) inputs) ++ ["system=${self}" "nixpkgs=${unstable}"]; nixPath = (lib.mapAttrsToList (name: value: name + "=" + value) inputs) ++ ["system=${self}" "nixpkgs=${inputs.unstable}"];
settings = { settings = {
experimental-features = ["nix-command" "flakes" "repl-flake"]; experimental-features = ["nix-command" "flakes" "repl-flake"];
auto-optimise-store = true; auto-optimise-store = true;

2
systems/game-laptop/default.nix
View file

@ -35,7 +35,7 @@ inputs: {
inputs.suckless.packages.${pkgs.system}.st inputs.suckless.packages.${pkgs.system}.st
]; ];
networking = { networking = {
hostName = settings.hostname; hostName = "game-laptop";
networkmanager.enable = true; networkmanager.enable = true;
}; };
users = { users = {

2
systems/gerg-desktop/default.nix
View file

@ -48,7 +48,7 @@ inputs: {
systemd.tmpfiles.rules = ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${self}/misc/black.theme.css"]; systemd.tmpfiles.rules = ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${self}/misc/black.theme.css"];
networking = { networking = {
hostName = settings.hostname; hostName = "gerg-desktop";
hostId = "288b56db"; hostId = "288b56db";
useDHCP = false; useDHCP = false;
dhcpcd.enable = false; dhcpcd.enable = false;

2
systems/mom-laptop/default.nix
View file

@ -30,7 +30,7 @@ inputs: {
]; ];
services.xserver.videoDrivers = ["intel"]; services.xserver.videoDrivers = ["intel"];
networking = { networking = {
hostName = settings.hostname; hostName = "mom-laptop";
networkmanager.enable = true; networkmanager.enable = true;
}; };
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;