From 065081b08ddf318c631f10aedd42ec42c5ff3750 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 18 Jul 2025 21:02:13 +0200 Subject: [PATCH 1/2] machine/workman: use plymouth overlay --- flake.nix | 1 - machines/configurations.nix | 8 +++++--- machines/workman/boot.nix | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 92eb58b..526d570 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ framework-plymouth = { url = "github:j-pap/framework-plymouth"; - inputs.nixpkgs.follows = "nixpkgs"; }; # own flakes diff --git a/machines/configurations.nix b/machines/configurations.nix index 8d3569a..129ba74 100644 --- a/machines/configurations.nix +++ b/machines/configurations.nix @@ -1,12 +1,13 @@ { self, ... }: let inherit (self.inputs) + disko + framework-plymouth + nixos-hardware nixpkgs nixpkgs-unstable - sops-nix - nixos-hardware passworts - disko + sops-nix ; nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem; overlay-unstable = final: _prev: { @@ -31,6 +32,7 @@ let nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ overlay-unstable + framework-plymouth.overlays.default (import ../overlays) (import ../pkgs) ]; diff --git a/machines/workman/boot.nix b/machines/workman/boot.nix index cb46451..fbbe5a7 100644 --- a/machines/workman/boot.nix +++ b/machines/workman/boot.nix @@ -1,6 +1,6 @@ { config, - inputs, + pkgs, ... }: { @@ -18,7 +18,7 @@ plymouth = { enable = true; theme = "framework"; - themePackages = [ inputs.framework-plymouth.packages.${config.nixpkgs.system}.default ]; + themePackages = [ pkgs.framework-plymouth ]; }; }; } From c49a17ad8890b25e55b16aa7a443e5c2741a1712 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 18 Jul 2025 21:03:48 +0200 Subject: [PATCH 2/2] flake: update --- flake.lock | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 2c491be..94a7bcf 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752718651, + "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "type": "github" }, "original": { @@ -91,17 +91,12 @@ } }, "framework-plymouth": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1744254441, - "narHash": "sha256-zpbqouGFxu0fdECX54jHPyjYEX+04kZRWZFZ4IKL58c=", + "lastModified": 1752437979, + "narHash": "sha256-Of/7i/+NH++eA2yQxtVBy5zb1ZMYTakeHrnEFj6ecNI=", "owner": "j-pap", "repo": "framework-plymouth", - "rev": "6aa8efd36bd79660ced9b8a82495afdb0c8c1166", + "rev": "a2f08a434cf7202301ae1a14862b88e9e52387e6", "type": "github" }, "original": { @@ -227,11 +222,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -242,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { @@ -299,11 +294,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -356,11 +351,11 @@ ] }, "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": {