emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

starting setup for new services host

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-04-12 16:26:18 -04:00
parent 9bcb012cfb
commit f8b713b3d1
5 changed files with 64 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

53
flake.lock generated
View file

@ -70,11 +70,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1744449247,
"narHash": "sha256-F3iPj8nXoIkLRuBWN6TqqvO6TaHHyUUkT1ZNGYQU0jQ=",
"lastModified": 1744479669,
"narHash": "sha256-t2KLWeuwczpXX0ZjsO6l07NFHpoHsfEHjLBn6Ifp/Rc=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "ff148db04653261fa37c10816b293e43efac3cfb",
"rev": "ff930b5e806d659480b70f6ac3b2ba7efb346682",
"type": "github"
},
"original": {
@ -744,11 +744,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1744381460,
"narHash": "sha256-ay8Vijc8IuQiA+bMmKaKFy/2iTtvB9K7xqrirhnwivU=",
"lastModified": 1744480072,
"narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "4e592d48fb54ed742fb1ab14972a11432b2cbc31",
"rev": "c845f42f0bf9a02350a1e561cb702911c61428a9",
"type": "github"
},
"original": {
@ -777,11 +777,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1744271375,
"narHash": "sha256-W4h6ZX2WHJ6k0ApUTpuxkDPZ5JAI3MLWFP4lpfu3iv8=",
"lastModified": 1744475937,
"narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "df9466243504a00240f7048a1f9644cb002776a8",
"rev": "95eafba346a17104a9af71021011fcdc9e13776b",
"type": "github"
},
"original": {
@ -865,24 +865,6 @@
"type": "github"
}
},
"nix-way-templates": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1744061992,
"narHash": "sha256-sbfONAA77bvCJwH7aBCMbSUd63o2fJdKA25iFZKEDo0=",
"owner": "the-nix-way",
"repo": "dev-templates",
"rev": "943841721c279255265dae6f3229f59e14cf2974",
"type": "github"
},
"original": {
"owner": "the-nix-way",
"repo": "dev-templates",
"type": "github"
}
},
"nixarr": {
"inputs": {
"nixpkgs": [
@ -1060,20 +1042,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1739758141,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"revCount": 714614,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.714614%2Brev-c618e28f70257593de75a7044438efc1c1fc0791/0195155d-20df-7b25-ad70-45871483b8d2/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2411.%2A"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1744232761,
"narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
@ -1174,10 +1142,9 @@
"niri": "niri",
"nix-flatpak": "nix-flatpak",
"nix-rice": "nix-rice",
"nix-way-templates": "nix-way-templates",
"nixarr": "nixarr",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_4",
"sops-nix": "sops-nix",
"wezterm": "wezterm",

16
flake.nix
View file

@ -12,6 +12,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-flatpak = {
url = "github:gmodena/nix-flatpak"; # unstable branch
};
@ -199,17 +204,18 @@
services-nixos = nixpkgs.lib.nixosSystem {
system = sys;
specialArgs = configArgs;
modules = [
inputs.sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager
./hosts/emenel-services/configuration.nix
# {
# home-manager = baseHomeModules // {
# users.emenel = import ./homes/emenel-services/default.nix;
# };
# }
{
home-manager = baseHomeManager // {
users.emenel = import ./homes/emenel-services/default.nix;
};
}
];
};
};

5
hosts/emenel-services/configuration.nix
View file

@ -3,10 +3,11 @@
imports = [
./hardware-configuration.nix
./networking.nix # generated at runtime by nixos-infect
./disko-config.nix
];
boot.tmp.cleanOnBoot = true;
boot.loader.grub.enable = true;
zramSwap.enable = true;
networking.hostName = "services-nixos";
networking.domain = "";
@ -42,7 +43,7 @@
system.stateVersion = "23.11";
system.stateVersion = "25.05"; # Did you read the comment?
}

37
hosts/emenel-services/disko-config.nix Normal file
View file

@ -0,0 +1,37 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02";
priority = 1;
};
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}

7
hosts/emenel-services/hardware-configuration.nix
View file

@ -1,9 +1,8 @@
{ modulesPath, ... }:
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot.loader.grub.device = "/dev/sda";
# boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
# fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
}