From c615a6b4e739c3cd95fb2ad0a3a6a7da3a02c2aa Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Fri, 10 Jan 2025 22:01:21 +0100 Subject: [PATCH] feat(dregil): Set grub theme --- flake.lock | 55 +++++++++++++++++++++++++++++++++ flake.nix | 11 +++++-- hosts/dregil/default.nix | 6 ++-- modules/grub-themes/default.nix | 7 +++++ 4 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 modules/grub-themes/default.nix diff --git a/flake.lock b/flake.lock index 5099713..9b51e5e 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,27 @@ "type": "github" } }, + "distro-grub-themes": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734806114, + "narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=", + "owner": "AdisonCavani", + "repo": "distro-grub-themes", + "rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4", + "type": "github" + }, + "original": { + "owner": "AdisonCavani", + "repo": "distro-grub-themes", + "type": "github" + } + }, "emacs": { "inputs": { "nixpkgs": [ @@ -134,6 +155,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -457,6 +496,7 @@ "inputs": { "agenix": "agenix", "disko": "disko", + "distro-grub-themes": "distro-grub-themes", "emacs": "emacs", "home-manager": "home-manager_2", "nix-on-droid": "nix-on-droid", @@ -536,6 +576,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, diff --git a/flake.nix b/flake.nix index ab35182..18844f9 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; + distro-grub-themes = { + url = "github:AdisonCavani/distro-grub-themes"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; @@ -75,10 +80,11 @@ }; }; - nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { + nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; specialArgs = { inherit inputs; + inherit system; }; modules = [ ( @@ -105,10 +111,11 @@ ]; }; - nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem { + nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; specialArgs = { inherit inputs; + inherit system; stable = import inputs.stable { system = "x86_64-linux"; }; }; modules = [ ./hosts/dregil ]; diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index 2880cb7..de99c8b 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -1,9 +1,7 @@ { - lib, - config, - pkgs, inputs, stable, + system, ... }: { @@ -24,8 +22,10 @@ ../../modules/common-system.nix ./configuration.nix inputs.home-manager.nixosModules.home-manager + inputs.distro-grub-themes.nixosModules.${system}.default ../../home/anne/default.nix ../../home/alex/default.nix + ../../modules/grub-themes ../../modules/podman ../../modules/tailscale ]; diff --git a/modules/grub-themes/default.nix b/modules/grub-themes/default.nix new file mode 100644 index 0000000..100b81a --- /dev/null +++ b/modules/grub-themes/default.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + config.distro-grub-themes = { + enable = true; + theme = "nixos"; + }; +}