From 0c0e511e669e243260960e7e672368b977c422e4 Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 7 Jul 2025 02:53:05 -0400 Subject: [PATCH] fix baal --- flake.lock | 46 +++++++++++++++++++++++++++++++++++++----- flake.nix | 3 +++ hosts/baal/default.nix | 17 ++++++++++++++-- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6931fa7..b7be3c7 100644 --- a/flake.lock +++ b/flake.lock @@ -61,6 +61,25 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", + "owner": "nix-community", + "repo": "disko", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v1.11.0", + "repo": "disko", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -299,8 +318,24 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1736241350, + "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "nixos", "repo": "nixpkgs", "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", @@ -313,7 +348,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -331,11 +366,12 @@ "inputs": { "agenix": "agenix", "catppuccin": "catppuccin", + "disko": "disko", "home-manager": "home-manager_2", "lix-module": "lix-module", "microvm": "microvm", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "vscode-server": "vscode-server", "zen-browser": "zen-browser" } @@ -419,7 +455,7 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1750353031, diff --git a/flake.nix b/flake.nix index 9325fa1..c74b34c 100755 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ microvm.url = "github:astro/microvm.nix"; microvm.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko/v1.11.0"; + catppuccin.url = "github:catppuccin/nix"; home-manager = { url = "github:nix-community/home-manager"; @@ -112,6 +114,7 @@ ./hosts/baal agenix.nixosModules.default + disko.nixosModules.disko { imports = builtins.attrValues nixosModules; } diff --git a/hosts/baal/default.nix b/hosts/baal/default.nix index d60a9e5..f4055b9 100644 --- a/hosts/baal/default.nix +++ b/hosts/baal/default.nix @@ -11,14 +11,25 @@ ../../host-secrets.nix ]; + boot = { + loader = { + systemd-boot.enable = true; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot"; + }; + }; + initrd.systemd.enable = true; + }; + system.stateVersion = "24.11"; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; systemd.targets.multi-user.enable = true; networking = { hostName = "baal"; - hostId = "193mdalf"; + hostId = "aaaaaaaa"; networkmanager.enable = true; }; @@ -26,4 +37,6 @@ enable = true; enableOnBoot = true; }; + + documentation.enable = false; }