Use custom grub

This commit is contained in:
Invariantspace 2023-10-27 15:20:59 -07:00
parent 01610722e1
commit 445e4b5743
5 changed files with 57 additions and 38 deletions

71
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1697723594, "lastModified": 1698429334,
"narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1698155728, "lastModified": 1698422527,
"narHash": "sha256-PUJ40o/0LyMEgSBEfLVyPA0K3gQnPYQDq9dW9nCOU9M=", "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "8c5d52db5690c72406b0cb13a5ac8554a287c93a", "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1694529238,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1698250431, "lastModified": 1698392685,
"narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,14 +146,15 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_5", "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": { "locked": {
"lastModified": 1691983676, "lastModified": 1698444924,
"narHash": "sha256-0K/o6iPzC/eOBM1FNWu5rl9B0yA52Z4mqHHvvk1xLGc=", "narHash": "sha256-HPj0bSe/Wo90J04nqmTsaGSUEnjTgYcUP+hS7wftETQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "fbf346f822d68ed20fc36486175a484693c23366", "rev": "69de97b39e13a9c12b8a41abc41b6950519706af",
"revCount": 3, "revCount": 5,
"type": "git", "type": "git",
"url": "https://forgejo.invariantspace.com/macronova/nix-custom" "url": "https://forgejo.invariantspace.com/macronova/nix-custom"
}, },
@ -270,11 +271,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1691654369, "lastModified": 1698318101,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +287,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1698134075, "lastModified": 1698318101,
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,11 +381,11 @@
"wallpaper-engine-kde-plugin-lib": { "wallpaper-engine-kde-plugin-lib": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1691303010, "lastModified": 1697944637,
"narHash": "sha256-BVtTnJA1RLUU/Tj7WI/80ja4pI8NezHCjKvB72VjrZk=", "narHash": "sha256-rrBsQy+vG22IiaNDHYbkNPPbExQPQYLCaXy+KMHDmss=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "f972b2a24c9c3cc2d3e4f41d2ebd14f1473cebdf", "rev": "08dad16f5cbf0de423b85edda313597c273a887e",
"revCount": 557, "revCount": 559,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin" "url": "https://github.com/catsout/wallpaper-engine-kde-plugin"
@ -394,6 +395,22 @@
"type": "git", "type": "git",
"url": "https://github.com/catsout/wallpaper-engine-kde-plugin" "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", "root": "root",

View file

@ -12,7 +12,7 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
}; };
outputs = inputs@{ self, darwin, nixpkgs, ... }: outputs = inputs@{ self, darwin, nixpkgs, nix-custom, ... }:
let let
darwinConfigDir = ./darwin; darwinConfigDir = ./darwin;
linuxConfigDir = ./linux; linuxConfigDir = ./linux;
@ -33,7 +33,10 @@
auto-optimise-store = true; auto-optimise-store = true;
}; };
}; };
nixpkgs.config.allowUnfree = true; nixpkgs = {
config.allowUnfree = true;
overlays = [ nix-custom.overlay ];
};
}) })
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };

View file

@ -9,7 +9,7 @@
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "nodev"; 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. # Set your time zone.

View file

@ -1,4 +1,4 @@
{ config, inputs, pkgs, ... }: { { config, pkgs, ... }: {
home-manager.users.${config.constants.userName} = { home-manager.users.${config.constants.userName} = {
home.packages = with pkgs; [ home.packages = with pkgs; [
exactaudiocopy exactaudiocopy
@ -7,24 +7,23 @@
nvtop-amd nvtop-amd
mono mono
picard picard
(python3.withPackages (ps: with ps; [
websockets
]))
qbittorrent qbittorrent
sweet sweet
sweet-nova sweet-nova
tauon tauon
telegram-desktop telegram-desktop
thunderbird thunderbird
wallpaper-engine-kde-plugin-lib
wineWowPackages.waylandFull wineWowPackages.waylandFull
winetricks winetricks
yuzu-mainline yuzu-mainline
] ++ (with pkgs.libsForQt5; [ ] ++ (with pkgs.libsForQt5; [
kirigami-addons kirigami-addons
qt5.qtwebsockets qt5.qtwebsockets
]) ++ [ ]);
inputs.nix-custom.packages.${pkgs.system}.wallpaper-engine-kde-plugin-lib
(pkgs.python3.withPackages (ps: with ps; [
websockets
]))
];
programs = { programs = {
firefox.enable = true; firefox.enable = true;
kitty = { kitty = {

View file

@ -10,7 +10,7 @@
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "nodev"; 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. # Set your time zone.