From 445e4b5743a521dabc6611c1ca532c2b0c54779a Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 27 Oct 2023 15:20:59 -0700 Subject: [PATCH] Use custom grub --- flake.lock | 71 ++++++++++++++++++++------------- flake.nix | 7 +++- linux/blitzar/configuration.nix | 2 +- linux/blitzar/gui.nix | 13 +++--- linux/nebula/configuration.nix | 2 +- 5 files changed, 57 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index ec03a68..f45955b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1697723594, - "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", + "lastModified": 1698429334, + "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", + "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1698155728, - "narHash": "sha256-PUJ40o/0LyMEgSBEfLVyPA0K3gQnPYQDq9dW9nCOU9M=", + "lastModified": 1698422527, + "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", "owner": "nix-community", "repo": "disko", - "rev": "8c5d52db5690c72406b0cb13a5ac8554a287c93a", + "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { @@ -146,14 +146,15 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_5", - "wallpaper-engine-kde-plugin-lib": "wallpaper-engine-kde-plugin-lib" + "wallpaper-engine-kde-plugin-lib": "wallpaper-engine-kde-plugin-lib", + "yorha-grub-theme": "yorha-grub-theme" }, "locked": { - "lastModified": 1691983676, - "narHash": "sha256-0K/o6iPzC/eOBM1FNWu5rl9B0yA52Z4mqHHvvk1xLGc=", + "lastModified": 1698444924, + "narHash": "sha256-HPj0bSe/Wo90J04nqmTsaGSUEnjTgYcUP+hS7wftETQ=", "ref": "refs/heads/main", - "rev": "fbf346f822d68ed20fc36486175a484693c23366", - "revCount": 3, + "rev": "69de97b39e13a9c12b8a41abc41b6950519706af", + "revCount": 5, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -270,11 +271,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -286,11 +287,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -380,11 +381,11 @@ "wallpaper-engine-kde-plugin-lib": { "flake": false, "locked": { - "lastModified": 1691303010, - "narHash": "sha256-BVtTnJA1RLUU/Tj7WI/80ja4pI8NezHCjKvB72VjrZk=", + "lastModified": 1697944637, + "narHash": "sha256-rrBsQy+vG22IiaNDHYbkNPPbExQPQYLCaXy+KMHDmss=", "ref": "refs/heads/main", - "rev": "f972b2a24c9c3cc2d3e4f41d2ebd14f1473cebdf", - "revCount": 557, + "rev": "08dad16f5cbf0de423b85edda313597c273a887e", + "revCount": 559, "submodules": true, "type": "git", "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" @@ -394,6 +395,22 @@ "type": "git", "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" } + }, + "yorha-grub-theme": { + "flake": false, + "locked": { + "lastModified": 1665169118, + "narHash": "sha256-XVzYDwJM7Q9DvdF4ZOqayjiYpasUeMhAWWcXtnhJ0WQ=", + "owner": "OliveThePuffin", + "repo": "yorha-grub-theme", + "rev": "4d9cd37baf56c4f5510cc4ff61be278f11077c81", + "type": "github" + }, + "original": { + "owner": "OliveThePuffin", + "repo": "yorha-grub-theme", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7bfb9a9..12cffa0 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ sops-nix.url = "github:Mic92/sops-nix"; }; - outputs = inputs@{ self, darwin, nixpkgs, ... }: + outputs = inputs@{ self, darwin, nixpkgs, nix-custom, ... }: let darwinConfigDir = ./darwin; linuxConfigDir = ./linux; @@ -33,7 +33,10 @@ auto-optimise-store = true; }; }; - nixpkgs.config.allowUnfree = true; + nixpkgs = { + config.allowUnfree = true; + overlays = [ nix-custom.overlay ]; + }; }) ]; specialArgs = { inherit inputs; }; diff --git a/linux/blitzar/configuration.nix b/linux/blitzar/configuration.nix index 9c21031..9a602be 100644 --- a/linux/blitzar/configuration.nix +++ b/linux/blitzar/configuration.nix @@ -9,7 +9,7 @@ boot.loader.grub = { enable = true; device = "nodev"; - theme = pkgs.sleek-grub-theme.override { withBanner = "For the Glory of Mankind"; withStyle = "dark"; }; + theme = pkgs.yorha-grub-theme; }; # Set your time zone. diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index a9a1cd0..ca2fa5d 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -1,4 +1,4 @@ -{ config, inputs, pkgs, ... }: { +{ config, pkgs, ... }: { home-manager.users.${config.constants.userName} = { home.packages = with pkgs; [ exactaudiocopy @@ -7,24 +7,23 @@ nvtop-amd mono picard + (python3.withPackages (ps: with ps; [ + websockets + ])) qbittorrent sweet sweet-nova tauon telegram-desktop thunderbird + wallpaper-engine-kde-plugin-lib wineWowPackages.waylandFull winetricks yuzu-mainline ] ++ (with pkgs.libsForQt5; [ kirigami-addons qt5.qtwebsockets - ]) ++ [ - inputs.nix-custom.packages.${pkgs.system}.wallpaper-engine-kde-plugin-lib - (pkgs.python3.withPackages (ps: with ps; [ - websockets - ])) - ]; + ]); programs = { firefox.enable = true; kitty = { diff --git a/linux/nebula/configuration.nix b/linux/nebula/configuration.nix index 2f66687..d41eb0b 100644 --- a/linux/nebula/configuration.nix +++ b/linux/nebula/configuration.nix @@ -10,7 +10,7 @@ boot.loader.grub = { enable = true; device = "nodev"; - theme = pkgs.sleek-grub-theme.override { withBanner = "For the Glory of Mankind"; withStyle = "dark"; }; + theme = pkgs.yorha-grub-theme; }; # Set your time zone.