deployed laptop harmatan.

This commit is contained in:
Gabe Venberg 2025-10-15 20:36:45 +02:00
parent 4282c8b199
commit 2bcc6c86aa
6 changed files with 43 additions and 38 deletions

36
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759705705, "lastModified": 1760482308,
"narHash": "sha256-ckBnfbxbT7VU7ay0c5jkstAZHrC4xDpEHgnQo99OdEw=", "narHash": "sha256-/N7svQ+TCTXEw/C9UPKi+l1Uft7b38eH9zpaOi4Guh0=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "20ac117c3272da50ce125795d831ac55f29e766d", "rev": "f55d8341f1de89bdea025a13f33e179090f46a4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759853171, "lastModified": 1760500983,
"narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1759582739, "lastModified": 1760106635,
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3441b5242af7577230a78ffb03542add264179ab", "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759833546, "lastModified": 1760536587,
"narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=", "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730", "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759831965, "lastModified": 1760284886,
"narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c9b6fb798541223bbb396d287d16f43520250518", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +255,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759635238, "lastModified": 1760393368,
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -127,6 +127,10 @@
hostname = "altostratus"; hostname = "altostratus";
profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.altostratus; profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.altostratus;
}; };
harmatan = {
hostname = "harmatan";
profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmatan;
};
}; };
sshUser = "root"; sshUser = "root";
}; };

View file

@ -14,13 +14,15 @@ inputs.nixpkgs.lib.nixosSystem {
./hardware-config.nix ./hardware-config.nix
../../configs/nixos/common.nix ../../configs/nixos/common.nix
../../configs/nixos/sshd.nix ../../configs/nixos/sshd.nix
# TODO ../../configs/nixos/interactive-networking.nix
#../../configs/nixos/secrets.nix ../../configs/nixos/secrets.nix
../../configs/nixos/tailscale.nix ../../configs/nixos/tailscale.nix
../../configs/nixos/printing.nix ../../configs/nixos/printing.nix
../../configs/nixos/syncthing.nix ../../configs/nixos/syncthing.nix
../../configs/nixos/touchpad.nix ../../configs/nixos/touchpad.nix
../../configs/nixos/i3 ../../configs/nixos/i3
../../roles/nixos/gaming.nix
../../roles/nixos/power-saving.nix
({ ({
config, config,
pkgs, pkgs,
@ -36,10 +38,9 @@ inputs.nixpkgs.lib.nixosSystem {
networking.hostName = "harmatan"; networking.hostName = "harmatan";
networking.hostId = "7a42af26"; networking.hostId = "7a42af26";
# TODO home-manager.sharedModules = [
# home-manager.sharedModules = [ inputs.sops-nix.homeManagerModules.sops
# inputs.sops-nix.homeManagerModules.sops ];
# ];
home-manager.users.${config.host.details.user} = { home-manager.users.${config.host.details.user} = {
inputs, inputs,
osConfig, osConfig,
@ -59,19 +60,17 @@ inputs.nixpkgs.lib.nixosSystem {
../../roles/home-manager/terminal.nix ../../roles/home-manager/terminal.nix
../../roles/home-manager/music.nix ../../roles/home-manager/music.nix
../../configs/home-manager/common.nix ../../configs/home-manager/common.nix
# TODO ../../configs/home-manager/secrets.nix
# ../../configs/home-manager/secrets.nix ../../configs/home-manager/email.nix
../configs/home-manager/email.nix ../../configs/home-manager/tiny-irc.nix
../configs/home-manager/tiny-irc.nix
]; ];
# TODO sops = lib.mkIf (inputs ? nix-secrets) {
# sops = lib.mkIf (inputs ? nix-secrets) { secrets = {
# secrets = { gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
# gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml"; irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
# irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml"; };
# }; };
# };
}; };
# Bootloader. # Bootloader.

View file

@ -22,7 +22,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted"; name = "crypted";
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/disk.key";
content = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = ["-L" "nixos" "-f"]; extraArgs = ["-L" "nixos" "-f"];
@ -51,7 +51,7 @@
"/swap" = { "/swap" = {
mountpoint = "/.swapvol"; mountpoint = "/.swapvol";
swap.swapfile.size = "16G"; swap.swapfile.size = "16G";
priority = 0; swap.swapfile.priority = 0;
}; };
}; };
}; };

View file

@ -1,5 +1,5 @@
{config, ...}: { {config, ...}: {
config.hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];

View file

@ -14,6 +14,8 @@
]; ];
}; };
users.users.${config.host.details.user}.extraGroups = [ "dialout" ];
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ libraries = with pkgs; [